[mapserver-commits] r12604 -
branches/branch-6-0/docs/en/input/vector
branches/branch-6-0/docs/en/mapfile
branches/branch-6-0/docs/en/mapscript
branches/branch-6-0/docs/en/mapscript/php
branches/branch-6-0/docs/en/ogc trunk/docs/en/input/vector
trunk/docs/en/mapfile trunk/docs/en/mapscript
trunk/docs/en/mapscript/php trunk/docs/en/ogc
svn at osgeo.org
svn at osgeo.org
Thu Sep 29 11:46:25 EDT 2011
Author: havatv
Date: 2011-09-29 08:46:24 -0700 (Thu, 29 Sep 2011)
New Revision: 12604
Modified:
branches/branch-6-0/docs/en/input/vector/oracle.txt
branches/branch-6-0/docs/en/mapfile/layer.txt
branches/branch-6-0/docs/en/mapscript/mapscript.txt
branches/branch-6-0/docs/en/mapscript/php/index.txt
branches/branch-6-0/docs/en/ogc/filter_encoding.txt
branches/branch-6-0/docs/en/ogc/wcs_format.txt
branches/branch-6-0/docs/en/ogc/wcs_server.txt
branches/branch-6-0/docs/en/ogc/wfs_server.txt
branches/branch-6-0/docs/en/ogc/wms_server.txt
branches/branch-6-0/docs/en/ogc/wms_time.txt
trunk/docs/en/input/vector/oracle.txt
trunk/docs/en/mapfile/layer.txt
trunk/docs/en/mapscript/mapscript.txt
trunk/docs/en/mapscript/php/index.txt
trunk/docs/en/ogc/filter_encoding.txt
trunk/docs/en/ogc/wcs_format.txt
trunk/docs/en/ogc/wcs_server.txt
trunk/docs/en/ogc/wfs_server.txt
trunk/docs/en/ogc/wms_server.txt
trunk/docs/en/ogc/wms_time.txt
Log:
Updated documentation to reflect the deprecation of the DUMP parameter (#3830).
Modified: branches/branch-6-0/docs/en/input/vector/oracle.txt
===================================================================
--- branches/branch-6-0/docs/en/input/vector/oracle.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/input/vector/oracle.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -308,7 +308,6 @@
CONNECTIONTYPE oraclespatial
CONNECTION "user/pwd"
DATA "GEOMETRIE FROM KWADRANTEN USING SRID 90112"
- DUMP TRUE
CLASS
STYLE
OUTLINECOLOR 0 0 0
@@ -357,4 +356,4 @@
.. _`Oracle Spatial FAQ`: http://www.orafaq.com/faqsdo.htm
-.. _`instant client`: http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
\ No newline at end of file
+.. _`instant client`: http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
Modified: branches/branch-6-0/docs/en/mapfile/layer.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/layer.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/mapfile/layer.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -185,6 +185,10 @@
Switch to allow MapServer to return data in GML format. Useful when
used with WMS GetFeatureInfo operations. "false" by default.
+ .. deprecated:: 6.0 `LAYER` `METADATA` is used instead.
+
+ .. seealso:: :ref:`WMS_SERVER`
+
.. index::
pair: LAYER; EXTENT
Modified: branches/branch-6-0/docs/en/mapscript/mapscript.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/mapscript.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/mapscript/mapscript.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -903,6 +903,8 @@
Switch to allow mapserver to return data in GML format. MS_TRUE or
MS_FALSE. Default is MS_FALSE.
+ .. deprecated:: 6.0 metadata is used instead.
+
extent : rectObj_
optional limiting extent for layer features.
Modified: branches/branch-6-0/docs/en/mapscript/php/index.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/php/index.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/mapscript/php/index.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -808,7 +808,7 @@
int connectiontype read-only, use setConnectionType() to set it
string data
int debug
-int dump
+int dump deprecated since 6.0
string filteritem
string footer
gridObj grid only available on a layer defined as grid (MS_GRATICULE)
Modified: branches/branch-6-0/docs/en/ogc/filter_encoding.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/filter_encoding.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/ogc/filter_encoding.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -265,7 +265,6 @@
"init=epsg:4326"
END
LABELITEM 'NAME'
- DUMP TRUE
CLASS
NAME 'World Cities'
STYLE
Modified: branches/branch-6-0/docs/en/ogc/wcs_format.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/wcs_format.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/ogc/wcs_format.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -50,9 +50,6 @@
EXTENSION "ecw"
END
-The keyword "DUMP" must be set to true to allow the data to download during a
-GetCoverage request.
-
.. code-block:: mapfile
LAYER
@@ -61,7 +58,6 @@
TYPE RASTER
PROCESSING "SCALE=AUTO"
UNITS Meters
- DUMP TRUE
TILEINDEX "MapServer/wcs/landsat7/l7mosaic15m.shp"
TILEITEM "Location"
METADATA
@@ -106,7 +102,6 @@
TYPE RASTER
PROCESSING "SCALE=AUTO"
UNITS Meters
- DUMP TRUE
TILEINDEX "MapServer/wcs/orthospot/spot.shp"
TILEITEM "Location"
METADATA
@@ -127,7 +122,6 @@
- Layer Name = Create a short name for the data
- Layer Type = Raster
- - Layer Dump = True
The following examples further demonstrate how WCS can be implemented and also
how to create WCS containing layers with a temporal dimension (see NetCDF
@@ -151,7 +145,7 @@
EXTENSION "tif"
END
-and in the corresponding layer to specify the keyword "DUMP" to be true
+and the corresponding layer
.. code-block:: mapfile
@@ -159,7 +153,6 @@
NAME "srtm"
STATUS OFF
TYPE RASTER
- DUMP TRUE
DATA "srtm.tif"
PROJECTION
"init=epsg:4326"
@@ -297,7 +290,6 @@
NAME 'TempData'
STATUS OFF
TYPE RASTER
- DUMP TRUE
TILEINDEX 'time_idx'
PROJECTION
"init=epsg:4326"
Modified: branches/branch-6-0/docs/en/ogc/wcs_server.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/wcs_server.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/ogc/wcs_server.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -77,7 +77,6 @@
(e.g GeoTIFF, Erdas Imagine, ...)
- LAYER NAME must be set
- LAYER TYPE is set to RASTER
-- LAYER DUMP parameter set to TRUE
- WEB metadata "wcs_enable_request" must be set
- WEB metadata "wcs_label" must be set
- LAYER metadata "wcs_label" must be set
@@ -156,7 +155,6 @@
PROJECTION
"init=epsg:42304"
END
- DUMP TRUE ### required
END
END # Map File
Modified: branches/branch-6-0/docs/en/ogc/wfs_server.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/wfs_server.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/ogc/wfs_server.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -99,8 +99,6 @@
- LAYER TYPE is one of: LINE, POINT, POLYGON
-- LAYER DUMP parameter set to TRUE
-
- The "wfs_onlineresource" metadata:
The wfs_onlineresource metadata is set in the map's web object
@@ -199,7 +197,6 @@
PROJECTION
"init=epsg:4326"
END
- DUMP TRUE ## REQUIRED
CLASS
NAME 'World Continents'
STYLE
Modified: branches/branch-6-0/docs/en/ogc/wms_server.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/wms_server.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/ogc/wms_server.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -172,7 +172,6 @@
- Layers set to STATUS DEFAULT will always be sent to the client.
- Layers set to STATUS ON or STATUS OFF can be requested by the client.
- Layer TEMPLATE (required for GetFeatureInfo requests - see :ref:`template`)
-- Layer DUMP TRUE (only required for GetFeatureInfo GML requests)
Let's go through each of these parameters in more detail:
@@ -316,12 +315,10 @@
requests of type "text/html" you should also set the layer HEADER
and FOOTER parameters.
- For GetFeatureInfo requests of GML you must set the layer to DUMP
- TRUE in the mapfile. As of MapServer 4.6 you must set the *gml_\**
- metadata for the layer attributes to be served (see the Layer Object
- metadata in the Reference Section later in this document). To
- include geometry, gml_geometries and gml_[name]_type has to be
- specified.
+ As of MapServer 4.6 you must set the *gml_\** metadata for the layer
+ attributes to be served (see the Layer Object metadata in the
+ Reference Section later in this document). To include geometry,
+ gml_geometries and gml_[name]_type has to be specified.
Here are working examples of GetFeatureInfo requests: `text/plain`_
/ `text/html`_ / `gml`_ (for gml, your browser might ask you to save
@@ -982,8 +979,6 @@
call the server with INFO_FORMAT=text/html.
- If not specified, MapServer by default has text/plain and GML implemented.
- - Note that for GML to be returned the layer in the wms-server mapfile must
- be set to DUMP TRUE.
**wms_fees**
Modified: branches/branch-6-0/docs/en/ogc/wms_time.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/wms_time.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ branches/branch-6-0/docs/en/ogc/wms_time.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -243,6 +243,7 @@
"wms_timeextent" "2003-08-01/2006-12-31/PT5M"
"wms_timeitem" "datetime" #column in postgis table of type timestamp
"wms_timedefault" "2006-06-23T03:10:00Z"
+ "wms_enable_request" "*"
END
CONNECTION "dbname=postgis host=10.10.10.20"
CONNECTIONTYPE postgis
@@ -254,7 +255,6 @@
TYPE RASTER
STATUS ON
DEBUG ON
- DUMP TRUE
PROJECTION
"init=epsg:4326"
END
Modified: trunk/docs/en/input/vector/oracle.txt
===================================================================
--- trunk/docs/en/input/vector/oracle.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/input/vector/oracle.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -308,7 +308,6 @@
CONNECTIONTYPE oraclespatial
CONNECTION "user/pwd"
DATA "GEOMETRIE FROM KWADRANTEN USING SRID 90112"
- DUMP TRUE
CLASS
STYLE
OUTLINECOLOR 0 0 0
@@ -357,4 +356,4 @@
.. _`Oracle Spatial FAQ`: http://www.orafaq.com/faqsdo.htm
-.. _`instant client`: http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
\ No newline at end of file
+.. _`instant client`: http://www.oracle.com/technology/software/tech/oci/instantclient/index.html
Modified: trunk/docs/en/mapfile/layer.txt
===================================================================
--- trunk/docs/en/mapfile/layer.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/mapfile/layer.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -185,6 +185,10 @@
Switch to allow MapServer to return data in GML format. Useful when
used with WMS GetFeatureInfo operations. "false" by default.
+ .. deprecated:: 6.0 `LAYER` `METADATA` is used instead.
+
+ .. seealso:: :ref:`WMS_SERVER`
+
.. index::
pair: LAYER; EXTENT
Modified: trunk/docs/en/mapscript/mapscript.txt
===================================================================
--- trunk/docs/en/mapscript/mapscript.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/mapscript/mapscript.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -903,6 +903,8 @@
Switch to allow mapserver to return data in GML format. MS_TRUE or
MS_FALSE. Default is MS_FALSE.
+ .. deprecated:: 6.0 metadata is used instead.
+
extent : rectObj_
optional limiting extent for layer features.
Modified: trunk/docs/en/mapscript/php/index.txt
===================================================================
--- trunk/docs/en/mapscript/php/index.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/mapscript/php/index.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -808,7 +808,7 @@
int connectiontype read-only, use setConnectionType() to set it
string data
int debug
-int dump
+int dump deprecated since 6.0
string filteritem
string footer
gridObj grid only available on a layer defined as grid (MS_GRATICULE)
Modified: trunk/docs/en/ogc/filter_encoding.txt
===================================================================
--- trunk/docs/en/ogc/filter_encoding.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/ogc/filter_encoding.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -265,7 +265,6 @@
"init=epsg:4326"
END
LABELITEM 'NAME'
- DUMP TRUE
CLASS
NAME 'World Cities'
STYLE
Modified: trunk/docs/en/ogc/wcs_format.txt
===================================================================
--- trunk/docs/en/ogc/wcs_format.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/ogc/wcs_format.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -50,9 +50,6 @@
EXTENSION "ecw"
END
-The keyword "DUMP" must be set to true to allow the data to download during a
-GetCoverage request.
-
.. code-block:: mapfile
LAYER
@@ -61,7 +58,6 @@
TYPE RASTER
PROCESSING "SCALE=AUTO"
UNITS Meters
- DUMP TRUE
TILEINDEX "MapServer/wcs/landsat7/l7mosaic15m.shp"
TILEITEM "Location"
METADATA
@@ -106,7 +102,6 @@
TYPE RASTER
PROCESSING "SCALE=AUTO"
UNITS Meters
- DUMP TRUE
TILEINDEX "MapServer/wcs/orthospot/spot.shp"
TILEITEM "Location"
METADATA
@@ -127,7 +122,6 @@
- Layer Name = Create a short name for the data
- Layer Type = Raster
- - Layer Dump = True
The following examples further demonstrate how WCS can be implemented and also
how to create WCS containing layers with a temporal dimension (see NetCDF
@@ -151,7 +145,7 @@
EXTENSION "tif"
END
-and in the corresponding layer to specify the keyword "DUMP" to be true
+and the corresponding layer
.. code-block:: mapfile
@@ -159,7 +153,6 @@
NAME "srtm"
STATUS OFF
TYPE RASTER
- DUMP TRUE
DATA "srtm.tif"
PROJECTION
"init=epsg:4326"
@@ -297,7 +290,6 @@
NAME 'TempData'
STATUS OFF
TYPE RASTER
- DUMP TRUE
TILEINDEX 'time_idx'
PROJECTION
"init=epsg:4326"
Modified: trunk/docs/en/ogc/wcs_server.txt
===================================================================
--- trunk/docs/en/ogc/wcs_server.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/ogc/wcs_server.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -77,7 +77,6 @@
(e.g GeoTIFF, Erdas Imagine, ...)
- LAYER NAME must be set
- LAYER TYPE is set to RASTER
-- LAYER DUMP parameter set to TRUE
- WEB metadata "wcs_enable_request" must be set
- WEB metadata "wcs_label" must be set
- LAYER metadata "wcs_label" must be set
@@ -156,7 +155,6 @@
PROJECTION
"init=epsg:42304"
END
- DUMP TRUE ### required
END
END # Map File
Modified: trunk/docs/en/ogc/wfs_server.txt
===================================================================
--- trunk/docs/en/ogc/wfs_server.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/ogc/wfs_server.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -99,8 +99,6 @@
- LAYER TYPE is one of: LINE, POINT, POLYGON
-- LAYER DUMP parameter set to TRUE
-
- The "wfs_onlineresource" metadata:
The wfs_onlineresource metadata is set in the map's web object
@@ -199,7 +197,6 @@
PROJECTION
"init=epsg:4326"
END
- DUMP TRUE ## REQUIRED
CLASS
NAME 'World Continents'
STYLE
Modified: trunk/docs/en/ogc/wms_server.txt
===================================================================
--- trunk/docs/en/ogc/wms_server.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/ogc/wms_server.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -172,7 +172,6 @@
- Layers set to STATUS DEFAULT will always be sent to the client.
- Layers set to STATUS ON or STATUS OFF can be requested by the client.
- Layer TEMPLATE (required for GetFeatureInfo requests - see :ref:`template`)
-- Layer DUMP TRUE (only required for GetFeatureInfo GML requests)
Let's go through each of these parameters in more detail:
@@ -316,12 +315,10 @@
requests of type "text/html" you should also set the layer HEADER
and FOOTER parameters.
- For GetFeatureInfo requests of GML you must set the layer to DUMP
- TRUE in the mapfile. As of MapServer 4.6 you must set the *gml_\**
- metadata for the layer attributes to be served (see the Layer Object
- metadata in the Reference Section later in this document). To
- include geometry, gml_geometries and gml_[name]_type has to be
- specified.
+ As of MapServer 4.6 you must set the *gml_\** metadata for the layer
+ attributes to be served (see the Layer Object metadata in the
+ Reference Section later in this document). To include geometry,
+ gml_geometries and gml_[name]_type has to be specified.
Here are working examples of GetFeatureInfo requests: `text/plain`_
/ `text/html`_ / `gml`_ (for gml, your browser might ask you to save
@@ -982,8 +979,6 @@
call the server with INFO_FORMAT=text/html.
- If not specified, MapServer by default has text/plain and GML implemented.
- - Note that for GML to be returned the layer in the wms-server mapfile must
- be set to DUMP TRUE.
**wms_fees**
Modified: trunk/docs/en/ogc/wms_time.txt
===================================================================
--- trunk/docs/en/ogc/wms_time.txt 2011-09-29 15:31:44 UTC (rev 12603)
+++ trunk/docs/en/ogc/wms_time.txt 2011-09-29 15:46:24 UTC (rev 12604)
@@ -243,6 +243,7 @@
"wms_timeextent" "2003-08-01/2006-12-31/PT5M"
"wms_timeitem" "datetime" #column in postgis table of type timestamp
"wms_timedefault" "2006-06-23T03:10:00Z"
+ "wms_enable_request" "*"
END
CONNECTION "dbname=postgis host=10.10.10.20"
CONNECTIONTYPE postgis
@@ -254,7 +255,6 @@
TYPE RASTER
STATUS ON
DEBUG ON
- DUMP TRUE
PROJECTION
"init=epsg:4326"
END
More information about the mapserver-commits
mailing list