# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1323081614 0
# Node ID a5f87f8dbe57b182f660b12e04773d0b60e66c91
# Parent  ccf2235035d609ac5d496c8be501bf8b41e30943
Modified prefix constants for Mapserver layers.

flys-artifacts/trunk@3354 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r ccf2235035d6 -r a5f87f8dbe57 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Dec 05 09:35:00 2011 +0000
+++ b/flys-artifacts/ChangeLog	Mon Dec 05 10:40:14 2011 +0000
@@ -1,3 +1,12 @@
+2011-12-05  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/utils/MapfileGenerator.java: Modified
+	  prefix constants for Mapserver layers and renamed constants (which have
+	  been postfixes before).
+
+	* src/main/java/de/intevation/flys/wsplgen/FacetCreator.java: Adjusted
+	  usage of Mapserver constants to the changes described above.
+
 2011-12-05  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java:
diff -r ccf2235035d6 -r a5f87f8dbe57 flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Mon Dec 05 09:35:00 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Mon Dec 05 10:40:14 2011 +0000
@@ -41,11 +41,11 @@
     public static final String SHP_LAYER_TEMPLATE = "shapefile_layer.vm";
     public static final String DB_LAYER_TEMPLATE  = "db_layer.vm";
 
-    public static final String MS_WSPLGEN_POSTFIX  = "-wsplgen";
-    public static final String MS_BARRIERS_POSTFIX = "-barriers";
-    public static final String MS_LINE_POSTFIX     = "-lines";
-    public static final String MS_POLYGONS_POSTFIX = "-polygons";
-    public static final String MS_LAYER_PREFIX     = "ms_layer-";
+    public static final String MS_WSPLGEN_PREFIX  = "wsplgen-";
+    public static final String MS_BARRIERS_PREFIX = "barriers-";
+    public static final String MS_LINE_PREFIX     = "lines-";
+    public static final String MS_POLYGONS_PREFIX = "polygons-";
+    public static final String MS_LAYER_PREFIX    = "ms_layer-";
 
     protected static final long SLEEPTIME = 10 * 1000L; // 10 seconds
 
@@ -370,7 +370,7 @@
         logger.debug("createUeskLayer");
 
         LayerInfo layerinfo = new LayerInfo();
-        layerinfo.setName(MS_WSPLGEN_POSTFIX + flys.identifier());
+        layerinfo.setName(MS_WSPLGEN_PREFIX + flys.identifier());
         layerinfo.setType("POLYGON");
         layerinfo.setDirectory(flys.identifier());
         layerinfo.setData(WSPLGEN_RESULT_SHAPE);
@@ -422,7 +422,7 @@
     throws FileNotFoundException, IOException
     {
         String uuid       = flys.identifier();
-        String group      = uuid + MS_BARRIERS_POSTFIX;
+        String group      = MS_BARRIERS_PREFIX + uuid;
         String groupTitle = "I18N_BARRIERS_TITLE";
 
         File dir  = new File(getShapefileBaseDir(), uuid);
@@ -434,7 +434,7 @@
         }
 
         LayerInfo lineInfo = new LayerInfo();
-        lineInfo.setName(MS_LINE_POSTFIX + uuid);
+        lineInfo.setName(MS_LINE_PREFIX + uuid);
         lineInfo.setType("LINE");
         lineInfo.setDirectory(uuid);
         lineInfo.setData(WSPLGEN_LINES_SHAPE);
@@ -467,7 +467,7 @@
     throws FileNotFoundException, IOException
     {
         String uuid       = flys.identifier();
-        String group      = uuid + MS_BARRIERS_POSTFIX;
+        String group      = uuid + MS_BARRIERS_PREFIX;
         String groupTitle = "I18N_BARRIERS_TITLE";
 
         File dir  = new File(getShapefileBaseDir(), uuid);
@@ -479,7 +479,7 @@
         }
 
         LayerInfo polygonInfo = new LayerInfo();
-        polygonInfo.setName(MS_POLYGONS_POSTFIX + uuid);
+        polygonInfo.setName(MS_POLYGONS_PREFIX + uuid);
         polygonInfo.setType("POLYGON");
         polygonInfo.setDirectory(uuid);
         polygonInfo.setData(WSPLGEN_POLYGONS_SHAPE);
diff -r ccf2235035d6 -r a5f87f8dbe57 flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java	Mon Dec 05 09:35:00 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/FacetCreator.java	Mon Dec 05 10:40:14 2011 +0000
@@ -116,7 +116,7 @@
         }
 
         wsplgen.addLayer(
-            MapfileGenerator.MS_WSPLGEN_POSTFIX + artifact.identifier());
+            MapfileGenerator.MS_WSPLGEN_PREFIX + artifact.identifier());
         wsplgen.setSrid(getSrid());
         wsplgen.setExtent(bounds);
 
@@ -137,7 +137,7 @@
             getUrl());
 
         barriers.addLayer(
-            MapfileGenerator.MS_BARRIERS_POSTFIX + artifact.identifier());
+            MapfileGenerator.MS_BARRIERS_PREFIX + artifact.identifier());
         barriers.setSrid(getSrid());
         barriers.setExtent(getBounds());