[mapserver-commits] r9772 - trunk/msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Wed Feb 3 12:04:23 EST 2010
Author: tomkralidis
Date: 2010-02-03 12:04:22 -0500 (Wed, 03 Feb 2010)
New Revision: 9772
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/wfs11_cap.xml
trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml
trunk/msautotest/wxs/expected/wfs_filter_startindex.xml
trunk/msautotest/wxs/expected/wfs_filter_startindex2.xml
trunk/msautotest/wxs/expected/wms_get_caps.xml
Log:
changes related to #3285, #2799
Modified: trunk/msautotest/wxs/expected/sos_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap.xml 2010-02-03 16:20:48 UTC (rev 9771)
+++ trunk/msautotest/wxs/expected/sos_cap.xml 2010-02-03 17:04:22 UTC (rev 9772)
@@ -199,6 +199,7 @@
</ogc:ComparisonOperators>
</ogc:Scalar_Capabilities>
<ogc:Id_Capabilities>
+ <ogc:EID/>
<ogc:FID/>
</ogc:Id_Capabilities>
</sos:Filter_Capabilities>
Modified: trunk/msautotest/wxs/expected/sos_cap0.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap0.xml 2010-02-03 16:20:48 UTC (rev 9771)
+++ trunk/msautotest/wxs/expected/sos_cap0.xml 2010-02-03 17:04:22 UTC (rev 9772)
@@ -199,6 +199,7 @@
</ogc:ComparisonOperators>
</ogc:Scalar_Capabilities>
<ogc:Id_Capabilities>
+ <ogc:EID/>
<ogc:FID/>
</ogc:Id_Capabilities>
</sos:Filter_Capabilities>
Modified: trunk/msautotest/wxs/expected/sos_cap1.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_cap1.xml 2010-02-03 16:20:48 UTC (rev 9771)
+++ trunk/msautotest/wxs/expected/sos_cap1.xml 2010-02-03 17:04:22 UTC (rev 9772)
@@ -199,6 +199,7 @@
</ogc:ComparisonOperators>
</ogc:Scalar_Capabilities>
<ogc:Id_Capabilities>
+ <ogc:EID/>
<ogc:FID/>
</ogc:Id_Capabilities>
</sos:Filter_Capabilities>
Modified: trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml 2010-02-03 16:20:48 UTC (rev 9771)
+++ trunk/msautotest/wxs/expected/sos_caps_updatesequence.xml 2010-02-03 17:04:22 UTC (rev 9772)
@@ -199,6 +199,7 @@
</ogc:ComparisonOperators>
</ogc:Scalar_Capabilities>
<ogc:Id_Capabilities>
+ <ogc:EID/>
<ogc:FID/>
</ogc:Id_Capabilities>
</sos:Filter_Capabilities>
Modified: trunk/msautotest/wxs/expected/wfs11_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_cap.xml 2010-02-03 16:20:48 UTC (rev 9771)
+++ trunk/msautotest/wxs/expected/wfs11_cap.xml 2010-02-03 17:04:22 UTC (rev 9772)
@@ -96,7 +96,7 @@
<FeatureType>
<Name>province</Name>
<Title>province</Title>
- <DefaultSRS>urn:ogc:def:crs:EPSG::4326</DefaultSRS>
+ <DefaultSRS>EPSG:4326</DefaultSRS>
<OutputFormats>
<Format>text/xml; subtype=gml/3.1.1</Format>
</OutputFormats>
@@ -142,6 +142,7 @@
</ogc:ComparisonOperators>
</ogc:Scalar_Capabilities>
<ogc:Id_Capabilities>
+ <ogc:EID/>
<ogc:FID/>
</ogc:Id_Capabilities>
</ogc:Filter_Capabilities>
Modified: trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml 2010-02-03 16:20:48 UTC (rev 9771)
+++ trunk/msautotest/wxs/expected/wfs11_caps_updatesequence.xml 2010-02-03 17:04:22 UTC (rev 9772)
@@ -142,6 +142,7 @@
</ogc:ComparisonOperators>
</ogc:Scalar_Capabilities>
<ogc:Id_Capabilities>
+ <ogc:EID/>
<ogc:FID/>
</ogc:Id_Capabilities>
</ogc:Filter_Capabilities>
Modified: trunk/msautotest/wxs/expected/wfs_filter_startindex.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_startindex.xml 2010-02-03 16:20:48 UTC (rev 9771)
+++ trunk/msautotest/wxs/expected/wfs_filter_startindex.xml 2010-02-03 17:04:22 UTC (rev 9772)
@@ -11,57 +11,57 @@
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=popplace&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
<gml:Box srsName="EPSG:4326">
- <gml:coordinates>-66.158957,43.740118 -59.972676,47.404770</gml:coordinates>
+ <gml:coordinates>-66.158957,43.797703 -60.214963,47.404770</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Tignish</ms:NAME>
+ <ms:NAME>Amherst</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Cheticamp</ms:NAME>
+ <ms:NAME>Kentville</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Sheet Harbour</ms:NAME>
+ <ms:NAME>Bridgewater</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Souris</ms:NAME>
+ <ms:NAME>Yarmouth</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Canso</ms:NAME>
+ <ms:NAME>Sydney Mines</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Port Hawkesbury</ms:NAME>
+ <ms:NAME>Sydney</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Antigonish</ms:NAME>
+ <ms:NAME>Dartmouth</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Springhill</ms:NAME>
+ <ms:NAME>Fatima</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Windsor</ms:NAME>
+ <ms:NAME>Charlottetown</ms:NAME>
</ms:popplace>
</gml:featureMember>
<gml:featureMember>
<ms:popplace>
- <ms:NAME>Lunenburg</ms:NAME>
+ <ms:NAME>Halifax</ms:NAME>
</ms:popplace>
</gml:featureMember>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wfs_filter_startindex2.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_startindex2.xml 2010-02-03 16:20:48 UTC (rev 9771)
+++ trunk/msautotest/wxs/expected/wfs_filter_startindex2.xml 2010-02-03 17:04:22 UTC (rev 9772)
@@ -16,6 +16,11 @@
</gml:boundedBy>
<gml:featureMember>
<ms:popplace>
+ <ms:NAME>Lunenburg</ms:NAME>
+ </ms:popplace>
+ </gml:featureMember>
+ <gml:featureMember>
+ <ms:popplace>
<ms:NAME>Liverpool</ms:NAME>
</ms:popplace>
</gml:featureMember>
@@ -59,10 +64,5 @@
<ms:NAME>Amherst</ms:NAME>
</ms:popplace>
</gml:featureMember>
- <gml:featureMember>
- <ms:popplace>
- <ms:NAME>Kentville</ms:NAME>
- </ms:popplace>
- </gml:featureMember>
</wfs:FeatureCollection>
Modified: trunk/msautotest/wxs/expected/wms_get_caps.xml
===================================================================
(Binary files differ)
More information about the mapserver-commits
mailing list