[PATCH] (issue657) Use regular expressions in Mapfile templates to catch various spellings of feature class types

[Wald Commits]

# HG changeset patch
# User Christian Lins <christian.lins at intevation.de>
# Date 1376566216 -7200
# Node ID 4b7944c37c4f33cd33b0b52fcf6c85ce4f8f74ea
# Parent  8c7433b8656d9df08e3394fc1104456cb889aa4e
(issue657) Use regular expressions in Mapfile templates to catch various spellings of feature class types.

diff -r 8c7433b8656d -r 4b7944c37c4f artifacts/doc/conf/mapserver/barrier_lines_class.vm
--- a/artifacts/doc/conf/mapserver/barrier_lines_class.vm	Wed Aug 14 16:50:35 2013 +0200
+++ b/artifacts/doc/conf/mapserver/barrier_lines_class.vm	Thu Aug 15 13:30:16 2013 +0200
@@ -1,6 +1,6 @@
 CLASS
     NAME "Damm"
-    EXPRESSION ("[TYP]"="Damm")
+    EXPRESSION /damm/i
     STYLE
         SIZE 5
         OUTLINECOLOR "#008000"
@@ -8,7 +8,7 @@
 END
 CLASS
     NAME "Rohr 1"
-    EXPRESSION ("[TYP]"="Rohr 1")
+    EXPRESSION /rohr.1/i
     STYLE
         SIZE 5
         OUTLINECOLOR "#800080"
@@ -16,7 +16,7 @@
 END
 CLASS
     NAME "Rohr 2"
-    EXPRESSION ("[TYP]"="Rohr 2")
+    EXPRESSION /rohr.2/i
     STYLE
         SIZE 5
         OUTLINECOLOR "#808080"
@@ -24,7 +24,7 @@
 END
 CLASS
     NAME "Graben"
-    EXPRESSION ("[TYP]"="Graben")
+    EXPRESSION /graben/i
     STYLE
         SIZE 5
         OUTLINECOLOR "#800000"
@@ -32,7 +32,7 @@
 END
 CLASS
     NAME "Ringdeich"
-    EXPRESSION ("[TYP]"="Ringdeich")
+    EXPRESSION /ringdeich/i
     STYLE
         SIZE 5
         OUTLINECOLOR "#800000"
diff -r 8c7433b8656d -r 4b7944c37c4f artifacts/doc/conf/mapserver/barrier_polygons_class.vm
--- a/artifacts/doc/conf/mapserver/barrier_polygons_class.vm	Wed Aug 14 16:50:35 2013 +0200
+++ b/artifacts/doc/conf/mapserver/barrier_polygons_class.vm	Thu Aug 15 13:30:16 2013 +0200
@@ -1,6 +1,6 @@
 CLASS
     NAME "Ringdeich"
-    EXPRESSION ("[TYP]"="Ringdeich")
+    EXPRESSION /ringdeich/i
     STYLE
         SIZE 5
         OUTLINECOLOR "#FF8000"
diff -r 8c7433b8656d -r 4b7944c37c4f artifacts/doc/conf/mapserver/shapefile_layer.vm
--- a/artifacts/doc/conf/mapserver/shapefile_layer.vm	Wed Aug 14 16:50:35 2013 +0200
+++ b/artifacts/doc/conf/mapserver/shapefile_layer.vm	Thu Aug 15 13:30:16 2013 +0200
@@ -21,6 +21,8 @@
             "wms_group_title" "$LAYER.getGroupTitle()"
         #end
     END
+    
+    CLASSITEM "TYP"
 
     #if ( !$LAYER.getStyle() )
         #if ( $LAYER.getGroupTitle() )