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

Mon Jan 21 16:56:57 EST 2008

Author: warmerdam
Date: 2008-01-21 16:56:57 -0500 (Mon, 21 Jan 2008)
New Revision: 7290

Added:
   trunk/msautotest/wxs/expected/wcs_getcov_grd_10.dat
   trunk/msautotest/wxs/expected/wcs_getcov_grd_11.dat
Modified:
   trunk/msautotest/wxs/expected/wcs_cap_11.xml
   trunk/msautotest/wxs/expected/wcs_describe.xml
   trunk/msautotest/wxs/expected/wcs_describe_11.xml
   trunk/msautotest/wxs/wcs_simple.map
Log:
Added AAIGRID output format, and getcoverages in this format using WCS
1.0 and 11.1.


Modified: trunk/msautotest/wxs/expected/wcs_cap_11.xml
===================================================================

--- trunk/msautotest/wxs/expected/wcs_cap_11.xml	2008-01-21 21:52:22 UTC (rev 7289)
+++ trunk/msautotest/wxs/expected/wcs_cap_11.xml	2008-01-21 21:56:57 UTC (rev 7290)
@@ -95,6 +95,7 @@
       <ows:Parameter name="format">
         <ows:Value>image/tiff</ows:Value>
         <ows:Value>image/png</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>
@@ -133,6 +134,7 @@
       </ows:WGS84BoundingBox>
       <SupportedFormat>image/tiff</SupportedFormat>
       <SupportedFormat>image/png</SupportedFormat>
+      <SupportedFormat>image/x-aaigrid</SupportedFormat>
       <SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
       <SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>
     </CoverageSummary>

Modified: trunk/msautotest/wxs/expected/wcs_describe.xml
===================================================================
(Binary files differ)

Modified: trunk/msautotest/wxs/expected/wcs_describe_11.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_describe_11.xml	2008-01-21 21:52:22 UTC (rev 7289)
+++ trunk/msautotest/wxs/expected/wcs_describe_11.xml	2008-01-21 21:56:57 UTC (rev 7290)
@@ -54,5 +54,6 @@
     <SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>
     <SupportedFormat>image/tiff</SupportedFormat>
     <SupportedFormat>image/png</SupportedFormat>
+    <SupportedFormat>image/x-aaigrid</SupportedFormat>
   </CoverageDescription>
 </CoverageDescriptions>

Added: trunk/msautotest/wxs/expected/wcs_getcov_grd_10.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_grd_10.dat	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_getcov_grd_10.dat	2008-01-21 21:56:57 UTC (rev 7290)
@@ -0,0 +1,18 @@
+Content-type: image/x-aaigrid
+
+ncols        13
+nrows        10
+xllcorner    -0.416666666667
+yllcorner    0.000000000000
+dx           30.833333333333
+dy           30.000000000000
+ 132 148 115 123 132 132 123 115 107 115 90 107 115
+ 156 132 115 148 123 107 115 99 115 107 115 115 107
+ 123 148 123 132 115 99 123 132 115 115 115 132 148
+ 132 99 107 115 173 123 115 115 148 123 99 99 123
+ 132 123 115 99 148 132 115 99 107 132 123 148 115
+ 173 165 90 90 107 99 156 140 123 115 115 173 206
+ 181 156 181 115 107 107 90 99 214 222 173 222 140
+ 222 230 239 222 165 99 99 115 206 222 255 165 165
+ 255 255 206 255 123 148 132 82 173 148 214 148 140
+ 255 173 255 247 165 115 132 107 140 123 132 173 132

Added: trunk/msautotest/wxs/expected/wcs_getcov_grd_11.dat
===================================================================
--- trunk/msautotest/wxs/expected/wcs_getcov_grd_11.dat	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_getcov_grd_11.dat	2008-01-21 21:56:57 UTC (rev 7290)
@@ -0,0 +1,41 @@
+Content-Type: multipart/mixed; boundary=wcs
+
+--wcs
+Content-Type: text/xml
+Content-ID: wcs.xml
+
+<?xml version="1.0" encoding="UTF-8"?>
+<Coverages
+     xmlns="http://www.opengis.net/wcs/1.1"
+     xmlns:ows="http://www.opengis.net/ows"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     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/wcs.grd"/>
+  </Coverage>
+</Coverages>
+--wcs
+Content-Type: image/x-aaigrid
+Content-Description: coverage data
+Content-Transfer-Encoding: binary
+Content-ID: coverage/wcs.grd
+Content-Disposition: INLINE
+
+ncols        14
+nrows        10
+xllcorner    -10.000000000000
+yllcorner    10.000000000000
+cellsize     30.000000000000
+ 132 148 115 123 99 132 99 140 115 132 107 90 107 115
+ 156 132 115 148 165 107 156 99 123 115 115 115 115 107
+ 123 148 123 132 107 123 99 107 99 90 107 115 132 148
+ 132 99 107 115 140 107 123 132 123 115 99 99 99 123
+ 132 123 115 99 115 99 148 132 123 132 99 123 148 115
+ 148 107 115 115 99 132 123 123 123 156 90 123 132 156
+ 247 132 123 165 148 123 107 99 148 173 156 181 214 206
+ 206 197 132 123 107 132 107 99 165 255 197 156 165 140
+ 255 255 214 181 156 197 156 140 148 173 197 230 148 181
+ 239 255 255 255 181 132 140 132 148 140 165 165 239 140
+--wcs--
+

Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map	2008-01-21 21:52:22 UTC (rev 7289)
+++ trunk/msautotest/wxs/wcs_simple.map	2008-01-21 21:56:57 UTC (rev 7290)
@@ -31,6 +31,12 @@
 # Coverage description 1.1
 # RUN_PARMS: wcs_describe_11.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.0&REQUEST=DescribeCoverage&IDENTIFIER=grey" > [RESULT]
 #
+# GetCoverage to AAIGRID 1.0
+# RUN_PARMS: wcs_getcov_grd_10.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&RESX=30&RESY=30&FORMAT=AAIGRID&BBOX=0,0,400,300&COVERAGE=grey&CRS=EPSG:32611" > [RESULT]
+#
+# GetCoverage to AAIGRID 1.1
+# RUN_PARMS: wcs_getcov_grd_11.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]
+#
 
 NAME TEST
 SIZE 400 300
@@ -54,6 +60,13 @@
   IMAGEMODE RGB
   EXTENSION "png"
 END
+OUTPUTFORMAT
+  NAME AAIGRID
+  DRIVER "GDAL/AAIGRID"
+  MIMETYPE "image/x-aaigrid"
+  IMAGEMODE INT16
+  EXTENSION "grd"
+END
 
 PROJECTION
   "init=epsg:32611"
@@ -108,7 +121,7 @@
    "ows_srs"	"EPSG:32611 EPSG:4326"
    "wcs_resolution" "10 10"
    "wcs_bandcount" "1"
-   "wcs_formats" "GEOTIFF_16 GDPNG"
+   "wcs_formats" "GEOTIFF_16 GDPNG AAIGRID"
    "wcs_nativeformat" "GeoTIFF"
    "wcs_description" "Test description"
    "wcs_metadatalink_href" "http://www.gdal.org/metadata_test_link.html"

