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

svn at osgeo.org svn at osgeo.org
Fri Sep 4 02:20:18 EDT 2009 

Author: warmerdam
Date: 2009-09-04 02:20:10 -0400 (Fri, 04 Sep 2009)
New Revision: 9290

Added:
   trunk/msautotest/wxs/expected/wcs11_caps_section1.xml
   trunk/msautotest/wxs/expected/wcs11_caps_section2.xml
   trunk/msautotest/wxs/expected/wcs11_caps_section3.xml
Modified:
   trunk/msautotest/wxs/wcs_simple.map
Log:
Added WCS 1.1 SECTIONS support for capabilities (#3105)

Added: trunk/msautotest/wxs/expected/wcs11_caps_section1.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_caps_section1.xml	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wcs11_caps_section1.xml	2009-09-04 06:20:10 UTC (rev 9290)
@@ -0,0 +1,118 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Capabilities xmlns="http://www.opengis.net/wcs/1.1" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" version="1.1.1" updateSequence="2007-10-30T14:23:38Z" xsi:schemaLocation="http://www.opengis.net/wcs/1.1 http://schemas.opengis.net/wcs/1.1/wcsGetCapabilities.xsd http://www.opengis.net/ows/1.1 http://schemas.opengis.net/ows/1.1.0/owsAll.xsd">
+  <ows:OperationsMetadata>
+    <ows:Operation name="GetCapabilities">
+      <ows:DCP>
+        <ows:HTTP>
+          <ows:Get xlink:type="simple" xlink:href="http://devgeo.cciw.ca/cgi-bin/mapserv/ecows?"/>
+        </ows:HTTP>
+      </ows:DCP>
+      <ows:Parameter name="service">
+        <ows:AllowedValues>
+          <ows:Value>WCS</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="version">
+        <ows:AllowedValues>
+          <ows:Value>1.1.1</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+    </ows:Operation>
+    <ows:Operation name="DescribeCoverage">
+      <ows:DCP>
+        <ows:HTTP>
+          <ows:Get xlink:type="simple" xlink:href="http://devgeo.cciw.ca/cgi-bin/mapserv/ecows?"/>
+        </ows:HTTP>
+      </ows:DCP>
+      <ows:Parameter name="service">
+        <ows:AllowedValues>
+          <ows:Value>WCS</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="version">
+        <ows:AllowedValues>
+          <ows:Value>1.1.1</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="identifiers">
+        <ows:AllowedValues>
+          <ows:Value>grey</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+    </ows:Operation>
+    <ows:Operation name="GetCoverage">
+      <ows:DCP>
+        <ows:HTTP>
+          <ows:Get xlink:type="simple" xlink:href="http://devgeo.cciw.ca/cgi-bin/mapserv/ecows?"/>
+        </ows:HTTP>
+      </ows:DCP>
+      <ows:Parameter name="service">
+        <ows:AllowedValues>
+          <ows:Value>WCS</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="version">
+        <ows:AllowedValues>
+          <ows:Value>1.1.1</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="Identifier">
+        <ows:AllowedValues>
+          <ows:Value>grey</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="InterpolationType">
+        <ows:AllowedValues>
+          <ows:Value>NEAREST_NEIGHBOUR</ows:Value>
+          <ows:Value>BILINEAR</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <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/jpeg</ows:Value>
+          <ows:Value>image/vnd.wap.wbmp</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="store">
+        <ows:AllowedValues>
+          <ows:Value>false</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="GridBaseCRS">
+        <ows:AllowedValues>
+          <ows:Value>urn:ogc:def:crs:epsg::4326</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+    </ows:Operation>
+  </ows:OperationsMetadata>
+  <Contents>
+    <CoverageSummary>
+      <ows:Title>Test description</ows:Title>
+      <ows:Abstract>Category: Image
+Product: IKONOS-2 PAN/MSI
+Acquisition: 1999-10-11 18:47</ows:Abstract>
+      <ows:Keywords>
+        <ows:Keyword>test</ows:Keyword>
+        <ows:Keyword>mapserver</ows:Keyword>
+      </ows:Keywords>
+      <ows:WGS84BoundingBox dimensions="2">
+        <ows:LowerCorner>-121.488743889689 0</ows:LowerCorner>
+        <ows:UpperCorner>-121.485160277178 0.00270582611334856</ows:UpperCorner>
+      </ows:WGS84BoundingBox>
+      <SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
+      <SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>
+      <SupportedFormat>image/tiff</SupportedFormat>
+      <SupportedFormat>image/png</SupportedFormat>
+      <SupportedFormat>image/x-aaigrid</SupportedFormat>
+      <Identifier>grey</Identifier>
+    </CoverageSummary>
+  </Contents>
+</Capabilities>

Added: trunk/msautotest/wxs/expected/wcs11_caps_section2.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_caps_section2.xml	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wcs11_caps_section2.xml	2009-09-04 06:20:10 UTC (rev 9290)
@@ -0,0 +1,43 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Capabilities xmlns="http://www.opengis.net/wcs/1.1" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" version="1.1.1" updateSequence="2007-10-30T14:23:38Z" xsi:schemaLocation="http://www.opengis.net/wcs/1.1 http://schemas.opengis.net/wcs/1.1/wcsGetCapabilities.xsd http://www.opengis.net/ows/1.1 http://schemas.opengis.net/ows/1.1.0/owsAll.xsd">
+  <ows:ServiceIdentification>
+    <ows:Title>First Test Service</ows:Title>
+    <ows:Abstract>Test Abstract</ows:Abstract>
+    <ows:Keywords>
+      <ows:Keyword>keyword</ows:Keyword>
+      <ows:Keyword>list</ows:Keyword>
+    </ows:Keywords>
+    <ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
+    <ows:ServiceTypeVersion>1.1.1</ows:ServiceTypeVersion>
+    <ows:Fees>NONE</ows:Fees>
+    <ows:AccessConstraints>NONE</ows:AccessConstraints>
+  </ows:ServiceIdentification>
+  <ows:ServiceProvider>
+    <ows:ProviderName>OSGeo</ows:ProviderName>
+    <ows:ProviderSite xlink:type="simple" xlink:href="http://198.202.74.215/cgi-bin/wcs_demo"/>
+    <ows:ServiceContact>
+      <ows:IndividualName>Frank Warmerdam</ows:IndividualName>
+      <ows:PositionName>Software Developer</ows:PositionName>
+      <ows:ContactInfo>
+        <ows:Phone>
+          <ows:Voice>(613) 754-2041</ows:Voice>
+          <ows:Facsimile>(613) 754-2041x343</ows:Facsimile>
+        </ows:Phone>
+        <ows:Address>
+          <ows:DeliveryPoint>3594 Foymount Rd</ows:DeliveryPoint>
+          <ows:City>Eganville</ows:City>
+          <ows:AdministrativeArea>Ontario</ows:AdministrativeArea>
+          <ows:PostalCode>K0J 1T0</ows:PostalCode>
+          <ows:Country>Canada</ows:Country>
+          <ows:ElectronicMailAddress>warmerdam at pobox.com</ows:ElectronicMailAddress>
+        </ows:Address>
+        <ows:OnlineResource xlink:type="simple" xlink:href="http://198.202.74.215/cgi-bin/wcs_demo"/>
+        <ows:HoursOfService>0800h - 1600h EST</ows:HoursOfService>
+        <ows:ContactInstructions>during hours of service</ows:ContactInstructions>
+      </ows:ContactInfo>
+      <ows:Role>staff</ows:Role>
+    </ows:ServiceContact>
+  </ows:ServiceProvider>
+</Capabilities>

Added: trunk/msautotest/wxs/expected/wcs11_caps_section3.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs11_caps_section3.xml	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wcs11_caps_section3.xml	2009-09-04 06:20:10 UTC (rev 9290)
@@ -0,0 +1,156 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Capabilities xmlns="http://www.opengis.net/wcs/1.1" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogc="http://www.opengis.net/ogc" version="1.1.1" updateSequence="2007-10-30T14:23:38Z" xsi:schemaLocation="http://www.opengis.net/wcs/1.1 http://schemas.opengis.net/wcs/1.1/wcsGetCapabilities.xsd http://www.opengis.net/ows/1.1 http://schemas.opengis.net/ows/1.1.0/owsAll.xsd">
+  <ows:ServiceIdentification>
+    <ows:Title>First Test Service</ows:Title>
+    <ows:Abstract>Test Abstract</ows:Abstract>
+    <ows:Keywords>
+      <ows:Keyword>keyword</ows:Keyword>
+      <ows:Keyword>list</ows:Keyword>
+    </ows:Keywords>
+    <ows:ServiceType codeSpace="OGC">OGC WCS</ows:ServiceType>
+    <ows:ServiceTypeVersion>1.1.1</ows:ServiceTypeVersion>
+    <ows:Fees>NONE</ows:Fees>
+    <ows:AccessConstraints>NONE</ows:AccessConstraints>
+  </ows:ServiceIdentification>
+  <ows:ServiceProvider>
+    <ows:ProviderName>OSGeo</ows:ProviderName>
+    <ows:ProviderSite xlink:type="simple" xlink:href="http://198.202.74.215/cgi-bin/wcs_demo"/>
+    <ows:ServiceContact>
+      <ows:IndividualName>Frank Warmerdam</ows:IndividualName>
+      <ows:PositionName>Software Developer</ows:PositionName>
+      <ows:ContactInfo>
+        <ows:Phone>
+          <ows:Voice>(613) 754-2041</ows:Voice>
+          <ows:Facsimile>(613) 754-2041x343</ows:Facsimile>
+        </ows:Phone>
+        <ows:Address>
+          <ows:DeliveryPoint>3594 Foymount Rd</ows:DeliveryPoint>
+          <ows:City>Eganville</ows:City>
+          <ows:AdministrativeArea>Ontario</ows:AdministrativeArea>
+          <ows:PostalCode>K0J 1T0</ows:PostalCode>
+          <ows:Country>Canada</ows:Country>
+          <ows:ElectronicMailAddress>warmerdam at pobox.com</ows:ElectronicMailAddress>
+        </ows:Address>
+        <ows:OnlineResource xlink:type="simple" xlink:href="http://198.202.74.215/cgi-bin/wcs_demo"/>
+        <ows:HoursOfService>0800h - 1600h EST</ows:HoursOfService>
+        <ows:ContactInstructions>during hours of service</ows:ContactInstructions>
+      </ows:ContactInfo>
+      <ows:Role>staff</ows:Role>
+    </ows:ServiceContact>
+  </ows:ServiceProvider>
+  <ows:OperationsMetadata>
+    <ows:Operation name="GetCapabilities">
+      <ows:DCP>
+        <ows:HTTP>
+          <ows:Get xlink:type="simple" xlink:href="http://devgeo.cciw.ca/cgi-bin/mapserv/ecows?"/>
+        </ows:HTTP>
+      </ows:DCP>
+      <ows:Parameter name="service">
+        <ows:AllowedValues>
+          <ows:Value>WCS</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="version">
+        <ows:AllowedValues>
+          <ows:Value>1.1.1</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+    </ows:Operation>
+    <ows:Operation name="DescribeCoverage">
+      <ows:DCP>
+        <ows:HTTP>
+          <ows:Get xlink:type="simple" xlink:href="http://devgeo.cciw.ca/cgi-bin/mapserv/ecows?"/>
+        </ows:HTTP>
+      </ows:DCP>
+      <ows:Parameter name="service">
+        <ows:AllowedValues>
+          <ows:Value>WCS</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="version">
+        <ows:AllowedValues>
+          <ows:Value>1.1.1</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="identifiers">
+        <ows:AllowedValues>
+          <ows:Value>grey</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+    </ows:Operation>
+    <ows:Operation name="GetCoverage">
+      <ows:DCP>
+        <ows:HTTP>
+          <ows:Get xlink:type="simple" xlink:href="http://devgeo.cciw.ca/cgi-bin/mapserv/ecows?"/>
+        </ows:HTTP>
+      </ows:DCP>
+      <ows:Parameter name="service">
+        <ows:AllowedValues>
+          <ows:Value>WCS</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="version">
+        <ows:AllowedValues>
+          <ows:Value>1.1.1</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="Identifier">
+        <ows:AllowedValues>
+          <ows:Value>grey</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="InterpolationType">
+        <ows:AllowedValues>
+          <ows:Value>NEAREST_NEIGHBOUR</ows:Value>
+          <ows:Value>BILINEAR</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <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/jpeg</ows:Value>
+          <ows:Value>image/vnd.wap.wbmp</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="store">
+        <ows:AllowedValues>
+          <ows:Value>false</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+      <ows:Parameter name="GridBaseCRS">
+        <ows:AllowedValues>
+          <ows:Value>urn:ogc:def:crs:epsg::4326</ows:Value>
+        </ows:AllowedValues>
+      </ows:Parameter>
+    </ows:Operation>
+  </ows:OperationsMetadata>
+  <Contents>
+    <CoverageSummary>
+      <ows:Title>Test description</ows:Title>
+      <ows:Abstract>Category: Image
+Product: IKONOS-2 PAN/MSI
+Acquisition: 1999-10-11 18:47</ows:Abstract>
+      <ows:Keywords>
+        <ows:Keyword>test</ows:Keyword>
+        <ows:Keyword>mapserver</ows:Keyword>
+      </ows:Keywords>
+      <ows:WGS84BoundingBox dimensions="2">
+        <ows:LowerCorner>-121.488743889689 0</ows:LowerCorner>
+        <ows:UpperCorner>-121.485160277178 0.00270582611334856</ows:UpperCorner>
+      </ows:WGS84BoundingBox>
+      <SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
+      <SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>
+      <SupportedFormat>image/tiff</SupportedFormat>
+      <SupportedFormat>image/png</SupportedFormat>
+      <SupportedFormat>image/x-aaigrid</SupportedFormat>
+      <Identifier>grey</Identifier>
+    </CoverageSummary>
+  </Contents>
+</Capabilities>

Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map	2009-09-03 03:24:01 UTC (rev 9289)
+++ trunk/msautotest/wxs/wcs_simple.map	2009-09-04 06:20:10 UTC (rev 9290)
@@ -27,7 +27,16 @@
 # Capabilities 1.1 updatesequence exception (higher)
 # RUN_PARMS: wcs11_exception_updatesequence2.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.1&REQUEST=GetCapabilities&updatesequence=2008-01-13T14:23:38Z" > [RESULT]
 #
+# Capabilities 1.1 selected section
+# RUN_PARMS: wcs11_caps_section1.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.1&REQUEST=GetCapabilities&sections=OperationsMetadata,Contents" > [RESULT]
 #
+# Capabilities 1.1 selected sections
+# RUN_PARMS: wcs11_caps_section2.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.1&REQUEST=GetCapabilities&sections=ServiceIdentificationServiceProvider" > [RESULT]
+#
+# Capabilities 1.1 selected sections
+# RUN_PARMS: wcs11_caps_section3.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.1&REQUEST=GetCapabilities&sections=All" > [RESULT]
+#
+#
 # Coverage description
 # RUN_PARMS: wcs_describe.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=DescribeCoverage&COVERAGE=grey" > [RESULT]
 #

More information about the mapserver-commits mailing list