Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/ShapeFacet.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 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/ShapeFacet.java Mon Oct 10 15:29:44 2022 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/map/ShapeFacet.java Tue Oct 11 11:42:09 2022 +0200 @@ -15,8 +15,8 @@ import org.dive4elements.artifactdatabase.state.DefaultFacet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; -import org.dive4elements.artifacts.common.utils.Config; import org.dive4elements.river.artifacts.D4EArtifact; +import org.dive4elements.river.utils.RiverUtils; public class ShapeFacet @@ -24,9 +24,6 @@ { private static Logger log = LogManager.getLogger(ShapeFacet.class); - private static final String BASE_DIR = - "/artifact-database/floodmap/shapefile-path/@value"; - /** * Defaults to ADVANCE Compute type. * @param name Name of the facet. @@ -42,8 +39,8 @@ @Override public Object getData(Artifact artifact, CallContext context) { D4EArtifact flys = (D4EArtifact)artifact; - String tmp = Config.getStringXPath(BASE_DIR); - String baseDir = Config.replaceConfigDir(tmp); + String baseDir = RiverUtils.getXPathString( + RiverUtils.XPATH_MAPFILES_PATH); baseDir += "/" + flys.identifier(); File shapeDir = new File(baseDir); if (shapeDir.exists()) { @@ -51,5 +48,4 @@ } return null; } - }