update tests from 6.4 to 7.0

msautotest/create_postgis_test_data.sh

@@ -98,3 +98,34 @@ alter TABLE pattern15 RENAME COLUMN time to time_str;
 alter TABLE pattern15 ADD COLUMN time timestamp without time zone;
 update pattern15 set time = to_timestamp(time_str,'YYYY-MM-DDZ');
 "
+psql -U postgres -d msautotest -c " 
+CREATE TABLE point3d (ID SERIAL);
+SELECT AddGeometryColumn('public', 'point3d', 'the_geom', 27700, 'POINT', 3);
+INSERT INTO point3d (the_geom) VALUES (GeomFromEWKT('SRID=27700;POINT(1 2 3)'));
+"
+psql -U postgres -d msautotest -c " 
+CREATE TABLE multipoint3d (ID SERIAL);
+SELECT AddGeometryColumn('public', 'multipoint3d', 'the_geom', 27700, 'MULTIPOINT', 3);
+INSERT INTO multipoint3d (the_geom) VALUES (GeomFromEWKT('SRID=27700;MULTIPOINT(1 2 3,4 5 6)'));
+"
+psql -U postgres -d msautotest -c " 
+CREATE TABLE linestring3d (ID SERIAL);
+SELECT AddGeometryColumn('public', 'linestring3d', 'the_geom', 27700, 'LINESTRING', 3);
+INSERT INTO linestring3d (the_geom) VALUES (GeomFromEWKT('SRID=27700;LINESTRING(1 2 3,4 5 6)'));
+"
+psql -U postgres -d msautotest -c " 
+CREATE TABLE multilinestring3d (ID SERIAL);
+SELECT AddGeometryColumn('public', 'multilinestring3d', 'the_geom', 27700, 'MULTILINESTRING', 3);
+INSERT INTO multilinestring3d (the_geom) VALUES (GeomFromEWKT('SRID=27700;MULTILINESTRING((1 2 3,4 5 6),(7 8 9,10 11 12))'));
+"
+psql -U postgres -d msautotest -c " 
+CREATE TABLE polygon3d (ID SERIAL);
+SELECT AddGeometryColumn('public', 'polygon3d', 'the_geom', 27700, 'POLYGON', 3);
+INSERT INTO polygon3d (the_geom) VALUES (GeomFromEWKT('SRID=27700;POLYGON((0 0 1,10 0 2,10 10 3,0 10 4,0 0 1))'));
+INSERT INTO polygon3d (the_geom) VALUES (GeomFromEWKT('SRID=27700;POLYGON((0 0 1,10 0 2,10 10 3,0 10 4,0 0 1),(1 1 2,1 9 3,9 9 4,9 1 5,1 1 2))'));
+"
+psql -U postgres -d msautotest -c " 
+CREATE TABLE multipolygon3d (ID SERIAL);
+SELECT AddGeometryColumn('public', 'multipolygon3d', 'the_geom', 27700, 'MULTIPOLYGON', 3);
+INSERT INTO multipolygon3d (the_geom) VALUES (GeomFromEWKT('SRID=27700;MULTIPOLYGON(((0 0 1,10 0 2,10 10 3,0 10 4,0 0 1),(1 1 2,1 9 3,9 9 4,9 1 5,1 1 2)),((10 10 0,10 20 1,20 20 2,20 10 3,10 10 0)))'));
+"

msautotest/gdal/bilinear_src_transp.map

@@ -0,0 +1,36 @@
+# Test bilinear resampling(over-sampling) with source that is
+# opaque red on the left and transparent on the right
+
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 400 40
+EXTENT 0.5 0.5 39.5 1.5
+IMAGECOLOR 0 0 0
+
+OUTPUTFORMAT
+  NAME "png"
+  DRIVER AGG/PNG
+  MIMETYPE "image/png"
+  IMAGEMODE RGBA
+  EXTENSION "png"
+END
+
+OUTPUTFORMAT
+  NAME "tif"
+  DRIVER GDAL/GTiff
+  MIMETYPE "image/tif"
+  IMAGEMODE RGBA
+  EXTENSION "tif"
+END
+
+LAYER
+  NAME test
+  TYPE RASTER
+  STATUS default
+  DATA data/leftredrighttransp.tif
+  PROCESSING "RESAMPLE=BILINEAR"
+END
+
+END # of map file

