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

[svn at osgeo.org]

Author: havatv
Date: 2011-10-31 15:03:18 -0700 (Mon, 31 Oct 2011)
New Revision: 12729

Modified:
   branches/branch-6-0/docs/en/mapfile/style.txt
   trunk/docs/en/mapfile/style.txt
Log:
Added the URL option to style (#3662) - and fixed and reorganised a bit.

Modified: branches/branch-6-0/docs/en/mapfile/style.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/style.txt	2011-10-31 14:41:56 UTC (rev 12728)
+++ branches/branch-6-0/docs/en/mapfile/style.txt	2011-10-31 22:03:18 UTC (rev 12729)
@@ -373,25 +373,51 @@
 .. index::
    pair: STYLE; SYMBOL
 
-SYMBOL [integer|string|filename|attribute]
-    The symbol name or number to use for all features if attribute
-    tables are not used. The number is the index of the symbol in the
-    symbol file, starting at 1, the 5th symbol in the file is
-    therefore symbol number 5.  You can also give your symbols names
-    using the `NAME` keyword in the symbol definition file, and use
-    those to refer to them. Default is 0, which results in a single
-    pixel, single width line, or solid polygon fill, depending on
-    layer type.
+SYMBOL [integer|string|filename|url|attribute]
+    The symbol to use for rendering the features.
 
-    You can also specify a GIF or PNG filename. The path is relative
-    to the location of the mapfile.
+    - Integer is the index of the symbol in the symbol set, starting
+      at 1 (the 5th symbol is symbol number 5).
 
-    [*attribute*] was introduced in version 5.6, to use an attribute
-    to specify the symbol name.  The hard brackets [] are required.
+    - String is the name of the symbol (as defined using the
+      :ref:`symbol` `NAME` parameter).
 
-.. index::
-   pair: STYLE; WIDTH
+    - Filename specifies the path to a file containing a symbol.  For
+      example a PNG file.  Specify the path relative to the directory
+      containing the mapfile.
 
+    - URL specifies the address of a file containing a pixmap symbol.
+      For example a PNG file.  A URL must start with "http"::
+
+        SYMBOL "http://myserver.org/path/to/file.png"
+
+      .. versionadded:: 6.0
+
+    - [attribute] allows individual rendering of features by using an
+      attribute in the dataset that specifies the symbol name (as
+      defined in the :ref:`symbol` `NAME` parameter).  The hard
+      brackets [] are required.
+
+      .. versionadded:: 5.6
+
+    If `SYMBOL` is not specified, the behaviour depends on the type of
+    feature.
+
+    - For points, nothing will be rendered.
+
+    - For lines, `SYMBOL` is only relevant if you want to style the
+      lines using symbols, so the absence of `SYMBOL` means that you
+      will get lines as specified using the relevant line rendering
+      parameters (`COLOR`, `WIDTH`, `PATTERN`, `LINECAP`, ...).
+
+    - For polygons, the interior of the polygons will be rendered
+      using a solid fill of the color specified in the `COLOR`
+      parameter.
+
+    .. seealso::
+
+       :ref:`symbol`
+
 WIDTH [double|attribute]
     `WIDTH` refers to the thickness of line work drawn, in layer
     `SIZEUNITS`.  Default is 1.0.

Modified: trunk/docs/en/mapfile/style.txt
===================================================================
--- trunk/docs/en/mapfile/style.txt	2011-10-31 14:41:56 UTC (rev 12728)
+++ trunk/docs/en/mapfile/style.txt	2011-10-31 22:03:18 UTC (rev 12729)
@@ -427,22 +427,51 @@
 .. index::
    pair: STYLE; SYMBOL
 
-SYMBOL [integer|string|filename|attribute]
-    The symbol name or number to use for all features if attribute
-    tables are not used. The number is the index of the symbol in the
-    symbol file, starting at 1, the 5th symbol in the file is
-    therefore symbol number 5.  You can also give your symbols names
-    using the `NAME` keyword in the symbol definition file, and use
-    those to refer to them. Default is 0, which results in a single
-    pixel, single width line, or solid polygon fill, depending on
-    layer type.
+SYMBOL [integer|string|filename|url|attribute]
+    The symbol to use for rendering the features.
 
-    You can also specify a GIF or PNG filename. The path is relative
-    to the location of the mapfile.
+    - Integer is the index of the symbol in the symbol set, starting
+      at 1 (the 5th symbol is symbol number 5).
 
-    [*attribute*] was introduced in version 5.6, to use an attribute
-    to specify the symbol name.  The hard brackets [] are required.
+    - String is the name of the symbol (as defined using the
+      :ref:`symbol` `NAME` parameter).
 
+    - Filename specifies the path to a file containing a symbol.  For
+      example a PNG file.  Specify the path relative to the directory
+      containing the mapfile.
+
+    - URL specifies the address of a file containing a pixmap symbol.
+      For example a PNG file.  A URL must start with "http"::
+
+        SYMBOL "http://myserver.org/path/to/file.png"
+
+      .. versionadded:: 6.0
+
+    - [attribute] allows individual rendering of features by using an
+      attribute in the dataset that specifies the symbol name (as
+      defined in the :ref:`symbol` `NAME` parameter).  The hard
+      brackets [] are required.
+
+      .. versionadded:: 5.6
+
+    If `SYMBOL` is not specified, the behaviour depends on the type of
+    feature.
+
+    - For points, nothing will be rendered.
+
+    - For lines, `SYMBOL` is only relevant if you want to style the
+      lines using symbols, so the absence of `SYMBOL` means that you
+      will get lines as specified using the relevant line rendering
+      parameters (`COLOR`, `WIDTH`, `PATTERN`, `LINECAP`, ...).
+
+    - For polygons, the interior of the polygons will be rendered
+      using a solid fill of the color specified in the `COLOR`
+      parameter.
+
+    .. seealso::
+
+       :ref:`symbol`
+
 .. index::
    pair: STYLE; WIDTH