Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.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/RiverMapfileGenerator.java Mon Oct 10 15:29:44 2022 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java Tue Oct 11 11:42:09 2022 +0200 @@ -11,8 +11,6 @@ import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.MultiLineString; -import org.dive4elements.artifacts.common.utils.Config; - import org.dive4elements.river.artifacts.model.LayerInfo; import org.dive4elements.river.artifacts.model.RiverFactory; @@ -20,7 +18,7 @@ import org.dive4elements.river.model.RiverAxis; import java.io.File; -import java.io.FileNotFoundException; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -35,20 +33,14 @@ public class RiverMapfileGenerator extends MapfileGenerator { - public static final String XPATH_RIVERMAP_SHAPEFILE_DIR = - "/artifact-database/rivermap/shapefile-path/@value"; - - public static final String XPATH_RIVERMAP_VELOCITY_LOGFILE = - "/artifact-database/rivermap/velocity/logfile/@path"; + private static final String XPATH_RIVERMAP_VELOCITY_LOGFILE = + "/artifact-database/rivermap/velocity/logfile/@path"; - public static final String XPATH_RIVERMAP_MAPFILE_PATH = - "/artifact-database/rivermap/mapserver/mapfile/@path"; + private static final String XPATH_RIVERMAP_MAPFILE_PATH = + "/artifact-database/rivermap/mapfile/@path"; - public static final String XPATH_RIVERMAP_MAPFILE_TEMPLATE = - "/artifact-database/rivermap/mapserver/map-template/@path"; - - public static final String XPATH_RIVERMAP_MAPSERVER_TEMPLATE_PATH = - "/artifact-database/rivermap/mapserver/templates/@path"; + private static final String XPATH_RIVERMAP_MAPFILE_TEMPLATE = + "/artifact-database/rivermap/map-template/@path"; public static final Pattern DB_URL_PATTERN = Pattern.compile("(.*)\\/\\/(.*):([0-9]+)\\/([a-zA-Z]+)"); @@ -126,9 +118,6 @@ layerInfo.setFilter("river_id = " + riverID + " and kind_id = 1"); layerInfo.setTitle(riverName + " RiverAxis"); - File layerFile = new File( - Config.getConfigDirectory().getParentFile(), - "river-" + riverName + ".map"); Template template = getTemplateByName("riveraxis-layer.vm"); if (template == null) { log.warn("Template riveraxis-layer.vm not found."); @@ -136,9 +125,12 @@ } try { + File layerFile = new File( + getShapefileBaseDir(), + "river-" + riverName + ".map"); writeLayer(layerInfo, layerFile, template); } - catch (FileNotFoundException e) { + catch (IOException e) { log.warn(e.getLocalizedMessage(), e); } } @@ -149,14 +141,9 @@ } @Override - protected String getMapserverTemplatePath() { - return RiverUtils.getXPathString( - XPATH_RIVERMAP_MAPSERVER_TEMPLATE_PATH); - } - - @Override protected String getMapfilePath() { - return RiverUtils.getXPathString(XPATH_RIVERMAP_MAPFILE_PATH); + return RiverUtils.getXPathString(RiverUtils.XPATH_MAPFILES_PATH) + + "/" + RiverUtils.getXPathString(XPATH_RIVERMAP_MAPFILE_PATH); } @Override