Merge 7396d3d into 6075de6

README.md

@@ -33,7 +33,7 @@ Then run simply: `make run`
 You can now show predefined mapfiles at this url:
 
 ```
-http://localhost:8380/mapserv?service=wms&version=1.3.0&request=getmap&bbox=46.61013,6.885254,46.881633,7.39633&layers=line_simple_line&width=1200&height=800&format=image/jpeg&CRS=EPSG:4326
+http://localhost:8380/mapserv?service=wms&version=1.3.0&request=getmap&bbox=46.4,6.4,47.2,7.8&layers=line_simple_line&width=1200&height=800&format=image/jpeg&CRS=EPSG:4326
 ```
 
 Set the `layers` param to display other layers (from layers defined in /data/mapfiles).

data/mapfiles/mapserver.map

@@ -39,7 +39,7 @@ MAP
     STATUS ON
 
     FONTSET "fonts.conf"
-    #SYMBOLSET "symbol.sym"
+    SYMBOLSET "symbols.sym"
 
     OUTPUTFORMAT
         NAME jpeg

data/mapfiles/point_simple_point_many_classes_filters.map

@@ -6,7 +6,7 @@ LAYER
   METADATA
     "wms_title" "point_simple_point_many_classes_filters"
   END
-  CLASSITEM "category"
+  CLASSITEM "id"
   CLASS
     NAME "Test point 1"
     EXPRESSION "1"
@@ -21,7 +21,7 @@ LAYER
     EXPRESSION "2"
     STYLE
       SYMBOL "triangle"
-      COLOR 0 0 255
+      COLOR 255 0 0
       SIZE 10
     END
   END
@@ -30,13 +30,12 @@ LAYER
     EXPRESSION "3"
     STYLE
       SYMBOL "square"
-      COLOR 0 0 255
+      COLOR 0 255 255
       SIZE 10
     END
   END
   CLASS
-    NAME "Test point 4"
-    EXPRESSION "4"
+    NAME "Test point 4 - default"
     STYLE
       SYMBOL "cross"
       COLOR 0 0 255

data/mapfiles/point_st_sample_point_style_tags_single_filter_list.map

@@ -6,15 +6,15 @@ LAYER
   METADATA
     "wms_title" "point_st_sample_point_style_tags_single_filter_list"
   END
-  CLASSITEM "Attr"
+  CLASSITEM "name"
   CLASS
-    EXPRESSION {Word1,Word2,Word3}
+    EXPRESSION {bus,bank}
     NAME "Test point"
     STYLE
       ANGLE 360
-      COLOR 0 255 0
+      COLOR 255 0 0
       OPACITY 50
-      SIZE 4
+      SIZE 10
       SYMBOL "circle"
     END
   END

data/mapfiles/point_st_sample_point_style_tags_single_filter_regex.map

@@ -6,15 +6,15 @@ LAYER
   METADATA
     "wms_title" "point_st_sample_point_style_tags_single_filter_regex"
   END
-  CLASSITEM "OBJECTVAL"
+  CLASSITEM "name"
   CLASS
-    EXPRESSION /^(A|B)Anyword$/
+    EXPRESSION /bus/
     NAME "Test point"
     STYLE
       ANGLE 360
       COLOR 0 0 0
       OPACITY 100
-      SIZE 5
+      SIZE 8.5
       SYMBOL "circle"
     END
   END

data/mapfiles/raster_simple_raster.map

@@ -1,15 +1,11 @@
 LAYER
   NAME "raster_simple_raster"
   TYPE RASTER
+  PROCESSING "SCALE=AUTO"
   DATA "../rasters/raster.tif"
   EXTENT -180 -90 180 90
   METADATA
     "wms_title" "raster_simple_raster"
-  END
-  CLASS
-    NAME "Test raster"
-    STYLE
-      OPACITY 50
-    END
+    "wms_srs" "EPSG:4326"
   END
 END

data/mapfiles/symbols.sym

@@ -252,6 +252,29 @@ SYMBOLSET
      END
   END
 
+  SYMBOL
+     NAME "triangle"
+     TYPE vector
+     POINTS
+        1.0 0.0
+        2.0 2.0
+        0.0 2.0
+        1.0 0.0
+     END
+  END
+
+  SYMBOL
+     NAME "square"
+     TYPE vector
+     POINTS
+        0.0 0.0
+        1.0 0.0
+        1.0 1.0
+        0.0 1.0
+        0.0 0.0
+     END
+  END
+
   SYMBOL
       NAME "arrow-start"
       TYPE vector
@@ -268,4 +291,4 @@ SYMBOLSET
       END # POINTS
       #ANCHORPOINT 0 0.5
   END # SYMBOL
-END
+END

data/shapes/points.prj

@@ -1 +1 @@
-GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]

data/shapes/points.qpj

@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]

data/styles/point_simple_point_many_classes_filters.ts

@@ -12,31 +12,31 @@ const pointStyle: Style = {
       radius: 7.5
     }],
     filter: [
-      "==", "category", "1"
+      "==", "id", "1"
     ]
   },
   {
     name: 'Test point 2',
     symbolizers: [{
       kind: 'Mark',
       wellKnownName: 'Triangle',
-      color: '#0000FF',
+      color: '#FF0000',
       radius: 5
     }],
     filter: [
-      "==", "category", "2"
+      "==", "id", "2"
     ]
   },
   {
     name: 'Test point 3',
     symbolizers: [{
       kind: 'Mark',
       wellKnownName: 'Square',
-      color: '#0000FF',
+      color: '#00FFFF',
       radius: 5
     }],
     filter: [
-      "==", "category", "3"
+      "==", "id", "3"
     ]
   },
   {
@@ -47,9 +47,6 @@ const pointStyle: Style = {
       color: '#0000FF',
       radius: 5
     }],
-    filter: [
-      "==", "category", "4"
-    ]
   }]
 }
 

data/styles/point_st_sample_point_style_tags_single_filter_list.ts

@@ -4,14 +4,14 @@ const pointStyle: Style = {
   name: 'point_st_sample_point_style_tags_single_filter_list',
   rules: [{
     filter: [
-      '*=', ['FN_strMatches', 'Attr', '/(Word1|Word2|Word3)/'], true
+      '*=', ['FN_strMatches', 'name', '/(bus|bank)/'], true
     ],
     name: 'Test point',
     symbolizers: [{
       kind: 'Mark',
       wellKnownName: 'Circle',
-      color: '#00FF00',
-      radius: 2,
+      color: '#FF0000',
+      radius: 5,
       rotate: 360,
       opacity: 0.5
     }],

data/styles/point_st_sample_point_style_tags_single_filter_regex.ts

@@ -4,14 +4,14 @@ const pointStyle: Style = {
   name: 'point_st_sample_point_style_tags_single_filter_regex',
   rules: [{
     filter: [
-      '*=', ['FN_strMatches', 'OBJECTVAL', '/^(A|B)Anyword$/'], true
+      '*=', ['FN_strMatches', 'name', '/bus/'], true
     ],
     name: 'Test point',
     symbolizers: [{
       kind: 'Mark',
       wellKnownName: 'Circle',
       color: '#000000',
-      radius: 2.5,
+      radius: 4.25,
       rotate: 360,
       opacity: 1
     }],