msautotest/gdal/bilinear_src_transp2.map

@@ -0,0 +1,36 @@
+# Test bilinear resampling(over-sampling) with source that has alpha
+# gradient from red opaque on the left to transparent on the right
+
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 400 40
+EXTENT 0.5 0.5 39.5 1.5
+IMAGECOLOR 0 0 0
+
+OUTPUTFORMAT
+  NAME "png"
+  DRIVER AGG/PNG
+  MIMETYPE "image/png"
+  IMAGEMODE RGBA
+  EXTENSION "png"
+END
+
+OUTPUTFORMAT
+  NAME "tif"
+  DRIVER GDAL/GTiff
+  MIMETYPE "image/tif"
+  IMAGEMODE RGBA
+  EXTENSION "tif"
+END
+
+LAYER
+  NAME test
+  TYPE RASTER
+  STATUS default
+  DATA data/redtranspgradient.tif
+  PROCESSING "RESAMPLE=BILINEAR"
+END
+
+END # of map file

msautotest/gdal/class8_range.map

@@ -1,3 +1,6 @@
+#RUN_PARMS: class8_range.png [SHP2IMG] -m [MAPFILE] -i png8_t -o [RESULT] -l grid1
+#RUN_PARMS: double_range_rgb.png [SHP2IMG] -m [MAPFILE] -i png -o [RESULT] -l grid2
+#RUN_PARMS: double_range_hsl.png [SHP2IMG] -m [MAPFILE] -i png -o [RESULT] -l grid3
 #
 # Simple test of classification methods on a floating point input. 
 #
@@ -21,7 +24,7 @@ END
 LAYER
   NAME grid1
   TYPE raster
-  STATUS default
+  STATUS ON
   DATA data/grey.tif
   CLASS
     STYLE
@@ -30,5 +33,38 @@ LAYER
     END
   END
 END
+LAYER
+  NAME grid2
+  TYPE raster
+  STATUS ON
+  DATA data/grey.tif
+  CLASS
+    STYLE
+      COLORRANGE 255 0 0  0 255 0
+      DATARANGE 0 200
+    END
+    STYLE
+      COLORRANGE 0 255 0   0 0 255
+      DATARANGE 200 255
+    END
+  END
+END
+LAYER
+  NAME grid3
+  TYPE raster
+  STATUS ON
+  DATA data/grey.tif
+  PROCESSING "RANGE_COLORSPACE=HSL"
+  CLASS
+    STYLE
+      COLORRANGE 255 0 0  0 255 0
+      DATARANGE 0 200
+    END
+    STYLE
+      COLORRANGE 0 255 0   0 0 255
+      DATARANGE 200 255
+    END
+  END
+END
 
 END # of map file

msautotest/gdal/data/pnts.prj

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

msautotest/gdal/heat.map

