[mapserver-commits] r11381 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Wed Mar 30 06:13:42 EDT 2011
Author: schpidi
Date: 2011-03-30 03:13:42 -0700 (Wed, 30 Mar 2011)
New Revision: 11381
Added:
trunk/msautotest/wxs/expected/wcs_20_desc_bands.xml
Modified:
trunk/msautotest/wxs/wcs_multi.map
Log:
Adding WCS test for multiple coverage descriptions.
Added: trunk/msautotest/wxs/expected/wcs_20_desc_bands.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_20_desc_bands.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_20_desc_bands.xml 2011-03-30 10:13:42 UTC (rev 11381)
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<wcs:CoverageDescriptions 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 ">
+ <wcs:CoverageDescription gml:id="multi">
+ <gml:boundedBy>
+ <gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
+ <gml:lowerCorner>14.4702712 47.8188382</gml:lowerCorner>
+ <gml:upperCorner>18.0111282 49.8911432</gml:upperCorner>
+ </gml:Envelope>
+ </gml:boundedBy>
+ <wcs:CoverageId>multi</wcs:CoverageId>
+ <gml:domainSet>
+ <gml:RectifiedGrid dimension="2" gml:id="grid_multi">
+ <gml:limits>
+ <gml:GridEnvelope>
+ <gml:low>0 0</gml:low>
+ <gml:high>104 60</gml:high>
+ </gml:GridEnvelope>
+ </gml:limits>
+ <gml:axisLabels>lat long</gml:axisLabels>
+ <gml:origin>
+ <gml:Point gml:id="grid_origin_multi" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+ <gml:pos>14.470271 47.818838</gml:pos>
+ </gml:Point>
+ </gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.033722 0</gml:offsetVector>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 0.033972</gml:offsetVector>
+ </gml:RectifiedGrid>
+ </gml:domainSet>
+ <gmlcov:rangeType>
+ <swe:DataRecord>
+ <swe:field name="Band1">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band2">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band3">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band4">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band5">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band6">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band7">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band8">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band9">
+ <swe:Quantity>
+ <swe:description>Test description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="W.m-2.Sr-1"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ </swe:DataRecord>
+ </gmlcov:rangeType>
+ <wcs:ServiceParameters>
+ <wcs:CoverageSubtype>RectifiedGridCoverage</wcs:CoverageSubtype>
+ <wcs:SupportedCRSs>
+ <wcs:SupportedCRS>http://www.opengis.net/def/crs/EPSG/0/4326</wcs:SupportedCRS>
+ <wcs:NativeCRS>http://www.opengis.net/def/crs/EPSG/0/4326</wcs:NativeCRS>
+ </wcs:SupportedCRSs>
+ <wcs:SupportedFormats>
+ <wcs:SupportedFormat>image/tiff</wcs:SupportedFormat>
+ </wcs:SupportedFormats>
+ </wcs:ServiceParameters>
+ </wcs:CoverageDescription>
+ <wcs:CoverageDescription gml:id="multi_new">
+ <gml:boundedBy>
+ <gml:Envelope srsName="http://www.opengis.net/def/crs/EPSG/0/4326" axisLabels="lat long" uomLabels="deg deg" srsDimension="2">
+ <gml:lowerCorner>14.4702712 47.8188382</gml:lowerCorner>
+ <gml:upperCorner>18.0111282 49.8911432</gml:upperCorner>
+ </gml:Envelope>
+ </gml:boundedBy>
+ <wcs:CoverageId>multi_new</wcs:CoverageId>
+ <gml:domainSet>
+ <gml:RectifiedGrid dimension="2" gml:id="grid_multi_new">
+ <gml:limits>
+ <gml:GridEnvelope>
+ <gml:low>0 0</gml:low>
+ <gml:high>104 60</gml:high>
+ </gml:GridEnvelope>
+ </gml:limits>
+ <gml:axisLabels>lat long</gml:axisLabels>
+ <gml:origin>
+ <gml:Point gml:id="grid_origin_multi_new" srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
+ <gml:pos>14.470271 47.818838</gml:pos>
+ </gml:Point>
+ </gml:origin>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0.033722 0</gml:offsetVector>
+ <gml:offsetVector srsName="http://www.opengis.net/def/crs/EPSG/0/4326">0 0.033972</gml:offsetVector>
+ </gml:RectifiedGrid>
+ </gml:domainSet>
+ <gmlcov:rangeType>
+ <swe:DataRecord>
+ <swe:field name="Band1">
+ <swe:Quantity definition="SomeDefinition">
+ <swe:description>This is some description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="SomeUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band2">
+ <swe:Quantity definition="DefaultDefinition">
+ <swe:description>Default description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="DefaultUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band3">
+ <swe:Quantity definition="DefaultDefinition">
+ <swe:description>Default description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="DefaultUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band4">
+ <swe:Quantity definition="DefaultDefinition">
+ <swe:description>Default description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="DefaultUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band5">
+ <swe:Quantity definition="DefaultDefinition">
+ <swe:description>Default description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="DefaultUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band6">
+ <swe:Quantity definition="DefaultDefinition">
+ <swe:description>Default description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="DefaultUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band7">
+ <swe:Quantity definition="DefaultDefinition">
+ <swe:description>Default description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="DefaultUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band8">
+ <swe:Quantity definition="DefaultDefinition">
+ <swe:description>Default description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="DefaultUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ <swe:field name="Band9">
+ <swe:Quantity definition="DefaultDefinition">
+ <swe:description>Default description</swe:description>
+ <swe:nilValues>
+ <swe:NilValues>
+ <swe:nilValue reason="urn:ogc:def:nil:OGC:1.0:inapplicable">0</swe:nilValue>
+ </swe:NilValues>
+ </swe:nilValues>
+ <swe:uom code="DefaultUOM"/>
+ <swe:constraint>
+ <swe:AllowedValues>
+ <swe:interval>0 255</swe:interval>
+ <swe:significantFigures>3</swe:significantFigures>
+ </swe:AllowedValues>
+ </swe:constraint>
+ </swe:Quantity>
+ </swe:field>
+ </swe:DataRecord>
+ </gmlcov:rangeType>
+ <wcs:ServiceParameters>
+ <wcs:CoverageSubtype>RectifiedGridCoverage</wcs:CoverageSubtype>
+ <wcs:SupportedCRSs>
+ <wcs:SupportedCRS>http://www.opengis.net/def/crs/EPSG/0/4326</wcs:SupportedCRS>
+ <wcs:NativeCRS>http://www.opengis.net/def/crs/EPSG/0/4326</wcs:NativeCRS>
+ </wcs:SupportedCRSs>
+ <wcs:SupportedFormats>
+ <wcs:SupportedFormat>image/tiff</wcs:SupportedFormat>
+ </wcs:SupportedFormats>
+ </wcs:ServiceParameters>
+ </wcs:CoverageDescription>
+</wcs:CoverageDescriptions>
Modified: trunk/msautotest/wxs/wcs_multi.map
===================================================================
--- trunk/msautotest/wxs/wcs_multi.map 2011-03-30 09:56:25 UTC (rev 11380)
+++ trunk/msautotest/wxs/wcs_multi.map 2011-03-30 10:13:42 UTC (rev 11381)
@@ -4,6 +4,8 @@
# REQUIRES: INPUT=GDAL OUTPUT=PNG SUPPORTS=WCS
#
# KVP:
+# RUN_PARMS: wcs_20_desc_bands.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=DescribeCoverage&COVERAGEID=multi,multi_new" > [RESULT_DEMIME]
+#
# RUN_PARMS: wcs_20_getcov_bands_index.tif [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=multi&FORMAT=image/tiff&RANGESUBSET=1,5,9" > [RESULT_DEMIME]
# RUN_PARMS: wcs_20_getcov_bands_name.tif [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=multi&FORMAT=image/tiff&RANGESUBSET=Band9,Band5,Band1" > [RESULT_DEMIME]
# RUN_PARMS: wcs_20_getcov_bands_name.dat [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=2.0.0&REQUEST=GetCoverage&COVERAGEID=multi&FORMAT=image/tiff&mediatype=multipart/mixed&RANGESUBSET=Band9,Band5,Band1" > [RESULT_DEMIME]
More information about the mapserver-commits
mailing list