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

svn at osgeo.org svn at osgeo.org
Mon Sep 19 17:54:31 EDT 2011


Author: havatv
Date: 2011-09-19 14:54:31 -0700 (Mon, 19 Sep 2011)
New Revision: 12558

Modified:
   branches/branch-6-0/docs/en/ogc/filter_encoding.txt
   trunk/docs/en/ogc/filter_encoding.txt
Log:
Added a section on supported units of measure to the wfs filter_encoding documentation (#3488).  Also added some index entries (#4001).

Modified: branches/branch-6-0/docs/en/ogc/filter_encoding.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/filter_encoding.txt	2011-09-19 21:18:10 UTC (rev 12557)
+++ branches/branch-6-0/docs/en/ogc/filter_encoding.txt	2011-09-19 21:54:31 UTC (rev 12558)
@@ -46,6 +46,9 @@
 .. _`Open GIS Consortium (OGC) home page`: http://www.opengeospatial.org
 .. _`MapServer OGC Web Services Workshop`: http://ms-ogc-workshop.maptools.org/
 
+.. index::
+   triple: WFS; Filter encoding; Supported features
+
 Currently Supported Features
 ============================
 
@@ -109,6 +112,32 @@
 |                      | PropertyIsBetween (range)           |
 +----------------------+-------------------------------------+
 
+.. index::
+   triple: WFS; Filter encoding; Units of measure
+
+Units of measure
+----------------
+
+The following units of measure are supported:
+
++---------------------------+--------------------------+
+|m or meters                | meters                   |
++---------------------------+--------------------------+
+|km or kilometers           | kilometers               |
++---------------------------+--------------------------+
+|NM                         | nauticalmiles            |
++---------------------------+--------------------------+
+|mi or miles                | miles                    |
++---------------------------+--------------------------+
+|in or inches               | inches                   |
++---------------------------+--------------------------+
+|ft or feet                 | feet                     |
++---------------------------+--------------------------+
+|deg or dd                  | degree                   |
++---------------------------+--------------------------+
+|px                         | pixels                   |
++---------------------------+--------------------------+
+
 Get and Post Requests
 =====================
 
@@ -266,6 +295,9 @@
 
 - The returned shapes will be drawn using the class defined in the layer.
 
+.. index::
+   triple: WFS; Filter encoding; Limitations
+
 Limitations
 ===========
 
@@ -408,6 +440,9 @@
 .. _`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>
    
+.. index::
+   triple: WFS; Filter encoding; OGC conformance tests
+
 - The OGC conformance tests (http://cite.opengeospatial.org/test_engine) have been run on 
   the FE support. The following table and notes reflect the current status.
 

Modified: trunk/docs/en/ogc/filter_encoding.txt
===================================================================
--- trunk/docs/en/ogc/filter_encoding.txt	2011-09-19 21:18:10 UTC (rev 12557)
+++ trunk/docs/en/ogc/filter_encoding.txt	2011-09-19 21:54:31 UTC (rev 12558)
@@ -46,6 +46,9 @@
 .. _`Open GIS Consortium (OGC) home page`: http://www.opengeospatial.org
 .. _`MapServer OGC Web Services Workshop`: http://ms-ogc-workshop.maptools.org/
 
+.. index::
+   triple: WFS; Filter encoding; Supported features
+
 Currently Supported Features
 ============================
 
@@ -109,6 +112,32 @@
 |                      | PropertyIsBetween (range)           |
 +----------------------+-------------------------------------+
 
+.. index::
+   triple: WFS; Filter encoding; Units of measure
+
+Units of measure
+----------------
+
+The following units of measure are supported:
+
++---------------------------+--------------------------+
+|m or meters                | meters                   |
++---------------------------+--------------------------+
+|km or kilometers           | kilometers               |
++---------------------------+--------------------------+
+|NM                         | nauticalmiles            |
++---------------------------+--------------------------+
+|mi or miles                | miles                    |
++---------------------------+--------------------------+
+|in or inches               | inches                   |
++---------------------------+--------------------------+
+|ft or feet                 | feet                     |
++---------------------------+--------------------------+
+|deg or dd                  | degree                   |
++---------------------------+--------------------------+
+|px                         | pixels                   |
++---------------------------+--------------------------+
+
 Get and Post Requests
 =====================
 
@@ -266,6 +295,9 @@
 
 - The returned shapes will be drawn using the class defined in the layer.
 
+.. index::
+   triple: WFS; Filter encoding; Limitations
+
 Limitations
 ===========
 
@@ -408,6 +440,9 @@
 .. _`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>
    
+.. index::
+   triple: WFS; Filter encoding; OGC conformance tests
+
 - The OGC conformance tests (http://cite.opengeospatial.org/test_engine) have been run on 
   the FE support. The following table and notes reflect the current status.
 



More information about the mapserver-commits mailing list