[mapserver-commits] r8163 - in trunk/docs: . images mapfile
mapfile/symbology ogc
svn at osgeo.org
svn at osgeo.org
Mon Dec 1 12:08:32 EST 2008
Author: hobu
Date: 2008-12-01 12:08:32 -0500 (Mon, 01 Dec 2008)
New Revision: 8163
Added:
trunk/docs/images/mapserver.jpg
Modified:
trunk/docs/conf.py
trunk/docs/mapfile/index.txt
trunk/docs/mapfile/legend.txt
trunk/docs/mapfile/symbology/construction.txt
trunk/docs/ogc/wcs_server.txt
Log:
tweaks for pdf
Modified: trunk/docs/conf.py
===================================================================
--- trunk/docs/conf.py 2008-12-01 16:19:27 UTC (rev 8162)
+++ trunk/docs/conf.py 2008-12-01 17:08:32 UTC (rev 8163)
@@ -171,11 +171,11 @@
# The name of an image file (relative to this directory) to place at the top of
# the title page.
-#latex_logo = None
+latex_logo = './images/mapserver.jpg'
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
-#latex_use_parts = False
+latex_use_parts = True
# Additional stuff for the LaTeX preamble.
#latex_preamble = ''
Copied: trunk/docs/images/mapserver.jpg (from rev 8160, trunk/docs/_static/mapserver.jpg)
===================================================================
(Binary files differ)
Modified: trunk/docs/mapfile/index.txt
===================================================================
--- trunk/docs/mapfile/index.txt 2008-12-01 16:19:27 UTC (rev 8162)
+++ trunk/docs/mapfile/index.txt 2008-12-01 17:08:32 UTC (rev 8163)
@@ -153,6 +153,32 @@
* :ref:`WEB` defines how a web interface rendered with MapServer will operate.
+.. toctree::
+ :maxdepth: 1
+
+ class
+ expressions
+ feature
+ fontset
+ Include
+ join
+ label
+ layer
+ legend
+ map
+ outputformat
+ projection
+ querymap
+ reference
+ scalebar
+ style
+ symbol
+ symbology/construction
+ symbology/examples
+ template
+ variable_sub
+ web
+
Notes
-----------------------------------------------------------------------------
Modified: trunk/docs/mapfile/legend.txt
===================================================================
--- trunk/docs/mapfile/legend.txt 2008-12-01 16:19:27 UTC (rev 8162)
+++ trunk/docs/mapfile/legend.txt 2008-12-01 17:08:32 UTC (rev 8163)
@@ -40,10 +40,8 @@
Is the legend image to be created.
TEMPLATE [filename]
- HTML legend template file. Refer to the `HTML Legend howto`_.
+ HTML legend template file. Refer to the :ref:`<html_legend>`.
-.. _`HTML Legend howto`: ../output/html_legend
-
TRANSPARENT [on|off]
**Deprecated** Should the background color for the legend be transparent.
This flag is now deprecated in favour of declaring transparency within
Modified: trunk/docs/mapfile/symbology/construction.txt
===================================================================
--- trunk/docs/mapfile/symbology/construction.txt 2008-12-01 16:19:27 UTC (rev 8162)
+++ trunk/docs/mapfile/symbology/construction.txt 2008-12-01 17:08:32 UTC (rev 8163)
@@ -292,9 +292,9 @@
| | END |
| | END |
+----------------------------------+---------------------------------+
-| .. image:: ../../images/railway.png |
-+----------------------------------+---------------------------------+
+.. image:: ../../images/railway.png
+
The STYLE parameter can be used for elements of the SYMBOL file with the
TYPE VECTOR, ELLIPSE, CARTOLINE and PIXMAP. It will define the number of
intervals in which the symbol is rendered. This can be done using the GAP
@@ -319,7 +319,7 @@
to the original geometry, for which the selected symbol is used (what a pity
this wasn't documented anywhere!).
-**Table2: Use of the OFFSET parameter with line signatures**
+**Table 2: Use of the OFFSET parameter with line signatures**
+--------------------------------+-------------------------------+--------------------------------+-------------------------------+
| CLASS-section from the Mapfile | Character from the Symbolfile | CLASS-Section from the Mapfile | Character from the Symbolfile |
@@ -341,9 +341,10 @@
| | | END | |
| | | END | |
+--------------------------------+-------------------------------+--------------------------------+-------------------------------+
-| .. image:: ../../images/symbol-offset-1.png | .. image:: ../../images/symbol-offset-1.png |
-| :align: right | :align: right |
-+----------------------------------------------------------------+----------------------------------------------------------------+
+
+.. image:: ../../images/symbol-offset-1.png
+
+.. image:: ../../images/symbol-offset-1.png
Area Symbols
------------
@@ -367,7 +368,7 @@
filled with other POINT elements to obtain special patterns (e.g. with circles
or triangles).
-**Table3: Construction of a cross hatch with different line distances**
+**Table 3: Construction of a cross hatch with different line distances**
+--------------------------------+-------------------------------+
| CLASS-Section from the Mapfile | Character from the Symbolfile |
@@ -391,10 +392,9 @@
| | END |
| | END |
+--------------------------------+-------------------------------+
-| .. image:: ../../images/crosshatch.png |
-| :align: right |
-+----------------------------------------------------------------+
+.. image:: ../../images/crosshatch.png
+
Signatures of TYPE PIXMAP
-------------------------
@@ -459,7 +459,7 @@
CLASS to display raster PIXMAPS although it has no influence on the output
and color of the image.
-**Table4: Construction of a horizontally arranged area symbol**
+**Table 4: Construction of a horizontally arranged area symbol**
+--------------------------------+-------------------------------------------------+
| CLASS-Section from the Mapfile | Character from the Symbolfile |
@@ -477,12 +477,11 @@
| END | :align: left |
| END | |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/horizontal-area-symbol.png |
-| :align: right |
-+----------------------------------------------------------------------------------+
-**Table5: Construction of a diagonally arranged area symbol**
+.. image:: ../../images/horizontal-area-symbol.png
+**Table 5: Construction of a diagonally arranged area symbol**
+
+--------------------------------+-------------------------------------------------+
| CLASS-Section from the Mapfile | Character from the Symbolfile |
+================================+=================================================+
@@ -498,12 +497,11 @@
| |.. image:: ../../images/dot-symbol.png |
| | :align: left |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/diagonal-area-symbol.png |
-| :align: right |
-+----------------------------------------------------------------------------------+
-**Table6: Construction of a face hatch**
+.. image:: ../../images/diagonal-area-symbol.png
+**Table 6: Construction of a face hatch**
+
+--------------------------------+-------------------------------------------------+
| CLASS-Section from the Mapfile | Character from the Symbolfile |
+================================+=================================================+
@@ -520,10 +518,9 @@
| END | :align: left |
| END | |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/hatch-symbol.png |
-| :align: right |
-+----------------------------------------------------------------------------------+
+.. image:: ../../images/hatch-symbol.png
+
Signatures of TYPE CARTOLINE
----------------------------
@@ -628,7 +625,7 @@
right (see table below). In left picture in the table the line is drawn
clockwise and in the right picture drawn counterclockwise.
-**Table7: TrueType-character used on lines**
+**Table 7: TrueType-character used on lines**
+--------------------------------+-------------------------------------------------+
| CLASS-Section from the Mapfile | Character from the Symbolfile |
@@ -645,15 +642,12 @@
| | END |
| | |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/truetype-character-clockwise.png |
-| :align: left |
-| :alt: clockwise |
-| .. image:: ../../images/truetype-character-cc.png |
-| :align: right |
-| :alt: counterclockwise |
-| |
-+----------------------------------------------------------------------------------+
+.. image:: ../../images/truetype-character-clockwise.png
+
+
+.. image:: ../../images/truetype-character-cc.png
+
To find out the character number of a symbol use one of the following options:
- Use the software FontMap (Shareware, with free trial version for download, thanks Till!)
@@ -702,7 +696,7 @@
(e.g. dashed line) on features with many points and nooks. The line pattern
will then often be displayed irregularly (see Table9).
-**Table8: Use of a simple cross on a line**
+**Table 8: Use of a simple cross on a line**
+--------------------------------+-------------------------------------------------+
| CLASS-Section from the Mapfile | Character from the Symbolfile |
@@ -724,11 +718,10 @@
| | END |
| | END |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/cross-fill-example.png |
-| :align: right |
-+----------------------------------------------------------------------------------+
+.. image:: ../../images/cross-fill-example.png
+
**Table9: Irregularities with line patterns**
+--------------------------------+-------------------------------------------------+
@@ -752,10 +745,9 @@
| | FILLED TRUE |
| | END |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/irregular-line-pattern.png |
-| :align: right |
-+----------------------------------------------------------------------------------+
+.. image:: ../../images/irregular-line-pattern.png
+
All symbols in this document were created with MAP files and SYMBOL files, which
can be `downloaded`_. If you want to use this MAP
file please note, that your MapServer must at least be able to handle with 50
Modified: trunk/docs/ogc/wcs_server.txt
===================================================================
--- trunk/docs/ogc/wcs_server.txt 2008-12-01 16:19:27 UTC (rev 8162)
+++ trunk/docs/ogc/wcs_server.txt 2008-12-01 17:08:32 UTC (rev 8163)
@@ -323,13 +323,13 @@
URNs
----
-In WCS 1.1 protcol coordinate systems are referenced by URN. Some typical URNs are::
+In WCS 1.1 protocol coordinate systems are referenced by URN. Some typical URNs are::
urn:ogc:def:crs:EPSG::4326
urn:ogc:def:crs:EPSG:27700
urn:ogc:def:crs:OGC::CRS84
-The first two are roughly equivelent to EPSG:4326, and EPSG:27700 while the third
+The first two are roughly equivalent to EPSG:4326, and EPSG:27700 while the third
is a CRS defined by OGC (essentially WGS84). One critical thing to note is that
WCS 1.1 follows EPSG defined axis/tuple ordering for geographic coordinate systems.
This means that coordinates reported, or provided in urn:ogc:def:EPSG::4326 (WGS84)
More information about the mapserver-commits
mailing list