Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.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 | afad1fac70fb |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java Mon Oct 10 15:29:44 2022 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java Tue Oct 11 11:42:09 2022 +0200 @@ -37,6 +37,15 @@ private static Logger log = LogManager.getLogger( ArtifactMapfileGenerator.class); + private static final String XPATH_FLOODMAP_VELOCITY_LOGFILE = + "/artifact-database/floodmap/velocity/logfile/@path"; + + private static final String XPATH_FLOODMAP_MAPFILE_TEMPLATE = + "/artifact-database/floodmap/map-template/@path"; + + private static final String XPATH_FLOODMAP_MAPFILE_PATH = + "/artifact-database/floodmap/mapfile/@path"; + public static final String FLOODMAP_UESK_KEY = "floodmap.uesk"; @@ -45,14 +54,7 @@ @Override protected String getVelocityLogfile() { - return RiverUtils.getXPathString( - RiverUtils.XPATH_FLOODMAP_VELOCITY_LOGFILE); - } - - @Override - protected String getMapserverTemplatePath() { - return RiverUtils.getXPathString( - RiverUtils.XPATH_FLOODMAP_MAPSERVER_TEMPLATE_PATH); + return RiverUtils.getXPathString(XPATH_FLOODMAP_VELOCITY_LOGFILE); } /** @@ -263,13 +265,12 @@ @Override protected String getMapfilePath() { - return RiverUtils.getXPathString( - RiverUtils.XPATH_FLOODMAP_MAPFILE_PATH); + return RiverUtils.getXPathString(RiverUtils.XPATH_MAPFILES_PATH) + + "/" + RiverUtils.getXPathString(XPATH_FLOODMAP_MAPFILE_PATH); } @Override protected String getMapfileTemplate() { - return RiverUtils.getXPathString( - RiverUtils.XPATH_FLOODMAP_MAPFILE_TEMPLATE); + return RiverUtils.getXPathString(XPATH_FLOODMAP_MAPFILE_TEMPLATE); } }