Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java @ 9751:308a0d822d18 3.2.x
Keep configuration and data in distinct directories
This allows having distinct volumes for configuration and data
(artifact database, generated mapfiles and shapefiles, etc.).
While at it, cleanup MapServer configuration a little bit.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 11 Oct 2022 11:42:09 +0200 |
| parents | 0a5239a1e46e |
| children | a41f9c355204 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java Mon Oct 10 15:29:44 2022 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java Tue Oct 11 11:42:09 2022 +0200 @@ -81,26 +81,11 @@ public static final String XPATH_FLOODMAP_RIVER_PROJECTION = "/artifact-database/floodmap/river[@name=$name]/srid/@value"; - public static final String XPATH_FLOODMAP_SHAPEFILE_DIR = - "/artifact-database/floodmap/shapefile-path/@value"; - - public static final String XPATH_FLOODMAP_VELOCITY_LOGFILE = - "/artifact-database/floodmap/velocity/logfile/@path"; - - public static final String XPATH_FLOODMAP_MAPSERVER_URL = - "/artifact-database/floodmap/mapserver/server/@path"; + public static final String XPATH_MAPSERVER_URL = + "/artifact-database/mapserver/server/@path"; - public static final String XPATH_RIVERMAP_MAPSERVER_URL = - "/artifact-database/rivermap/mapserver/server/@path"; - - public static final String XPATH_FLOODMAP_MAPFILE_PATH = - "/artifact-database/floodmap/mapserver/mapfile/@path"; - - public static final String XPATH_FLOODMAP_MAPFILE_TEMPLATE = - "/artifact-database/floodmap/mapserver/map-template/@path"; - - public static final String XPATH_FLOODMAP_MAPSERVER_TEMPLATE_PATH = - "/artifact-database/floodmap/mapserver/templates/@path"; + public static final String XPATH_MAPFILES_PATH = + "/artifact-database/mapserver/mapfiles/@path"; public static final String CURRENT_KM = "currentKm"; @@ -631,7 +616,7 @@ * @return the URL of the user wms. */ public static String getUserWMSUrl(String artifactId) { - String url = getXPathString(XPATH_FLOODMAP_MAPSERVER_URL); + String url = getXPathString(XPATH_MAPSERVER_URL); url = url.endsWith("/") ? url + "user-wms" : url + "/" + "user-wms"; return url; @@ -639,7 +624,7 @@ public static String getRiverWMSUrl() { - String url = getXPathString(XPATH_RIVERMAP_MAPSERVER_URL); + String url = getXPathString(XPATH_MAPSERVER_URL); url = url.endsWith("/") ? url + "river-wms" : url + "/" + "river-wms"; return url;