[mapserver-commits] r8513 - trunk/msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Fri Feb 6 19:08:27 EST 2009
Author: tomkralidis
Date: 2009-02-06 19:08:27 -0500 (Fri, 06 Feb 2009)
New Revision: 8513
Modified:
trunk/msautotest/wxs/expected/sos_getobs_all.xml
trunk/msautotest/wxs/expected/sos_getobs_datablock.xml
trunk/msautotest/wxs/expected/sos_getobs_filter.xml
trunk/msautotest/wxs/expected/sos_getobs_foi.xml
trunk/msautotest/wxs/expected/sos_getobs_proc.xml
trunk/msautotest/wxs/expected/sos_getobs_time.xml
trunk/msautotest/wxs/expected/sos_getobs_time_filter.xml
trunk/msautotest/wxs/expected/sos_getobs_time_filter_foi.xml
Log:
update for more valid results (#2646)
Modified: trunk/msautotest/wxs/expected/sos_getobs_all.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_all.xml 2009-02-07 00:06:14 UTC (rev 8512)
+++ trunk/msautotest/wxs/expected/sos_getobs_all.xml 2009-02-07 00:08:27 UTC (rev 8513)
@@ -11,16 +11,25 @@
</gml:Envelope>
</gml:boundedBy>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_371">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2001-10-30T14:24:55Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="371">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -40,16 +49,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_377">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2002-10-30T18:31:38Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="377">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -69,16 +87,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_238">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2007-10-30T08:57:29Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:2147"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="238">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -98,16 +125,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_297">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2003-10-30T07:37:29Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:2147"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="297">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -127,16 +163,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_964">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2000-10-30T18:24:39Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:604"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="964">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
Modified: trunk/msautotest/wxs/expected/sos_getobs_datablock.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_datablock.xml 2009-02-07 00:06:14 UTC (rev 8512)
+++ trunk/msautotest/wxs/expected/sos_getobs_datablock.xml 2009-02-07 00:08:27 UTC (rev 8513)
@@ -12,12 +12,12 @@
</gml:boundedBy>
<om:member>
<om:Observation>
- <sos:time>
+ <om:samplingTime>
<gml:TimePeriod>
<gml:beginPosition>1990</gml:beginPosition>
<gml:endPosition>2007</gml:endPosition>
</gml:TimePeriod>
- </sos:time>
+ </om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
<om:observedProperty>
<swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
@@ -53,12 +53,12 @@
</om:member>
<om:member>
<om:Observation>
- <sos:time>
+ <om:samplingTime>
<gml:TimePeriod>
<gml:beginPosition>1990</gml:beginPosition>
<gml:endPosition>2007</gml:endPosition>
</gml:TimePeriod>
- </sos:time>
+ </om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:2147"/>
<om:observedProperty>
<swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
@@ -94,12 +94,12 @@
</om:member>
<om:member>
<om:Observation>
- <sos:time>
+ <om:samplingTime>
<gml:TimePeriod>
<gml:beginPosition>1990</gml:beginPosition>
<gml:endPosition>2007</gml:endPosition>
</gml:TimePeriod>
- </sos:time>
+ </om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:604"/>
<om:observedProperty>
<swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
Modified: trunk/msautotest/wxs/expected/sos_getobs_filter.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_filter.xml 2009-02-07 00:06:14 UTC (rev 8512)
+++ trunk/msautotest/wxs/expected/sos_getobs_filter.xml 2009-02-07 00:08:27 UTC (rev 8513)
@@ -11,16 +11,25 @@
</gml:Envelope>
</gml:boundedBy>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_238">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2007-10-30T08:57:29Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:2147"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="238">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
Modified: trunk/msautotest/wxs/expected/sos_getobs_foi.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_foi.xml 2009-02-07 00:06:14 UTC (rev 8512)
+++ trunk/msautotest/wxs/expected/sos_getobs_foi.xml 2009-02-07 00:08:27 UTC (rev 8513)
@@ -11,16 +11,25 @@
</gml:Envelope>
</gml:boundedBy>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_371">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2001-10-30T14:24:55Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="371">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -40,16 +49,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_377">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2002-10-30T18:31:38Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="377">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
Modified: trunk/msautotest/wxs/expected/sos_getobs_proc.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_proc.xml 2009-02-07 00:06:14 UTC (rev 8512)
+++ trunk/msautotest/wxs/expected/sos_getobs_proc.xml 2009-02-07 00:08:27 UTC (rev 8513)
@@ -11,16 +11,25 @@
</gml:Envelope>
</gml:boundedBy>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_238">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2007-10-30T08:57:29Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:2147"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="238">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -40,16 +49,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_297">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2003-10-30T07:37:29Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:2147"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="297">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
Modified: trunk/msautotest/wxs/expected/sos_getobs_time.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_time.xml 2009-02-07 00:06:14 UTC (rev 8512)
+++ trunk/msautotest/wxs/expected/sos_getobs_time.xml 2009-02-07 00:08:27 UTC (rev 8513)
@@ -11,16 +11,25 @@
</gml:Envelope>
</gml:boundedBy>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_371">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2001-10-30T14:24:55Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="371">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -40,16 +49,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_377">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2002-10-30T18:31:38Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="377">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -69,16 +87,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_964">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2000-10-30T18:24:39Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:604"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="964">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
Modified: trunk/msautotest/wxs/expected/sos_getobs_time_filter.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_time_filter.xml 2009-02-07 00:06:14 UTC (rev 8512)
+++ trunk/msautotest/wxs/expected/sos_getobs_time_filter.xml 2009-02-07 00:08:27 UTC (rev 8513)
@@ -11,16 +11,25 @@
</gml:Envelope>
</gml:boundedBy>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_377">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2002-10-30T18:31:38Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="377">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
@@ -40,16 +49,25 @@
</om:Observation>
</om:member>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_964">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2000-10-30T18:24:39Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:604"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="964">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
Modified: trunk/msautotest/wxs/expected/sos_getobs_time_filter_foi.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_time_filter_foi.xml 2009-02-07 00:06:14 UTC (rev 8512)
+++ trunk/msautotest/wxs/expected/sos_getobs_time_filter_foi.xml 2009-02-07 00:08:27 UTC (rev 8513)
@@ -11,16 +11,25 @@
</gml:Envelope>
</gml:boundedBy>
<om:member>
- <om:Observation>
+ <om:Observation gml:id="o_377">
<om:samplingTime>
<gml:TimeInstant>
<gml:timePosition>2002-10-30T18:31:38Z</gml:timePosition>
</gml:TimeInstant>
</om:samplingTime>
<om:procedure xlink:href="urn:ogc:def:procedure:35"/>
- <observedProperty>WaterQuality</observedProperty>
+ <om:observedProperty>
+ <swe:CompositePhenomenon gml:id="WaterQuality" dimension="4">
+ <gml:name>WaterQuality</gml:name>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:STN_ID"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:DATETIME"/>
+ <swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
+ </swe:CompositePhenomenon>
+ </om:observedProperty>
+ <om:featureOfInterest xlink:href="urn:ogc:foo"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml" gml:id="377">
+ <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
<obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
More information about the mapserver-commits
mailing list