[mapserver-commits] r7286 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Mon Jan 21 12:11:56 EST 2008
Author: warmerdam
Date: 2008-01-21 12:11:56 -0500 (Mon, 21 Jan 2008)
New Revision: 7286
Added:
trunk/msautotest/wxs/expected/wcs_cap_11.xml
trunk/msautotest/wxs/expected/wcs_describe_11.xml
Modified:
trunk/msautotest/wxs/expected/wcs_cap.xml
trunk/msautotest/wxs/wcs_simple.map
Log:
added OWS metadata, added preliminary WCS 1.1 tests
Modified: trunk/msautotest/wxs/expected/wcs_cap.xml
===================================================================
(Binary files differ)
Added: trunk/msautotest/wxs/expected/wcs_cap_11.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_cap_11.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_cap_11.xml 2008-01-21 17:11:56 UTC (rev 7286)
@@ -0,0 +1,140 @@
+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" 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">
+ <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/>
+ <!--WARNING: Optional metadata "ows_hoursofservice" was missing for ows:HoursOfService-->
+ <ows:ContactInstructions/>
+ <!--WARNING: Optional metadata "ows_contactinstructions" was missing for ows:ContactInstructions-->
+ </ows:ContactInfo>
+ <ows:Role/>
+ <!--WARNING: Optional metadata "ows_role" was missing for 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:Value>WCS</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:Value>1.1.1</ows:Value>
+ </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:Value>WCS</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:Value>1.1.1</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="identifiers">
+ <ows:Value>grey</ows:Value>
+ </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:Value>WCS</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="version">
+ <ows:Value>1.1.1</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="Identifier">
+ <ows:Value>grey</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="InterpolationType">
+ <ows:Value>NEAREST_NEIGHBOUR</ows:Value>
+ <ows:Value>BILINEAR</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="format">
+ <ows:Value>image/tiff</ows:Value>
+ <ows:Value>image/png</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:Parameter>
+ <ows:Parameter name="store">
+ <ows:Value>false</ows:Value>
+ </ows:Parameter>
+ <ows:Parameter name="GridBaseCRS">
+ <ows:Value>urn:ogc:def:crs:epsg::4326</ows:Value>
+ </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>
+ <Identifier>grey</Identifier>
+ <ows:Keywords>
+ <ows:Keyword>test</ows:Keyword>
+ <ows:Keyword>mapserver</ows:Keyword>
+ </ows:Keywords>
+ <ows:BoundingBox crs="urn:ogc:def:crs:OGC::imageCRS" dimensions="2">
+ <ows:LowerCorner>0 0</ows:LowerCorner>
+ <ows:UpperCorner>39 29</ows:UpperCorner>
+ </ows:BoundingBox>
+ <ows:BoundingBox crs="urn:ogc:def:crs:EPSG::32611" dimensions="2">
+ <ows:LowerCorner>0 0</ows:LowerCorner>
+ <ows:UpperCorner>400 300</ows:UpperCorner>
+ </ows:BoundingBox>
+ <ows:WGS84BoundingBox dimensions="2">
+ <ows:LowerCorner>-121.48874388968 0</ows:LowerCorner>
+ <ows:UpperCorner>-121.48516027717 0.0027058261133485</ows:UpperCorner>
+ </ows:WGS84BoundingBox>
+ <SupportedFormat>image/tiff</SupportedFormat>
+ <SupportedFormat>image/png</SupportedFormat>
+ <SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
+ <SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>
+ </CoverageSummary>
+ </Contents>
+</Capabilities>
Added: trunk/msautotest/wxs/expected/wcs_describe_11.xml
===================================================================
--- trunk/msautotest/wxs/expected/wcs_describe_11.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wcs_describe_11.xml 2008-01-21 17:11:56 UTC (rev 7286)
@@ -0,0 +1,58 @@
+Content-type: text/xml
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<CoverageDescriptions 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" xmlns:ogc="http://www.opengis.net/ogc" version="1.1.0">
+ <CoverageDescription>
+ <ows:Title>Test description</ows:Title>
+ <ows:Abstract>Category: Image
+Product: IKONOS-2 PAN/MSI
+Acquisition: 1999-10-11 18:47</ows:Abstract>
+ <Identifier>grey</Identifier>
+ <ows:Keywords>
+ <ows:Keyword>test</ows:Keyword>
+ <ows:Keyword>mapserver</ows:Keyword>
+ </ows:Keywords>
+ <Domain>
+ <SpatialDomain>
+ <ows:BoundingBox crs="urn:ogc:def:crs:OGC::imageCRS" dimensions="2">
+ <ows:LowerCorner>0 0</ows:LowerCorner>
+ <ows:UpperCorner>39 29</ows:UpperCorner>
+ </ows:BoundingBox>
+ <ows:BoundingBox crs="urn:ogc:def:crs:EPSG::32611" dimensions="2">
+ <ows:LowerCorner>0 0</ows:LowerCorner>
+ <ows:UpperCorner>400 300</ows:UpperCorner>
+ </ows:BoundingBox>
+ <ows:WGS84BoundingBox dimensions="2">
+ <ows:LowerCorner>-121.488743889689 0</ows:LowerCorner>
+ <ows:UpperCorner>-121.485160277178 0.00270582611334856</ows:UpperCorner>
+ </ows:WGS84BoundingBox>
+ <GridCRS>
+ <GridBaseCRS>urn:ogc:def:crs:EPSG::32611</GridBaseCRS>
+ <GridType>urn:ogc:def:method:WCS:1.1:2dSimpleGrid</GridType>
+ <GridOrigin>5 295</GridOrigin>
+ <GridOffsets>10 -10</GridOffsets>
+ <GridCS>urn:ogc:def:cs:OGC:0.0:Grid2dSquareCS</GridCS>
+ </GridCRS>
+ </SpatialDomain>
+ </Domain>
+ <Range>
+ <Field>
+ <ows:Title>Bands</ows:Title>
+ <Identifier>Landsat 5 TM Bands</Identifier>
+ <InterpolationMethods>
+ <DefaultMethod>nearest neighbour</DefaultMethod>
+ <OtherMethod>bilinear</OtherMethod>
+ </InterpolationMethods>
+ <Axis identifier="bands">
+ <AvailableKeys>
+ <Key>1</Key>
+ </AvailableKeys>
+ </Axis>
+ </Field>
+ </Range>
+ <SupportedCRS>urn:ogc:def:crs:EPSG::32611</SupportedCRS>
+ <SupportedCRS>urn:ogc:def:crs:EPSG::4326</SupportedCRS>
+ <SupportedFormat>image/tiff</SupportedFormat>
+ <SupportedFormat>image/png</SupportedFormat>
+ </CoverageDescription>
+</CoverageDescriptions>
Modified: trunk/msautotest/wxs/wcs_simple.map
===================================================================
--- trunk/msautotest/wxs/wcs_simple.map 2008-01-21 17:09:01 UTC (rev 7285)
+++ trunk/msautotest/wxs/wcs_simple.map 2008-01-21 17:11:56 UTC (rev 7286)
@@ -23,6 +23,14 @@
#
# Try downsampling with change of projection (test bug #2180)
# RUN_PARMS: wcs_16_repro.tif [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.0.0&REQUEST=GetCoverage&WIDTH=20&HEIGHT=30&FORMAT=GEOTIFF_16&BBOX=-121.488744,0,-121.485169,0.002697&COVERAGE=grey&CRS=EPSG:4326" > [RESULT_DEMIME]
+#
+#
+# Capabilities 1.1
+# RUN_PARMS: wcs_cap_11.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WCS&VERSION=1.1.1&REQUEST=GetCapabilities" > [RESULT_DEVERSION]
+#
+# 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]
+#
NAME TEST
SIZE 400 300
@@ -55,6 +63,25 @@
METADATA
"ows_schemas_location" "http://schemas.opengeospatial.net"
+ # OWS stuff for server
+ "ows_title" "First Test Service"
+ "ows_fees" "NONE"
+ "ows_accessconstraints" "NONE"
+ "ows_abstract" "Test Abstract"
+ "ows_keywordlist" "keyword,list"
+ "ows_service_onlineresource" "http://198.202.74.215/cgi-bin/wcs_demo"
+ "ows_contactorganization" "OSGeo"
+ "ows_contactperson" "Frank Warmerdam"
+ "ows_contactposition" "Software Developer"
+ "ows_contactvoicetelephone" "(613) 754-2041"
+ "ows_contactfacsimiletelephone" "(613) 754-2041x343"
+ "ows_address" "3594 Foymount Rd"
+ "ows_city" "Eganville"
+ "ows_stateorprovince" "Ontario"
+ "ows_postcode" "K0J 1T0"
+ "ows_country" "Canada"
+ "ows_contactelectronicmailaddress" "warmerdam at pobox.com"
+
# OGC:WCS
"wcs_label" "Test Label"
"wcs_description" "Test description"
@@ -75,7 +102,8 @@
PROJECTION
"init=epsg:32611"
END
- METADATA "ows_extent" "0 0 400 300"
+ METADATA
+ "ows_extent" "0 0 400 300"
"wcs_label" "Test label"
"ows_srs" "EPSG:32611 EPSG:4326"
"wcs_resolution" "10 10"
@@ -85,6 +113,9 @@
"wcs_description" "Test description"
"wcs_metadatalink_href" "http://www.gdal.org/metadata_test_link.html"
"wcs_keywordlist" "test,mapserver"
+ "wcs_abstract" "Category: Image
+Product: IKONOS-2 PAN/MSI
+Acquisition: 1999-10-11 18:47"
"wcs_rangeset_axes" "bands"
"wcs_rangeset_name" "Landsat 5 TM Bands"
"wcs_rangeset_label" "Bands"
More information about the mapserver-commits
mailing list