@@ -0,0 +1,125 @@
+#RUN_PARMS: heatmap-r15-border-autonorm-hsl-attr.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&LAYERS=heatmap&BBOX=-79.369542201052,-39.684771100526,79.369542201052,39.684771100526&WIDTH=200&HEIGHT=100&VERSION=1.1.1&FORMAT=image%2Fpng&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application%2Fvnd.ogc.se_inimage&SRS=EPSG%3A4326" > [RESULT_DEMIME]
+#RUN_PARMS: heatmap-r20-noborder-fixednorm-rgb-fixed.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&LAYERS=heatmap&BBOX=-82.544323889094,-41.272161944547,82.544323889094,41.272161944547&WIDTH=200&HEIGHT=100&VERSION=1.1.1&FORMAT=image%2Fpng&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application%2Fvnd.ogc.se_inimage&SRS=EPSG%3A4326" > [RESULT_DEMIME]
+#RUN_PARMS: heatmap-r20-noborder-fixednorm-rgb-expression.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&LAYERS=heatmap&BBOX=-85.719105577136,-42.859552788568,85.719105577136,42.859552788568&WIDTH=200&HEIGHT=100&VERSION=1.1.1&FORMAT=image%2Fpng&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application%2Fvnd.ogc.se_inimage&SRS=EPSG%3A4326" > [RESULT_DEMIME]
+#RUN_PARMS: heatmap-reproj.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&LAYERS=heatmap&BBOX=-7760000,-600000,240000,3400000&WIDTH=200&HEIGHT=100&VERSION=1.1.1&FORMAT=image%2Fpng&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application%2Fvnd.ogc.se_inimage&SRS=EPSG%3A3857" > [RESULT_DEMIME]
+
+#no overlap because outside of shape extents
+#RUN_PARMS: heatmap-no-overlap.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&LAYERS=heatmap&BBOX=200,200,201,201&WIDTH=10&HEIGHT=10&VERSION=1.1.1&FORMAT=image%2Fpng&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application%2Fvnd.ogc.se_inimage&SRS=EPSG%3A4326" > [RESULT_DEMIME]
+
+#no features intersected search rect
+#RUN_PARMS: heatmap-no-overlap.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&LAYERS=heatmap&BBOX=0,0,0.01,0.01&WIDTH=10&HEIGHT=10&VERSION=1.1.1&FORMAT=image%2Fpng&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application%2Fvnd.ogc.se_inimage&SRS=EPSG%3A4326" > [RESULT_DEMIME]
+
+map
+
+  size 1000 500
+  extent -180 -90 180 90
+  name "test heat"
+  imagetype "png"
+  units dd
+
+  web
+    metadata
+      "ows_srs" "epsg:4326  epsg:3857 epsg:900913"
+      "ows_enable_request" "*"
+    end
+  end
+
+  projection
+    "+init=epsg:4326"
+  end
+  CONFIG "MS_ERRORFILE" "stderr"
+
+  layer
+    name "heatmap"
+    type raster
+    connectiontype kerneldensity
+    connection "points"
+    status on
+    processing "RANGE_COLORSPACE=%color%"
+    processing "KERNELDENSITY_RADIUS=%radius%"
+    processing "KERNELDENSITY_COMPUTE_BORDERS=%border%"
+    processing "KERNELDENSITY_NORMALIZATION=%norm%"
+    offsite 0 0 0
+    SCALETOKEN
+      NAME "%radius%"
+      VALUES
+        "0" "15"
+        "255000000" "20"
+      END
+    END
+    SCALETOKEN
+      NAME "%border%"
+      VALUES
+        "0" "ON"
+        "255000000" "OFF"
+      END
+    END
+    SCALETOKEN
+      NAME "%norm%"
+      VALUES
+        "0" "AUTO"
+        "255000000" "30"
+      END
+    END
+    SCALETOKEN
+      NAME "%color%"
+      VALUES
+        "0" "HSL"
+        "255000000" "RGB"
+      END
+    END
+    class
+      style
+        COLORRANGE  "#0000ff00"  "#0000ffff"
+        DATARANGE 0 32
+      end
+      style
+        COLORRANGE  "#0000ffff"  "#ff0000ff"
+        DATARANGE 32 255
+      end
+    end
+  end
+
+symbol
+ name "circle"
+ type ellipse
+ points 1 1 end
+end
+
+layer
+    name "points"
+    status on
+    type POINT
+    data "data/pnts.shp"
+    CLASS
+     MAXSCALE 255000000
+     STYLE
+      SIZE [VAL]
+     END
+    END
+    CLASS
+     MAXSCALE 265000000
+     STYLE
+      SIZE 0.1
+     END
+    END
+    CLASS
+     MAXSCALE 275000000
+     EXPRESSION ([VAL]>1)
+     STYLE
+      SIZE 1
+     END
+    END
+    CLASS
+     MAXSCALE 275000000
+     STYLE
+      SIZE 2
+     END
+    END
+  end
+
+
+end
+
+
+

msautotest/gdal/nonsquare.map

@@ -26,7 +26,7 @@ END
 SCALEBAR
   STATUS EMBED
 #  POSTLABELCACHE TRUE
-  SIZE 200 10
+  SIZE 205 10
   UNITS METERS
 END
 

msautotest/gdal/ticket_5032_optim_1.map

