Skip to content

Commit

Permalink
update with results of commit MapServer/MapServer-documentation@68eb6ab
Browse files Browse the repository at this point in the history
  • Loading branch information
MapServer deploybot committed Dec 14, 2024
1 parent 3f0456a commit cd050c3
Show file tree
Hide file tree
Showing 531 changed files with 1,955 additions and 726 deletions.
81 changes: 67 additions & 14 deletions MIGRATION_GUIDE.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,30 +126,49 @@ <h3>Navigation</h3>
<span id="migration"></span><h1><a class="toc-backref" href="#table-of-contents" role="doc-backlink">MapServer Migration Guide</a><a class="headerlink" href="#mapserver-migration-guide" title="Link to this heading"></a></h1>
<dl class="field-list simple">
<dt class="field-odd">Last Updated<span class="colon">:</span></dt>
<dd class="field-odd"><p>2024-08-26</p>
<dd class="field-odd"><p>2024-12-13</p>
</dd>
</dl>
<nav class="contents" id="table-of-contents">
<p class="topic-title">Table of Contents</p>
<ul class="simple">
<li><p><a class="reference internal" href="#mapserver-migration-guide" id="id3">MapServer Migration Guide</a></p>
<ul>
<li><p><a class="reference internal" href="#mapserver-8-0-to-8-2-migration" id="id4">MapServer 8.0 to 8.2 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-7-6-to-8-0-migration" id="id5">MapServer 7.6 to 8.0 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-7-4-to-7-6-migration" id="id6">MapServer 7.4 to 7.6 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-7-2-to-7-4-migration" id="id7">MapServer 7.2 to 7.4 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-7-0-to-7-2-migration" id="id8">MapServer 7.0 to 7.2 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-6-4-to-7-0-migration" id="id9">MapServer 6.4 to 7.0 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-6-2-to-6-4-migration" id="id10">MapServer 6.2 to 6.4 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-6-0-to-6-2-migration" id="id11">MapServer 6.0 to 6.2 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-5-6-to-6-0-migration" id="id12">MapServer 5.6 to 6.0 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-5-4-to-5-6-migration" id="id13">MapServer 5.4 to 5.6 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-5-2-to-5-4-migration" id="id14">MapServer 5.2 to 5.4 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-4-10-to-5-0-migration" id="id15">MapServer 4.10 to 5.0 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-8-2-to-8-4-migration" id="id4">MapServer 8.2 to 8.4 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-8-0-to-8-2-migration" id="id5">MapServer 8.0 to 8.2 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-7-6-to-8-0-migration" id="id6">MapServer 7.6 to 8.0 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-7-4-to-7-6-migration" id="id7">MapServer 7.4 to 7.6 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-7-2-to-7-4-migration" id="id8">MapServer 7.2 to 7.4 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-7-0-to-7-2-migration" id="id9">MapServer 7.0 to 7.2 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-6-4-to-7-0-migration" id="id10">MapServer 6.4 to 7.0 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-6-2-to-6-4-migration" id="id11">MapServer 6.2 to 6.4 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-6-0-to-6-2-migration" id="id12">MapServer 6.0 to 6.2 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-5-6-to-6-0-migration" id="id13">MapServer 5.6 to 6.0 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-5-4-to-5-6-migration" id="id14">MapServer 5.4 to 5.6 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-5-2-to-5-4-migration" id="id15">MapServer 5.2 to 5.4 Migration</a></p></li>
<li><p><a class="reference internal" href="#mapserver-4-10-to-5-0-migration" id="id16">MapServer 4.10 to 5.0 Migration</a></p></li>
</ul>
</li>
</ul>
</nav>
<section id="mapserver-8-2-to-8-4-migration">
<span id="migration-8-4"></span><h2><a class="toc-backref" href="#table-of-contents" role="doc-backlink">MapServer 8.2 to 8.4 Migration</a><a class="headerlink" href="#mapserver-8-2-to-8-4-migration" title="Link to this heading"></a></h2>
<ul>
<li><p>you can now build against the PCRE2 library (WITH_PCRE2=ON)</p></li>
<li><p>reminder that since the PROJ 9.1 release, the former <cite>PROJ_LIB</cite> variable has
been replaced with <cite>PROJ_DATA</cite></p>
<div class="admonition seealso">
<p class="admonition-title">See also</p>
<p><cite>Setting the location of PROJ files</cite> in <a class="reference internal" href="mapfile/projection.html#projection"><span class="std std-ref">PROJECTION</span></a>.</p>
</div>
<div class="admonition tip">
<p class="admonition-title">Tip</p>
<p>For Windows users, MS4W &gt;=5 leverages the <cite>PROJ_DATA</cite> environment variable,
which points to <cite>/ms4w/share/proj/</cite></p>
</div>
</li>
</ul>
</section>
<section id="mapserver-8-0-to-8-2-migration">
<span id="migration-8-2"></span><h2><a class="toc-backref" href="#table-of-contents" role="doc-backlink">MapServer 8.0 to 8.2 Migration</a><a class="headerlink" href="#mapserver-8-0-to-8-2-migration" title="Link to this heading"></a></h2>
<ul class="simple">
Expand Down Expand Up @@ -262,6 +281,39 @@ <h3>Navigation</h3>
</pre></div>
</div>
</li>
<li><p>Using the <a class="reference internal" href="mapfile/label.html#label"><span class="std std-ref">LABEL</span></a> WRAP parameter with <em>MAXLENGTH 0</em> to always wrap at the wrap character
is no longer supported (as there are more strict checks in MapServer &gt;= 8 for negative or
zero values), so instead you can remove (or comment) that <em>MAXLENGTH 0</em> line, and MapServer
will wrap at the character, such as:</p>
<div class="highlight-mapfile notranslate"><div class="highlight"><pre><span></span><span class="k">LAYER</span>
<span class="k">NAME</span> <span class="s">&quot;wrap-no-maxlength&quot;</span>
<span class="k">CLASS</span>
<span class="k">LABEL</span>
<span class="k">TYPE</span> <span class="nb">truetype</span>
<span class="k">ANGLE</span> <span class="nb">follow</span>
<span class="k">FONT</span> <span class="s">&quot;dejavu&quot;</span>
<span class="k">SIZE</span> <span class="mi">8</span>
<span class="k">COLOR</span> <span class="mi">0</span> <span class="mi">0</span> <span class="mi">0</span>
<span class="c">#MAXLENGTH 0 #would cause error in MapServer &gt;=8</span>
<span class="k">WRAP</span> <span class="s">&quot;|&quot;</span>
<span class="k">END</span> <span class="c">#label</span>
<span class="p">...</span>
<span class="k">END</span> <span class="c">#class</span>
<span class="p">...</span>

