Skip to content

Commit

Permalink
8.2.0 release minor changes (#943)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmckenna authored Jul 8, 2024
1 parent 4aaadbc commit 4aea286
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 54 deletions.
2 changes: 1 addition & 1 deletion en/development/announce/8-2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Binary Distributions

Binary distributions will be available in the coming days:

- Debian binaries of 8.2.0 will soon be available: https://tracker.debian.org/pkg/mapserver
- Debian binaries of 8.2.0 are already available: https://tracker.debian.org/pkg/mapserver
- `OSGeoLive <https://live.osgeo.org>`__ 17.0 release process is happening now, but
it will soon include MapServer 8.2.0
- `UbuntuGIS <https://wiki.ubuntu.com/UbuntuGIS>`__ will follow the OSGeoLive
Expand Down
4 changes: 2 additions & 2 deletions en/development/rfc/ms-rfc-138.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ MS RFC 138: Reference SLD files in Mapfiles
:Author: Seth Girvin
:Contact: sethg@geographika.co.uk
:Last Updated: 2024-03-04
:Version: Targeting MapServer 8.2
:Status: Draft
:Version: MapServer 8.2
:Status: Adopted

1. Overview
===========
Expand Down
80 changes: 44 additions & 36 deletions en/mapfile/layer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1612,55 +1612,63 @@ STYLEITEM [<attribute>|auto|<javascript file>|<sld file>]
(style string) attached to the feature. MapServer supports the
following style string representations:

- **MapServer STYLE definition** - The style string can be
represented as a MapServer :ref:`STYLE` block according to the
following example:
- **MapServer STYLE definition**

- The style string can be
represented as a MapServer :ref:`STYLE` block according to the
following example:

.. code-block:: mapfile
.. code-block:: mapfile

STYLE BACKGROUNDCOLOR 128 0 0 COLOR 0 0 208 END
STYLE BACKGROUNDCOLOR 128 0 0 COLOR 0 0 208 END

- **MapServer CLASS definition** - By specifying the entire
:ref:`CLASS` instead of a single style allows to use further
options (like setting expressions, label attributes, multiple
styles) on a per feature basis.
- **MapServer CLASS definition**

- By specifying the entire
:ref:`CLASS` 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:: bash
.. code-block:: bash

ogr2ogr -sql "select *, OGR_STYLE from srclayer" "dstlayer" "srclayer"
ogr2ogr -sql "select *, OGR_STYLE from srclayer" "dstlayer" "srclayer"

- **SLD String** - Different Styled Layer Descriptor documents (see :ref:`sld`) can be stored
as strings in the feature attribute to allow styling on a per feature basis. The SLD string
must end with ``StyledLayerDescriptor>`` (part of the SLD closing tag) for it to be interpreted as SLD.
- **SLD String**

.. versionadded:: 8.2

- Different Styled Layer Descriptor documents (see :ref:`sld`) can be stored
as strings in the feature attribute to allow styling on a per feature basis. The SLD string
must end with ``StyledLayerDescriptor>`` (part of the SLD closing tag) for it to be interpreted as SLD.

To use the first NamedLayer in the SLD string, whether or not the LAYER :ref:`NAME <mapfile-layer-name>`
matches the NamedLayer Name, add a **SLD_USE_FIRST_NAMEDLAYER**
:ref:`METADATA <mapfile-layer-metadata>` key and set its value to **"true"**.
To use the first NamedLayer in the SLD string, whether or not the LAYER :ref:`NAME <mapfile-layer-name>`
matches the NamedLayer Name, add a **SLD_USE_FIRST_NAMEDLAYER**
:ref:`METADATA <mapfile-layer-metadata>` key and set its value to **"true"**.

.. code-block:: mapfile
.. code-block:: mapfile

LAYER
...
STYLEITEM "STYLE" # name of the attribute containing styling information
METADATA
"SLD_USE_FIRST_NAMEDLAYER" "true"
LAYER
...
STYLEITEM "STYLE" # name of the attribute containing styling information
METADATA
"SLD_USE_FIRST_NAMEDLAYER" "true"
END
END
END

.. versionadded:: 8.2

.. seealso::
.. seealso::

:ref:`rfc138`
:ref:`rfc138`

.. index::
triple: LAYER; STYLEITEM; AUTO
Expand Down
11 changes: 6 additions & 5 deletions en/ogc/ogc_api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

:Author: Jeff McKenna
:Contact: jmckenna at gatewaygeomatics.com
:Last Updated: 2022-09-12
:Last Updated: 2024-07-08

.. contents:: Table of Contents
:depth: 3
Expand Down Expand Up @@ -429,16 +429,17 @@ The following metadata may be used for additional configuration of the service:
Web Object Metadata
-------------------


.. index::
triple: OGCAPI; METADATA; ows_schemas_location

**ows_schemas_location**

- *Description:* (Optional) (Note the name ows_schemas_location because all
.. versionadded:: 8.2

- *Description:* (Optional) (Note the name *ows_schemas_location* because all
OGC Web Services (OWS) use the same metadata) Root of the web tree where
the family of OGC API JSON Schma files are located. This must be a valid URL
the family of OGC API JSON Schema files are located. This must be a valid URL
where the actual .yaml files are located if you want your OpenAPI description
to be valid. Default is `http://schemas.opengis.net`_.
to be valid. Default is *http://schemas.opengis.net*


6 changes: 3 additions & 3 deletions en/ogc/wcs_server.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
:Contact: stephan.meissl at eox.at
:Author: Fabian Schindler
:Contact: fabian.schindler at eox.at
:Last Updated: 2021-03-27
:Last Updated: 2024-07-08

.. contents:: Table of Contents
:depth: 2
Expand Down Expand Up @@ -1237,6 +1237,8 @@ wcs_country, wcs_postcode, wcs_stateorprovince**

**wcs_metadatalink_list**

.. versionadded:: 8.0

- *Description:* (Optional) Space-separated list of parts of metadata keys,
to be able to specify several metadata links. If the value of wcs_metadatalink_list
is "foo bar", then wcs_metadatalink_foo_href, wcs_metadatalink_foo_format,
Expand All @@ -1258,8 +1260,6 @@ wcs_country, wcs_postcode, wcs_stateorprovince**
"wcs_metadatalink_html_type" "TC211"
"wcs_metadatalink_html_href" "http://example.com/testHTML"

- .. versionadded:: 8.0

.. index::
triple: WCS; METADATA; wcs_metadatalink_type

Expand Down
6 changes: 3 additions & 3 deletions en/ogc/wfs_server.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
:Contact: jmckenna at gatewaygeomatics.com
:Author: Even Rouault
:Contact: even.rouault at mines-paris.org
:Last Updated: 2022-09-05
:Last Updated: 2024-07-08

.. contents::
:depth: 2
Expand Down Expand Up @@ -1308,6 +1308,8 @@ Layer Object

**wfs_metadataurl_list**

.. versionadded:: 8.0

- (Optional) Space-separated list of parts of metadata keys,
to be able to specify several MetadataURL. If the value of wfs_metadataurl_list
is "foo bar", then wfs_metadataurl_foo_href, wfs_metadataurl_foo_format,
Expand All @@ -1334,8 +1336,6 @@ Layer Object
"wfs_metadataurl_html_href" "http://example.com/testHTML"
"wfs_metadataurl_html_about" "about HTML"

- .. versionadded:: 8.0

.. index::
triple: WFS; METADATA; wfs_metadataurl_type

Expand Down
2 changes: 1 addition & 1 deletion en/ogc/wms_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

:Author: Jeff McKenna
:Contact: jmckenna at gatewaygeomatics.com
:Last Updated: 2022-08-15
:Last Updated: 2024-07-08

.. contents:: Table of Contents
:depth: 4
Expand Down
6 changes: 3 additions & 3 deletions en/ogc/wms_server.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

:Author: Jeff McKenna
:Contact: jmckenna at gatewaygeomatics.com
:Last Updated: 2022-09-05
:Last Updated: 2024-07-08

.. contents:: Table of Contents
:depth: 3
Expand Down Expand Up @@ -1949,6 +1949,8 @@ Layer Object Metadata

**wms_metadataurl_list**

.. versionadded:: 8.0

- *Description:* (Optional) Space-separated list of parts of metadata keys,
to be able to specify several MetadataURL. If the value of wms_metadataurl_list
is "foo bar", then wms_metadataurl_foo_href, wms_metadataurl_foo_format,
Expand All @@ -1970,8 +1972,6 @@ Layer Object Metadata
"wms_metadataurl_html_type" "TC211"
"wms_metadataurl_html_href" "http://example.com/testHTML"

- .. versionadded:: 8.0

.. index::
triple: WMS; METADATA; wms_metadataurl_type

Expand Down

0 comments on commit 4aea286

Please sign in to comment.