Merge pull request #169 from tastle/official-wcs-crs-extension

Updated the WCS CRS 1.0 extension to be the latest that arrived on th…
highsource · Feb 26, 2016 · 49370f0 · 49370f0
2 parents df1e5ef + 893f8a3
commit 49370f0
Show file tree

Hide file tree

Showing 7 changed files with 194 additions and 84 deletions.
diff --git a/schemas/src/main/resources-original/ogc/wcs/ReadMe.txt b/schemas/src/main/resources-original/ogc/wcs/ReadMe.txt
@@ -16,6 +16,9 @@ The most current schema are available at http://schemas.opengis.net/ .
 
 -----------------------------------------------------------------------
 
+2016-02-03  Peter Baumann
+  * wcs/crs/1.0: added WCS 2.0 CRS Extension 1.0.0 (OGC 11-053r1)
+
 2014-11-26  Peter Baumann
   * wcs/processing/2.0: added WCS Processing Extension 2.0.0 (OGC 08-059r4)
 

diff --git a/schemas/src/main/resources-original/ogc/wcs/crs/1.0/examples/requestGetCoverageOutputCRS.xml b/schemas/src/main/resources-original/ogc/wcs/crs/1.0/examples/requestGetCoverageOutputCRS.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wcs:GetCoverage
+  xmlns:wcs="http://www.opengis.net/wcs/2.0"
+  xmlns:wcscrs="http://www.opengis.net/wcs/crs/1.0"
+  xmlns:gml="http://www.opengis.net/gml/3.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd 
+    http://www.opengis.net/wcs/crs/1.0 http://schemas.opengis.net/wcs/crs/1.0/wcsCrs.xsd"
+  service="WCS"
+  version="2.0.1">
+  <wcs:Extension>
+    <wcscrs:outputCrs>http://www.opengis.net/def/crs/EPSG/0/4326</wcscrs:outputCrs>
+  </wcs:Extension>
+  <wcs:CoverageId>C0001</wcs:CoverageId>
+  <wcs:format>application/gml+xml</wcs:format>
+</wcs:GetCoverage>
diff --git a/.../src/main/resources-original/ogc/wcs/crs/1.0/examples/requestGetCoverageSubsettingCRS.xml b/.../src/main/resources-original/ogc/wcs/crs/1.0/examples/requestGetCoverageSubsettingCRS.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wcs:GetCoverage
+  xmlns:wcs="http://www.opengis.net/wcs/2.0"
+  xmlns:wcscrs="http://www.opengis.net/wcs/crs/1.0"
+  xmlns:gml="http://www.opengis.net/gml/3.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd 
+    http://www.opengis.net/wcs/crs/1.0 http://schemas.opengis.net/wcs/crs/1.0/wcsCrs.xsd"
+  service="WCS"
+  version="2.0.1">
+  <wcs:Extension>
+    <wcscrs:subsettingCrs>http://www.opengis.net/def/crs/EPSG/0/4326</wcscrs:subsettingCrs>
+    <wcscrs:outputCrs>http://www.opengis.net/def/crs/EPSG/0/4326</wcscrs:outputCrs>
+  </wcs:Extension>
+  <wcs:CoverageId>C0001</wcs:CoverageId>
+  <wcs:format>application/gml+xml</wcs:format>
+</wcs:GetCoverage>
diff --git a/schemas/src/main/resources-original/ogc/wcs/crs/1.0/examples/responseGetCapabilities.xml b/schemas/src/main/resources-original/ogc/wcs/crs/1.0/examples/responseGetCapabilities.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wcs:Capabilities  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+    xmlns:xlink='http://www.w3.org/1999/xlink'
+    xmlns='http://www.opengis.net/ows/2.0'
+    xmlns:ows='http://www.opengis.net/ows/2.0'
+    xmlns:wcs='http://www.opengis.net/wcs/2.0'
+    xmlns:wcscrs="http://www.opengis.net/wcs/crs/1.0"
+    xmlns:gml='http://www.opengis.net/gml/3.2'
+    xsi:schemaLocation="http://www.opengis.net/wcs/2.0 http://schemas.opengis.net/wcs/2.0/wcsAll.xsd 
+      http://www.opengis.net/wcs/crs/1.0 http://schemas.opengis.net/wcs/crs/1.0/wcsCrs.xsd"
+    version="2.0.1">
+    <ows:ServiceIdentification>
+        <ows:Title>rasdaman</ows:Title>
+        <ows:Abstract>rasdaman server - free download from www.rasdaman.org</ows:Abstract>
+        <ows:ServiceType>OGC WCS</ows:ServiceType>
+        <ows:ServiceTypeVersion>2.0.1</ows:ServiceTypeVersion>
+        <ows:Profile>http://www.opengis.net/spec/WCS_protocol-binding_soap/1.0/conf/soap</ows:Profile>
+        <ows:Profile>http://www.opengis.net/spec/WCS_coverage-encoding_netcdf/1.0/conf/netcdf</ows:Profile>
+        <ows:Profile>http://www.opengis.net/spec/WCS_service-model_processing/1.0/conf/processing</ows:Profile>
+        <ows:Profile>http://www.opengis.net/spec/WCS_service-model_transaction/1.0/conf/transaction</ows:Profile>
+    </ows:ServiceIdentification>
+    <ows:ServiceProvider>
+        <ows:ProviderName>Jacobs University Bremen</ows:ProviderName>
+        <ows:ProviderSite xlink:href="http://www.jacobs-university.de/"/>
+        <ows:ServiceContact>
+            <ows:IndividualName>Andrei Aiordachioaie</ows:IndividualName>
+            <ows:PositionName>Developer</ows:PositionName>
+            <ows:ContactInfo>
+                <ows:Phone>
+                    <ows:Voice></ows:Voice>
+                </ows:Phone>
+            </ows:ContactInfo>
+        </ows:ServiceContact>
+    </ows:ServiceProvider>
+    <ows:OperationsMetadata>
+        <ows:Operation name="GetCapabilities">
+            <ows:DCP>
+                <ows:HTTP>
+                    <ows:Get xlink:href="http://server:8000/GetCapabilitiesURL"/>
+                </ows:HTTP>
+            </ows:DCP>
+        </ows:Operation>
+        <ows:Operation name="DescribeCoverage">
+            <ows:DCP>
+                <ows:HTTP>
+                    <ows:Get xlink:href="http://server:8000/DescribeCoverageURL"/>
+                </ows:HTTP>
+            </ows:DCP>
+        </ows:Operation>
+        <ows:Operation name="GetCoverage">
+            <ows:DCP>
+                <ows:HTTP>
+                    <ows:Get xlink:href="http://server:8000/GetCoverageURL"/>
+                </ows:HTTP>
+            </ows:DCP>
+        </ows:Operation>
+    </ows:OperationsMetadata>
+    <wcs:ServiceMetadata>
+        <wcs:formatSupported>application/gml+xml</wcs:formatSupported>
+        <wcs:Extension>
+            <wcscrs:crsSupported>http://www.opengis.net/def/crs/EPSG/0/4326</wcscrs:crsSupported>
+        </wcs:Extension>
+    </wcs:ServiceMetadata>
+    <wcs:Contents>
+        <wcs:CoverageSummary>
+            <wcs:CoverageId>C0001</wcs:CoverageId>
+            <wcs:CoverageSubtype>GridCoverage</wcs:CoverageSubtype>
+        </wcs:CoverageSummary>
+        <wcs:CoverageSummary>
+            <wcs:CoverageId>C0002</wcs:CoverageId>
+            <wcs:CoverageSubtype>MultiPointCoverage</wcs:CoverageSubtype>
+        </wcs:CoverageSummary>
+        <wcs:CoverageSummary>
+            <wcs:CoverageId>C0003</wcs:CoverageId>
+            <wcs:CoverageSubtype>MultiCurveCoverage</wcs:CoverageSubtype>
+        </wcs:CoverageSummary>
+          <wcs:CoverageSummary>
+            <wcs:CoverageId>C0004</wcs:CoverageId>
+            <wcs:CoverageSubtype>MultiSurfaceCoverage</wcs:CoverageSubtype>
+        </wcs:CoverageSummary>
+           <wcs:CoverageSummary>
+            <wcs:CoverageId>C0005</wcs:CoverageId>
+            <wcs:CoverageSubtype>MultiSolidCoverage</wcs:CoverageSubtype>
+        </wcs:CoverageSummary>
+    </wcs:Contents>
+</wcs:Capabilities>
diff --git a/schemas/src/main/resources-original/ogc/wcs/crs/1.0/wcsCrs.sch b/schemas/src/main/resources-original/ogc/wcs/crs/1.0/wcsCrs.sch
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    This Schematron Document is part of the WCS 2.0 CRS Extension 1.0 [OGC 11-053]
+    which enables expressing Coordinate Reference Sytems (CRSs) in WCS client/server communication.
+    Last updated: 2015-12-17
+    Version: 1.0.0
+    Copyright (c) 2012, 2015 Open Geospatial Consortium.
+    To obtain additional rights of use, visit http://www.opengeospatial.org/legal/.
+-->
+<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
+    <sch:title>WCS CRS Extension Schematron Rules</sch:title>
+    <sch:ns uri="http://www.opengis.net/wcs/2.0" prefix="wcs"/>
+    <sch:ns uri="http://www.w3.org/1999/xlink" prefix="xlink"/>
+    <sch:pattern>
+        <sch:title>Requirement 1: /req/crs/extension-identifier</sch:title>
+        <sch:rule context="//wcs:Capabilities">
+            <sch:let name="profiles" value="string-join(//*[local-name()='ServiceIdentification']/*[local-name()='Profile'],' ')"/>
+            <sch:assert test="contains(profiles,'http://www.opengis.net/spec/wcs/crs/1.0/conf/crs')">
+                To indicate that the WCS CRS extension is implemented by this server, there shall be a profile element containing the extension identifier.
+            </sch:assert>
+        </sch:rule>
+    </sch:pattern>
+    <sch:pattern>
+        <sch:title>Requirement 3: /req/crs/wcsServiceMetadata-crs</sch:title>
+        <sch:rule context="//wcs:Capabilities">
+            <sch:assert test="count(//*[local-name()='CrsMetadata'])=1">
+                The Capabilities document shall contain a CrsMetadata element.
+            </sch:assert>
+        </sch:rule>
+    </sch:pattern>
+    <sch:pattern>
+        <sch:title>Requirement 6: /req/crs/getCoverage-crs</sch:title>
+        <sch:rule context="//wcs:GetCoverage">
+            <sch:assert test="count(//*[local-name()='GetCoverageCrs'])=1">
+                Cardinality of the GetCoverageCrs element shall be 1.
+            </sch:assert>
+        </sch:rule>
+    </sch:pattern>
+</sch:schema>
diff --git a/schemas/src/main/resources-original/ogc/wcs/crs/1.0/wcsCrs.xsd b/schemas/src/main/resources-original/ogc/wcs/crs/1.0/wcsCrs.xsd
@@ -1,42 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.opengis.net/wcs/crs/1.0" 
-    xmlns:wcscrs="http://www.opengis.net/wcs/crs/1.0"
-    xmlns="http://www.w3.org/2001/XMLSchema" 
-    elementFormDefault="qualified" version="1.0.0" xml:lang="en">   
-    <annotation>
-        <appinfo>wcsCrs.xsd</appinfo>
-        <documentation>This XML Schema Document is part of the WCS CRS Extension [OGC 11-053]. It encodes the elements and types that allow expressing Coordinate Reference Sytems (CRSs) in WCS client/server communication.
-            Last updated: 2013-aug-30
-            Copyright (c) 2013 Open Geospatial Consortium, Inc. All Rights Reserved.
-            To obtain additional rights of use, visit http://www.opengeospatial.org/legal/.
-        </documentation>
-    </annotation>
-
-    <!-- ============================================================== -->
-    <!-- includes and imports                                           -->
-    <!-- ============================================================== -->
-    <import namespace="http://www.opengis.net/wcs/2.0" schemaLocation="http://schemas.opengis.net/wcs/2.0/wcsAll.xsd"/>
-    <!-- ============================================================== -->
-    <!-- elements and types                                             -->
-    <!-- ============================================================== -->
-    <element name="CrsMetadata" type="wcscrs:CrsMetadataType"/>
-    <complexType name="CrsMetadataType">
-        <annotation>
-            <documentation>CRS information reported in the Capabilities document of a WCS service supporting the CRS Extension. </documentation>
-        </annotation>
-        <sequence>
-            <element name="crsSupported" type="anyURI" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <!-- ============================================================== -->
-    <element name="Crs" type="wcscrs:CrsType"/>
-    <complexType name="CrsType">
-        <annotation>
-            <documentation>CRSs for the request bounding box and for the result coverage. </documentation>
-        </annotation>
-        <sequence>
-            <element name="subsettingCrs" type="anyURI" minOccurs="0"/>
-            <element name="outputCrs" type="anyURI" minOccurs="0"/>
-        </sequence>
-    </complexType>
-</schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.opengis.net/wcs/crs/1.0" 
+    xmlns:crs="http://www.opengis.net/wcs/crs/1.0"
+    xmlns="http://www.w3.org/2001/XMLSchema" 
+    elementFormDefault="qualified" xml:lang="en" version="1.0.0">
+    <annotation>
+        <appinfo>wcsCrs.xsd</appinfo>
+        <documentation>This XML Schema Document is part of the WCS 2.0 CRS Extension 1.0 [OGC 11-053]. 
+            It encodes the elements and types that allow expressing Coordinate Reference Sytems (CRSs) in WCS client/server communication.
+            Last updated: 2015-12-17
+            Copyright (c) 2011, 2015 Open Geospatial Consortium.
+            To obtain additional rights of use, visit http://www.opengeospatial.org/legal/.
+        </documentation>
+    </annotation>
+    <!-- ============================================================== -->
+    <!-- includes and imports                                           -->
+    <!-- ============================================================== -->
+    <import namespace="http://www.opengis.net/wcs/2.0" schemaLocation="http://schemas.opengis.net/wcs/2.0/wcsAll.xsd"/>
+    <!-- ============================================================== -->
+    <!-- elements and types                                             -->
+    <!-- ============================================================== -->
+    <element name="supportedCrs" type="anyURI">
+        <annotation>
+            <documentation>CRS information reported in the Capabilities document of a WCS service supporting the CRS Extension. </documentation>
+        </annotation>
+    </element>
+    <!-- ============================================================== -->
+    <annotation>
+        <documentation>CRSs for the request bounding box and for the result coverage. </documentation>
+    </annotation>
+    <element name="subsettingCrs" type="anyURI"/>
+    <element name="outputCrs" type="anyURI"/>
+</schema>
diff --git a/schemas/src/main/resources/ogc/wcs/crs/1.0/wcsCrs.xsd b/schemas/src/main/resources/ogc/wcs/crs/1.0/wcsCrs.xsd