[mapserver-commits] r8515 - trunk/msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Fri Feb 6 21:20:24 EST 2009
Author: tomkralidis
Date: 2009-02-06 21:20:24 -0500 (Fri, 06 Feb 2009)
New Revision: 8515
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:
- add WFS calls for schema resolution (#2646)
Modified: trunk/msautotest/wxs/expected/sos_getobs_all.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_all.xml 2009-02-07 02:19:30 UTC (rev 8514)
+++ trunk/msautotest/wxs/expected/sos_getobs_all.xml 2009-02-07 02:20:24 UTC (rev 8515)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd">
+<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs">
<gml:description xmlns:gml="http://www.opengis.net/gml">This is for water</gml:description>
<gml:name xmlns:gml="http://www.opengis.net/gml">Water</gml:name>
<gml:boundedBy>
@@ -27,10 +27,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-75.000000 45.000000</gml:lowerCorner>
@@ -42,8 +42,8 @@
<gml:pos>-75.000000 45.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>89.9</Value>
- </obs>
+ <ms:Value>89.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -65,10 +65,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-75.000000 45.000000</gml:lowerCorner>
@@ -80,8 +80,8 @@
<gml:pos>-75.000000 45.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>93.9</Value>
- </obs>
+ <ms:Value>93.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -103,10 +103,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-79.000000 43.000000</gml:lowerCorner>
@@ -118,8 +118,8 @@
<gml:pos>-79.000000 43.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>103.5</Value>
- </obs>
+ <ms:Value>103.5</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -141,10 +141,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-79.000000 43.000000</gml:lowerCorner>
@@ -156,8 +156,8 @@
<gml:pos>-79.000000 43.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>93.5</Value>
- </obs>
+ <ms:Value>93.5</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -179,10 +179,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-122.000000 49.000000</gml:lowerCorner>
@@ -194,8 +194,8 @@
<gml:pos>-122.000000 49.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>99.9</Value>
- </obs>
+ <ms:Value>99.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
Modified: trunk/msautotest/wxs/expected/sos_getobs_datablock.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_datablock.xml 2009-02-07 02:19:30 UTC (rev 8514)
+++ trunk/msautotest/wxs/expected/sos_getobs_datablock.xml 2009-02-07 02:20:24 UTC (rev 8515)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd">
+<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs">
<gml:description xmlns:gml="http://www.opengis.net/gml">This is for water</gml:description>
<gml:name xmlns:gml="http://www.opengis.net/gml">Water</gml:name>
<gml:boundedBy>
Modified: trunk/msautotest/wxs/expected/sos_getobs_filter.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_filter.xml 2009-02-07 02:19:30 UTC (rev 8514)
+++ trunk/msautotest/wxs/expected/sos_getobs_filter.xml 2009-02-07 02:20:24 UTC (rev 8515)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd">
+<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs">
<gml:description xmlns:gml="http://www.opengis.net/gml">This is for water</gml:description>
<gml:name xmlns:gml="http://www.opengis.net/gml">Water</gml:name>
<gml:boundedBy>
@@ -27,10 +27,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-79.000000 43.000000</gml:lowerCorner>
@@ -42,8 +42,8 @@
<gml:pos>-79.000000 43.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>103.5</Value>
- </obs>
+ <ms:Value>103.5</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
Modified: trunk/msautotest/wxs/expected/sos_getobs_foi.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_foi.xml 2009-02-07 02:19:30 UTC (rev 8514)
+++ trunk/msautotest/wxs/expected/sos_getobs_foi.xml 2009-02-07 02:20:24 UTC (rev 8515)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd">
+<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs">
<gml:description xmlns:gml="http://www.opengis.net/gml">This is for water</gml:description>
<gml:name xmlns:gml="http://www.opengis.net/gml">Water</gml:name>
<gml:boundedBy>
@@ -27,10 +27,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-75.000000 45.000000</gml:lowerCorner>
@@ -42,8 +42,8 @@
<gml:pos>-75.000000 45.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>89.9</Value>
- </obs>
+ <ms:Value>89.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -65,10 +65,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-75.000000 45.000000</gml:lowerCorner>
@@ -80,8 +80,8 @@
<gml:pos>-75.000000 45.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>93.9</Value>
- </obs>
+ <ms:Value>93.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
Modified: trunk/msautotest/wxs/expected/sos_getobs_proc.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_proc.xml 2009-02-07 02:19:30 UTC (rev 8514)
+++ trunk/msautotest/wxs/expected/sos_getobs_proc.xml 2009-02-07 02:20:24 UTC (rev 8515)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd">
+<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs">
<gml:description xmlns:gml="http://www.opengis.net/gml">This is for water</gml:description>
<gml:name xmlns:gml="http://www.opengis.net/gml">Water</gml:name>
<gml:boundedBy>
@@ -27,10 +27,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-79.000000 43.000000</gml:lowerCorner>
@@ -42,8 +42,8 @@
<gml:pos>-79.000000 43.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>103.5</Value>
- </obs>
+ <ms:Value>103.5</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -65,10 +65,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-79.000000 43.000000</gml:lowerCorner>
@@ -80,8 +80,8 @@
<gml:pos>-79.000000 43.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>93.5</Value>
- </obs>
+ <ms:Value>93.5</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
Modified: trunk/msautotest/wxs/expected/sos_getobs_time.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_time.xml 2009-02-07 02:19:30 UTC (rev 8514)
+++ trunk/msautotest/wxs/expected/sos_getobs_time.xml 2009-02-07 02:20:24 UTC (rev 8515)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd">
+<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs">
<gml:description xmlns:gml="http://www.opengis.net/gml">This is for water</gml:description>
<gml:name xmlns:gml="http://www.opengis.net/gml">Water</gml:name>
<gml:boundedBy>
@@ -27,10 +27,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-75.000000 45.000000</gml:lowerCorner>
@@ -42,8 +42,8 @@
<gml:pos>-75.000000 45.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>89.9</Value>
- </obs>
+ <ms:Value>89.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -65,10 +65,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-75.000000 45.000000</gml:lowerCorner>
@@ -80,8 +80,8 @@
<gml:pos>-75.000000 45.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>93.9</Value>
- </obs>
+ <ms:Value>93.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -103,10 +103,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-122.000000 49.000000</gml:lowerCorner>
@@ -118,8 +118,8 @@
<gml:pos>-122.000000 49.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>99.9</Value>
- </obs>
+ <ms:Value>99.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
Modified: trunk/msautotest/wxs/expected/sos_getobs_time_filter.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_time_filter.xml 2009-02-07 02:19:30 UTC (rev 8514)
+++ trunk/msautotest/wxs/expected/sos_getobs_time_filter.xml 2009-02-07 02:20:24 UTC (rev 8515)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd">
+<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs">
<gml:description xmlns:gml="http://www.opengis.net/gml">This is for water</gml:description>
<gml:name xmlns:gml="http://www.opengis.net/gml">Water</gml:name>
<gml:boundedBy>
@@ -27,10 +27,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-75.000000 45.000000</gml:lowerCorner>
@@ -42,8 +42,8 @@
<gml:pos>-75.000000 45.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>93.9</Value>
- </obs>
+ <ms:Value>93.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
@@ -65,10 +65,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-122.000000 49.000000</gml:lowerCorner>
@@ -80,8 +80,8 @@
<gml:pos>-122.000000 49.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>99.9</Value>
- </obs>
+ <ms:Value>99.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
Modified: trunk/msautotest/wxs/expected/sos_getobs_time_filter_foi.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_getobs_time_filter_foi.xml 2009-02-07 02:19:30 UTC (rev 8514)
+++ trunk/msautotest/wxs/expected/sos_getobs_time_filter_foi.xml 2009-02-07 02:20:24 UTC (rev 8515)
@@ -1,7 +1,7 @@
Content-type: text/xml
<?xml version="1.0" encoding="ISO-8859-1"?>
-<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd">
+<om:ObservationCollection xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sos="http://www.opengis.net/sos/1.0" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xmlns:om="http://www.opengis.net/om/1.0" gml:id="Water" xsi:schemaLocation="http://www.opengis.net/om/1.0 http://schemas.opengis.net/om/1.0.0/om.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs">
<gml:description xmlns:gml="http://www.opengis.net/gml">This is for water</gml:description>
<gml:name xmlns:gml="http://www.opengis.net/gml">Water</gml:name>
<gml:boundedBy>
@@ -27,10 +27,10 @@
<swe:component xlink:href="urn:ogc:def:property:ACME:8:Value"/>
</swe:CompositePhenomenon>
</om:observedProperty>
- <om:featureOfInterest xlink:href="urn:ogc:foo"/>
+ <om:featureOfInterest xlink:href="http://localhost/cgi-bin/sostest?service=WFS&version=1.1.0&request=DescribeFeatureType&typename=obs"/>
<om:result>
- <gml:featureMember xmlns:gml="http://www.opengis.net/gml">
- <obs>
+ <gml:featureMember>
+ <ms:obs>
<gml:boundedBy>
<gml:Envelope srsName="urn:ogc:crs:epsg:4326" srsDimension="2">
<gml:lowerCorner>-75.000000 45.000000</gml:lowerCorner>
@@ -42,8 +42,8 @@
<gml:pos>-75.000000 45.000000</gml:pos>
</gml:Point>
</msGeometry>
- <Value>93.9</Value>
- </obs>
+ <ms:Value>93.9</ms:Value>
+ </ms:obs>
</gml:featureMember>
</om:result>
</om:Observation>
More information about the mapserver-commits
mailing list