[mapserver-commits] r13077 - branches/branch-6-0/docs/en/ogc trunk/docs/en/ogc

svn at osgeo.org svn at osgeo.org
Tue Feb 7 06:38:25 EST 2012


Author: havatv
Date: 2012-02-07 03:38:25 -0800 (Tue, 07 Feb 2012)
New Revision: 13077

Modified:
   branches/branch-6-0/docs/en/ogc/filter_encoding.txt
   trunk/docs/en/ogc/filter_encoding.txt
Log:
Changed Intersect to Intersects in the wfs filter encoding documentation (#4112).  Also fixed some overfull lines in the PDF (#3947)

Modified: branches/branch-6-0/docs/en/ogc/filter_encoding.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/filter_encoding.txt	2012-02-06 23:43:15 UTC (rev 13076)
+++ branches/branch-6-0/docs/en/ogc/filter_encoding.txt	2012-02-07 11:38:25 UTC (rev 13077)
@@ -12,6 +12,7 @@
 :Author:        Yewondwossen Assefa
 :Contact:       assefa at dmsolutions.ca
 :Last Updated: 2010-10-07
+:Date: $Date$
 
 .. contents:: Table of Contents
     :depth: 2
@@ -170,73 +171,85 @@
 Server Side
 -----------
 
-To be able to use Filter Encoding, you need to create a valid WFS server using 
-MapServer. Please refer to the :ref:`WFS Server HOWTO <wfs_server>` for specifics. 
+To be able to use Filter Encoding, you need to create a valid WFS
+server using MapServer. Please refer to the :ref:`WFS Server HOWTO
+<wfs_server>` for specifics.
 
-There is nothing special that should be added to a WFS server for Filter 
-Encoding, but you should note that, when requesting the capabilities of 
-your WFS server, the document returned should contain the supported filters. 
-Here is part of a Capabilities document (note the "Filter_Capabilities" section):
+There is nothing special that should be added to a WFS server for
+Filter Encoding, but you should note that, when requesting the
+capabilities of your WFS server, the document returned should contain
+the supported filters.  Here is part of a Capabilities document (note
+the "Filter_Capabilities" section):
 
 .. code-block:: guess
-    :linenos:
+   :linenos:
 
-	<?xml version="1.0" encoding="ISO-8859-1"?>
-	<WFS_Capabilities version="1.0.0" updateSequence="0" xmlns="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd">
+   <?xml version="1.0" encoding="ISO-8859-1"?>
+   <WFS_Capabilities version="1.0.0" updateSequence="0"
+     xmlns="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://www.opengis.net/wfs
+     http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd">
 
-	<!-- MapServer version 5.6.5 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=WBMP OUTPUT=SWF OUTPUT=SVG SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=GEOS SUPPORTS=RGBA_PNG INPUT=EPPL7 INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
+   <!-- MapServer version 5.6.5 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=WBMP
+        OUTPUT=SWF OUTPUT=SVG SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE
+        SUPPORTS=ICONV SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT
+        SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER
+        SUPPORTS=GEOS SUPPORTS=RGBA_PNG INPUT=EPPL7 INPUT=POSTGIS INPUT=OGR
+        INPUT=GDAL INPUT=SHAPEFILE -->
 
-	<Service>
-	  <Name>MapServer WFS</Name>
-	  <Title>WMS Demo Server for MapServer</Title>
-	  <Abstract>This demonstration server showcases MapServer (www.mapserver.org) and its OGC support</Abstract>
-	  <OnlineResource>http://demo.mapserver.org/cgi-bin/wfs?</OnlineResource>
-	</Service>
+   <Service>
+     <Name>MapServer WFS</Name>
+     <Title>WMS Demo Server for MapServer</Title>
+     <Abstract>This demonstration server showcases MapServer (www.mapserver.org)
+               and its OGC support</Abstract>
+     <OnlineResource>http://demo.mapserver.org/cgi-bin/wfs?</OnlineResource>
+   </Service>
 
-	<Capability>
-	  <Request>
-	    <GetCapabilities>
-	      <DCPType>
-		<HTTP>
-		  <Get onlineResource="http://demo.mapserver.org/cgi-bin/wfs?"/>
-		</HTTP>
-	      </DCPType>
-	      <DCPType>
-		<HTTP>
-		  <Post onlineResource="http://demo.mapserver.org/cgi-bin/wfs?"/>
-		</HTTP>
-	      </DCPType>
-	    </GetCapabilities>
-            ...
-	  </Request>
-	</Capability>
-        ...
-	<ogc:Filter_Capabilities>
-	  <ogc:Spatial_Capabilities>
-	    <ogc:Spatial_Operators>
-	      <ogc:Equals/>
-	      <ogc:Disjoint/>
-	      <ogc:Touches/>
-	      <ogc:Within/>
-	      <ogc:Overlaps/>
-	      <ogc:Crosses/>
-	      <ogc:Intersect/>
-	      <ogc:Contains/>
-	      <ogc:DWithin/>
-	      <ogc:BBOX/>
-	    </ogc:Spatial_Operators>
-	  </ogc:Spatial_Capabilities>
-	  <ogc:Scalar_Capabilities>
-	    <ogc:Logical_Operators/>
-	    <ogc:Comparison_Operators>
-	      <ogc:Simple_Comparisons/>
-	      <ogc:Like/>
-	      <ogc:Between/>
-	    </ogc:Comparison_Operators>
-	  </ogc:Scalar_Capabilities>
-	</ogc:Filter_Capabilities>
+   <Capability>
+     <Request>
+       <GetCapabilities>
+         <DCPType>
+           <HTTP>
+             <Get onlineResource="http://demo.mapserver.org/cgi-bin/wfs?"/>
+           </HTTP>
+         </DCPType>
+         <DCPType>
+           <HTTP>
+             <Post onlineResource="http://demo.mapserver.org/cgi-bin/wfs?"/>
+           </HTTP>
+         </DCPType>
+       </GetCapabilities>
+       ...
+     </Request>
+   </Capability>
+   ...
+   <ogc:Filter_Capabilities>
+     <ogc:Spatial_Capabilities>
+       <ogc:Spatial_Operators>
+         <ogc:Equals/>
+         <ogc:Disjoint/>
+         <ogc:Touches/>
+         <ogc:Within/>
+         <ogc:Overlaps/>
+         <ogc:Crosses/>
+         <ogc:Intersects/>
+         <ogc:Contains/>
+         <ogc:DWithin/>
+         <ogc:BBOX/>
+       </ogc:Spatial_Operators>
+     </ogc:Spatial_Capabilities>
+     <ogc:Scalar_Capabilities>
+       <ogc:Logical_Operators/>
+       <ogc:Comparison_Operators>
+         <ogc:Simple_Comparisons/>
+         <ogc:Like/>
+         <ogc:Between/>
+       </ogc:Comparison_Operators>
+     </ogc:Scalar_Capabilities>
+   </ogc:Filter_Capabilities>
 
-	</WFS_Capabilities>
+   </WFS_Capabilities>
     
 Client Side
 -----------
@@ -247,43 +260,43 @@
 
 .. code-block:: mapfile
 
-	LAYER 
-	  NAME "cities"
-	  TYPE POINT
-	  STATUS ON  
-	  CONNECTION "http://demo.mapserver.org/cgi-bin/wfs?"
-	  CONNECTIONTYPE WFS
-	  METADATA
-	    "wfs_typename"          "cities"
-	    "wfs_version"           "1.0.0"
-	    "wfs_connectiontimeout" "60"
-	    "wfs_maxfeatures"       "100"
-	    "wfs_filter"    "<PropertyIsGreaterThan><PropertyName>POPULATION</PropertyName>
-	                                   <Literal>10000000</Literal></PropertyIsGreaterThan>"    
-	  END
-	  PROJECTION
-	    "init=epsg:4326"
-	  END
-	  LABELITEM    'NAME'
-	  CLASS
-	    NAME       'World Cities'
-	    STYLE
-	      COLOR    255 128 128
-	      OUTLINECOLOR 128 0 0
-	      SYMBOL   'circle'
-	      SIZE     9
-	    END
-	    LABEL
-	      COLOR    0 0 0
-	      OUTLINECOLOR 255 255 255                 
-	      TYPE     TRUETYPE
-	      FONT     sans
-	      SIZE     7
-	      POSITION UC
-	      PARTIALS FALSE
-	    END
-	  END
-	END 
+        LAYER 
+           NAME "cities"
+          TYPE POINT
+          STATUS ON  
+          CONNECTION "http://demo.mapserver.org/cgi-bin/wfs?"
+          CONNECTIONTYPE WFS
+          METADATA
+            "wfs_typename" "cities"
+            "wfs_version" "1.0.0"
+            "wfs_connectiontimeout" "60"
+            "wfs_maxfeatures" "100"
+            "wfs_filter" "<PropertyIsGreaterThan><PropertyName>POPULATION</PropertyName>
+                          <Literal>10000000</Literal></PropertyIsGreaterThan>"    
+          END
+          PROJECTION
+            "init=epsg:4326"
+          END
+          LABELITEM    'NAME'
+          CLASS
+            NAME       'World Cities'
+            STYLE
+              COLOR    255 128 128
+              OUTLINECOLOR 128 0 0
+              SYMBOL   'circle'
+              SIZE     9
+            END
+            LABEL
+              COLOR    0 0 0
+              OUTLINECOLOR 255 255 255                 
+              TYPE     TRUETYPE
+              FONT     sans
+              SIZE     7
+              POSITION UC
+              PARTIALS FALSE
+            END
+          END
+        END 
 
 *Note:*
 
@@ -312,117 +325,140 @@
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsEqualTo><PropertyName>NAME</PropertyName>
-  <Literal>Halifax</Literal></PropertyIsEqualTo></Filter> 
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsEqualTo><PropertyName>NAME</PropertyName>
+    <Literal>Halifax</Literal></PropertyIsEqualTo></Filter> 
   
 - `PropertyIsNotEqualTo`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsNotEqualTo><PropertyName>NAME</PropertyName>
-  <Literal>Halifax</Literal></PropertyIsNotEqualTo></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsNotEqualTo><PropertyName>NAME</PropertyName>
+    <Literal>Halifax</Literal></PropertyIsNotEqualTo></Filter>
 
 - `PropertyIsLessThan`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsLessThan><PropertyName>POPULATION</PropertyName>
-  <Literal>1000</Literal></PropertyIsLessThan></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsLessThan><PropertyName>POPULATION</PropertyName>
+    <Literal>1000</Literal></PropertyIsLessThan></Filter>
 
 - `PropertyIsGreaterThan`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsGreaterThan><PropertyName>POPULATION</PropertyName>
-  <Literal>10000000</Literal></PropertyIsGreaterThan></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsGreaterThan><PropertyName>POPULATION</PropertyName>
+    <Literal>10000000</Literal></PropertyIsGreaterThan></Filter>
 
 - `PropertyIsLessThanOrEqualTo`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsLessThanOrEqualTo><PropertyName>POPULATION</PropertyName>
-  <Literal>499</Literal></PropertyIsLessThanOrEqualTo></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsLessThanOrEqualTo><PropertyName>POPULATION</PropertyName>
+    <Literal>499</Literal></PropertyIsLessThanOrEqualTo></Filter>
 
 - `PropertyIsGreaterThanOrEqualTo`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsGreaterThanOrEqualTo><PropertyName>POPULATION</PropertyName>
-  <Literal>10194978</Literal></PropertyIsGreaterThanOrEqualTo></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsGreaterThanOrEqualTo><PropertyName>POPULATION</PropertyName>
+    <Literal>10194978</Literal></PropertyIsGreaterThanOrEqualTo></Filter>
 
 - `PropertyIsBetween`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsBetween><PropertyName>POPULATION</PropertyName>
-  <LowerBoundary>10194978</LowerBoundary><UpperBoundary>12116379</UpperBoundary></PropertyIsBetween></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsBetween><PropertyName>POPULATION</PropertyName>
+    <LowerBoundary>10194978</LowerBoundary>
+    <UpperBoundary>12116379</UpperBoundary></PropertyIsBetween></Filter>
 
 - `PropertyIsLike`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsLike wildcard='*' singleChar='.' escape='!'>
-  <PropertyName>NAME</PropertyName><Literal>Syd*</Literal></PropertyIsLike></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsLike wildcard='*' singleChar='.' escape='!'>
+    <PropertyName>NAME</PropertyName><Literal>Syd*</Literal></PropertyIsLike>
+    </Filter>
 
 - `Logical operator OR`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><OR><PropertyIsEqualTo><PropertyName>NAME</PropertyName>
-  <Literal>Sydney</Literal></PropertyIsEqualTo><PropertyIsEqualTo><PropertyName>NAME</PropertyName>
-  <Literal>Halifax</Literal></PropertyIsEqualTo></OR></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <OR><PropertyIsEqualTo><PropertyName>NAME</PropertyName>
+    <Literal>Sydney</Literal></PropertyIsEqualTo><PropertyIsEqualTo>
+    <PropertyName>NAME</PropertyName><Literal>Halifax</Literal>
+    </PropertyIsEqualTo></OR></Filter>
 
 - `Logical operator AND`_ 
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><AND><PropertyIsLike wildcard='*' singleChar='.' escape='!'>
-  <PropertyName>NAME</PropertyName><Literal>Syd*</Literal></PropertyIsLike><PropertyIsEqualTo>
-  <PropertyName>POPULATION</PropertyName><Literal>4250065</Literal></PropertyIsEqualTo></AND></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <AND><PropertyIsLike wildcard='*' singleChar='.' escape='!'>
+    <PropertyName>NAME</PropertyName><Literal>Syd*</Literal></PropertyIsLike>
+    <PropertyIsEqualTo><PropertyName>POPULATION</PropertyName>
+    <Literal>4250065</Literal></PropertyIsEqualTo></AND></Filter>
 
 - `Logical operator NOT`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><AND><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName>
-  <Literal>0</Literal></PropertyIsEqualTo></NOT><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName>
-  <Literal>12116379</Literal></PropertyIsEqualTo></NOT></AND></Filter> 
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <AND><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName>
+    <Literal>0</Literal></PropertyIsEqualTo></NOT><NOT><PropertyIsEqualTo>
+    <PropertyName>POPULATION</PropertyName><Literal>12116379</Literal>
+    </PropertyIsEqualTo></NOT></AND></Filter> 
 
 - `Spatial operator BBOX`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&
-  Filter=<Filter><BBOX><PropertyName>Name>NAME</PropertyName><Box%20srsName='EPSG:42304'>
-  <coordinates>135.2239,34.4879 135.8578,34.8471</coordinates></Box></BBOX></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <BBOX><PropertyName>Name>NAME</PropertyName><Box%20srsName='EPSG:42304'>
+    <coordinates>135.2239,34.4879 135.8578,34.8471</coordinates></Box></BBOX>
+    </Filter>
 
 - `Spatial operator Dwithin`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=
-  <Filter><DWithin><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>135.500000,34.666667</gml:coordinates>
-  </gml:Point><Distance units='m'>10000</Distance></DWithin></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <DWithin><PropertyName>Geometry</PropertyName><gml:Point>
+    <gml:coordinates>135.500000,34.666667</gml:coordinates>
+    </gml:Point><Distance units='m'>10000</Distance></DWithin></Filter>
 
 - `Spatial operator Intersects`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
-  <Intersect><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing>
-  <gml:coordinates>135.5329,34.6624 135.4921,34.8153 135.3673,34.7815 135.3800,34.6216 135.5361,34.6210 135.5329,34.6624</gml:coordinates>
-  </gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersect></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <Intersects><PropertyName>Geometry</PropertyName>
+    <gml:Polygon><gml:outerBoundaryIs><gml:LinearRing>
+    <gml:coordinates>135.5329,34.6624 135.4921,34.8153 135.3673,34.7815
+    135.3800,34.6216 135.5361,34.6210 135.5329,34.6624</gml:coordinates>
+    </gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersects></Filter>
 
 .. _`PropertyIsEqualTo`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><PropertyIsEqualTo><PropertyName>NAME</PropertyName><Literal>Halifax</Literal></PropertyIsEqualTo></Filter>
 .. _`PropertyIsNotEqualTo`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><PropertyIsNotEqualTo><PropertyName>NAME</PropertyName><Literal>Halifax</Literal></PropertyIsNotEqualTo></Filter>
@@ -437,7 +473,7 @@
 .. _`Logical operator NOT`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><AND><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName><Literal>0</Literal></PropertyIsEqualTo></NOT><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName><Literal>12116379</Literal></PropertyIsEqualTo></NOT></AND></Filter> 
 .. _`Spatial operator BBOX`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><BBOX><PropertyName>Name>NAME</PropertyName><Box%20srsName='EPSG:4326'><coordinates>135.2239,34.4879%20135.8578,34.8471</coordinates></Box></BBOX></Filter>
 .. _`Spatial operator Dwithin`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><DWithin><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>135.500000,34.666667</gml:coordinates></gml:Point><Distance%20units='m'>10000</Distance></DWithin></Filter>
-.. _`Spatial operator Intersects`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><Intersect><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>135.5329,34.6624%20135.4921,34.8153%20135.3673,34.7815%20135.3800,34.6216%20135.5361,34.6210%20135.5329,34.6624</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersect></Filter>
+.. _`Spatial operator Intersects`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><Intersects><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>135.5329,34.6624%20135.4921,34.8153%20135.3673,34.7815%20135.3800,34.6216%20135.5361,34.6210%20135.5329,34.6624</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersects></Filter>
    
 .. index::
    triple: WFS; Filter encoding; OGC conformance tests

Modified: trunk/docs/en/ogc/filter_encoding.txt
===================================================================
--- trunk/docs/en/ogc/filter_encoding.txt	2012-02-06 23:43:15 UTC (rev 13076)
+++ trunk/docs/en/ogc/filter_encoding.txt	2012-02-07 11:38:25 UTC (rev 13077)
@@ -12,6 +12,7 @@
 :Author:        Yewondwossen Assefa
 :Contact:       assefa at dmsolutions.ca
 :Last Updated: 2010-10-07
+:Date: $Date$
 
 .. contents:: Table of Contents
     :depth: 2
@@ -170,73 +171,85 @@
 Server Side
 -----------
 
-To be able to use Filter Encoding, you need to create a valid WFS server using 
-MapServer. Please refer to the :ref:`WFS Server HOWTO <wfs_server>` for specifics. 
+To be able to use Filter Encoding, you need to create a valid WFS
+server using MapServer. Please refer to the :ref:`WFS Server HOWTO
+<wfs_server>` for specifics.
 
-There is nothing special that should be added to a WFS server for Filter 
-Encoding, but you should note that, when requesting the capabilities of 
-your WFS server, the document returned should contain the supported filters. 
-Here is part of a Capabilities document (note the "Filter_Capabilities" section):
+There is nothing special that should be added to a WFS server for
+Filter Encoding, but you should note that, when requesting the
+capabilities of your WFS server, the document returned should contain
+the supported filters.  Here is part of a Capabilities document (note
+the "Filter_Capabilities" section):
 
 .. code-block:: guess
-    :linenos:
+   :linenos:
 
-	<?xml version="1.0" encoding="ISO-8859-1"?>
-	<WFS_Capabilities version="1.0.0" updateSequence="0" xmlns="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd">
+   <?xml version="1.0" encoding="ISO-8859-1"?>
+   <WFS_Capabilities version="1.0.0" updateSequence="0"
+     xmlns="http://www.opengis.net/wfs" xmlns:ogc="http://www.opengis.net/ogc"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://www.opengis.net/wfs
+     http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd">
 
-	<!-- MapServer version 5.6.5 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=WBMP OUTPUT=SWF OUTPUT=SVG SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=GEOS SUPPORTS=RGBA_PNG INPUT=EPPL7 INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
+   <!-- MapServer version 5.6.5 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=WBMP
+        OUTPUT=SWF OUTPUT=SVG SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE
+        SUPPORTS=ICONV SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT
+        SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER
+        SUPPORTS=GEOS SUPPORTS=RGBA_PNG INPUT=EPPL7 INPUT=POSTGIS INPUT=OGR
+        INPUT=GDAL INPUT=SHAPEFILE -->
 
-	<Service>
-	  <Name>MapServer WFS</Name>
-	  <Title>WMS Demo Server for MapServer</Title>
-	  <Abstract>This demonstration server showcases MapServer (www.mapserver.org) and its OGC support</Abstract>
-	  <OnlineResource>http://demo.mapserver.org/cgi-bin/wfs?</OnlineResource>
-	</Service>
+   <Service>
+     <Name>MapServer WFS</Name>
+     <Title>WMS Demo Server for MapServer</Title>
+     <Abstract>This demonstration server showcases MapServer (www.mapserver.org)
+               and its OGC support</Abstract>
+     <OnlineResource>http://demo.mapserver.org/cgi-bin/wfs?</OnlineResource>
+   </Service>
 
-	<Capability>
-	  <Request>
-	    <GetCapabilities>
-	      <DCPType>
-		<HTTP>
-		  <Get onlineResource="http://demo.mapserver.org/cgi-bin/wfs?"/>
-		</HTTP>
-	      </DCPType>
-	      <DCPType>
-		<HTTP>
-		  <Post onlineResource="http://demo.mapserver.org/cgi-bin/wfs?"/>
-		</HTTP>
-	      </DCPType>
-	    </GetCapabilities>
-            ...
-	  </Request>
-	</Capability>
-        ...
-	<ogc:Filter_Capabilities>
-	  <ogc:Spatial_Capabilities>
-	    <ogc:Spatial_Operators>
-	      <ogc:Equals/>
-	      <ogc:Disjoint/>
-	      <ogc:Touches/>
-	      <ogc:Within/>
-	      <ogc:Overlaps/>
-	      <ogc:Crosses/>
-	      <ogc:Intersect/>
-	      <ogc:Contains/>
-	      <ogc:DWithin/>
-	      <ogc:BBOX/>
-	    </ogc:Spatial_Operators>
-	  </ogc:Spatial_Capabilities>
-	  <ogc:Scalar_Capabilities>
-	    <ogc:Logical_Operators/>
-	    <ogc:Comparison_Operators>
-	      <ogc:Simple_Comparisons/>
-	      <ogc:Like/>
-	      <ogc:Between/>
-	    </ogc:Comparison_Operators>
-	  </ogc:Scalar_Capabilities>
-	</ogc:Filter_Capabilities>
+   <Capability>
+     <Request>
+       <GetCapabilities>
+         <DCPType>
+           <HTTP>
+             <Get onlineResource="http://demo.mapserver.org/cgi-bin/wfs?"/>
+           </HTTP>
+         </DCPType>
+         <DCPType>
+           <HTTP>
+             <Post onlineResource="http://demo.mapserver.org/cgi-bin/wfs?"/>
+           </HTTP>
+         </DCPType>
+       </GetCapabilities>
+       ...
+     </Request>
+   </Capability>
+   ...
+   <ogc:Filter_Capabilities>
+     <ogc:Spatial_Capabilities>
+       <ogc:Spatial_Operators>
+         <ogc:Equals/>
+         <ogc:Disjoint/>
+         <ogc:Touches/>
+         <ogc:Within/>
+         <ogc:Overlaps/>
+         <ogc:Crosses/>
+         <ogc:Intersects/>
+         <ogc:Contains/>
+         <ogc:DWithin/>
+         <ogc:BBOX/>
+       </ogc:Spatial_Operators>
+     </ogc:Spatial_Capabilities>
+     <ogc:Scalar_Capabilities>
+       <ogc:Logical_Operators/>
+       <ogc:Comparison_Operators>
+         <ogc:Simple_Comparisons/>
+         <ogc:Like/>
+         <ogc:Between/>
+       </ogc:Comparison_Operators>
+     </ogc:Scalar_Capabilities>
+   </ogc:Filter_Capabilities>
 
-	</WFS_Capabilities>
+   </WFS_Capabilities>
     
 Client Side
 -----------
@@ -247,43 +260,43 @@
 
 .. code-block:: mapfile
 
-	LAYER 
-	  NAME "cities"
-	  TYPE POINT
-	  STATUS ON  
-	  CONNECTION "http://demo.mapserver.org/cgi-bin/wfs?"
-	  CONNECTIONTYPE WFS
-	  METADATA
-	    "wfs_typename"          "cities"
-	    "wfs_version"           "1.0.0"
-	    "wfs_connectiontimeout" "60"
-	    "wfs_maxfeatures"       "100"
-	    "wfs_filter"    "<PropertyIsGreaterThan><PropertyName>POPULATION</PropertyName>
-	                                   <Literal>10000000</Literal></PropertyIsGreaterThan>"    
-	  END
-	  PROJECTION
-	    "init=epsg:4326"
-	  END
-	  LABELITEM    'NAME'
-	  CLASS
-	    NAME       'World Cities'
-	    STYLE
-	      COLOR    255 128 128
-	      OUTLINECOLOR 128 0 0
-	      SYMBOL   'circle'
-	      SIZE     9
-	    END
-	    LABEL
-	      COLOR    0 0 0
-	      OUTLINECOLOR 255 255 255                 
-	      TYPE     TRUETYPE
-	      FONT     sans
-	      SIZE     7
-	      POSITION UC
-	      PARTIALS FALSE
-	    END
-	  END
-	END 
+        LAYER 
+           NAME "cities"
+          TYPE POINT
+          STATUS ON  
+          CONNECTION "http://demo.mapserver.org/cgi-bin/wfs?"
+          CONNECTIONTYPE WFS
+          METADATA
+            "wfs_typename" "cities"
+            "wfs_version" "1.0.0"
+            "wfs_connectiontimeout" "60"
+            "wfs_maxfeatures" "100"
+            "wfs_filter" "<PropertyIsGreaterThan><PropertyName>POPULATION</PropertyName>
+                          <Literal>10000000</Literal></PropertyIsGreaterThan>"    
+          END
+          PROJECTION
+            "init=epsg:4326"
+          END
+          LABELITEM    'NAME'
+          CLASS
+            NAME       'World Cities'
+            STYLE
+              COLOR    255 128 128
+              OUTLINECOLOR 128 0 0
+              SYMBOL   'circle'
+              SIZE     9
+            END
+            LABEL
+              COLOR    0 0 0
+              OUTLINECOLOR 255 255 255                 
+              TYPE     TRUETYPE
+              FONT     sans
+              SIZE     7
+              POSITION UC
+              PARTIALS FALSE
+            END
+          END
+        END 
 
 *Note:*
 
@@ -312,117 +325,140 @@
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsEqualTo><PropertyName>NAME</PropertyName>
-  <Literal>Halifax</Literal></PropertyIsEqualTo></Filter> 
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsEqualTo><PropertyName>NAME</PropertyName>
+    <Literal>Halifax</Literal></PropertyIsEqualTo></Filter> 
   
 - `PropertyIsNotEqualTo`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsNotEqualTo><PropertyName>NAME</PropertyName>
-  <Literal>Halifax</Literal></PropertyIsNotEqualTo></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsNotEqualTo><PropertyName>NAME</PropertyName>
+    <Literal>Halifax</Literal></PropertyIsNotEqualTo></Filter>
 
 - `PropertyIsLessThan`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsLessThan><PropertyName>POPULATION</PropertyName>
-  <Literal>1000</Literal></PropertyIsLessThan></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsLessThan><PropertyName>POPULATION</PropertyName>
+    <Literal>1000</Literal></PropertyIsLessThan></Filter>
 
 - `PropertyIsGreaterThan`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsGreaterThan><PropertyName>POPULATION</PropertyName>
-  <Literal>10000000</Literal></PropertyIsGreaterThan></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsGreaterThan><PropertyName>POPULATION</PropertyName>
+    <Literal>10000000</Literal></PropertyIsGreaterThan></Filter>
 
 - `PropertyIsLessThanOrEqualTo`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsLessThanOrEqualTo><PropertyName>POPULATION</PropertyName>
-  <Literal>499</Literal></PropertyIsLessThanOrEqualTo></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsLessThanOrEqualTo><PropertyName>POPULATION</PropertyName>
+    <Literal>499</Literal></PropertyIsLessThanOrEqualTo></Filter>
 
 - `PropertyIsGreaterThanOrEqualTo`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsGreaterThanOrEqualTo><PropertyName>POPULATION</PropertyName>
-  <Literal>10194978</Literal></PropertyIsGreaterThanOrEqualTo></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsGreaterThanOrEqualTo><PropertyName>POPULATION</PropertyName>
+    <Literal>10194978</Literal></PropertyIsGreaterThanOrEqualTo></Filter>
 
 - `PropertyIsBetween`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsBetween><PropertyName>POPULATION</PropertyName>
-  <LowerBoundary>10194978</LowerBoundary><UpperBoundary>12116379</UpperBoundary></PropertyIsBetween></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsBetween><PropertyName>POPULATION</PropertyName>
+    <LowerBoundary>10194978</LowerBoundary>
+    <UpperBoundary>12116379</UpperBoundary></PropertyIsBetween></Filter>
 
 - `PropertyIsLike`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><PropertyIsLike wildcard='*' singleChar='.' escape='!'>
-  <PropertyName>NAME</PropertyName><Literal>Syd*</Literal></PropertyIsLike></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <PropertyIsLike wildcard='*' singleChar='.' escape='!'>
+    <PropertyName>NAME</PropertyName><Literal>Syd*</Literal></PropertyIsLike>
+    </Filter>
 
 - `Logical operator OR`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><OR><PropertyIsEqualTo><PropertyName>NAME</PropertyName>
-  <Literal>Sydney</Literal></PropertyIsEqualTo><PropertyIsEqualTo><PropertyName>NAME</PropertyName>
-  <Literal>Halifax</Literal></PropertyIsEqualTo></OR></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <OR><PropertyIsEqualTo><PropertyName>NAME</PropertyName>
+    <Literal>Sydney</Literal></PropertyIsEqualTo><PropertyIsEqualTo>
+    <PropertyName>NAME</PropertyName><Literal>Halifax</Literal>
+    </PropertyIsEqualTo></OR></Filter>
 
 - `Logical operator AND`_ 
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><AND><PropertyIsLike wildcard='*' singleChar='.' escape='!'>
-  <PropertyName>NAME</PropertyName><Literal>Syd*</Literal></PropertyIsLike><PropertyIsEqualTo>
-  <PropertyName>POPULATION</PropertyName><Literal>4250065</Literal></PropertyIsEqualTo></AND></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <AND><PropertyIsLike wildcard='*' singleChar='.' escape='!'>
+    <PropertyName>NAME</PropertyName><Literal>Syd*</Literal></PropertyIsLike>
+    <PropertyIsEqualTo><PropertyName>POPULATION</PropertyName>
+    <Literal>4250065</Literal></PropertyIsEqualTo></AND></Filter>
 
 - `Logical operator NOT`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&
-  TYPENAME=cities&Filter=<Filter><AND><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName>
-  <Literal>0</Literal></PropertyIsEqualTo></NOT><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName>
-  <Literal>12116379</Literal></PropertyIsEqualTo></NOT></AND></Filter> 
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <AND><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName>
+    <Literal>0</Literal></PropertyIsEqualTo></NOT><NOT><PropertyIsEqualTo>
+    <PropertyName>POPULATION</PropertyName><Literal>12116379</Literal>
+    </PropertyIsEqualTo></NOT></AND></Filter> 
 
 - `Spatial operator BBOX`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&
-  Filter=<Filter><BBOX><PropertyName>Name>NAME</PropertyName><Box%20srsName='EPSG:42304'>
-  <coordinates>135.2239,34.4879 135.8578,34.8471</coordinates></Box></BBOX></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <BBOX><PropertyName>Name>NAME</PropertyName><Box%20srsName='EPSG:42304'>
+    <coordinates>135.2239,34.4879 135.8578,34.8471</coordinates></Box></BBOX>
+    </Filter>
 
 - `Spatial operator Dwithin`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=
-  <Filter><DWithin><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>135.500000,34.666667</gml:coordinates>
-  </gml:Point><Distance units='m'>10000</Distance></DWithin></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <DWithin><PropertyName>Geometry</PropertyName><gml:Point>
+    <gml:coordinates>135.500000,34.666667</gml:coordinates>
+    </gml:Point><Distance units='m'>10000</Distance></DWithin></Filter>
 
 - `Spatial operator Intersects`_
 
 ::
 
-  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
-  <Intersect><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing>
-  <gml:coordinates>135.5329,34.6624 135.4921,34.8153 135.3673,34.7815 135.3800,34.6216 135.5361,34.6210 135.5329,34.6624</gml:coordinates>
-  </gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersect></Filter>
+  http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS
+    &REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter>
+    <Intersects><PropertyName>Geometry</PropertyName>
+    <gml:Polygon><gml:outerBoundaryIs><gml:LinearRing>
+    <gml:coordinates>135.5329,34.6624 135.4921,34.8153 135.3673,34.7815
+    135.3800,34.6216 135.5361,34.6210 135.5329,34.6624</gml:coordinates>
+    </gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersects></Filter>
 
 .. _`PropertyIsEqualTo`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><PropertyIsEqualTo><PropertyName>NAME</PropertyName><Literal>Halifax</Literal></PropertyIsEqualTo></Filter>
 .. _`PropertyIsNotEqualTo`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><PropertyIsNotEqualTo><PropertyName>NAME</PropertyName><Literal>Halifax</Literal></PropertyIsNotEqualTo></Filter>
@@ -437,7 +473,7 @@
 .. _`Logical operator NOT`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><AND><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName><Literal>0</Literal></PropertyIsEqualTo></NOT><NOT><PropertyIsEqualTo><PropertyName>POPULATION</PropertyName><Literal>12116379</Literal></PropertyIsEqualTo></NOT></AND></Filter> 
 .. _`Spatial operator BBOX`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><BBOX><PropertyName>Name>NAME</PropertyName><Box%20srsName='EPSG:4326'><coordinates>135.2239,34.4879%20135.8578,34.8471</coordinates></Box></BBOX></Filter>
 .. _`Spatial operator Dwithin`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><DWithin><PropertyName>Geometry</PropertyName><gml:Point><gml:coordinates>135.500000,34.666667</gml:coordinates></gml:Point><Distance%20units='m'>10000</Distance></DWithin></Filter>
-.. _`Spatial operator Intersects`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><Intersect><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>135.5329,34.6624%20135.4921,34.8153%20135.3673,34.7815%20135.3800,34.6216%20135.5361,34.6210%20135.5329,34.6624</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersect></Filter>
+.. _`Spatial operator Intersects`: http://demo.mapserver.org/cgi-bin/wfs?&VERSION=1.0.0&SERVICE=WFS&REQUEST=GetFeature&TYPENAME=cities&Filter=<Filter><Intersects><PropertyName>Geometry</PropertyName><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>135.5329,34.6624%20135.4921,34.8153%20135.3673,34.7815%20135.3800,34.6216%20135.5361,34.6210%20135.5329,34.6624</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></Intersects></Filter>
    
 .. index::
    triple: WFS; Filter encoding; OGC conformance tests



More information about the mapserver-commits mailing list