diff flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java @ 1917:71139016cd0f

Avoid WMS layer names that begin with digits to ensure valid WMS GetFeatureInfo responses. flys-artifacts/trunk@3277 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 16 Nov 2011 15:55:24 +0000
parents dd467951335c
children a5f87f8dbe57
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Wed Nov 16 15:53:52 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Wed Nov 16 15:55:24 2011 +0000
@@ -370,7 +370,7 @@
         logger.debug("createUeskLayer");
 
         LayerInfo layerinfo = new LayerInfo();
-        layerinfo.setName(flys.identifier() + MS_WSPLGEN_POSTFIX);
+        layerinfo.setName(MS_WSPLGEN_POSTFIX + flys.identifier());
         layerinfo.setType("POLYGON");
         layerinfo.setDirectory(flys.identifier());
         layerinfo.setData(WSPLGEN_RESULT_SHAPE);
@@ -434,7 +434,7 @@
         }
 
         LayerInfo lineInfo = new LayerInfo();
-        lineInfo.setName(uuid + MS_LINE_POSTFIX);
+        lineInfo.setName(MS_LINE_POSTFIX + uuid);
         lineInfo.setType("LINE");
         lineInfo.setDirectory(uuid);
         lineInfo.setData(WSPLGEN_LINES_SHAPE);
@@ -479,7 +479,7 @@
         }
 
         LayerInfo polygonInfo = new LayerInfo();
-        polygonInfo.setName(uuid + MS_POLYGONS_POSTFIX);
+        polygonInfo.setName(MS_POLYGONS_POSTFIX + uuid);
         polygonInfo.setType("POLYGON");
         polygonInfo.setDirectory(uuid);
         polygonInfo.setData(WSPLGEN_POLYGONS_SHAPE);
@@ -522,7 +522,7 @@
         logger.debug("createDatabaseLayer");
 
         LayerInfo layerinfo = new LayerInfo();
-        layerinfo.setName(flys.identifier() + "-" + wms.getName());
+        layerinfo.setName(wms.getName() + "-" + flys.identifier());
         layerinfo.setType(wms.getGeometryType());
         layerinfo.setFilter(wms.getFilter());
         layerinfo.setData(wms.getData());

http://dive4elements.wald.intevation.org