[mapserver-commits] r12817 - branches/branch-6-0/docs/en/mapfile trunk/docs/en/mapfile

svn at osgeo.org svn at osgeo.org
Mon Nov 28 05:17:32 EST 2011


Author: havatv
Date: 2011-11-28 02:17:32 -0800 (Mon, 28 Nov 2011)
New Revision: 12817

Modified:
   branches/branch-6-0/docs/en/mapfile/layer.txt
   trunk/docs/en/mapfile/layer.txt
Log:
Updated the layer styleitem text to include auto for union layers (#3674).  Also did some styling, fixed some too long lines, added a new index entry (auto), and moved links to the bottom.

Modified: branches/branch-6-0/docs/en/mapfile/layer.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/layer.txt	2011-11-28 10:02:03 UTC (rev 12816)
+++ branches/branch-6-0/docs/en/mapfile/layer.txt	2011-11-28 10:17:32 UTC (rev 12817)
@@ -451,11 +451,12 @@
    pair: LAYER; NAME
     
 NAME [string]
-    Short name for this layer. This name is the link between the mapfile and web 
-    interfaces that refer to this name. They must be identical. The name should 
-    be unique, unless one layer replaces another at different scales. Use the 
-    GROUP option to associate layers with each other.  It is recommended that
-    the name not contain spaces, special characters, or begin with a number (which
+    Short name for this layer. This name is the link between the
+    mapfile and web interfaces that refer to this name. They must be
+    identical. The name should be unique, unless one layer replaces
+    another at different scales. Use the GROUP option to associate
+    layers with each other.  It is recommended that the name not
+    contain spaces, special characters, or begin with a number (which
     could cause problems through interfaces such as OGC services).
 
 .. index::
@@ -627,7 +628,7 @@
 .. index::
    pair: LAYER; STYLEITEM
     
-STYLEITEM [attribute]
+STYLEITEM [<attribute>|auto]
     Item to use for feature specific styling. The style information may be 
     represented by a separate attribute (style string) attached to the feature.
     MapServer supports the following style string representations:
@@ -643,23 +644,28 @@
       instead of a single style allows to use further options (like setting 
       expressions, label attributes, multiple styles) on a per feature basis.
 
-    - **OGR Style String** - MapServer support rendering the OGR style string 
-      format according to the `OGR - Feature Style Specification`_ documentation.
-      Currently only a few data sources support storing the styles along with the 
-      features (like MapInfo, AutoCAD DXF, Microstation DGN), however those styles 
-      can easily be transferred to many other data sources as a separate attribute 
-      by using the `ogr2ogr`_ command line tool as follows:
+    - **OGR Style String** - MapServer support rendering the OGR style
+      string format according to the `OGR - Feature Style
+      Specification`_ documentation.  Currently only a few data
+      sources support storing the styles along with the features (like
+      MapInfo, AutoCAD DXF, Microstation DGN), however those styles
+      can easily be transferred to many other data sources as a
+      separate attribute by using the `ogr2ogr`_ command line tool as
+      follows::
 
-      .. code-block:: mapfile
-
           ogr2ogr -sql "select *, OGR_STYLE from srclayer" "dstlayer" "srclayer"      
       
-.. _`OGR - Feature Style Specification`: http://www.gdal.org/ogr/ogr_feature_style.html
-.. _`ogr2ogr`: http://www.gdal.org/ogr2ogr.html
-             
-    We can specify the value: "AUTO" in order to have the driver to retrieve the 
-    style information. Currently only the OGR driver supports the "AUTO" setting,  
+    .. index::
+       triple: LAYER; STYLEITEM; AUTO
+    
+    The value: `AUTO` can be used for automatic styling.
 
+    - Automatic styling can be provided by the driver. Currently, only
+      the OGR driver supports automatic styling.
+
+    - When used for a :ref:`union`, the styles from the source layers
+      will be used.
+
 .. index::
    pair: LAYER; SYMBOLSCALEDENOM
     
@@ -855,3 +861,6 @@
     As of MapServer 5.4.0, `VALIDATION` blocks are the preferred
     mechanism for specifying validation patterns for CGI param runtime
     substitutions.  See :ref:`RUNSUB`.
+
+.. _`OGR - Feature Style Specification`: http://www.gdal.org/ogr/ogr_feature_style.html
+.. _`ogr2ogr`: http://www.gdal.org/ogr2ogr.html

Modified: trunk/docs/en/mapfile/layer.txt
===================================================================
--- trunk/docs/en/mapfile/layer.txt	2011-11-28 10:02:03 UTC (rev 12816)
+++ trunk/docs/en/mapfile/layer.txt	2011-11-28 10:17:32 UTC (rev 12817)
@@ -451,11 +451,12 @@
    pair: LAYER; NAME
     
 NAME [string]
-    Short name for this layer. This name is the link between the mapfile and web 
-    interfaces that refer to this name. They must be identical. The name should 
-    be unique, unless one layer replaces another at different scales. Use the 
-    GROUP option to associate layers with each other.  It is recommended that
-    the name not contain spaces, special characters, or begin with a number (which
+    Short name for this layer. This name is the link between the
+    mapfile and web interfaces that refer to this name. They must be
+    identical. The name should be unique, unless one layer replaces
+    another at different scales. Use the GROUP option to associate
+    layers with each other.  It is recommended that the name not
+    contain spaces, special characters, or begin with a number (which
     could cause problems through interfaces such as OGC services).
 
 .. index::
@@ -627,7 +628,7 @@
 .. index::
    pair: LAYER; STYLEITEM
     
-STYLEITEM [attribute]
+STYLEITEM [<attribute>|auto]
     Item to use for feature specific styling. The style information may be 
     represented by a separate attribute (style string) attached to the feature.
     MapServer supports the following style string representations:
@@ -643,23 +644,28 @@
       instead of a single style allows to use further options (like setting 
       expressions, label attributes, multiple styles) on a per feature basis.
 
-    - **OGR Style String** - MapServer support rendering the OGR style string 
-      format according to the `OGR - Feature Style Specification`_ documentation.
-      Currently only a few data sources support storing the styles along with the 
-      features (like MapInfo, AutoCAD DXF, Microstation DGN), however those styles 
-      can easily be transferred to many other data sources as a separate attribute 
-      by using the `ogr2ogr`_ command line tool as follows:
+    - **OGR Style String** - MapServer support rendering the OGR style
+      string format according to the `OGR - Feature Style
+      Specification`_ documentation.  Currently only a few data
+      sources support storing the styles along with the features (like
+      MapInfo, AutoCAD DXF, Microstation DGN), however those styles
+      can easily be transferred to many other data sources as a
+      separate attribute by using the `ogr2ogr`_ command line tool as
+      follows::
 
-      .. code-block:: mapfile
-
           ogr2ogr -sql "select *, OGR_STYLE from srclayer" "dstlayer" "srclayer"      
       
-.. _`OGR - Feature Style Specification`: http://www.gdal.org/ogr/ogr_feature_style.html
-.. _`ogr2ogr`: http://www.gdal.org/ogr2ogr.html
-             
-    We can specify the value: "AUTO" in order to have the driver to retrieve the 
-    style information. Currently only the OGR driver supports the "AUTO" setting,  
+    .. index::
+       triple: LAYER; STYLEITEM; AUTO
+    
+    The value: `AUTO` can be used for automatic styling.
 
+    - Automatic styling can be provided by the driver. Currently, only
+      the OGR driver supports automatic styling.
+
+    - When used for a :ref:`union`, the styles from the source layers
+      will be used.
+
 .. index::
    pair: LAYER; SYMBOLSCALEDENOM
     
@@ -855,3 +861,6 @@
     As of MapServer 5.4.0, `VALIDATION` blocks are the preferred
     mechanism for specifying validation patterns for CGI param runtime
     substitutions.  See :ref:`RUNSUB`.
+
+.. _`OGR - Feature Style Specification`: http://www.gdal.org/ogr/ogr_feature_style.html
+.. _`ogr2ogr`: http://www.gdal.org/ogr2ogr.html



More information about the mapserver-commits mailing list