changeset 6330:36dc11244ec3

Group barriers layer and fix polygon layer path to shapefile
author Andre Heinecke <aheinecke@intevation.de>
date Thu, 13 Jun 2013 17:17:45 +0200
parents 5a7c48dbfeaa
children 91dfd6425f11
files artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodMapState.java
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodMapState.java	Thu Jun 13 17:17:06 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodMapState.java	Thu Jun 13 17:17:45 2013 +0200
@@ -458,6 +458,7 @@
         info.setData(hwsShapefile);
         info.setSrid(srid);
         info.setGroupTitle(group);
+        info.setGroup(group + artifact.identifier());
         MapfileGenerator generator = new ArtifactMapfileGenerator();
         Template tpl = generator.getTemplateByName(MapfileGenerator.SHP_LAYER_TEMPLATE);
         try {
@@ -600,7 +601,7 @@
                 WSPLGEN_BARRIERS_LINES,
                 "LINE",
                 srid,
-                "barriers");
+                MapfileGenerator.MS_BARRIERS_PREFIX);
 
             if (scenario.equals(WSPLGENJob.GEL_NOSPERRE)) {
                 logger.debug("WSPLGEN will not use barrier features.");
@@ -624,10 +625,10 @@
                 artifact,
                 dir,
                 MapfileGenerator.MS_LAYER_PREFIX + "barriers-poly",
-                shapePolys.getAbsolutePath(),
+                WSPLGEN_BARRIERS_POLY,
                 "POLYGON",
                 srid,
-                "barriers");
+                MapfileGenerator.MS_BARRIERS_PREFIX);
 
             if (scenario.equals(WSPLGENJob.GEL_NOSPERRE)) {
                 logger.debug("WSPLGEN will not use barrier features.");

http://dive4elements.wald.intevation.org