[Dive4elements-commits] [PATCH 2 of 4] Group barriers layer and fix polygon layer path to shapefile

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1371136665 -7200
# Node ID 36dc11244ec3f165da735a1bbc6a303010b6bad1
# Parent  5a7c48dbfeaa72ae57b85608d70ea0d8c404bea9
Group barriers layer and fix polygon layer path to shapefile

diff -r 5a7c48dbfeaa -r 36dc11244ec3 artifacts/src/main/java/org/dive4elements/river/artifacts/states/FloodMapState.java
--- 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.");