[mapserver-commits] r7510 - in trunk/msautotest/wxs: . expected

[svn at osgeo.org]

Author: warmerdam
Date: 2008-04-10 00:41:58 -0400 (Thu, 10 Apr 2008)
New Revision: 7510

Added:
   trunk/msautotest/wxs/expected/wcs_getcov_gdpng8_11.dat
Modified:
   trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml
   trunk/msautotest/wxs/expected/wcs_cap_11.xml
   trunk/msautotest/wxs/wcs_simple.map
Log:
add test of wcs 1.1 non-gdal output

Modified: trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml	2008-04-09 22:28:10 UTC (rev 7509)
+++ trunk/msautotest/wxs/expected/wcs11_caps_updatesequence.xml	2008-04-10 04:41:58 UTC (rev 7510)
@@ -95,6 +95,7 @@
       <ows:Parameter name="format">
         <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>

Modified: trunk/msautotest/wxs/expected/wcs_cap_11.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_cap_11.xml	2008-04-09 22:28:10 UTC (rev 7509)
+++ trunk/msautotest/wxs/expected/wcs_cap_11.xml	2008-04-10 04:41:58 UTC (rev 7510)
@@ -95,6 +95,7 @@
       <ows:Parameter name="format">
         <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>

Added: trunk/msautotest/wxs/expected/wcs_getcov_gdpng8_11.dat
===================================================================
(Binary files differ)


Property changes on: trunk/msautotest/wxs/expected/wcs_getcov_gdpng8_11.dat
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map	2008-04-09 22:28:10 UTC (rev 7509)
+++ trunk/msautotest/wxs/wcs_simple.map	2008-04-10 04:41:58 UTC (rev 7510)
@@ -66,11 +66,14 @@
 # RUN_PARMS: wcs_getcov_grd_11_imagecrs.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=GetCoverage&FORMAT=AAIGRID&BOUNDINGBOX=0,0,39,29,urn:ogc:def:crs:OGC::imageCRS&IDENTIFIER=grey&GridCS=urn:ogc:def:crs:OGC::imageCRS&GridType=urn:ogc:def:method:WCS:1.1:2dGridIn2dCrs&GridOrigin=0,0&GridOffsets=3,3" > [RESULT]
 #
 # GetCoverage to AAIGRID 1.1 (EPSG 4326 with reversed axes)
-# RUN_PARMS: wcs_getcov_grd_11_4326.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=GetCoverage&FORMAT=AAIGRID&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]
+# RUN_PARMS: wcs_getcov_grd_11_4326.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=GetCoverage&FORMAT=image/x-aaigrid&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 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=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]
+# 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]
+#
 
 NAME TEST
 SIZE 400 300
@@ -95,6 +98,13 @@
   EXTENSION "png"
 END
 OUTPUTFORMAT
+  NAME GDPNGGREY
+  DRIVER "GD/PNG"
+  MIMETYPE "image/png; mode=8bit"
+  IMAGEMODE PC256
+  EXTENSION "png"
+END
+OUTPUTFORMAT
   NAME AAIGRID
   DRIVER "GDAL/AAIGRID"
   MIMETYPE "image/x-aaigrid"