[mapserver-commits] r9505 - in trunk/docs/en: mapfile mapscript mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2009-10-23 09:04:01 -0400 (Fri, 23 Oct 2009)
New Revision: 9505

Modified:
   trunk/docs/en/mapfile/layer.txt
   trunk/docs/en/mapfile/map.txt
   trunk/docs/en/mapfile/scalebar.txt
   trunk/docs/en/mapscript/mapscript.txt
   trunk/docs/en/mapscript/php/index.txt
   trunk/docs/en/mapscript/variables.txt
Log:
Updated doc for nauticalmiles unit (#3173)

Modified: trunk/docs/en/mapfile/layer.txt
===================================================================
--- trunk/docs/en/mapfile/layer.txt	2009-10-23 12:48:13 UTC (rev 9504)
+++ trunk/docs/en/mapfile/layer.txt	2009-10-23 13:04:01 UTC (rev 9505)
@@ -411,9 +411,9 @@
 REQUIRES [expression]
     Sets context for displaying this layer (see LABELREQUIRES_).
 
-SIZEUNITS [pixels|feet|inches|kilometers|meters|miles|
+SIZEUNITS [pixels|feet|inches|kilometers|meters|miles|nauticalmiles]
     Sets the unit of :ref:`CLASS` object SIZE values (default is pixels). 
-    Useful for simulating buffering.
+    Useful for simulating buffering. `Nauticalmiles` was added in MapServer 5.6.
 
 .. _STATUS:
 
@@ -500,8 +500,9 @@
     restrict polygon searches so that the point must occur in the polygon 
     set the tolerance to zero.
 
-TOLERANCEUNITS [pixels|feet|inches|kilometers|meters|miles|dd]
-    Units of the TOLERANCE value. Default is pixels.
+TOLERANCEUNITS [pixels|feet|inches|kilometers|meters|miles|nauticalmiles|dd]
+    Units of the TOLERANCE value. Default is pixels. 
+    `Nauticalmiles` was added in MapServer 5.6.
 
 TRANSPARENCY [integer|alpha] - deprecated
     Since MapServer 5.0 the proper parameter to use is OPACITY.  The
@@ -589,6 +590,6 @@
         For CHART layers, see the :ref:`Dynamic Charting<dynamic_charting>`
         HowTo.
 
-UNITS [feet|inches|kilometers|meters|miles|dd|pixels|percentages]
+UNITS [feet|inches|kilometers|meters|miles|nauticalmiles|dd|pixels|percentages]
     Units of the layer. `Percentages` was added in MapServer 4.10 and is mostly
-    geared for inline features.
+    geared for inline features. `Nauticalmiles` was added in MapServer 5.6.

Modified: trunk/docs/en/mapfile/map.txt
===================================================================
--- trunk/docs/en/mapfile/map.txt	2009-10-23 12:48:13 UTC (rev 9504)
+++ trunk/docs/en/mapfile/map.txt	2009-10-23 13:04:01 UTC (rev 9505)
@@ -303,8 +303,9 @@
     
     .. deprecated:: 4.6
 
-UNITS [feet|inches|kilometers|meters|miles|dd]
+UNITS [feet|inches|kilometers|meters|miles|nauticalmiles|dd]
     Units of the map coordinates. Used for scalebar and scale computations.
+    `Nauticalmiles` was added in MapServer 5.6.
 
 :ref:`WEB`
     Signals the start of a :ref:`WEB` object.

Modified: trunk/docs/en/mapfile/scalebar.txt
===================================================================
--- trunk/docs/en/mapfile/scalebar.txt	2009-10-23 12:48:13 UTC (rev 9504)
+++ trunk/docs/en/mapfile/scalebar.txt	2009-10-23 13:04:01 UTC (rev 9505)
@@ -67,7 +67,7 @@
     
     .. deprecated:: 4.6
 
-UNITS [feet|inches|kilometers|meters|miles]
+UNITS [feet|inches|kilometers|meters|miles|nauticalmiles]
     Output scalebar units, default is miles. Used in conjunction with the 
     map's units to develop the actual graphic. Note that decimal degrees 
-    are not valid scalebar units.
\ No newline at end of file
+    are not valid scalebar units. `Nauticalmiles` was added in MapServer 5.6.

Modified: trunk/docs/en/mapscript/mapscript.txt
===================================================================
--- trunk/docs/en/mapscript/mapscript.txt	2009-10-23 12:48:13 UTC (rev 9504)
+++ trunk/docs/en/mapscript/mapscript.txt	2009-10-23 13:04:01 UTC (rev 9505)
@@ -903,7 +903,7 @@
     Logical expression.
     
 sizeunits : int
-    Units of class size values. MS_INCHES, MS_FEET, MS_MILES, MS_METERS, MS_KILOMETERS, MS_DD or MS_PIXELS
+    Units of class size values. MS_INCHES, MS_FEET, MS_MILES, MS_NAUTICALMILES, MS_METERS, MS_KILOMETERS, MS_DD or MS_PIXELS
 
 status : int
     MS_ON, MS_OFF, or MS_DEFAULT.
@@ -928,7 +928,7 @@
     Search buffer for point and line queries.
 
 toleranceunits : int
-    MS_INCHES, MS_FEET, MS_MILES, MS_METERS, MS_KILOMETERS, MS_DD or MS_PIXELS
+    MS_INCHES, MS_FEET, MS_MILES, MS_NAUTICALMILES, MS_METERS, MS_KILOMETERS, MS_DD or MS_PIXELS
 
 transform : int
     Whether or not layer data is to be transformed to image units.  

Modified: trunk/docs/en/mapscript/php/index.txt
===================================================================
--- trunk/docs/en/mapscript/php/index.txt	2009-10-23 12:48:13 UTC (rev 9504)
+++ trunk/docs/en/mapscript/php/index.txt	2009-10-23 13:04:01 UTC (rev 9505)
@@ -65,7 +65,7 @@
 
 Map units
     MS_INCHES, MS_FEET, MS_MILES, MS_METERS, 
-    MS_KILOMETERS, MS_DD, MS_PIXELS
+    MS_KILOMETERS, MS_DD, MS_PIXELS, MS_NAUTICALMILES
 
 Layer types
     MS_LAYER_POINT, MS_LAYER_LINE, MS_LAYER_POLYGON, 

Modified: trunk/docs/en/mapscript/variables.txt
===================================================================
--- trunk/docs/en/mapscript/variables.txt	2009-10-23 12:48:13 UTC (rev 9504)
+++ trunk/docs/en/mapscript/variables.txt	2009-10-23 13:04:01 UTC (rev 9505)
@@ -61,6 +61,7 @@
    MS_INCHES           integer                
    MS_METERS           integer                
    MS_MILES            integer                
+   MS_NAUTICALMILES    integer                
    MS_PIXELS           integer                
 =====================  ============  ===========