[mapserver-commits] r11100 - trunk/msautotest/wxs
svn at osgeo.org
svn at osgeo.org
Sun Mar 6 15:39:48 EST 2011
Author: rouault
Date: 2011-03-06 12:39:48 -0800 (Sun, 06 Mar 2011)
New Revision: 11100
Modified:
trunk/msautotest/wxs/wms_time1.map
trunk/msautotest/wxs/wms_time2.map
trunk/msautotest/wxs/wms_time_pattern_12_13_test.map
Log:
correct the mapfiles (but the tests are still KO)
Modified: trunk/msautotest/wxs/wms_time1.map
===================================================================
--- trunk/msautotest/wxs/wms_time1.map 2011-03-06 20:36:19 UTC (rev 11099)
+++ trunk/msautotest/wxs/wms_time1.map 2011-03-06 20:39:48 UTC (rev 11100)
@@ -13,42 +13,42 @@
#
# Draw a layer by using no time value specified
#.
-# RUN_PARMS: wms_time_no_time_param.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_no_time_param.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4" > [RESULT_DEMIME]
#
# Triggered a service exception with an out of extents single time value
# specified
#
-# RUN_PARMS: wms_time_out_of_extents_single.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-12-12%2014:10:00" > [RESULT]
+# RUN_PARMS: wms_time_out_of_extents_single.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-12-12%2014:10:00" > [RESULT]
#
# Triggered a service exception with an out of extents multiple time values
# specified
#
-# RUN_PARMS: wms_time_out_of_extents_multi.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2014:10:00,2004-12-12%2014:10:00" > [RESULT]
+# RUN_PARMS: wms_time_out_of_extents_multi.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2014:10:00,2004-12-12%2014:10:00" > [RESULT]
#
# Triggered a service exception with an out of extents range time values
# specified
#
-# RUN_PARMS: wms_time_out_of_extents_single_range.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2014:10:00/2004-12-03%17:23:00" > [RESULT]
+# RUN_PARMS: wms_time_out_of_extents_single_range.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2014:10:00/2004-12-03%17:23:00" > [RESULT]
#
# Triggered a service exception with an out of extents multiples ranges time
# values specified
#
-# RUN_PARMS: wms_time_out_of_extents_multi_ranges.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2014:10:00/2004-01-01%2015:10:00,2005-01-01%2022:40:00/2005-02-01%2018:55:00" > [RESULT]
+# RUN_PARMS: wms_time_out_of_extents_multi_ranges.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2014:10:00/2004-01-01%2015:10:00,2005-01-01%2022:40:00/2005-02-01%2018:55:00" > [RESULT]
#
# Draw a layer by using with multiple time values specified in reverse order
#
-# RUN_PARMS: wms_time_multi_reverse.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2017:10:00,2004-01-01%2014:10:00" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_multi_reverse.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2017:10:00,2004-01-01%2014:10:00" > [RESULT_DEMIME]
#
# Draw a layer by using with multiples ranges time values specified with a
# smaller resolution
#
-# RUN_PARMS: wms_time_multi_ranges_reso_hour.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2014/2004-01-01%2015,2004-01-01%2016/2004-01-01%2017" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_multi_ranges_reso_hour.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=2004-01-01%2014/2004-01-01%2015,2004-01-01%2016/2004-01-01%2017" > [RESULT_DEMIME]
#
#
# Draw a layer by using time parameter set to null and no default time
# specified in the map
#
-# RUN_PARMS: wms_time_no_default_value.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=" > [RESULT]
+# RUN_PARMS: wms_time_no_default_value.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=" > [RESULT]
#
MAP
@@ -62,15 +62,6 @@
IMAGECOLOR 255 255 255
FONTSET ./etc/fonts.txt
-OUTPUTFORMAT
- NAME GDPNG
- DRIVER "GD/PNG"
- MIMETYPE "image/png"
- IMAGEMODE RGB
- EXTENSION "png"
-END
-
-
# Start of web interface definition
#
WEB
Modified: trunk/msautotest/wxs/wms_time2.map
===================================================================
--- trunk/msautotest/wxs/wms_time2.map 2011-03-06 20:36:19 UTC (rev 11099)
+++ trunk/msautotest/wxs/wms_time2.map 2011-03-06 20:39:48 UTC (rev 11100)
@@ -8,7 +8,7 @@
# Draw a layer by using time parameter set to null and a default time
# specified in the map
#
-# RUN_PARMS: wms_time_default_value.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_default_value.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern4&Time=" > [RESULT_DEMIME]
#
MAP
@@ -22,15 +22,6 @@
IMAGECOLOR 255 255 255
FONTSET ./etc/fonts.txt
-OUTPUTFORMAT
- NAME GDPNG
- DRIVER "GD/PNG"
- MIMETYPE "image/png"
- IMAGEMODE RGB
- EXTENSION "png"
-END
-
-
# Start of web interface definition
#
WEB
@@ -48,6 +39,7 @@
"WMS_ACCESSCONTRAINTS" "none"
"WMS_FEES" "none"
"wms_timeformat" "YYYY-MM-DD HH,YYYY-MM-DD HH:MM:"
+ "ows_enable_request" "*"
END
END
Modified: trunk/msautotest/wxs/wms_time_pattern_12_13_test.map
===================================================================
--- trunk/msautotest/wxs/wms_time_pattern_12_13_test.map 2011-03-06 20:36:19 UTC (rev 11099)
+++ trunk/msautotest/wxs/wms_time_pattern_12_13_test.map 2011-03-06 20:39:48 UTC (rev 11100)
@@ -8,37 +8,37 @@
#
# Draw a layer by using single time value
#
-# RUN_PARMS: wms_time_pattern12a.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern12&&Time=T14:10:00Z" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_pattern12a.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern12&&Time=T14:10:00Z" > [RESULT_DEMIME]
#
# Draw a layer by using multiple time values
#
-# RUN_PARMS: wms_time_pattern12b.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern12&Time=T14:10:00Z,T15:10:00Z" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_pattern12b.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern12&Time=T14:10:00Z,T15:10:00Z" > [RESULT_DEMIME]
#
# Draw a layer by using a range time values
#
-# RUN_PARMS: wms_time_pattern12c.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern12&Time=T14:10:00Z/T15:10:00Z" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_pattern12c.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern12&Time=T14:10:00Z/T15:10:00Z" > [RESULT_DEMIME]
#
# Draw a layer by using multiple ranges time values
#
-# RUN_PARMS: wms_time_pattern12d.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern12&Time=T14:10:00Z/T15:10:00Z,T16:10:00Z/T17:10:00Z" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_pattern12d.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern12&Time=T14:10:00Z/T15:10:00Z,T16:10:00Z/T17:10:00Z" > [RESULT_DEMIME]
#
#Pattern13 : "T%H:%M:%S"
#
# Draw a layer by using single time value
#
-# RUN_PARMS: wms_time_pattern13a.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&&Time=T14:10:00" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_pattern13a.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&&Time=T14:10:00" > [RESULT_DEMIME]
#
# Draw a layer by using multiple time values
#
-# RUN_PARMS: wms_time_pattern13b.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&Time=T14:10:00,T15:10:00" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_pattern13b.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&Time=T14:10:00,T15:10:00" > [RESULT_DEMIME]
#
# Draw a layer by using a range time values
#
-# RUN_PARMS: wms_time_pattern13c.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&Time=T14:10:00/T15:10:00" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_pattern13c.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&Time=T14:10:00/T15:10:00" > [RESULT_DEMIME]
#
# Draw a layer by using multiple ranges time values
#
-# RUN_PARMS: wms_time_pattern13d.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&Time=T14:10:00/T15:10:00,T16:10:00/T17:10:00" > [RESULT_DEMIME]
+# RUN_PARMS: wms_time_pattern13d.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetMap&SRS=EPSG:4326&BBOX=-132,4,-68,68&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=pattern13&Time=T14:10:00/T15:10:00,T16:10:00/T17:10:00" > [RESULT_DEMIME]
#
MAP
@@ -52,15 +52,6 @@
IMAGECOLOR 255 255 255
FONTSET ./etc/fonts.txt
-OUTPUTFORMAT
- NAME GDPNG
- DRIVER "GD/PNG"
- MIMETYPE "image/png"
- IMAGEMODE RGB
- EXTENSION "png"
-END
-
-
# Start of web interface definition
#
WEB
@@ -79,6 +70,7 @@
"WMS_ACCESSCONTRAINTS" "none"
"WMS_FEES" "none"
"wms_timeformat" "THH:MM:SS,THH:MM,THH"
+ "ows_enable_request" "*"
END
END
More information about the mapserver-commits
mailing list