@@ -0,0 +1,39 @@
+#
+# Test optimization where we request exactly at the raster resolution and
+# on pixel boundaries (#5032)
+#
+# REQUIRES: SUPPORTS=PROJ
+#
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 400 300
+EXTENT 0.5 0.5 399.5 299.5
+IMAGECOLOR 255 255 0
+
+PROJECTION
+    "+proj=utm +zone=30 +datum=WGS84 +units=m +no_defs"
+END
+
+IMAGETYPE png24
+
+#
+# Start of layer definitions
+#
+
+LAYER
+
+  # Slightly different formulations, but identical to the MAP projection
+  PROJECTION
+        "+proj=utm +datum=WGS84 +zone=30 +units=m"
+  END
+
+  NAME grid1
+  TYPE raster
+  STATUS default
+  PROCESSING "RESAMPLE=AVERAGE" # will be ignored
+  DATA data/rgb.tif
+END
+
+END # of map file

msautotest/gdal/ticket_5032_optim_2.map

@@ -0,0 +1,29 @@
+#
+# Test optimization where we request exactly at an integral factor of the
+# raster resolution and pixel boundaries (#5032)
+#
+# REQUIRES: SUPPORTS=PROJ
+#
+MAP
+
+NAME TEST
+STATUS ON
+SIZE 200 150
+EXTENT 1.0 1.0 399.0 299.0
+IMAGECOLOR 255 255 0
+
+IMAGETYPE png24
+
+#
+# Start of layer definitions
+#
+
+LAYER
+  NAME grid1
+  TYPE raster
+  STATUS default
+  PROCESSING "RESAMPLE=AVERAGE"
+  DATA data/rgb.tif
+END
+
+END # of map file

msautotest/misc/data/ogrbrush.csv

@@ -0,0 +1,3 @@
+WKT,OGR_STYLE
+"POLYGON((0.1 0.9,0.9 0.9,0.9 0.8,0.1 0.8,0.1 0.9))","BRUSH(fc:#0000ff,bc:#ff0000,id:""rectsymbol"",dx:0,dy:1)"
+"POLYGON((0.1 0.7,0.9 0.7,0.9 0.6,0.1 0.6,0.1 0.7))","BRUSH(fc:#000000,id:""rectsymbol"",a:20,dx:6,dy:6,s:2)"

msautotest/misc/data/ogrmultitool.csv

@@ -0,0 +1,10 @@
+WKT,OGR_STYLE,comment
+"POLYGON((0.1 0.9,0.9 0.9,0.9 0.8,0.1 0.8,0.1 0.9))","BRUSH(fc:#0000ff,bc:#ff0000,id:""rectsymbol"",s:2,dx:3,dy:3);PEN(c:#00FF00,w:2px)","particular historical case: BRUSH/PEN order doesn't matter"
+"POLYGON((0.1 0.7,0.9 0.7,0.9 0.6,0.1 0.6,0.1 0.7))","PEN(c:#00FF00,w:2px);BRUSH(fc:#0000ff,bc:#ff0000,id:""rectsymbol"",s:2,dx:3,dy:3)","particular historical case: BRUSH/PEN order doesn't matter"
+"POLYGON((0.1 0.5,0.9 0.5,0.9 0.4,0.1 0.4,0.1 0.5))","PEN(c:#FF00FF,w:10px);PEN(c:#00FF00,w:2px)","second PEN drawn above first one"
+"POLYGON((0.1 0.3,0.9 0.3,0.9 0.2,0.1 0.2,0.1 0.3))","PEN(c:#FF00FF,w:10px,l:1);PEN(c:#00FF00,w:2px,l:1)","same explicit priority: second PEN drawn above first one"
+"POLYGON((0.1 0.1,0.9 0.1,0.9 0.0,0.1 0.0,0.1 0.1))","PEN(c:#FF00FF,w:10px,l:1);PEN(c:#00FF00,w:2px,l:2)","increasing explicit priority: second PEN drawn above first one"
+"POLYGON((0.1 -0.1,0.9 -0.1,0.9 -0.2,0.1 -0.2,0.1 -0.1))","PEN(c:#FF00FF,w:10px,l:2);PEN(c:#00FF00,w:2px,l:1)","decreasing explicit priority: first PEN drawn above second one"
+
+
+