[mapserver-commits] r7738 - in trunk/msautotest/wxs: . expected

svn at osgeo.org svn at osgeo.org
Tue Jun 24 11:21:52 EDT 2008 

Author: Assefa
Date: 2008-06-24 11:21:52 -0400 (Tue, 24 Jun 2008)
New Revision: 7738

Modified:
   trunk/msautotest/wxs/expected/wfs_filter_contains.xml
   trunk/msautotest/wxs/wfs_filter.map
Log:
Correct contains filter

Modified: trunk/msautotest/wxs/expected/wfs_filter_contains.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_contains.xml	2008-06-24 15:21:01 UTC (rev 7737)
+++ trunk/msautotest/wxs/expected/wfs_filter_contains.xml	2008-06-24 15:21:52 UTC (rev 7738)
@@ -11,29 +11,29 @@
                        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:4326">
-      		<gml:coordinates>-62.076968,47.191069 -61.433227,47.627593</gml:coordinates>
+      		<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:4326">
-        		<gml:coordinates>-62.076968,47.191069 -61.433227,47.627593</gml:coordinates>
+        		<gml:coordinates>-61.750964,47.255073 -61.719830,47.282116</gml:coordinates>
         	</gml:Box>
         </gml:boundedBy>
         <ms:msGeometry>
         <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>
+              <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>
             </gml:LinearRing>
           </gml:outerBoundaryIs>
         </gml:Polygon>
         </ms:msGeometry>
-        <ms:AREA>328572864.000</ms:AREA>
-        <ms:PERIMETER>194691.391</ms:PERIMETER>
-        <ms:PROVINCE_>982</ms:PROVINCE_>
-        <ms:PROVINCE_I>982</ms:PROVINCE_I>
+        <ms:AREA>4833029.500</ms:AREA>
+        <ms:PERIMETER>8483.013</ms:PERIMETER>
+        <ms:PROVINCE_>1000</ms:PROVINCE_>
+        <ms:PROVINCE_I>1000</ms:PROVINCE_I>
         <ms:STATUS>Province</ms:STATUS>
         <ms:NAME></ms:NAME>
         <ms:NAME_E>Quebec</ms:NAME_E>

Modified: trunk/msautotest/wxs/wfs_filter.map
===================================================================
--- trunk/msautotest/wxs/wfs_filter.map	2008-06-24 15:21:01 UTC (rev 7737)
+++ trunk/msautotest/wxs/wfs_filter.map	2008-06-24 15:21:52 UTC (rev 7738)
@@ -76,8 +76,8 @@
 # Verify WITHIN Results:  Quebec, Iles de la Madeleine (3 islands)
 # RUN_PARMS: wfs_filter_within.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Within><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-62.16,47.07 -61.33,47.07 -61.33,47.75 -62.16,47.75</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Within></Filter>" > [RESULT]
 
-# Verify CONTAINS Result:  Quebec, Iles de la Madeleine
-# RUN_PARMS: wfs_filter_contains.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Contains><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-61.99,47.35 -61.95,47.35 -61.95,47.38 -61.99,47.38</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Contains></Filter>" > [RESULT]
+# Verify CONTAINS Result:  Quebec, Iles de la Madeleine (AREA:  4833029.500)
+# RUN_PARMS: wfs_filter_contains.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=province&FILTER=<Filter><Contains><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-61.76,47.24 -61.71,47.24 -61.71,47.29 -61.76,47.29</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Contains></Filter>" > [RESULT]
 
 # Verify CROSSES Result:  Nova Scotia, Sable Island
 # 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]

More information about the mapserver-commits mailing list