Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[6345] trunk/web/src/main
|
From: <fxp...@us...> - 2010-08-04 16:25:41
|
Revision: 6345
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=6345&view=rev
Author: fxprunayre
Date: 2010-08-04 16:25:32 +0000 (Wed, 04 Aug 2010)
Log Message:
-----------
Harvester / OGC WxS / Add WMS version 1.3.0
Modified Paths:
--------------
trunk/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java
trunk/web/src/main/webapp/loc/ar/xml/harvesting.xml
trunk/web/src/main/webapp/loc/cn/xml/harvesting.xml
trunk/web/src/main/webapp/loc/de/xml/harvesting.xml
trunk/web/src/main/webapp/loc/en/xml/harvesting.xml
trunk/web/src/main/webapp/loc/es/xml/harvesting.xml
trunk/web/src/main/webapp/loc/fr/xml/harvesting.xml
trunk/web/src/main/webapp/loc/nl/xml/harvesting.xml
trunk/web/src/main/webapp/loc/pt/xml/harvesting.xml
trunk/web/src/main/webapp/loc/ru/xml/harvesting.xml
trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl
trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/identification.xsl
trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/resp-party.xsl
Modified: trunk/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java
===================================================================
--- trunk/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java 2010-08-04 16:25:32 UTC (rev 6345)
@@ -292,10 +292,12 @@
//--- Select layers, featureTypes and Coverages (for layers having no child named layer = not take group of layer into account)
// and add the metadata
XPath xp = XPath.newInstance ("//Layer[count(./*[name(.)='Layer'])=0] | " +
+ "//wms:Layer[count(./*[name(.)='Layer'])=0] | " +
"//wfs:FeatureType | " +
"//wcs:CoverageOfferingBrief");
xp.addNamespace("wfs", "http://www.opengis.net/wfs");
xp.addNamespace("wcs", "http://www.opengis.net/wcs");
+ xp.addNamespace("wms", "http://www.opengis.net/wms");
List<Element> layers = xp.selectNodes(capa);
log.info(" - Number of layers, featureTypes or Coverages found : " + layers.size());
@@ -481,7 +483,13 @@
reg.uuid = UUID.randomUUID().toString();
if (params.ogctype.substring(0,3).equals("WMS")) {
+
+ if (params.ogctype.substring(3,8).equals("1.3.0")) {
+ Namespace wms = Namespace.getNamespace("http://www.opengis.net/wms");
+ reg.name = layer.getChild ("Name", wms).getValue ();
+ } else {
reg.name = layer.getChild ("Name").getValue ();
+ }
} else if (params.ogctype.substring(0,3).equals("WFS")) {
Namespace wfs = Namespace.getNamespace("http://www.opengis.net/wfs");
reg.name = layer.getChild ("Name", wfs).getValue ();
Modified: trunk/web/src/main/webapp/loc/ar/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/ar/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/ar/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -73,7 +73,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Version 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Version 1.1.1 - preferred</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Version 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Version 1.1.0 - preferred</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Version 1.0.0</type>
Modified: trunk/web/src/main/webapp/loc/cn/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/cn/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/cn/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -75,7 +75,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Version 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Version 1.1.1 - preferred</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Version 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Version 1.1.0 - preferred</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Version 1.0.0</type>
Modified: trunk/web/src/main/webapp/loc/de/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/de/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/de/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -74,7 +74,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Version 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Version 1.1.1 - preferred</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Version 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Version 1.1.0 - preferred</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Version 1.0.0</type>
Modified: trunk/web/src/main/webapp/loc/en/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/en/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/en/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -75,7 +75,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Version 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Version 1.1.1 - preferred</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Version 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Version 1.1.0 - preferred</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Version 1.0.0</type>
Modified: trunk/web/src/main/webapp/loc/es/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/es/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/es/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -75,7 +75,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Version 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Version 1.1.1 - preferred</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Version 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Version 1.1.0 - preferred</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Version 1.0.0</type>
Modified: trunk/web/src/main/webapp/loc/fr/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/fr/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/fr/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -75,7 +75,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Version 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Version 1.1.1 - preferred</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Version 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Version 1.1.0 - preferred</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Version 1.0.0</type>
Modified: trunk/web/src/main/webapp/loc/nl/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/nl/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/nl/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -75,7 +75,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Versie 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Versie 1.1.1 - aanbevolen</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Versie 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Versie 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Versie 1.1.0 - aanbevolen</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Versie 1.0.0</type>
Modified: trunk/web/src/main/webapp/loc/pt/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/pt/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/pt/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -75,7 +75,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Versão 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Versão 1.1.1 - preferido</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Versão 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Versão 1.1.0 - preferido</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Versão 1.0.0</type>
Modified: trunk/web/src/main/webapp/loc/ru/xml/harvesting.xml
===================================================================
--- trunk/web/src/main/webapp/loc/ru/xml/harvesting.xml 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/loc/ru/xml/harvesting.xml 2010-08-04 16:25:32 UTC (rev 6345)
@@ -75,7 +75,7 @@
<wxstypes>
<type value="WMS1.0.0">OGC Web Map Service (WMS) Version 1.0.0</type>
<type value="WMS1.1.1">OGC Web Map Service (WMS) Version 1.1.1 - preferred</type>
- <!-- <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type> -->
+ <type value="WMS1.3.0">OGC Web Map Service (WMS) Version 1.3.0</type>
<type value="WFS1.0.0">OGC Web Feature Service (WFS) Version 1.0.0</type>
<type value="WFS1.1.0">OGC Web Feature Service (WFS) Version 1.1.0 - preferred</type>
<type value="WCS1.0.0">OGC Web Coverage Service (WCS) Version 1.0.0</type>
Modified: trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl
===================================================================
--- trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl 2010-08-04 16:25:32 UTC (rev 6345)
@@ -3,6 +3,7 @@
Mapping between :
- WMS 1.0.0
- WMS 1.1.1
+- WMS 1.3.0
- WCS 1.0.0
- WFS 1.0.0
- WFS 1.1.0
@@ -20,6 +21,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:wcs="http://www.opengis.net/wcs"
+ xmlns:wms="http://www.opengis.net/wms"
xmlns:ows="http://www.opengis.net/ows"
xmlns:owsg="http://www.opengeospatial.net/ows"
xmlns:ows11="http://www.opengis.net/ows/1.1"
@@ -51,7 +53,8 @@
<!-- ============================================================================= -->
- <xsl:template match="WMT_MS_Capabilities|wfs:WFS_Capabilities|wcs:WCS_Capabilities|wps:Capabilities|wps1:Capabilities">
+ <xsl:template match="WMT_MS_Capabilities|wfs:WFS_Capabilities|wcs:WCS_Capabilities|
+ wps:Capabilities|wps1:Capabilities|wms:WMS_Capabilities">
<xsl:variable name="ows">
<xsl:choose>
@@ -98,12 +101,14 @@
<xsl:choose>
<xsl:when test="Service/ContactInformation|
wfs:Service/wfs:ContactInformation|
- ows:ServiceProvider|
+ wms:Service/wms:ContactInformation|
+ ows:ServiceProvider|
owsg:ServiceProvider|
ows11:ServiceProvider">
<xsl:for-each select="Service/ContactInformation|
wfs:Service/wfs:ContactInformation|
- ows:ServiceProvider|
+ wms:Service/wms:ContactInformation|
+ ows:ServiceProvider|
owsg:ServiceProvider|
ows11:ServiceProvider">
<contact>
@@ -183,6 +188,9 @@
<xsl:value-of select="//ows:Operation[@name='GetCapabilities']/ows:DCP/ows:HTTP/ows:Get/@xlink:href|
//ows11:Operation[@name='GetCapabilities']/ows11:DCP/ows11:HTTP/ows11:Get/@xlink:href"/>
</xsl:when>
+ <xsl:when test="name(.)='WMS_Capabilities'">
+ <xsl:value-of select="//wms:GetCapabilities/wms:DCPType/wms:HTTP/wms:Get/wms:OnlineResource/@xlink:href"/>
+ </xsl:when>
<xsl:when test="name(.)='WFS_Capabilities'">
<xsl:value-of select="//wfs:GetCapabilities/wfs:DCPType/wfs:HTTP/wfs:Get/@onlineResource"/>
</xsl:when>
@@ -204,7 +212,10 @@
<xsl:when test="$ows='true'">
<xsl:value-of select="//ows:Operation[@name='GetCapabilities']/ows:DCP/ows:HTTP/ows:Get/@xlink:href"/>
</xsl:when>
- <xsl:when test="name(.)='WFS_Capabilities'">
+ <xsl:when test="name(.)='WMS_Capabilities'">
+ <xsl:value-of select="//wms:GetCapabilities/wms:DCPType/wms:HTTP/wms:Get/wms:OnlineResource/@xlink:href"/>
+ </xsl:when>
+ <xsl:when test="name(.)='WFS_Capabilities'">
<xsl:value-of select="//wfs:GetCapabilities/wfs:DCPType/wfs:HTTP/wfs:Get/@onlineResource"/>
</xsl:when>
<xsl:when test="name(.)='WMT_MS_Capabilities'">
Modified: trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/identification.xsl
===================================================================
--- trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/identification.xsl 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/identification.xsl 2010-08-04 16:25:32 UTC (rev 6345)
@@ -11,6 +11,7 @@
xmlns:ows="http://www.opengis.net/ows"
xmlns:ows11="http://www.opengis.net/ows/1.1"
xmlns:wcs="http://www.opengis.net/wcs"
+ xmlns:wms="http://www.opengis.net/wms"
xmlns:wps="http://www.opengeospatial.net/wps"
xmlns:wps1="http://www.opengis.net/wps/1.0.0"
xmlns:gml="http://www.opengis.net/gml"
@@ -25,7 +26,7 @@
<xsl:param name="ows"/>
- <xsl:variable name="s" select="Service|wfs:Service|ows:ServiceIdentification|ows11:ServiceIdentification|wcs:Service"/>
+ <xsl:variable name="s" select="Service|wfs:Service|wms:Service|ows:ServiceIdentification|ows11:ServiceIdentification|wcs:Service"/>
<citation>
<CI_Citation>
@@ -39,6 +40,9 @@
<xsl:when test="name(.)='WFS_Capabilities'">
<xsl:value-of select="wfs:Service/wfs:Title"/>
</xsl:when>
+ <xsl:when test="name(.)='WMS_Capabilities'">
+ <xsl:value-of select="wms:Service/wms:Title"/>
+ </xsl:when>
<xsl:when test="name(.)='WMT_MS_Capabilities'">
<xsl:value-of select="Service/Title"/>
</xsl:when>
@@ -74,6 +78,9 @@
<xsl:when test="name(.)='WFS_Capabilities'">
<xsl:value-of select="wfs:Service/wfs:Abstract"/>
</xsl:when>
+ <xsl:when test="name(.)='WMS_Capabilities'">
+ <xsl:value-of select="wms:Service/wms:Abstract"/>
+ </xsl:when>
<xsl:when test="name(.)='WMT_MS_Capabilities'">
<xsl:value-of select="Service/Abstract"/>
</xsl:when>
@@ -92,7 +99,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="//ContactInformation|//wcs:responsibleParty">
+ <xsl:for-each select="//ContactInformation|//wcs:responsibleParty|//wms:responsibleParty">
<pointOfContact>
<CI_ResponsibleParty>
<xsl:apply-templates select="." mode="RespParty"/>
@@ -110,7 +117,7 @@
<!-- resMaint -->
<!-- graphOver -->
<!-- dsFormat-->
- <xsl:for-each select="$s/KeywordList|$s/wfs:keywords|$s/wcs:keywords|$s/ows:Keywords|$s/ows11:Keywords">
+ <xsl:for-each select="$s/KeywordList|$s/wms:KeywordList|$s/wfs:keywords|$s/wcs:keywords|$s/ows:Keywords|$s/ows11:Keywords">
<descriptiveKeywords>
<MD_Keywords>
<xsl:apply-templates select="." mode="Keywords"/>
@@ -123,7 +130,7 @@
<srv:serviceType>
<gco:LocalName codeSpace="www.w3c.org">
<xsl:choose>
- <xsl:when test="name(.)='WMT_MS_Capabilities'">OGC:WMS</xsl:when>
+ <xsl:when test="name(.)='WMT_MS_Capabilities' or name(.)='WMS_Capabilities'">OGC:WMS</xsl:when>
<xsl:when test="name(.)='WCS_Capabilities'">OGC:WCS</xsl:when>
<xsl:when test="name(.)='wps:Capabilities'">OGC:WPS</xsl:when>
<xsl:otherwise>OGC:WFS</xsl:otherwise>
@@ -139,7 +146,7 @@
<srv:accessProperties>
<MD_StandardOrderProcess>
<fees>
- <gco:CharacterString><xsl:value-of select="$s/Fees|$s/wfs:Fees|$s/ows:Fees|$s/ows11:Fees|$s/wcs:fees"/></gco:CharacterString>
+ <gco:CharacterString><xsl:value-of select="$s/Fees|$s/wms:Fees|$s/wfs:Fees|$s/ows:Fees|$s/ows11:Fees|$s/wcs:fees"/></gco:CharacterString>
</fees>
</MD_StandardOrderProcess>
</srv:accessProperties>
@@ -162,6 +169,15 @@
WMS 1.1.1
<LatLonBoundingBox minx="-74.047185" miny="40.679648" maxx="-73.907005" maxy="40.882078"/>
+ WMS 1.3.0
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>-178.9988054730254</westBoundLongitude>
+ <eastBoundLongitude>179.0724773329789</eastBoundLongitude>
+ <southBoundLatitude>-0.5014529001680404</southBoundLatitude>
+ <northBoundLatitude>88.9987992292308</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326" minx="27.116136375774644" miny="-17.934116876940887" maxx="44.39484823803499" maxy="6.052081516030762"/>
+
WPS 0.4.0 : none
WPS 1.0.0 : none
@@ -214,16 +230,16 @@
</xsl:when>
<xsl:otherwise>
<westBoundLongitude>
- <gco:Decimal><xsl:value-of select="math:min(//LatLonBoundingBox/@minx|//wfs:LatLongBoundingBox/@minx)"/></gco:Decimal>
+ <gco:Decimal><xsl:value-of select="math:min(//wms:EX_GeographicBoundingBox/wms:westBoundLongitude|//LatLonBoundingBox/@minx|//wfs:LatLongBoundingBox/@minx)"/></gco:Decimal>
</westBoundLongitude>
<eastBoundLongitude>
- <gco:Decimal><xsl:value-of select="math:max(//LatLonBoundingBox/@maxx|//wfs:LatLongBoundingBox/@maxx)"/></gco:Decimal>
+ <gco:Decimal><xsl:value-of select="math:max(//wms:EX_GeographicBoundingBox/wms:eastBoundLongitude|//LatLonBoundingBox/@maxx|//wfs:LatLongBoundingBox/@maxx)"/></gco:Decimal>
</eastBoundLongitude>
<southBoundLatitude>
- <gco:Decimal><xsl:value-of select="math:min(//LatLonBoundingBox/@miny|//wfs:LatLongBoundingBox/@miny)"/></gco:Decimal>
+ <gco:Decimal><xsl:value-of select="math:min(//wms:EX_GeographicBoundingBox/wms:southBoundLatitude|//LatLonBoundingBox/@miny|//wfs:LatLongBoundingBox/@miny)"/></gco:Decimal>
</southBoundLatitude>
<northBoundLatitude>
- <gco:Decimal><xsl:value-of select="math:max(//LatLonBoundingBox/@maxy|//wfs:LatLongBoundingBox/@maxy)"/></gco:Decimal>
+ <gco:Decimal><xsl:value-of select="math:max(//wms:EX_GeographicBoundingBox/wms:northBoundLatitude|//LatLonBoundingBox/@maxy|//wfs:LatLongBoundingBox/@maxy)"/></gco:Decimal>
</northBoundLatitude>
</xsl:otherwise>
</xsl:choose>
@@ -250,7 +266,8 @@
-->
<xsl:for-each select="Capability/Request/*|
- wfs:Capability/wfs:Request/*|
+ wfs:Capability/wfs:Request/*|
+ wms:Capability/wms:Request/*|
wcs:Capability/wcs:Request/*|
ows:OperationsMetadata/ows:Operation|
ows11:OperationsMetadata/ows:Operation|
@@ -269,13 +286,14 @@
</gco:CharacterString>
</srv:operationName>
<!-- CHECKME : DCPType/SOAP ? -->
- <xsl:for-each select="DCPType/HTTP/*|wfs:DCPType/wfs:HTTP/*|wcs:DCPType/wcs:HTTP/*|ows:DCP/ows:HTTP/*|ows11:DCP/ows11:HTTP/*">
+ <xsl:for-each select="DCPType/HTTP/*|wfs:DCPType/wfs:HTTP/*|wms:DCPType/wms:HTTP/*|
+ wcs:DCPType/wcs:HTTP/*|ows:DCP/ows:HTTP/*|ows11:DCP/ows11:HTTP/*">
<srv:DCP>
<srv:DCPList codeList="./resources/codeList.xml#DCPList">
<xsl:variable name="dcp">
<xsl:choose>
- <xsl:when test="name(.)='Get' or name(.)='wfs:Get' or name(.)='wcs:Get' or name(.)='ows:Get' or name(.)='ows11:Get'">HTTP-GET</xsl:when>
- <xsl:when test="name(.)='Post' or name(.)='wfs:Post' or name(.)='wcs:Post' or name(.)='ows:Post' or name(.)='ows11:Post'">HTTP-POST</xsl:when>
+ <xsl:when test="name(.)='Get' or name(.)='wfs:Get' or name(.)='wms:Get' or name(.)='wcs:Get' or name(.)='ows:Get' or name(.)='ows11:Get'">HTTP-GET</xsl:when>
+ <xsl:when test="name(.)='Post' or name(.)='wfs:Post' or name(.)='wms:Post' or name(.)='wcs:Post' or name(.)='ows:Post' or name(.)='ows11:Post'">HTTP-POST</xsl:when>
<xsl:otherwise>WebServices</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -295,7 +313,7 @@
</srv:invocationName>
</xsl:if>
- <xsl:for-each select="Format|ows:Parameter[@name='AcceptFormats' or @name='outputFormat']">
+ <xsl:for-each select="Format|wms:Format|ows:Parameter[@name='AcceptFormats' or @name='outputFormat']">
<srv:connectPoint>
<CI_OnlineResource>
<linkage>
@@ -305,7 +323,7 @@
<xsl:value-of select="..//ows:Get[1]/@xlink:href"/><!-- FIXME supposed at least one Get -->
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="..//OnlineResource[1]/@xlink:href"/>
+ <xsl:value-of select="..//OnlineResource[1]/@xlink:href|..//wms:OnlineResource[1]/@xlink:href"/>
</xsl:otherwise>
</xsl:choose>
</URL>
@@ -387,6 +405,9 @@
<xsl:when test="name(.)='WFS_Capabilities' or name(.)='wfs:WFS_Capabilities' or $ows='true'">
<xsl:value-of select="//wfs:FeatureType[wfs:Name=$Name]/wfs:Title"/>
</xsl:when>
+ <xsl:when test="name(.)='WMS_Capabilities'">
+ <xsl:value-of select="//wms:Layer[wms:Name=$Name]/wms:Title"/>
+ </xsl:when>
<xsl:when test="name(.)='WMT_MS_Capabilities'">
<xsl:value-of select="//Layer[Name=$Name]/Title"/>
</xsl:when>
@@ -418,6 +439,9 @@
<xsl:when test="name(.)='WFS_Capabilities' or $ows='true'">
<xsl:value-of select="//wfs:FeatureType[wfs:Name=$Name]/wfs:Abstract"/>
</xsl:when>
+ <xsl:when test="name(.)='WMS_Capabilities'">
+ <xsl:value-of select="//wms:Layer[wms:Name=$Name]/wms:Abstract"/>
+ </xsl:when>
<xsl:when test="name(.)='WMT_MS_Capabilities'">
<xsl:value-of select="//Layer[Name=$Name]/Abstract"/>
</xsl:when>
@@ -436,7 +460,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="Service/ContactInformation">
+ <xsl:for-each select="Service/ContactInformation|wms:Service/wms:ContactInformation">
<pointOfContact>
<CI_ResponsibleParty>
<xsl:apply-templates select="." mode="RespParty"/>
@@ -454,6 +478,13 @@
</MD_Keywords>
</descriptiveKeywords>
</xsl:for-each>
+ <xsl:for-each select="//wms:Layer[wms:Name=$Name]/wms:KeywordList|wms:KeywordList">
+ <descriptiveKeywords>
+ <MD_Keywords>
+ <xsl:apply-templates select="." mode="Keywords"/>
+ </MD_Keywords>
+ </descriptiveKeywords>
+ </xsl:for-each>
<xsl:for-each select="//wfs:FeatureType[wfs:Name=$Name]">
<descriptiveKeywords>
<MD_Keywords>
@@ -491,13 +522,13 @@
</xsl:choose>
<!-- TODO WCS -->
- <xsl:if test="//Layer[Name=$Name]/MinScaleDenominator">
+ <xsl:if test="//Layer[Name=$Name]/MinScaleDenominator|//wms:Layer[wms:Name=$Name]/wms:MinScaleDenominator">
<spatialResolution>
<MD_Resolution>
<equivalentScale>
<MD_RepresentativeFraction>
<denominator>
- <gco:Integer><xsl:value-of select="MinScaleDenominator"/></gco:Integer>
+ <gco:Integer><xsl:value-of select="MinScaleDenominator|wms:MinScaleDenominator"/></gco:Integer>
</denominator>
</MD_RepresentativeFraction>
</equivalentScale>
@@ -508,7 +539,7 @@
<equivalentScale>
<MD_RepresentativeFraction>
<denominator>
- <gco:Integer><xsl:value-of select="MaxScaleDenominator"/></gco:Integer>
+ <gco:Integer><xsl:value-of select="MaxScaleDenominator|wms:MaxScaleDenominator"/></gco:Integer>
</denominator>
</MD_RepresentativeFraction>
</equivalentScale>
@@ -589,16 +620,20 @@
</xsl:when>
<xsl:otherwise>
<westBoundLongitude>
- <gco:Decimal><xsl:value-of select="//Layer[Name=$Name]/LatLonBoundingBox/@minx"/></gco:Decimal>
+ <gco:Decimal><xsl:value-of select="//Layer[Name=$Name]/LatLonBoundingBox/@minx|
+ //wms:Layer[wms:Name=$Name]/wms:EX_GeographicBoundingBox/wms:westBoundLongitude"/></gco:Decimal>
</westBoundLongitude>
<eastBoundLongitude>
- <gco:Decimal><xsl:value-of select="//Layer[Name=$Name]/LatLonBoundingBox/@maxx"/></gco:Decimal>
+ <gco:Decimal><xsl:value-of select="//Layer[Name=$Name]/LatLonBoundingBox/@maxx|
+ //wms:Layer[wms:Name=$Name]/wms:EX_GeographicBoundingBox/wms:eastBoundLongitude"/></gco:Decimal>
</eastBoundLongitude>
<southBoundLatitude>
- <gco:Decimal><xsl:value-of select="//Layer[Name=$Name]/LatLonBoundingBox/@miny"/></gco:Decimal>
+ <gco:Decimal><xsl:value-of select="//Layer[Name=$Name]/LatLonBoundingBox/@miny|
+ //wms:Layer[wms:Name=$Name]/wms:EX_GeographicBoundingBox/wms:southBoundLatitude"/></gco:Decimal>
</southBoundLatitude>
<northBoundLatitude>
- <gco:Decimal><xsl:value-of select="//Layer[Name=$Name]/LatLonBoundingBox/@maxy"/></gco:Decimal>
+ <gco:Decimal><xsl:value-of select="//Layer[Name=$Name]/LatLonBoundingBox/@maxy|
+ //wms:Layer[wms:Name=$Name]/wms:EX_GeographicBoundingBox/wms:northBoundLatitude"/></gco:Decimal>
</northBoundLatitude>
</xsl:otherwise>
</xsl:choose>
@@ -625,7 +660,7 @@
<xsl:template match="*" mode="Keywords">
<!-- TODO : tokenize WFS 100 keywords list -->
- <xsl:for-each select="Keyword|ows:Keyword|ows11:Keyword|wfs:Keywords|wcs:keyword">
+ <xsl:for-each select="Keyword|wms:Keyword|ows:Keyword|ows11:Keyword|wfs:Keywords|wcs:keyword">
<keyword>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</keyword>
Modified: trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/resp-party.xsl
===================================================================
--- trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/resp-party.xsl 2010-08-03 22:45:32 UTC (rev 6344)
+++ trunk/web/src/main/webapp/xsl/conversion/OGCWxSGetCapabilitiesto19119/resp-party.xsl 2010-08-04 16:25:32 UTC (rev 6345)
@@ -8,6 +8,7 @@
xmlns:ows="http://www.opengis.net/ows"
xmlns:owsg="http://www.opengeospatial.net/ows"
xmlns:ows11="http://www.opengis.net/ows/1.1"
+ xmlns:wms="http://www.opengis.net/wms"
xmlns:wcs="http://www.opengis.net/wcs"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
extension-element-prefixes="wcs ows wfs owsg ows11">
@@ -16,7 +17,7 @@
<xsl:template match="*" mode="RespParty">
- <xsl:for-each select="ContactPersonPrimary/ContactPerson|wcs:individualName|ows:ServiceContact/ows:IndividualName|ows11:ServiceContact/ows11:IndividualName">
+ <xsl:for-each select="ContactPersonPrimary/ContactPerson|wms:ContactPersonPrimary/wms:ContactPerson|wcs:individualName|ows:ServiceContact/ows:IndividualName|ows11:ServiceContact/ows11:IndividualName">
<individualName>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</individualName>
@@ -24,7 +25,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="ContactPersonPrimary/ContactOrganization|wcs:organisationName|ows:ProviderName|ows11:ProviderName">
+ <xsl:for-each select="ContactPersonPrimary/ContactOrganization|wms:ContactPersonPrimary/wms:ContactOrganization|wcs:organisationName|ows:ProviderName|ows11:ProviderName">
<organisationName>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</organisationName>
@@ -32,7 +33,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="ContactPosition|wcs:positionName|ows:ServiceContact/ows:PositionName|ows11:ServiceContact/ows11:PositionName">
+ <xsl:for-each select="ContactPosition|wms:ContactPosition|wcs:positionName|ows:ServiceContact/ows:PositionName|ows11:ServiceContact/ows11:PositionName">
<positionName>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</positionName>
@@ -60,7 +61,7 @@
<phone>
<CI_Telephone>
- <xsl:for-each select="ContactVoiceTelephone|
+ <xsl:for-each select="ContactVoiceTelephone|wms:ContactVoiceTelephone|
ows:ServiceContact/ows:ContactInfo/ows:Phone/ows:Voice|
ows11:ServiceContact/ows11:ContactInfo/ows11:Phone/ows11:Voice">
<voice>
@@ -68,7 +69,7 @@
</voice>
</xsl:for-each>
- <xsl:for-each select="ContactFacsimileTelephone|
+ <xsl:for-each select="ContactFacsimileTelephone|wms:ContactFacsimileTelephone|
ows:ServiceContact/ows:ContactInfo/ows:Phone/ows:Facsimile|
ows11:ServiceContact/ows11:ContactInfo/ows11:Phone/ows11:Facsimile">
<facsimile>
@@ -80,7 +81,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="ContactAddress|
+ <xsl:for-each select="ContactAddress|wms:ContactAddress|
wcs:contactInfo|
ows:ServiceContact/ows:ContactInfo/ows:Address|
ows11:ServiceContact/ows11:ContactInfo/ows11:Address">
@@ -112,7 +113,7 @@
<xsl:template match="*" mode="Address">
- <xsl:for-each select="Address|ows:DeliveryPoint|ows11:DeliveryPoint">
+ <xsl:for-each select="Address|wms:Address|ows:DeliveryPoint|ows11:DeliveryPoint">
<deliveryPoint>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</deliveryPoint>
@@ -120,7 +121,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="City|wcs:address/wcs:city|ows:City|ows11:City">
+ <xsl:for-each select="City|wms:City|wcs:address/wcs:city|ows:City|ows11:City">
<city>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</city>
@@ -128,7 +129,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="StateOrProvince|ows:AdministrativeArea|ows11:AdministrativeArea">
+ <xsl:for-each select="StateOrProvince|wms:StateOrProvince|ows:AdministrativeArea|ows11:AdministrativeArea">
<administrativeArea>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</administrativeArea>
@@ -136,7 +137,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="PostCode|ows:PostalCode|ows11:PostalCode">
+ <xsl:for-each select="PostCode|wms:PostCode|ows:PostalCode|ows11:PostalCode">
<postalCode>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</postalCode>
@@ -144,7 +145,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="Country|wcs:address/wcs:country|ows:Country|ows11:Country">
+ <xsl:for-each select="Country|wms:Country|wcs:address/wcs:country|ows:Country|ows11:Country">
<country>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</country>
@@ -152,7 +153,7 @@
<!-- TODO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <xsl:for-each select="ContactElectronicMailAddress|wcs:address/wcs:electronicMailAddress|ows:ElectronicMailAddress|ows11:ElectronicMailAddress">
+ <xsl:for-each select="ContactElectronicMailAddress|wms:ContactElectronicMailAddress|wcs:address/wcs:electronicMailAddress|ows:ElectronicMailAddress|ows11:ElectronicMailAddress">
<electronicMailAddress>
<gco:CharacterString><xsl:value-of select="."/></gco:CharacterString>
</electronicMailAddress>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|