[mapserver-commits] r7405 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Tue Feb 26 08:20:34 EST 2008
Author: tomkralidis
Date: 2008-02-26 08:20:34 -0500 (Tue, 26 Feb 2008)
New Revision: 7405
Modified:
trunk/msautotest/wxs/expected/sos_cap.xml
trunk/msautotest/wxs/expected/sos_cap0.xml
trunk/msautotest/wxs/expected/sos_cap1.xml
trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml
trunk/msautotest/wxs/expected/sos_getobs_datablock.xml
trunk/msautotest/wxs/sos.map
Log:
support URN scheme for components of observed property elements (#2522)
Modified: trunk/msautotest/wxs/expected/sos_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap.xml 2008-02-26 13:18:16 UTC (rev 7404)
+++ trunk/msautotest/wxs/expected/sos_cap.xml 2008-02-26 13:20:34 UTC (rev 7405)
@@ -224,9 +224,12 @@
<sos:procedure xlink:href="urn:ogc:def:procedure:2147"/>
<sos:procedure xlink:href="urn:ogc:def:procedure:604"/>
<sos:observedProperty>
- <swe:CompositePhenomenon gml:id="WaterQuality" dimension="1">
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
<gml:name>WaterQuality</gml:name>
- <swe:component xlink:href="http://localhost/sos#value"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:Value"/>
</swe:CompositePhenomenon>
</sos:observedProperty>
<sos:featureOfInterest xlink:href="urn:ogc:def:feature:OGC-SWE:3:transient"/>
Modified: trunk/msautotest/wxs/expected/sos_cap0.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap0.xml 2008-02-26 13:18:16 UTC (rev 7404)
+++ trunk/msautotest/wxs/expected/sos_cap0.xml 2008-02-26 13:20:34 UTC (rev 7405)
@@ -224,9 +224,12 @@
<sos:procedure xlink:href="urn:ogc:def:procedure:2147"/>
<sos:procedure xlink:href="urn:ogc:def:procedure:604"/>
<sos:observedProperty>
- <swe:CompositePhenomenon gml:id="WaterQuality" dimension="1">
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
<gml:name>WaterQuality</gml:name>
- <swe:component xlink:href="http://localhost/sos#value"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:Value"/>
</swe:CompositePhenomenon>
</sos:observedProperty>
<sos:featureOfInterest xlink:href="urn:ogc:def:feature:OGC-SWE:3:transient"/>
Modified: trunk/msautotest/wxs/expected/sos_cap1.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap1.xml 2008-02-26 13:18:16 UTC (rev 7404)
+++ trunk/msautotest/wxs/expected/sos_cap1.xml 2008-02-26 13:20:34 UTC (rev 7405)
@@ -224,9 +224,12 @@
<sos:procedure xlink:href="urn:ogc:def:procedure:2147"/>
<sos:procedure xlink:href="urn:ogc:def:procedure:604"/>
<sos:observedProperty>
- <swe:CompositePhenomenon gml:id="WaterQuality" dimension="1">
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
<gml:name>WaterQuality</gml:name>
- <swe:component xlink:href="http://localhost/sos#value"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:Value"/>
</swe:CompositePhenomenon>
</sos:observedProperty>
<sos:featureOfInterest xlink:href="urn:ogc:def:feature:OGC-SWE:3:transient"/>
Modified: trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml 2008-02-26 13:18:16 UTC (rev 7404)
+++ trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml 2008-02-26 13:20:34 UTC (rev 7405)
@@ -224,9 +224,12 @@
<sos:procedure xlink:href="urn:ogc:def:procedure:2147"/>
<sos:procedure xlink:href="urn:ogc:def:procedure:604"/>
<sos:observedProperty>
- <swe:CompositePhenomenon gml:id="WaterQuality" dimension="1">
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
<gml:name>WaterQuality</gml:name>
- <swe:component xlink:href="http://localhost/sos#value"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:Value"/>
</swe:CompositePhenomenon>
</sos:observedProperty>
<sos:featureOfInterest xlink:href="urn:ogc:def:feature:OGC-SWE:3:transient"/>
Modified: trunk/msautotest/wxs/expected/sos_getobs_datablock.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_datablock.xml 2008-02-26 13:18:16 UTC (rev 7404)
+++ trunk/msautotest/wxs/expected/sos_getobs_datablock.xml 2008-02-26 13:20:34 UTC (rev 7405)
@@ -20,9 +20,12 @@
</sos:time>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
<om:observedProperty>
- <swe:CompositePhenomenon gml:id="WaterQuality" dimension="1">
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
<gml:name>WaterQuality</gml:name>
- <swe:component xlink:href="http://localhost/sos#value"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
<om:resultDefinition>
@@ -58,9 +61,12 @@
</sos:time>
<om:procedure xlink:href="urn:ogc:def:procedure:2147"/>
<om:observedProperty>
- <swe:CompositePhenomenon gml:id="WaterQuality" dimension="1">
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
<gml:name>WaterQuality</gml:name>
- <swe:component xlink:href="http://localhost/sos#value"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
<om:resultDefinition>
@@ -96,9 +102,12 @@
</sos:time>
<om:procedure xlink:href="urn:ogc:def:procedure:604"/>
<om:observedProperty>
- <swe:CompositePhenomenon gml:id="WaterQuality" dimension="1">
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
<gml:name>WaterQuality</gml:name>
- <swe:component xlink:href="http://localhost/sos#value"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:EC:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
<om:resultDefinition>
Modified: trunk/msautotest/wxs/sos.map
===================================================================
--- trunk/msautotest/wxs/sos.map 2008-02-26 13:18:16 UTC (rev 7404)
+++ trunk/msautotest/wxs/sos.map 2008-02-26 13:20:34 UTC (rev 7405)
@@ -156,8 +156,9 @@
"ows_srs" "EPSG:4326"
"sos_observedproperty_id" "WaterQuality"
"sos_observedproperty_name" "WaterQuality"
+ "sos_observedproperty_authority" "EC"
+ "sos_observedproperty_version" "8"
"sos_value_alias" "Value"
- "sos_value_componenturl" "http://localhost/sos#value"
"sos_value_definition" "mydef"
"sos_value_uom" "meters"
"ows_timeitem" "datetime"
More information about the mapserver-commits
mailing list