[mapserver-commits] r11348 - trunk/docs/en/mapfile

[svn at osgeo.org]

Author: havatv
Date: 2011-03-28 07:14:39 -0700 (Mon, 28 Mar 2011)
New Revision: 11348

Modified:
   trunk/docs/en/mapfile/class.txt
   trunk/docs/en/mapfile/layer.txt
   trunk/docs/en/mapfile/web.txt
Log:
Fix scale terminology (#3775)


Modified: trunk/docs/en/mapfile/class.txt
===================================================================
--- trunk/docs/en/mapfile/class.txt	2011-03-28 13:12:55 UTC (rev 11347)
+++ trunk/docs/en/mapfile/class.txt	2011-03-28 14:14:39 UTC (rev 11348)
@@ -112,7 +112,7 @@
     pair: MAXSCALEDENOM; CLASS
     
 MAXSCALEDENOM [double]
-    Maximum scale at which this :ref:`CLASS` is drawn. Scale is given as the
+    Minimum scale at which this :ref:`CLASS` is drawn. Scale is given as the
     denominator of the actual scale fraction, for example for a map at a scale
     of 1:24,000 use 24000. Implemented in MapServer 5.0, to replace the
     deprecated MAXSCALE parameter. 
@@ -123,7 +123,7 @@
 
 MAXSCALE [double] - deprecated
     Since MapServer 5.0 the proper parameter to use is MAXSCALEDENOM instead.
-    The deprecated MAXSCALE is the maximum scale at which this CLASS is drawn.
+    The deprecated MAXSCALE is the minimum scale at which this CLASS is drawn.
     Scale is given as the denominator of the actual scale fraction, for
     example for a map at a scale of 1:24,000 use 24000. 
     
@@ -136,7 +136,7 @@
     pair: MINSCALEDENOM; CLASS
     
 MINSCALEDENOM [double]
-    Minimum scale at which this :ref:`CLASS` is drawn.  Scale is given as the
+    Maximum scale at which this :ref:`CLASS` is drawn.  Scale is given as the
     denominator of the actual scale fraction, for example for a map at a scale
     of 1:24,000 use 24000.  Implemented in MapServer 5.0, to replace the
     deprecated MINSCALE parameter. 
@@ -147,7 +147,7 @@
 
 MINSCALE [double] - deprecated
     Since MapServer 5.0 the proper parameter to use is MINSCALEDENOM instead.
-    The deprecated MINSCALE is the minimum scale at which this CLASS is drawn.
+    The deprecated MINSCALE is the maximum scale at which this CLASS is drawn.
     Scale is given as the denominator of the actual scale fraction, for
     example for a map at a scale of 1:24,000 use 24000. 
 
@@ -213,4 +213,4 @@
 - OVERLAYSIZE
 - OVERLAYMINSIZE
 - OVERLAYMAXSIZE
-- OVERLAYSYMBOL
\ No newline at end of file
+- OVERLAYSYMBOL

Modified: trunk/docs/en/mapfile/layer.txt
===================================================================
--- trunk/docs/en/mapfile/layer.txt	2011-03-28 13:12:55 UTC (rev 11347)
+++ trunk/docs/en/mapfile/layer.txt	2011-03-28 14:14:39 UTC (rev 11348)
@@ -223,7 +223,7 @@
     pair: LABELMAXSCALEDENOM; LAYER
 
 LABELMAXSCALEDENOM [double]
-    Maximum scale at which this LAYER is labeled.  Scale is given as the
+    Minimum scale at which this LAYER is labeled.  Scale is given as the
     denominator of the actual scale fraction, for example for a map at a scale
     of 1:24,000 use 24000.  Implemented in MapServer 5.0, to replace the
     deprecated LABELMAXSCALE parameter.
@@ -234,7 +234,7 @@
 
 LABELMAXSCALE [double] - deprecated
     Since MapServer 5.0 the proper parameter to use is LABELMAXSCALEDENOM
-    instead.  The deprecated LABELMAXSCALE is the maximum scale at which this
+    instead.  The deprecated LABELMAXSCALE is the minimum scale at which this
     LAYER is labeled.  Scale is given as the denominator of the actual scale
     fraction, for example for a map at a scale of 1:24,000 use 24000.
     
@@ -244,7 +244,7 @@
     pair: LABELMINSCALEDENOM; LAYER
 
 LABELMINSCALEDENOM [double]
-    Minimum scale at which this LAYER is labeled.  Scale is given as the
+    Maximum scale at which this LAYER is labeled.  Scale is given as the
     denominator of the actual scale fraction, for example for a map at a scale
     of 1:24,000 use 24000.  Implemented in MapServer 5.0, to replace the
     deprecated LABELMINSCALE parameter.
@@ -255,7 +255,7 @@
 
 LABELMINSCALE [double] - deprecated
     Since MapServer 5.0 the proper parameter to use is LABELMINSCALEDENOM
-    instead.  The deprecated LABELMINSCALE is the minimum scale at which this
+    instead.  The deprecated LABELMINSCALE is the maximum scale at which this
     LAYER is labeled.  Scale is given as the denominator of the actual scale
     fraction, for example for a map at a scale of 1:24,000 use 24000.
 
@@ -303,7 +303,7 @@
       [maxx] - [minx]    
 
 MAXSCALEDENOM [double]
-    Maximum scale at which this LAYER is drawn.  Scale is given as the
+    Minimum scale at which this LAYER is drawn.  Scale is given as the
     denominator of the actual scale fraction, for example for a map at a scale
     of 1:24,000 use 24000.  Implemented in MapServer 5.0, to replace the
     deprecated MAXSCALE parameter.
@@ -314,7 +314,7 @@
 
 MAXSCALE [double] - deprecated
     Since MapServer 5.0 the proper parameter to use is MAXSCALEDENOM instead.
-    The deprecated MAXSCALE is the maximum scale at which this LAYER is drawn.  
+    The deprecated MAXSCALE is the minimum scale at which this LAYER is drawn.  
     Scale is given as the denominator of the actual scale fraction, for example
     for a map at a scale of 1:24,000 use 24000.
 
@@ -349,7 +349,7 @@
       [maxx] - [minx]      
 
 MINSCALEDENOM [double]
-    Minimum scale at which this LAYER is drawn.  Scale is given as the
+    Maximum scale at which this LAYER is drawn.  Scale is given as the
     denominator of the actual scale fraction, for example for a map at a scale
     of 1:24,000 use 24000.  Implemented in MapServer 5.0, to replace the
     deprecated MINSCALE parameter.
@@ -360,7 +360,7 @@
 
 MINSCALE [double] - deprecated
     Since MapServer 5.0 the proper parameter to use is MINSCALEDENOM
-    instead.  The deprecated MINSCALE is the minimum scale at which this LAYER
+    instead.  The deprecated MINSCALE is the maximum scale at which this LAYER
     is drawn.  Scale is given as the denominator of the actual scale fraction,
     for example for a map at a scale of 1:24,000 use 24000.
 

Modified: trunk/docs/en/mapfile/web.txt
===================================================================
--- trunk/docs/en/mapfile/web.txt	2011-03-28 13:12:55 UTC (rev 11347)
+++ trunk/docs/en/mapfile/web.txt	2011-03-28 14:14:39 UTC (rev 11348)
@@ -57,8 +57,8 @@
     pair: MAXSCALEDENOM; WEB
     
 MAXSCALEDENOM [double]
-    Maximum scale at which this interface is valid. When a user requests a map
-    at a bigger scale, MapServer automatically returns the map at this scale.
+    Minimum scale at which this interface is valid. When a user requests a map
+    at a smaller scale, MapServer automatically returns the map at this scale.
     This effectively prevents user from zooming too far out.  Scale is given as
     the denominator of the actual scale fraction, for example for a map at a
     scale of 1:24,000 use 24000.  Implemented in MapServer 5.0, to replace the
@@ -68,8 +68,8 @@
     
 MAXSCALE [double] - deprecated
     Since MapServer 5.0 the proper parameter to use is MAXSCALEDENOM instead.
-    The deprecated MAXSCALE is the maximum scale at which this interface is
-    valid. When a user requests a map at a bigger scale, MapServer automatically
+    The deprecated MAXSCALE is the minimum scale at which this interface is
+    valid. When a user requests a map at a smaller scale, MapServer automatically
     returns the map at this scale. This effectively prevents user from zooming
     too far out.  Scale is given as the denominator of the actual scale
     fraction, for example for a map at a scale of 1:24,000 use 24000.
@@ -79,8 +79,9 @@
         :term:`Map scale`
 
 MAXTEMPLATE [file|url]
-    Template to be used if above the maximum scale for the app, useful 
-    for nesting apps.
+    Template to be used if below the minimum scale for the app (the
+    denominator of the requested scale is larger than MAXSCALEDENOM),
+    useful for nesting apps.
 
 METADATA
     This keyword allows for arbitrary data to be stored as name value pairs. 
@@ -100,8 +101,8 @@
     pair: MINSCALEDENOM; WEB
     
 MINSCALEDENOM [double]
-    Minimum scale at which this interface is valid. When a user reqests a 
-    map at a smaller scale, MapServer automatically returns the map at this 
+    Maximum scale at which this interface is valid. When a user reqests a 
+    map at a larger scale, MapServer automatically returns the map at this 
     scale. This effectively prevents the user from zooming in too far. 
     Scale is given as the denominator of the actual scale fraction, for example
     for a map at a scale of 1:24,000 use 24000.  Implemented in MapServer 5.0, to
@@ -113,8 +114,8 @@
 
 MINSCALE [double] - deprecated
     Since MapServer 5.0 the proper parameter to use is MINSCALEDENOM
-    instead.  The deprecated MINSCALE is the minimum scale at which this
-    interface is valid. When a user reqests a map at a smaller scale, MapServer
+    instead.  The deprecated MINSCALE is the maximum scale at which this
+    interface is valid. When a user reqests a map at a larger scale, MapServer
     automatically returns the map at this scale. This effectively prevents the
     user from zooming in too far.  Scale is given as the denominator of the
     actual scale fraction, for example for a map at a scale of 1:24,000 use
@@ -123,8 +124,9 @@
     .. deprecated:: 5.0
 
 MINTEMPLATE
-    Template to be used if above the minimum scale for the app, useful 
-    for nesting apps.
+    Template to be used if above the maximum scale for the app (the
+    denominator of the requested scale is smaller than MINSCALEDENOM),
+    useful for nesting apps.
     
 QUERYFORMAT [mime-type]
     Format of the query output. *(added to MapServer 4.8.0)*  This works for 
@@ -137,4 +139,4 @@
 
 TEMPLATE [filename|url]
     Template file or URL to use in presenting the results to the user in an 
-    interactive mode (i.e. map generates map and so on ... )
\ No newline at end of file
+    interactive mode (i.e. map generates map and so on ... )