[mapserver-commits] r7709 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Thu Jun 19 13:05:06 EDT 2008
Author: Assefa
Date: 2008-06-19 13:05:06 -0400 (Thu, 19 Jun 2008)
New Revision: 7709
Modified:
trunk/msautotest/wxs/expected/wfs_filter_contains.xml
trunk/msautotest/wxs/expected/wfs_filter_equals.xml
trunk/msautotest/wxs/expected/wfs_filter_equals_poly.xml
trunk/msautotest/wxs/expected/wfs_filter_touches.xml
trunk/msautotest/wxs/wfs_filter.map
Log:
Correct coordinates for equal, tocuhes, contains test #2306, #2307, #2308
Modified: trunk/msautotest/wxs/expected/wfs_filter_contains.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_contains.xml 2008-06-19 12:36:56 UTC (rev 7708)
+++ trunk/msautotest/wxs/expected/wfs_filter_contains.xml 2008-06-19 17:05:06 UTC (rev 7709)
@@ -10,19 +10,19 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Box srsName="EPSG:4269">
- <gml:coordinates>2397218.000000,436961.250000 2421720.250000,500409.562500</gml:coordinates>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>-62.076968,47.191069 -61.433227,47.627593</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<gml:featureMember>
<ms:province>
<gml:boundedBy>
- <gml:Box srsName="EPSG:4269">
+ <gml:Box srsName="EPSG:4326">
<gml:coordinates>-62.076968,47.191069 -61.433227,47.627593</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<ms:msGeometry>
- <gml:Polygon srsName="EPSG:4269">
+ <gml:Polygon srsName="EPSG:4326">
<gml:outerBoundaryIs>
<gml:LinearRing>
<gml:coordinates>-62.010515,47.241088 -61.966742,47.246040 -61.947548,47.238311 -61.932708,47.228257 -61.906997,47.222202 -61.864694,47.233116 -61.842210,47.242674 -61.828736,47.238572 -61.828048,47.227311 -61.838414,47.215824 -61.895286,47.191069 -61.910866,47.195878 -61.930279,47.207300 -61.943690,47.211466 -61.980541,47.200682 -62.009180,47.202105 -62.057130,47.211273 -62.073040,47.219864 -62.076968,47.230193 -62.025236,47.300625 -62.012584,47.327971 -62.014128,47.354223 -62.001451,47.381572 -61.974280,47.406325 -61.875844,47.460730 -61.744027,47.556462 -61.659750,47.596818 -61.589874,47.619458 -61.532104,47.620068 -61.492444,47.626271 -61.467016,47.627593 -61.443646,47.625790 -61.433227,47.617067 -61.440203,47.602653 -61.482632,47.584451 -61.501965,47.571983 -61.527322,47.546702 -61.554237,47.531009 -61.580413,47.524411 -61.602124,47.536685 -61.592755,47.546644 -61.553676,47.564103 -61.540355,47.583872 -61.575318,47.596569 -61.628933,47.581754 -61.673230,47.560421 -61.707530,47.537886 -61.771983,47.502438 -61.811839,47.463236 -61.843632,47.439850 -61.867341,47.428764 -61.888445,47.413176 -61.910824,47.379589 -61.919309,47.354617 -61.918598,47.343351 -61.947480,47.328320 -61.983069,47.315363 -62.021449,47.257309 -62.010515,47.241088 </gml:coordinates>
Modified: trunk/msautotest/wxs/expected/wfs_filter_equals.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_equals.xml 2008-06-19 12:36:56 UTC (rev 7708)
+++ trunk/msautotest/wxs/expected/wfs_filter_equals.xml 2008-06-19 17:05:06 UTC (rev 7709)
@@ -10,19 +10,19 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
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:4269">
- <gml:coordinates>2503805.500000,427872.656250 2503805.500000,427872.656250</gml:coordinates>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>-60.981038,46.689323 -60.981038,46.689323</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<gml:featureMember>
<ms:popplace>
<gml:boundedBy>
- <gml:Box srsName="EPSG:4269">
+ <gml:Box srsName="EPSG:4326">
<gml:coordinates>-60.981038,46.689323 -60.981038,46.689323</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<ms:msGeometry>
- <gml:Point srsName="EPSG:4269">
+ <gml:Point srsName="EPSG:4326">
<gml:coordinates>-60.981038,46.689323</gml:coordinates>
</gml:Point>
</ms:msGeometry>
Modified: trunk/msautotest/wxs/expected/wfs_filter_equals_poly.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_equals_poly.xml 2008-06-19 12:36:56 UTC (rev 7708)
+++ trunk/msautotest/wxs/expected/wfs_filter_equals_poly.xml 2008-06-19 17:05:06 UTC (rev 7709)
@@ -10,19 +10,19 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Box srsName="EPSG:4269">
- <gml:coordinates>2419658.500000,453227.250000 2422047.000000,456235.250000</gml:coordinates>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>-61.750964,47.255073 -61.719830,47.282116</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<gml:featureMember>
<ms:province>
<gml:boundedBy>
- <gml:Box srsName="EPSG:4269">
+ <gml:Box srsName="EPSG:4326">
<gml:coordinates>-61.750964,47.255073 -61.719830,47.282116</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<ms:msGeometry>
- <gml:Polygon srsName="EPSG:4269">
+ <gml:Polygon srsName="EPSG:4326">
<gml:outerBoundaryIs>
<gml:LinearRing>
<gml:coordinates>-61.748897,47.258394 -61.750964,47.275550 -61.730322,47.282116 -61.719830,47.269593 -61.732191,47.255073 -61.748897,47.258394 </gml:coordinates>
Modified: trunk/msautotest/wxs/expected/wfs_filter_touches.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_touches.xml 2008-06-19 12:36:56 UTC (rev 7708)
+++ trunk/msautotest/wxs/expected/wfs_filter_touches.xml 2008-06-19 17:05:06 UTC (rev 7709)
@@ -10,19 +10,19 @@
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=province&OUTPUTFORMAT=XMLSCHEMA">
<gml:boundedBy>
- <gml:Box srsName="EPSG:4269">
- <gml:coordinates>2419658.500000,453227.250000 2422047.000000,456235.250000</gml:coordinates>
+ <gml:Box srsName="EPSG:4326">
+ <gml:coordinates>-61.750964,47.255073 -61.719830,47.282116</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<gml:featureMember>
<ms:province>
<gml:boundedBy>
- <gml:Box srsName="EPSG:4269">
+ <gml:Box srsName="EPSG:4326">
<gml:coordinates>-61.750964,47.255073 -61.719830,47.282116</gml:coordinates>
</gml:Box>
</gml:boundedBy>
<ms:msGeometry>
- <gml:Polygon srsName="EPSG:4269">
+ <gml:Polygon srsName="EPSG:4326">
<gml:outerBoundaryIs>
<gml:LinearRing>
<gml:coordinates>-61.748897,47.258394 -61.750964,47.275550 -61.730322,47.282116 -61.719830,47.269593 -61.732191,47.255073 -61.748897,47.258394 </gml:coordinates>
Modified: trunk/msautotest/wxs/wfs_filter.map
===================================================================
--- trunk/msautotest/wxs/wfs_filter.map 2008-06-19 12:36:56 UTC (rev 7708)
+++ trunk/msautotest/wxs/wfs_filter.map 2008-06-19 17:05:06 UTC (rev 7709)
@@ -67,7 +67,7 @@
# RUN_PARMS: wfs_filter_beyond.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=popplace&FILTER=<Filter><Beyond><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>-60.18,46.10</gml:coordinates></gml:Point><Distance units='dd'>0.05</Distance></Beyond></Filter>" > [RESULT]
#
# Verify EQUALS Result: Cheticamp
-# RUN_PARMS: wfs_filter_equals.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=popplace&FILTER=<Filter><Equals><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>-60.214963466386187,46.123322047124134</gml:coordinates></gml:Point></Equals></Filter>" > [RESULT]
+# RUN_PARMS: wfs_filter_equals.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=popplace&FILTER=<Filter><Equals><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>-60.981037876445555,46.689322879890163</gml:coordinates></gml:Point></Equals></Filter>" > [RESULT]
#
# Verify OVERLAPS Result: Prince Edward Island
# RUN_PARMS: wfs_filter_overlaps.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Overlaps><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-64.75,46.08 -63.53,46.08 -63.53,47.29 -64.75,47.29</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Overlaps></Filter>" > [RESULT]
@@ -83,10 +83,10 @@
# RUN_PARMS: wfs_filter_crosses.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Crosses><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-60.25,43.79 -59.95,43.79 -59.95,44.09 -60.25,44.09</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Crosses></Filter>" > [RESULT]
# Verify TOUCHES Result: Quebec, Iles de la Madeleine (AREA: 4833029.500)
-# RUN_PARMS: wfs_filter_touches.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Touches><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-61.719829698475976,47.269592918433993 -61.732190995311512,47.25507337571689 -61.72,47.24 -61.71,47.26</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Touches></Filter>" > [RESULT]
+# RUN_PARMS: wfs_filter_touches.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Touches><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>-61.748897101358850,47.258393824294672</gml:coordinates></gml:Point></Touches></Filter>" > [RESULT]
# Verify EQUALS Result: Quebec, Iles de la Madeleine (AREA: 4833029.500)
-# RUN_PARMS: wfs_filter_equals_poly.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Equals><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-61.748897101358892 47.258393824294707,-61.75096395282408 47.275550067023246,-61.730321527607451 47.282116089229753,-61.719829698475976 47.269592918433993,-61.732190995311512 47.25507337571689,-61.748897101358892 47.258393824294707</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Equals></Filter>" > [RESULT]
+# RUN_PARMS: wfs_filter_equals_poly.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Equals><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-61.748897101358850,47.258393824294672 -61.750963952824037,47.275550067023204 -61.730321527607408,47.282116089229731 -61.719829698475941,47.269592918433965 -61.732190995311470,47.255073375716847 -61.748897101358850,47.258393824294672</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Equals></Filter>" > [RESULT]
# Verify DISJOINT Result: Nova Scotia, Sable Island
# RUN_PARMS: wfs_filter_disjoint.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Disjoint><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-66.23,42.50 -58.95,45.67 -58.97,48.52 -67.01,47.13</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Disjoint></Filter>" > [RESULT]
More information about the mapserver-commits
mailing list