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

[svn at osgeo.org]

Author: Assefa
Date: 2008-06-24 17:58:57 -0400 (Tue, 24 Jun 2008)
New Revision: 7740

Added:
   trunk/msautotest/wxs/expected/wfs_filter_dwithin_units.xml
Modified:
   trunk/msautotest/wxs/wfs_filter.map
Log:
Add test for dwithin with units

Added: trunk/msautotest/wxs/expected/wfs_filter_dwithin_units.xml
===================================================================
--- trunk/msautotest/wxs/expected/wfs_filter_dwithin_units.xml	                        (rev 0)
+++ trunk/msautotest/wxs/expected/wfs_filter_dwithin_units.xml	2008-06-24 21:58:57 UTC (rev 7740)
@@ -0,0 +1,49 @@
+Content-type: text/xml
+
+<?xml version='1.0' encoding="ISO-8859-1" ?>
+<wfs:FeatureCollection
+   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"
+   xmlns:wfs="http://www.opengis.net/wfs"
+   xmlns:gml="http://www.opengis.net/gml"
+   xmlns:ogc="http://www.opengis.net/ogc"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   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&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=popplace&amp;OUTPUTFORMAT=XMLSCHEMA">
+      <gml:boundedBy>
+      	<gml:Box srsName="EPSG:4326">
+      		<gml:coordinates>-60.214963,46.123322 -60.214963,46.123322</gml:coordinates>
+      	</gml:Box>
+      </gml:boundedBy>
+    <gml:featureMember>
+      <ms:popplace>
+        <gml:boundedBy>
+        	<gml:Box srsName="EPSG:4326">
+        		<gml:coordinates>-60.214963,46.123322 -60.214963,46.123322</gml:coordinates>
+        	</gml:Box>
+        </gml:boundedBy>
+        <ms:msGeometry>
+        <gml:Point srsName="EPSG:4326">
+          <gml:coordinates>-60.214963,46.123322</gml:coordinates>
+        </gml:Point>
+        </ms:msGeometry>
+        <ms:AREA>0.000</ms:AREA>
+        <ms:PERIMETER>0.000</ms:PERIMETER>
+        <ms:POPPLACE_>391</ms:POPPLACE_>
+        <ms:POPPLACE_I>4</ms:POPPLACE_I>
+        <ms:UNIQUE_KEY>CBLGX</ms:UNIQUE_KEY>
+        <ms:NAME>Sydney</ms:NAME>
+        <ms:NAME_E></ms:NAME_E>
+        <ms:NAME_F></ms:NAME_F>
+        <ms:UNIQUE_K_1></ms:UNIQUE_K_1>
+        <ms:UNIQUE_K_2></ms:UNIQUE_K_2>
+        <ms:REG_CODE>12</ms:REG_CODE>
+        <ms:NTS50>011K01</ms:NTS50>
+        <ms:LAT>460900</ms:LAT>
+        <ms:LONG>601100</ms:LONG>
+        <ms:SGC_CODE>1217014</ms:SGC_CODE>
+        <ms:CAPITAL>0</ms:CAPITAL>
+        <ms:POP_RANGE>4</ms:POP_RANGE>
+      </ms:popplace>
+    </gml:featureMember>
+</wfs:FeatureCollection>
+

Modified: trunk/msautotest/wxs/wfs_filter.map
===================================================================
--- trunk/msautotest/wxs/wfs_filter.map	2008-06-24 21:47:34 UTC (rev 7739)
+++ trunk/msautotest/wxs/wfs_filter.map	2008-06-24 21:58:57 UTC (rev 7740)
@@ -63,6 +63,9 @@
 # RUN_PARMS: wfs_filter_dwithin.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=popplace&FILTER=<Filter><DWithin><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>-60.18,46.10</gml:coordinates></gml:Point><Distance units='dd'>0.05</Distance></DWithin></Filter>" > [RESULT]
 #
 
+# Verify DWITHIN with units Result:  Sydney
+# RUN_PARMS: wfs_filter_dwithin_units.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=popplace&FILTER=<Filter><DWithin><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>-60.18,46.10</gml:coordinates></gml:Point><Distance units='kilometers'>10</Distance></DWithin></Filter>" > [RESULT]
+#
 # Verify BEYOND Results:  all but Sydney excluded
 # 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]
 #