<span class="k">FEATURE</span>
<span class="k">POINTS</span>
<span class="mi">50</span> <span class="p">-</span><span class="mi">450</span> <span class="mi">150</span> <span class="p">-</span><span class="mi">450</span>
<span class="k">END</span> <span class="c">#points</span>
<span class="k">TEXT</span> <span class="s">&quot;W: WrapSpace|With Pipe&quot;</span>
<span class="k">END</span> <span class="c">#feature</span>

<span class="k">END</span> <span class="c">#layer</span>
</pre></div>
</div>
<p>so the label will appear in the map image as:</p>
<img alt="_images/label-wrap-with-pipe.png" class="no-scaled-link" src="_images/label-wrap-with-pipe.png" style="width: 187px; height: 59px;" />
</li>
<li><p>Reminder: every mapfile <a class="reference internal" href="mapfile/layer.html#layer"><span class="std std-ref">LAYER</span></a> should include a <strong>NAME</strong> parameter.
The NAME should <strong>not contain</strong> special characters, or spaces, or begin with
a number. This simple name is important for your downstream users (such as
Expand Down Expand Up @@ -1294,6 +1346,7 @@ <h3 id="searchlabel">Quick search</h3>
<h3>Current Table Of Contents</h3>
<ul>
<li><a class="reference internal" href="#">MapServer Migration Guide</a><ul>
<li><a class="reference internal" href="#mapserver-8-2-to-8-4-migration">MapServer 8.2 to 8.4 Migration</a></li>
<li><a class="reference internal" href="#mapserver-8-0-to-8-2-migration">MapServer 8.0 to 8.2 Migration</a></li>
<li><a class="reference internal" href="#mapserver-7-6-to-8-0-migration">MapServer 7.6 to 8.0 Migration</a></li>
<li><a class="reference internal" href="#mapserver-7-4-to-7-6-migration">MapServer 7.4 to 7.6 Migration</a></li>
Expand Down Expand Up @@ -1379,7 +1432,7 @@ <h3>Navigation</h3>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="copyright.html">Copyright</a> 2024, Open Source Geospatial Foundation.
Last updated on 2024-11-26.
Last updated on 2024-12-14.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 8.1.3.
</div>
</body>
Expand Down
Binary file added _images/label-wrap-with-maxlength.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _images/label-wrap-with-pipe.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion _modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ <h3>Navigation</h3>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../copyright.html">Copyright</a> 2024, Open Source Geospatial Foundation.
Last updated on 2024-11-26.
Last updated on 2024-12-14.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 8.1.3.
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion _modules/mapscript/mapscript.html
Original file line number Diff line number Diff line change
Expand Up @@ -5560,7 +5560,7 @@ <h3>Navigation</h3>
</div>
<div class="footer" role="contentinfo">
&#169; <a href="../../copyright.html">Copyright</a> 2024, Open Source Geospatial Foundation.
Last updated on 2024-11-26.
Last updated on 2024-12-14.
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 8.1.3.
</div>
</body>
Expand Down
61 changes: 57 additions & 4 deletions _sources/MIGRATION_GUIDE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,28 @@
MapServer Migration Guide
*****************************************************************************

:Last Updated: 2024-08-26
:Last Updated: 2024-12-13

.. contents:: Table of Contents
:depth: 2
:backlinks: top

.. _migration-8-4:

MapServer 8.2 to 8.4 Migration
==============================

- you can now build against the PCRE2 library (WITH_PCRE2=ON)

- reminder that since the PROJ 9.1 release, the former `PROJ_LIB` variable has
been replaced with `PROJ_DATA`

.. seealso:: `Setting the location of PROJ files` in :ref:`projection`.

.. TIP::
For Windows users, MS4W >=5 leverages the `PROJ_DATA` environment variable,
which points to `/ms4w/share/proj/`

.. _migration-8-2:

MapServer 8.0 to 8.2 Migration
Expand Down Expand Up @@ -74,8 +90,6 @@ MapServer 7.6 to 8.0 Migration
...
END #map



- Several deprecated mapfile parameters have been removed, and will throw an
error if you still specify them now. The following are specific examples
to be aware of (but be sure to review the :ref:`full list <rfc133>`), taken from the
Expand Down Expand Up @@ -135,8 +149,47 @@ MapServer 7.6 to 8.0 Migration

::

...&map.layer[county].class[0].label[0]=SIZE+24&...
...&map.layer[county].class[0].label[0]=SIZE+24&...

- Using the :ref:`LABEL` WRAP parameter with *MAXLENGTH 0* to always wrap at the wrap character
is no longer supported (as there are more strict checks in MapServer >= 8 for negative or
zero values), so instead you can remove (or comment) that *MAXLENGTH 0* line, and MapServer
will wrap at the character, such as:

.. code-block:: mapfile

LAYER
NAME "wrap-no-maxlength"
CLASS
LABEL
TYPE truetype
ANGLE follow
FONT "dejavu"
SIZE 8
COLOR 0 0 0
#MAXLENGTH 0 #would cause error in MapServer >=8
WRAP "|"
END #label
...
END #class
...

FEATURE
POINTS
50 -450 150 -450
END #points
TEXT "W: WrapSpace|With Pipe"
END #feature

END #layer

so the label will appear in the map image as:

.. image:: ./images/label-wrap-with-pipe.png
:height: 59
:width: 187
:class: no-scaled-link

- Reminder: every mapfile :ref:`LAYER` should include a **NAME** parameter.
The NAME should **not contain** special characters, or spaces, or begin with
a number. This simple name is important for your downstream users (such as
Expand Down
7 changes: 7 additions & 0 deletions _sources/announcements/announcements_archive.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
MapServer Announcement Archives
*****************************************************************************

**2024-12-14 - MapServer 8.4.0-beta2 is released**

The second beta for MapServer 8.4 has been released. The list of
major changes for this release can be found in the :ref:`8.4 announcement <announce-8-4>`.
See the :ref:`changelog <changelog-8-4-0-beta2>`
for the full list of changes and head to :ref:`download` to obtain a copy.

**2024-09-02 - MapServer 8.2.2 is released**

The maintenance release of MapServer 8.2.2 is now available.
Expand Down
90 changes: 90 additions & 0 deletions _sources/development/announce/8-4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
.. _announce-8-4:

*****************************************************************************
Version 8.4.0-beta1 Announcement
*****************************************************************************

:Authors: Project Steering Committee
:Drafted: 2024-12-14

The MapServer Team is pleased to announce the first beta of the major release of
MapServer 8.4.0

This 8.4 release will bring a number of major new features that are briefly
summarized in this document. The full list of changes can be found in :ref:`changelog-8-4`.
The :ref:`Migration Guide <migration-8-4>` also contains more detailed examples of
the major changes.

Major New Features in MapServer 8.4
-----------------------------------

- add option to build against the PCRE2 library (`#7073 <https://github.com/MapServer/MapServer/pull/7073>`__)

- add CONNECTIONTYPE RASTERLABEL (`#7135 <https://github.com/MapServer/MapServer/pull/7135>`__)

- set MS_LEGEND_KEYSIZE_MAX to 1000 (`#7154 <https://github.com/MapServer/MapServer/pull/7154>`__)

- add 4 new COMPOSITE.COMPOP blending operations (`#7065 <https://github.com/MapServer/MapServer/pull/7065>`__)

- allow encryption key files to use paths relative to a mapfile (`#7181 <https://github.com/MapServer/MapServer/pull/7181>`__)

- allow use_default_extent_for_getfeature to be used for OGC Features API and PostGIS (`#7197 <https://github.com/MapServer/MapServer/pull/7197>`__)

Other Related Updates
---------------------

- the demo server hosting many live OGC endpoints has been updated &
constantly maintained, as it is so important for the community:
https://demo.mapserver.org

Migration Guide
---------------

Head to the :ref:`Migration Guide <migration-8-4>` for mapfile examples of the major 8.4.0 changes.

Source Code Download
--------------------

The source for this release can be downloaded at:

https://mapserver.org/download.html

Binary Distributions
--------------------

Binary distributions will be available in the coming days:

- Debian binaries of 8.4.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.4.0
- `UbuntuGIS <https://wiki.ubuntu.com/UbuntuGIS>`__ will follow the OSGeoLive
release and will then include MapServer 8.4.0
- MS4W users have already been using branch-8-4 code, but watch for
a new release shortly containing the 8.4.0 changes at: https://ms4w.com

.. TBD
- `RHEL and CentOS` TODO
- `OpenSUSE` TODO

Other binary distributions listed on the download page should also be updated
with binaries for the new release shortly.

Documentation
-------------

The entire 8.4.0 documentation is also available as a `PDF document <https://download.osgeo.org/mapserver/docs/MapServer.pdf>`__ |image|
(1143 pages, with clickable table of contents as well).

.. |image| image:: ../../../_static/pdf.png
:height: 15
:width: 15
:alt: PDF icon
:target: https://download.osgeo.org/mapserver/docs/MapServer.pdf

Thanks
------

Thank you to all of the users, developers, and supporters of MapServer. Enjoy!

*The MapServer Team*

1 change: 1 addition & 0 deletions _sources/development/announce/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.. toctree::
:maxdepth: 2

8-4
8-2
8-0
7-6
Expand Down
Loading

0 comments on commit cd050c3

Please sign in to comment.