[mapserver-commits] r10930 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Wed Feb 2 17:12:25 EST 2011
Author: warmerdam
Date: 2011-02-02 14:12:25 -0800 (Wed, 02 Feb 2011)
New Revision: 10930
Added:
trunk/msautotest/wxs/expected/wcs_20_getcov_grd.dat
trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
Modified:
trunk/msautotest/wxs/expected/wcs_16.grd
trunk/msautotest/wxs/expected/wcs_getcov_grd_10.dat
trunk/msautotest/wxs/expected/wcs_getcov_grd_11.dat
trunk/msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat
trunk/msautotest/wxs/expected/wcs_getcov_grd_11_imagecrs.dat
trunk/msautotest/wxs/expected/wcs_getcov_grd_11_wgs84.dat
trunk/msautotest/wxs/wcs_simple.map
Log:
add regression testing of WCS filename setting, fixup wbmp failures (#3665)
Modified: trunk/msautotest/wxs/expected/wcs_16.grd
===================================================================
--- trunk/msautotest/wxs/expected/wcs_16.grd 2011-02-02 21:04:18 UTC (rev 10929)
+++ trunk/msautotest/wxs/expected/wcs_16.grd 2011-02-02 22:12:25 UTC (rev 10930)
@@ -1,3 +1,6 @@
+Content-Disposition: attachment; filename=result.grd
+Content-type: image/x-aaigrid
+
ncols 120
nrows 90
xllcorner 0.000000000000
Added: trunk/msautotest/wxs/expected/wcs_20_getcov_grd.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_getcov_grd.dat (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_20_getcov_grd.dat 2011-02-02 22:12:25 UTC (rev 10930)
@@ -0,0 +1,52 @@
+Content-Disposition: attachment; filename=result.grd
+Content-Type: image/x-aaigrid
+
+ncols 40
+nrows 30
+xllcorner 0.000000000000
+yllcorner 0.000000000000
+cellsize 10.000000000000
+ 107 123 132 115 132 132 140 132 132 132 107 132 107 132 132 107 123 115 156 148 107 132 107 115 99 123 99 74 115 82 115 115 107 123 123 99 123 123 115 115
+ 115 132 107 123 148 115 165 115 140 107 123 123 99 132 123 132 132 132 99 156 123 140 115 115 115 99 107 132 107 115 107 99 90 115 115 107 123 99 115 123
+ 115 132 140 132 123 115 140 107 140 115 132 123 107 132 132 115 115 107 115 107 123 107 132 90 132 123 99 107 99 115 90 99 115 107 115 90 123 99 123 123
+ 148 132 123 123 115 132 132 123 115 123 115 123 107 115 148 107 115 140 115 132 99 107 107 107 115 132 115 156 115 115 115 107 115 99 123 90 107 99 107 115
+ 132 156 132 140 132 132 115 115 115 123 148 123 165 123 132 107 107 132 156 123 115 99 107 99 123 99 115 115 99 107 115 90 115 90 99 115 107 123 107 99
+ 189 173 173 148 148 115 148 123 107 132 115 132 156 99 123 115 132 132 206 107 115 99 90 107 123 99 115 123 90 99 99 99 99 123 107 115 107 107 123 132
+ 197 173 148 140 140 132 99 132 123 115 140 132 132 99 132 123 132 173 123 115 115 99 107 132 107 123 99 107 107 99 115 99 99 90 99 115 90 115 140 115
+ 148 123 148 115 148 123 140 123 107 115 132 115 107 115 99 123 99 181 99 107 123 107 99 132 99 99 115 90 123 115 107 115 115 132 107 132 115 115 148 140
+ 123 115 132 115 123 132 115 132 132 123 123 132 99 115 99 123 132 115 115 107 132 99 115 99 74 123 115 90 115 107 115 107 115 115 140 107 123 123 123 99
+ 140 140 99 140 99 115 123 107 132 107 115 107 115 123 132 123 107 123 132 132 140 132 107 115 107 115 99 115 132 107 140 132 107 115 115 107 132 132 115 140
+ 132 132 132 123 99 132 123 107 148 99 115 123 140 173 123 107 123 123 123 107 115 132 107 115 123 107 148 115 123 123 99 123 99 132 140 99 140 123 123 115
+ 123 123 123 107 140 123 123 115 115 90 107 173 107 107 107 107 99 132 123 115 115 123 107 99 123 99 132 123 132 148 123 90 140 107 123 123 140 115 123 132
+ 173 148 99 123 123 107 123 99 107 189 173 107 115 115 107 99 140 107 173 140 90 123 107 132 115 115 132 115 132 123 115 115 123 107 140 132 115 165 132 140
+ 148 132 132 107 123 99 99 115 99 132 99 140 115 148 123 99 132 123 148 140 115 132 115 99 123 107 107 132 132 132 99 115 123 115 123 148 148 123 115 107
+ 140 107 140 90 107 115 107 90 99 123 115 115 115 123 123 148 115 148 99 132 123 140 132 156 132 107 99 107 107 148 148 123 140 140 123 115 115 148 181 247
+ 165 148 156 123 107 107 107 115 140 99 115 99 99 107 115 132 115 90 123 115 123 123 132 107 123 156 156 156 123 123 90 107 123 107 107 132 156 181 156 206
+ 189 173 140 140 165 115 132 90 99 115 90 99 99 107 99 132 99 107 132 132 156 140 115 140 90 115 123 115 107 115 140 107 115 115 132 173 255 247 206 214
+ 156 181 140 173 123 132 99 115 123 74 115 99 123 140 156 132 165 140 140 99 107 107 115 107 107 140 173 148 165 140 115 165 181 140 156 197 222 247 214 214
+ 173 247 255 206 132 107 140 123 148 132 165 165 148 140 132 123 107 123 107 123 82 99 99 90 148 181 197 173 181 197 156 165 181 197 222 214 230 230 206 165
+ 181 181 156 148 156 156 156 181 132 148 115 132 107 107 107 107 107 115 99 107 90 115 99 99 165 197 214 206 173 222 173 140 173 181 181 222 181 173 140 148
+ 156 181 165 181 148 165 181 132 123 115 90 99 115 90 107 99 132 99 90 99 107 99 99 123 156 189 197 206 181 197 230 156 148 197 173 165 156 148 140 173
+ 197 206 206 206 197 107 123 132 173 148 123 123 107 99 156 132 82 107 107 107 99 99 107 165 165 197 173 255 173 197 197 173 156 156 165 165 148 148 140 140
+ 197 222 230 214 230 255 222 239 148 148 222 156 132 165 181 90 99 140 140 107 99 82 115 115 156 189 206 239 222 222 222 189 255 140 156 165 173 156 165 148
+ 255 255 255 255 255 189 222 255 206 255 230 165 173 123 90 140 140 148 173 214 123 107 123 140 173 165 173 214 197 189 214 222 239 148 140 181 173 173 140 173
+ 255 255 255 255 255 173 255 214 255 255 181 165 156 206 230 197 173 140 156 140 140 140 99 132 148 156 140 173 156 230 197 214 230 132 123 148 189 181 181 173
+ 255 255 255 255 255 123 239 206 255 255 255 173 140 123 173 165 148 165 156 156 132 140 115 82 140 123 173 132 148 148 197 239 214 156 148 148 156 123 140 115
+ 206 222 239 255 222 123 206 255 255 255 255 189 165 132 165 132 140 156 165 123 148 148 123 90 99 148 148 140 148 181 156 206 255 148 230 165 156 140 173 132
+ 189 239 206 197 255 255 255 255 255 255 255 255 181 132 173 132 156 140 140 148 140 132 156 99 148 123 132 140 156 165 165 156 165 197 214 239 148 165 140 156
+ 255 255 255 255 173 181 255 255 255 255 247 165 206 165 181 148 115 148 165 132 132 148 181 107 115 156 140 132 140 123 123 140 132 140 173 173 140 132 132 132
+ 214 255 255 214 148 148 255 255 239 140 181 148 148 140 140 140 148 156 132 156 156 140 197 148 140 132 148 148 156 132 132 148 140 140 148 156 156 214 115 107
+Content-Disposition: attachment; filename=result.grd.aux.xml
+Content-Type: application/octet-stream
+
+<PAMDataset>
+ <Metadata>
+ <MDI key="TIFFTAG_XRESOLUTION">72.000000</MDI>
+ <MDI key="TIFFTAG_YRESOLUTION">72.000000</MDI>
+ <MDI key="TIFFTAG_RESOLUTIONUNIT">2</MDI>
+ </Metadata>
+</PAMDataset>
+Content-Disposition: attachment; filename=result.prj
+Content-Type: application/octet-stream
+
+PROJCS["WGS_1984_UTM_Zone_11N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]
\ No newline at end of file
Added: trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat 2011-02-02 22:12:25 UTC (rev 10930)
@@ -0,0 +1,118 @@
+Content-Type: multipart/mixed; boundary=wcs
+
+--wcs
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<gmlcov:RectifiedGridCoverage xmlns:wcs="http://www.opengis.net/wcs/2.0" xmlns:ows="http://www.opengis.net/ows/2.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:swe="http://www.opengis.net/swe/2.0" xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd " gml:id="grey">
+ <gml:boundedBy>
+ <gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/32611" axisLabels="x y" uomLabels="m m" srsDimension="2">
+ <gml:lowerCorner>0 0</gml:lowerCorner>
+ <gml:upperCorner>400 300</gml:upperCorner>
+ </gml:Envelope>
+ </gml:boundedBy>
+ <gml:domainSet>
+ <gml:RectifiedGrid dimension="2" gml:id="grid_grey">
+ <gml:limits>
+ <gml:GridEnvelope>
+ <gml:low>0 0</gml:low>
+ <gml:high>39 29</gml:high>
+ </gml:GridEnvelope>
+ </gml:limits>
+ <gml:axisLabels>x y</gml:axisLabels>
+ <gml:origin>
+ <gml:Point gml:id="grid_origin_grey" srsName="http://www.opengis.net/def/crs/EPSG/0/32611">
+ <gml:pos>0.000000 0.000000</gml:pos>
+ </gml:Point>
+ </gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">10.000000 0</gml:offsetVector>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/32611">0 10.000000</gml:offsetVector>
+ </gml:RectifiedGrid>
+ </gml:domainSet>
+ <gml:rangeSet>
+ <gml:File>
+ <gml:rangeParameters/>
+ <gml:fileReference>file</gml:fileReference>
+ <gml:fileStructure/>
+ </gml:File>
+ </gml:rangeSet>
+ <gmlcov:rangeType>
+ <swe:DataRecord>
+ <swe:field name="band">
+ <swe:Quantity>
+ <swe:uom code="W/cm2"/>
+ <swe:constraint>
+ <swe:AllowedValues gml:id="VALUE_SPACE_0">
+ <swe:interval>-340282346638528859811704183484516925440.00000 340282346638528859811704183484516925440.00000</swe:interval>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ </swe:DataRecord>
+ </gmlcov:rangeType>
+</gmlcov:RectifiedGridCoverage>
+--wcs
+Content-Type: image/x-aaigrid
+Content-Description: coverage data
+Content-Transfer-Encoding: binary
+Content-ID: coverage/result.grd
+Content-Disposition: INLINE
+
+ncols 40
+nrows 30
+xllcorner 0.000000000000
+yllcorner 0.000000000000
+cellsize 10.000000000000
+ 107 123 132 115 132 132 140 132 132 132 107 132 107 132 132 107 123 115 156 148 107 132 107 115 99 123 99 74 115 82 115 115 107 123 123 99 123 123 115 115
+ 115 132 107 123 148 115 165 115 140 107 123 123 99 132 123 132 132 132 99 156 123 140 115 115 115 99 107 132 107 115 107 99 90 115 115 107 123 99 115 123
+ 115 132 140 132 123 115 140 107 140 115 132 123 107 132 132 115 115 107 115 107 123 107 132 90 132 123 99 107 99 115 90 99 115 107 115 90 123 99 123 123
+ 148 132 123 123 115 132 132 123 115 123 115 123 107 115 148 107 115 140 115 132 99 107 107 107 115 132 115 156 115 115 115 107 115 99 123 90 107 99 107 115
+ 132 156 132 140 132 132 115 115 115 123 148 123 165 123 132 107 107 132 156 123 115 99 107 99 123 99 115 115 99 107 115 90 115 90 99 115 107 123 107 99
+ 189 173 173 148 148 115 148 123 107 132 115 132 156 99 123 115 132 132 206 107 115 99 90 107 123 99 115 123 90 99 99 99 99 123 107 115 107 107 123 132
+ 197 173 148 140 140 132 99 132 123 115 140 132 132 99 132 123 132 173 123 115 115 99 107 132 107 123 99 107 107 99 115 99 99 90 99 115 90 115 140 115
+ 148 123 148 115 148 123 140 123 107 115 132 115 107 115 99 123 99 181 99 107 123 107 99 132 99 99 115 90 123 115 107 115 115 132 107 132 115 115 148 140
+ 123 115 132 115 123 132 115 132 132 123 123 132 99 115 99 123 132 115 115 107 132 99 115 99 74 123 115 90 115 107 115 107 115 115 140 107 123 123 123 99
+ 140 140 99 140 99 115 123 107 132 107 115 107 115 123 132 123 107 123 132 132 140 132 107 115 107 115 99 115 132 107 140 132 107 115 115 107 132 132 115 140
+ 132 132 132 123 99 132 123 107 148 99 115 123 140 173 123 107 123 123 123 107 115 132 107 115 123 107 148 115 123 123 99 123 99 132 140 99 140 123 123 115
+ 123 123 123 107 140 123 123 115 115 90 107 173 107 107 107 107 99 132 123 115 115 123 107 99 123 99 132 123 132 148 123 90 140 107 123 123 140 115 123 132
+ 173 148 99 123 123 107 123 99 107 189 173 107 115 115 107 99 140 107 173 140 90 123 107 132 115 115 132 115 132 123 115 115 123 107 140 132 115 165 132 140
+ 148 132 132 107 123 99 99 115 99 132 99 140 115 148 123 99 132 123 148 140 115 132 115 99 123 107 107 132 132 132 99 115 123 115 123 148 148 123 115 107
+ 140 107 140 90 107 115 107 90 99 123 115 115 115 123 123 148 115 148 99 132 123 140 132 156 132 107 99 107 107 148 148 123 140 140 123 115 115 148 181 247
+ 165 148 156 123 107 107 107 115 140 99 115 99 99 107 115 132 115 90 123 115 123 123 132 107 123 156 156 156 123 123 90 107 123 107 107 132 156 181 156 206
+ 189 173 140 140 165 115 132 90 99 115 90 99 99 107 99 132 99 107 132 132 156 140 115 140 90 115 123 115 107 115 140 107 115 115 132 173 255 247 206 214
+ 156 181 140 173 123 132 99 115 123 74 115 99 123 140 156 132 165 140 140 99 107 107 115 107 107 140 173 148 165 140 115 165 181 140 156 197 222 247 214 214
+ 173 247 255 206 132 107 140 123 148 132 165 165 148 140 132 123 107 123 107 123 82 99 99 90 148 181 197 173 181 197 156 165 181 197 222 214 230 230 206 165
+ 181 181 156 148 156 156 156 181 132 148 115 132 107 107 107 107 107 115 99 107 90 115 99 99 165 197 214 206 173 222 173 140 173 181 181 222 181 173 140 148
+ 156 181 165 181 148 165 181 132 123 115 90 99 115 90 107 99 132 99 90 99 107 99 99 123 156 189 197 206 181 197 230 156 148 197 173 165 156 148 140 173
+ 197 206 206 206 197 107 123 132 173 148 123 123 107 99 156 132 82 107 107 107 99 99 107 165 165 197 173 255 173 197 197 173 156 156 165 165 148 148 140 140
+ 197 222 230 214 230 255 222 239 148 148 222 156 132 165 181 90 99 140 140 107 99 82 115 115 156 189 206 239 222 222 222 189 255 140 156 165 173 156 165 148
+ 255 255 255 255 255 189 222 255 206 255 230 165 173 123 90 140 140 148 173 214 123 107 123 140 173 165 173 214 197 189 214 222 239 148 140 181 173 173 140 173
+ 255 255 255 255 255 173 255 214 255 255 181 165 156 206 230 197 173 140 156 140 140 140 99 132 148 156 140 173 156 230 197 214 230 132 123 148 189 181 181 173
+ 255 255 255 255 255 123 239 206 255 255 255 173 140 123 173 165 148 165 156 156 132 140 115 82 140 123 173 132 148 148 197 239 214 156 148 148 156 123 140 115
+ 206 222 239 255 222 123 206 255 255 255 255 189 165 132 165 132 140 156 165 123 148 148 123 90 99 148 148 140 148 181 156 206 255 148 230 165 156 140 173 132
+ 189 239 206 197 255 255 255 255 255 255 255 255 181 132 173 132 156 140 140 148 140 132 156 99 148 123 132 140 156 165 165 156 165 197 214 239 148 165 140 156
+ 255 255 255 255 173 181 255 255 255 255 247 165 206 165 181 148 115 148 165 132 132 148 181 107 115 156 140 132 140 123 123 140 132 140 173 173 140 132 132 132
+ 214 255 255 214 148 148 255 255 239 140 181 148 148 140 140 140 148 156 132 156 156 140 197 148 140 132 148 148 156 132 132 148 140 140 148 156 156 214 115 107
+--wcs
+Content-Type: application/octet-stream
+Content-Description: coverage data
+Content-Transfer-Encoding: binary
+Content-ID: coverage/result.grd.aux.xml
+Content-Disposition: INLINE
+
+<PAMDataset>
+ <Metadata>
+ <MDI key="TIFFTAG_XRESOLUTION">72.000000</MDI>
+ <MDI key="TIFFTAG_YRESOLUTION">72.000000</MDI>
+ <MDI key="TIFFTAG_RESOLUTIONUNIT">2</MDI>
+ </Metadata>
+</PAMDataset>
+--wcs
+Content-Type: application/octet-stream
+Content-Description: coverage data
+Content-Transfer-Encoding: binary
+Content-ID: coverage/result.prj
+Content-Disposition: INLINE
+
+PROJCS["WGS_1984_UTM_Zone_11N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]--wcs--
+
Modified: trunk/msautotest/wxs/expected/wcs_getcov_grd_10.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_grd_10.dat 2011-02-02 21:04:18 UTC (rev 10929)
+++ trunk/msautotest/wxs/expected/wcs_getcov_grd_10.dat 2011-02-02 22:12:25 UTC (rev 10930)
@@ -1,3 +1,4 @@
+Content-Disposition: attachment; filename=result.grd
Content-type: image/x-aaigrid
ncols 13
Modified: trunk/msautotest/wxs/expected/wcs_getcov_grd_11.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_grd_11.dat 2011-02-02 21:04:18 UTC (rev 10929)
+++ trunk/msautotest/wxs/expected/wcs_getcov_grd_11.dat 2011-02-02 22:12:25 UTC (rev 10930)
@@ -12,14 +12,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.opengis.net/ows/1.1 ../owsCoverages.xsd">
<Coverage>
- <Reference xlink:href="cid:coverage/out.grd"/>
+ <Reference xlink:href="cid:coverage/result.grd"/>
</Coverage>
</Coverages>
--wcs
Content-Type: image/x-aaigrid
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.grd
+Content-ID: coverage/result.grd
Content-Disposition: INLINE
ncols 14
@@ -42,7 +42,7 @@
Content-Type: application/octet-stream
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.grd.aux.xml
+Content-ID: coverage/result.grd.aux.xml
Content-Disposition: INLINE
<PAMDataset>
@@ -56,7 +56,7 @@
Content-Type: application/octet-stream
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.prj
+Content-ID: coverage/result.prj
Content-Disposition: INLINE
PROJCS["WGS_1984_UTM_Zone_11N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]--wcs--
Modified: trunk/msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat 2011-02-02 21:04:18 UTC (rev 10929)
+++ trunk/msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat 2011-02-02 22:12:25 UTC (rev 10930)
@@ -12,14 +12,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.opengis.net/ows/1.1 ../owsCoverages.xsd">
<Coverage>
- <Reference xlink:href="cid:coverage/out.grd"/>
+ <Reference xlink:href="cid:coverage/result.grd"/>
</Coverage>
</Coverages>
--wcs
Content-Type: image/x-aaigrid
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.grd
+Content-ID: coverage/result.grd
Content-Disposition: INLINE
ncols 12
@@ -42,7 +42,7 @@
Content-Type: application/octet-stream
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.grd.aux.xml
+Content-ID: coverage/result.grd.aux.xml
Content-Disposition: INLINE
<PAMDataset>
@@ -56,7 +56,7 @@
Content-Type: application/octet-stream
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.prj
+Content-ID: coverage/result.prj
Content-Disposition: INLINE
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]--wcs--
Modified: trunk/msautotest/wxs/expected/wcs_getcov_grd_11_imagecrs.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_grd_11_imagecrs.dat 2011-02-02 21:04:18 UTC (rev 10929)
+++ trunk/msautotest/wxs/expected/wcs_getcov_grd_11_imagecrs.dat 2011-02-02 22:12:25 UTC (rev 10930)
@@ -12,14 +12,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.opengis.net/ows/1.1 ../owsCoverages.xsd">
<Coverage>
- <Reference xlink:href="cid:coverage/out.grd"/>
+ <Reference xlink:href="cid:coverage/result.grd"/>
</Coverage>
</Coverages>
--wcs
Content-Type: image/x-aaigrid
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.grd
+Content-ID: coverage/result.grd
Content-Disposition: INLINE
ncols 14
@@ -42,7 +42,7 @@
Content-Type: application/octet-stream
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.grd.aux.xml
+Content-ID: coverage/result.grd.aux.xml
Content-Disposition: INLINE
<PAMDataset>
@@ -56,7 +56,7 @@
Content-Type: application/octet-stream
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.prj
+Content-ID: coverage/result.prj
Content-Disposition: INLINE
PROJCS["WGS_1984_UTM_Zone_11N",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-117],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["Meter",1]]--wcs--
Modified: trunk/msautotest/wxs/expected/wcs_getcov_grd_11_wgs84.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_grd_11_wgs84.dat 2011-02-02 21:04:18 UTC (rev 10929)
+++ trunk/msautotest/wxs/expected/wcs_getcov_grd_11_wgs84.dat 2011-02-02 22:12:25 UTC (rev 10930)
@@ -12,14 +12,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.opengis.net/ows/1.1 ../owsCoverages.xsd">
<Coverage>
- <Reference xlink:href="cid:coverage/out.grd"/>
+ <Reference xlink:href="cid:coverage/result.grd"/>
</Coverage>
</Coverages>
--wcs
Content-Type: image/x-aaigrid
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.grd
+Content-ID: coverage/result.grd
Content-Disposition: INLINE
ncols 12
@@ -42,7 +42,7 @@
Content-Type: application/octet-stream
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.grd.aux.xml
+Content-ID: coverage/result.grd.aux.xml
Content-Disposition: INLINE
<PAMDataset>
@@ -56,7 +56,7 @@
Content-Type: application/octet-stream
Content-Description: coverage data
Content-Transfer-Encoding: binary
-Content-ID: coverage/out.prj
+Content-ID: coverage/result.prj
Content-Disposition: INLINE
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]--wcs--
Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map 2011-02-02 21:04:18 UTC (rev 10929)
+++ trunk/msautotest/wxs/wcs_simple.map 2011-02-02 22:12:25 UTC (rev 10930)
@@ -43,7 +43,7 @@
# RUN_PARMS: wcs_describe.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=DescribeCoverage&COVERAGE=grey" > [RESULT]
#
# Generate 16bit.
-# 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_DEMIME]
+# 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]
@@ -110,6 +110,12 @@
# GetCoverage 2.0 image/tiff full
# RUN_PARMS: wcs_20_getcov_full.tif [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/tiff" > [RESULT_DEMIME]
#
+# GetCoverage 2.0 grid, full (testing FILENAME= option)
+# RUN_PARMS: wcs_20_getcov_grd.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/x-aaigrid" > [RESULT]
+#
+# GetCoverage 2.0 grid, full, multipart (testing FILENAME= option)
+# RUN_PARMS: wcs_20_getcov_grd_mp.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/x-aaigrid&MEDIATYPE=multipart/mixed" > [RESULT]
+#
# GetCoverage 2.0 image/tiff trim x min
# RUN_PARMS: wcs_20_getcov_trim_x_min.tif [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=grey&FORMAT=image/tiff&SUBSET=x(20,*)" > [RESULT_DEMIME]
#
@@ -225,6 +231,7 @@
MIMETYPE "image/x-aaigrid"
IMAGEMODE INT16
EXTENSION "grd"
+ FORMATOPTION "FILENAME=result.grd"
END
PROJECTION
More information about the mapserver-commits
mailing list