# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1331891511 0
# Node ID b23c956c5aa2b96501ba0794c7b0a7d839d997b5
# Parent  226c360febaeb1a49f1ef7a1b6eafffff9ae4864
Fixed broken Floodmaps in datacage for floodmap output.

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

diff -r 226c360febae -r b23c956c5aa2 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Mar 16 09:32:29 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Mar 16 09:51:51 2012 +0000
@@ -1,3 +1,16 @@
+2012-03-16  Ingo Weinzierl <ingo@intevation.de>
+
+	* doc/conf/mapserver/db_layer.vm: Set the FILTER expression into double
+	  quotes (") instead of single quotes (') which allows single quotes in
+	  expressions.
+
+	* doc/conf/meta-data.xml: Moved the floodmaps from kilometrage to its
+	  parent folder.
+
+	* src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java:
+	  Fixed broken filter expression and set geometry type (MapServer does not
+	  know a 'MULTIPOLYGON').
+
 2012-03-16  Raimund Renkert <raimund.renkert@intevation.de>
 
 	* src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java:
diff -r 226c360febae -r b23c956c5aa2 flys-artifacts/doc/conf/mapserver/db_layer.vm
--- a/flys-artifacts/doc/conf/mapserver/db_layer.vm	Fri Mar 16 09:32:29 2012 +0000
+++ b/flys-artifacts/doc/conf/mapserver/db_layer.vm	Fri Mar 16 09:51:51 2012 +0000
@@ -6,7 +6,7 @@
     CONNECTION "$LAYER.getConnection()"
 
     DATA    "$LAYER.getData()"
-    FILTER  '$LAYER.getFilter()'
+    FILTER  "$LAYER.getFilter()"
     EXTENT  $LAYER.getExtent()
 
     STATUS    ON
diff -r 226c360febae -r b23c956c5aa2 flys-artifacts/doc/conf/meta-data.xml
--- a/flys-artifacts/doc/conf/meta-data.xml	Fri Mar 16 09:32:29 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Fri Mar 16 09:51:51 2012 +0000
@@ -801,8 +801,8 @@
                     <dc:call-macro name="flood-map-lines"/>
                     <dc:call-macro name="flood-map-buildings"/>
                     <dc:call-macro name="flood-map-fixpoints"/>
-                    <dc:call-macro name="flood-map-uesk"/>
                   </kilometrage>
+                  <dc:call-macro name="flood-map-uesk"/>
                   <rastermap>
                       <background>
                           <dc:attribute name="factory" value="wmsbackground"/>
diff -r 226c360febae -r b23c956c5aa2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java	Fri Mar 16 09:32:29 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java	Fri Mar 16 09:51:51 2012 +0000
@@ -161,7 +161,7 @@
         @Override
         protected String getFilter() {
             return "river_id=" + String.valueOf(getRiverId())
-                + "name=" + getFloodmapName();
+                + " AND name='" + getFloodmapName() + "'";
         }
 
         @Override
@@ -178,7 +178,7 @@
 
         @Override
         protected String getGeometryType() {
-            return "MULTIPOLYGON";
+            return "POLYGON";
         }
     } // end of WMSKmState
 }