[mapserver-commits] r11251 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Fri Mar 18 14:13:41 EDT 2011
Author: schpidi
Date: 2011-03-18 11:13:41 -0700 (Fri, 18 Mar 2011)
New Revision: 11251
Added:
trunk/msautotest/wxs/expected/wcs_getcov_png8_11.dat
Removed:
trunk/msautotest/wxs/expected/wcs_getcov_gdpng8_11.dat
Modified:
trunk/msautotest/wxs/expected/wcs11_caps_section1.xml
trunk/msautotest/wxs/expected/wcs11_caps_section3.xml
trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml
trunk/msautotest/wxs/expected/wcs11_post_cap.xml
trunk/msautotest/wxs/expected/wcs11_post_caps_section1.xml
trunk/msautotest/wxs/expected/wcs11_post_caps_section3.xml
trunk/msautotest/wxs/expected/wcs11_post_caps_updatesequence.xml
trunk/msautotest/wxs/expected/wcs_cap_11.xml
trunk/msautotest/wxs/expected/wcs_cap_highversion_x.y.xml
trunk/msautotest/wxs/expected/wcs_cap_highversion_x.y.z.xml
trunk/msautotest/wxs/expected/wcs_cap_noversion.xml
trunk/msautotest/wxs/expected/wcs_describe.xml
trunk/msautotest/wxs/wcs_simple.map
Log:
Correcting WCS tests and expected results to new default formats.
Modified: trunk/msautotest/wxs/expected/wcs11_caps_section1.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_caps_section1.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs11_caps_section1.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -75,12 +75,11 @@
<ows:Parameter name="format">
<ows:AllowedValues>
<ows:Value>image/tiff</ows:Value>
- <ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
+ <ows:Value>image/png</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs11_caps_section3.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_caps_section3.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs11_caps_section3.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -113,12 +113,11 @@
<ows:Parameter name="format">
<ows:AllowedValues>
<ows:Value>image/tiff</ows:Value>
- <ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
+ <ows:Value>image/png</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -113,12 +113,11 @@
<ows:Parameter name="format">
<ows:AllowedValues>
<ows:Value>image/tiff</ows:Value>
- <ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
+ <ows:Value>image/png</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs11_post_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_post_cap.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs11_post_cap.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -116,9 +116,8 @@
<ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs11_post_caps_section1.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_post_caps_section1.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs11_post_caps_section1.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -78,9 +78,8 @@
<ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs11_post_caps_section3.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_post_caps_section3.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs11_post_caps_section3.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -116,9 +116,8 @@
<ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs11_post_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_post_caps_updatesequence.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs11_post_caps_updatesequence.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -116,9 +116,8 @@
<ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs_cap_11.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_cap_11.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs_cap_11.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -113,12 +113,11 @@
<ows:Parameter name="format">
<ows:AllowedValues>
<ows:Value>image/tiff</ows:Value>
- <ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
+ <ows:Value>image/png</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs_cap_highversion_x.y.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_cap_highversion_x.y.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs_cap_highversion_x.y.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -111,12 +111,11 @@
<ows:Parameter name="format">
<ows:AllowedValues>
<ows:Value>image/tiff</ows:Value>
- <ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
+ <ows:Value>image/png</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs_cap_highversion_x.y.z.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_cap_highversion_x.y.z.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs_cap_highversion_x.y.z.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -111,12 +111,11 @@
<ows:Parameter name="format">
<ows:AllowedValues>
<ows:Value>image/tiff</ows:Value>
- <ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
+ <ows:Value>image/png</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs_cap_noversion.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_cap_noversion.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs_cap_noversion.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -111,12 +111,11 @@
<ows:Parameter name="format">
<ows:AllowedValues>
<ows:Value>image/tiff</ows:Value>
- <ows:Value>image/png</ows:Value>
<ows:Value>image/png; mode=8bit</ows:Value>
<ows:Value>image/x-aaigrid</ows:Value>
- <ows:Value>image/gif</ows:Value>
- <ows:Value>image/png; mode=24bit</ows:Value>
+ <ows:Value>image/png</ows:Value>
<ows:Value>image/jpeg</ows:Value>
+ <ows:Value>image/gif</ows:Value>
</ows:AllowedValues>
</ows:Parameter>
<ows:Parameter name="store">
Modified: trunk/msautotest/wxs/expected/wcs_describe.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_describe.xml 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/expected/wcs_describe.xml 2011-03-18 18:13:41 UTC (rev 11251)
@@ -74,7 +74,7 @@
</supportedCRSs>
<supportedFormats nativeFormat="GeoTIFF">
<formats>GEOTIFF_16</formats>
- <formats>GDPNG</formats>
+ <formats>PNG</formats>
<formats>AAIGRID</formats>
</supportedFormats>
<supportedInterpolations default="nearest neighbor">
Deleted: trunk/msautotest/wxs/expected/wcs_getcov_gdpng8_11.dat
===================================================================
(Binary files differ)
Copied: trunk/msautotest/wxs/expected/wcs_getcov_png8_11.dat (from rev 11216, trunk/msautotest/wxs/expected/wcs_getcov_gdpng8_11.dat)
===================================================================
(Binary files differ)
Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map 2011-03-18 18:09:35 UTC (rev 11250)
+++ trunk/msautotest/wxs/wcs_simple.map 2011-03-18 18:13:41 UTC (rev 11251)
@@ -54,16 +54,16 @@
# RUN_PARMS: wcs_16.grd [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=AAIGRID&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
#
# Generate simple PNG.
-# RUN_PARMS: wcs_simple.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=GDPNG&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611" > [RESULT_DEMIME]
+# RUN_PARMS: wcs_simple.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=PNG&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611" > [RESULT_DEMIME]
#
# Generate error if bbox does not overlap coverage extent
-# RUN_PARMS: wcs_getcov_exception_bbox.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=GDPNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
+# RUN_PARMS: wcs_getcov_exception_bbox.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=PNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
#
# Generate error if requested coverage exceeds maxsize
-# RUN_PARMS: wcs_getcov_exception_maxsize.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=5001&HEIGHT=5001&FORMAT=GDPNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
+# RUN_PARMS: wcs_getcov_exception_maxsize.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=5001&HEIGHT=5001&FORMAT=PNG&BBOX=500,500,1000,1000&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
#
# Use bilinear resampling.
-# RUN_PARMS: wcs_bilinear.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=GDPNG&BBOX=0.1,0.1,399.9,299.9&COVERAGE=grey&CRS=EPSG:32611&INTERPOLATION=BILINEAR" > [RESULT_DEMIME]
+# RUN_PARMS: wcs_bilinear.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=120&HEIGHT=90&FORMAT=PNG&BBOX=0.1,0.1,399.9,299.9&COVERAGE=grey&CRS=EPSG:32611&INTERPOLATION=BILINEAR" > [RESULT_DEMIME]
#
# Downsample oddly (per #2180).
# RUN_PARMS: wcs_16_ds.grd [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=12&HEIGHT=20&FORMAT=AAIGRID&BBOX=0.1,0.1,399.9,299.9&COVERAGE=grey&CRS=EPSG:32611" > [RESULT_DEMIME]
@@ -96,8 +96,8 @@
# GetCoverage to AAIGRID 1.1 (WGS84 (non-EPSG - normal axes)
# RUN_PARMS: wcs_getcov_grd_11_wgs84.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=GetCoverage&FORMAT=image/x-aaigrid&BOUNDINGBOX=-121.48874388968,0,-121.48516027717,0.0027058261133485,urn:ogc:def:crs:OGC::CRS84&IDENTIFIER=grey&GridCS=urn:ogc:def:crs:OGC::imageCRS&GridType=urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs&GridOrigin=-121.48874388968,0.0027058261133485&GridOffsets=0.0003,-0.0003" > [RESULT]
#
-# GetCoverage to GDPNG 1.1 (Test non-GDAL output)
-# RUN_PARMS: wcs_getcov_gdpng8_11.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=GetCoverage&FORMAT=image/png;%20mode=8bit&BOUNDINGBOX=0,-121.48874388968,0.0027058261133485,-121.48516027717,urn:ogc:def:crs:EPSG::4326&IDENTIFIER=grey&GridCS=urn:ogc:def:crs:OGC::imageCRS&GridType=urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs&GridOrigin=0.0027058261133485,-121.48874388968&GridOffsets=-0.0003,0.0003" > [RESULT]
+# GetCoverage to PNG 1.1 (Test non-GDAL output)
+# RUN_PARMS: wcs_getcov_png8_11.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=GetCoverage&FORMAT=image/png;%20mode=8bit&BOUNDINGBOX=0,-121.48874388968,0.0027058261133485,-121.48516027717,urn:ogc:def:crs:EPSG::4326&IDENTIFIER=grey&GridCS=urn:ogc:def:crs:OGC::imageCRS&GridType=urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs&GridOrigin=0.0027058261133485,-121.48874388968&GridOffsets=-0.0003,0.0003" > [RESULT]
#
#
# WCS 2.0.0
@@ -218,6 +218,8 @@
EXTENT 0 0 400 300
MAXSIZE 5000
+#CONFIG "MS_ERRORFILE" "stderr"
+
IMAGETYPE PNG
TRANSPARENT OFF
SHAPEPATH "data"
@@ -230,13 +232,6 @@
EXTENSION "tif"
END
OUTPUTFORMAT
- NAME GDPNG
- DRIVER "AGG/PNG"
- MIMETYPE "image/png"
- IMAGEMODE RGB
- EXTENSION "png"
-END
-OUTPUTFORMAT
NAME GDPNGGREY
DRIVER "GD/PNG"
MIMETYPE "image/png; mode=8bit"
@@ -307,7 +302,7 @@
"ows_srs" "EPSG:32611 EPSG:4326"
"wcs_resolution" "10 10"
"wcs_bandcount" "1"
- "wcs_formats" "GEOTIFF_16 GDPNG AAIGRID"
+ "wcs_formats" "GEOTIFF_16 PNG AAIGRID"
"wcs_nativeformat" "GeoTIFF"
"wcs_description" "Test description"
"wcs_metadatalink_href" "http://www.gdal.org/metadata_test_link.html"
More information about the mapserver-commits
mailing list