Skip to content

Commit cd050c3

Browse files
author
MapServer deploybot
committed
update with results of commit MapServer/MapServer-documentation@68eb6ab
1 parent 3f0456a commit cd050c3

File tree

531 files changed

+1955
-726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

531 files changed

+1955
-726
lines changed

MIGRATION_GUIDE.html

Lines changed: 67 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,30 +126,49 @@ <h3>Navigation</h3>
126126
<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>
127127
<dl class="field-list simple">
128128
<dt class="field-odd">Last Updated<span class="colon">:</span></dt>
129-
<dd class="field-odd"><p>2024-08-26</p>
129+
<dd class="field-odd"><p>2024-12-13</p>
130130
</dd>
131131
</dl>
132132
<nav class="contents" id="table-of-contents">
133133
<p class="topic-title">Table of Contents</p>
134134
<ul class="simple">
135135
<li><p><a class="reference internal" href="#mapserver-migration-guide" id="id3">MapServer Migration Guide</a></p>
136136
<ul>
137-
<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>
138-
<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>
139-
<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>
140-
<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>
141-
<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>
142-
<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>
143-
<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>
144-
<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>
145-
<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>
146-
<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>
147-
<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>
148-
<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>
137+
<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>
138+
<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>
139+
<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>
140+
<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>
141+
<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>
142+
<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>
143+
<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>
144+
<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>
145+
<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>
146+
<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>
147+
<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>
148+
<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>
149+
<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>
149150
</ul>
150151
</li>
151152
</ul>
152153
</nav>
154+
<section id="mapserver-8-2-to-8-4-migration">
155+
<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>
156+
<ul>
157+
<li><p>you can now build against the PCRE2 library (WITH_PCRE2=ON)</p></li>
158+
<li><p>reminder that since the PROJ 9.1 release, the former <cite>PROJ_LIB</cite> variable has
159+
been replaced with <cite>PROJ_DATA</cite></p>
160+
<div class="admonition seealso">
161+
<p class="admonition-title">See also</p>
162+
<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>
163+
</div>
164+
<div class="admonition tip">
165+
<p class="admonition-title">Tip</p>
166+
<p>For Windows users, MS4W &gt;=5 leverages the <cite>PROJ_DATA</cite> environment variable,
167+
which points to <cite>/ms4w/share/proj/</cite></p>
168+
</div>
169+
</li>
170+
</ul>
171+
</section>
153172
<section id="mapserver-8-0-to-8-2-migration">
154173
<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>
155174
<ul class="simple">
@@ -262,6 +281,39 @@ <h3>Navigation</h3>
262281
</pre></div>
263282
</div>
264283
</li>
284+
<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
285+
is no longer supported (as there are more strict checks in MapServer &gt;= 8 for negative or
286+
zero values), so instead you can remove (or comment) that <em>MAXLENGTH 0</em> line, and MapServer
287+
will wrap at the character, such as:</p>
288+
<div class="highlight-mapfile notranslate"><div class="highlight"><pre><span></span><span class="k">LAYER</span>
289+
<span class="k">NAME</span> <span class="s">&quot;wrap-no-maxlength&quot;</span>
290+
<span class="k">CLASS</span>
291+
<span class="k">LABEL</span>
292+
<span class="k">TYPE</span> <span class="nb">truetype</span>
293+
<span class="k">ANGLE</span> <span class="nb">follow</span>
294+
<span class="k">FONT</span> <span class="s">&quot;dejavu&quot;</span>
295+
<span class="k">SIZE</span> <span class="mi">8</span>
296+
<span class="k">COLOR</span> <span class="mi">0</span> <span class="mi">0</span> <span class="mi">0</span>
297+
<span class="c">#MAXLENGTH 0 #would cause error in MapServer &gt;=8</span>
298+
<span class="k">WRAP</span> <span class="s">&quot;|&quot;</span>
299+
<span class="k">END</span> <span class="c">#label</span>
300+
<span class="p">...</span>
301+
<span class="k">END</span> <span class="c">#class</span>
302+
<span class="p">...</span>
303+
304+
<span class="k">FEATURE</span>
305+
<span class="k">POINTS</span>
306+
<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>
307+
<span class="k">END</span> <span class="c">#points</span>
308+
<span class="k">TEXT</span> <span class="s">&quot;W: WrapSpace|With Pipe&quot;</span>
309+
<span class="k">END</span> <span class="c">#feature</span>
310+
311+
<span class="k">END</span> <span class="c">#layer</span>
312+
</pre></div>
313+
</div>
314+
<p>so the label will appear in the map image as:</p>
315+
<img alt="_images/label-wrap-with-pipe.png" class="no-scaled-link" src="_images/label-wrap-with-pipe.png" style="width: 187px; height: 59px;" />
316+
</li>
265317
<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.
266318
The NAME should <strong>not contain</strong> special characters, or spaces, or begin with
267319
a number. This simple name is important for your downstream users (such as
@@ -1294,6 +1346,7 @@ <h3 id="searchlabel">Quick search</h3>
12941346
<h3>Current Table Of Contents</h3>
12951347
<ul>
12961348
<li><a class="reference internal" href="#">MapServer Migration Guide</a><ul>
1349+
<li><a class="reference internal" href="#mapserver-8-2-to-8-4-migration">MapServer 8.2 to 8.4 Migration</a></li>
12971350
<li><a class="reference internal" href="#mapserver-8-0-to-8-2-migration">MapServer 8.0 to 8.2 Migration</a></li>
12981351
<li><a class="reference internal" href="#mapserver-7-6-to-8-0-migration">MapServer 7.6 to 8.0 Migration</a></li>
12991352
<li><a class="reference internal" href="#mapserver-7-4-to-7-6-migration">MapServer 7.4 to 7.6 Migration</a></li>
@@ -1379,7 +1432,7 @@ <h3>Navigation</h3>
13791432
</div>
13801433
<div class="footer" role="contentinfo">
13811434
&#169; <a href="copyright.html">Copyright</a> 2024, Open Source Geospatial Foundation.
1382-
Last updated on 2024-11-26.
1435+
Last updated on 2024-12-14.
13831436
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 8.1.3.
13841437
</div>
13851438
</body>
2.8 KB
Loading

_images/label-wrap-with-pipe.png

2.75 KB
Loading

_modules/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ <h3>Navigation</h3>
159159
</div>
160160
<div class="footer" role="contentinfo">
161161
&#169; <a href="../copyright.html">Copyright</a> 2024, Open Source Geospatial Foundation.
162-
Last updated on 2024-11-26.
162+
Last updated on 2024-12-14.
163163
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 8.1.3.
164164
</div>
165165
</body>

_modules/mapscript/mapscript.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5560,7 +5560,7 @@ <h3>Navigation</h3>
55605560
</div>
55615561
<div class="footer" role="contentinfo">
55625562
&#169; <a href="../../copyright.html">Copyright</a> 2024, Open Source Geospatial Foundation.
5563-
Last updated on 2024-11-26.
5563+
Last updated on 2024-12-14.
55645564
Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> 8.1.3.
55655565
</div>
55665566
</body>

_sources/MIGRATION_GUIDE.txt

Lines changed: 57 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,28 @@
66
MapServer Migration Guide
77
*****************************************************************************
88

9-
:Last Updated: 2024-08-26
9+
:Last Updated: 2024-12-13
1010

1111
.. contents:: Table of Contents
1212
:depth: 2
1313
:backlinks: top
1414

15+
.. _migration-8-4:
16+
17+
MapServer 8.2 to 8.4 Migration
18+
==============================
19+
20+
- you can now build against the PCRE2 library (WITH_PCRE2=ON)
21+
22+
- reminder that since the PROJ 9.1 release, the former `PROJ_LIB` variable has
23+
been replaced with `PROJ_DATA`
24+
25+
.. seealso:: `Setting the location of PROJ files` in :ref:`projection`.
26+
27+
.. TIP::
28+
For Windows users, MS4W >=5 leverages the `PROJ_DATA` environment variable,
29+
which points to `/ms4w/share/proj/`
30+
1531
.. _migration-8-2:
1632

1733
MapServer 8.0 to 8.2 Migration
@@ -74,8 +90,6 @@ MapServer 7.6 to 8.0 Migration
7490
...
7591
END #map
7692

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

136150
::
137151

138-
...&map.layer[county].class[0].label[0]=SIZE+24&...
152+
...&map.layer[county].class[0].label[0]=SIZE+24&...
153+
154+
- Using the :ref:`LABEL` WRAP parameter with *MAXLENGTH 0* to always wrap at the wrap character
155+
is no longer supported (as there are more strict checks in MapServer >= 8 for negative or
156+
zero values), so instead you can remove (or comment) that *MAXLENGTH 0* line, and MapServer
157+
will wrap at the character, such as:
158+
159+
.. code-block:: mapfile
160+
161+
LAYER
162+
NAME "wrap-no-maxlength"
163+
CLASS
164+
LABEL
165+
TYPE truetype
166+
ANGLE follow
167+
FONT "dejavu"
168+
SIZE 8
169+
COLOR 0 0 0
170+
#MAXLENGTH 0 #would cause error in MapServer >=8
171+
WRAP "|"
172+
END #label
173+
...
174+
END #class
175+
...
176+
177+
FEATURE
178+
POINTS
179+
50 -450 150 -450
180+
END #points
181+
TEXT "W: WrapSpace|With Pipe"
182+
END #feature
139183

184+
END #layer
185+
186+
so the label will appear in the map image as:
187+
188+
.. image:: ./images/label-wrap-with-pipe.png
189+
:height: 59
190+
:width: 187
191+
:class: no-scaled-link
192+
140193
- Reminder: every mapfile :ref:`LAYER` should include a **NAME** parameter.
141194
The NAME should **not contain** special characters, or spaces, or begin with
142195
a number. This simple name is important for your downstream users (such as

_sources/announcements/announcements_archive.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
MapServer Announcement Archives
55
*****************************************************************************
66

7+
**2024-12-14 - MapServer 8.4.0-beta2 is released**
8+
9+
The second beta for MapServer 8.4 has been released. The list of
10+
major changes for this release can be found in the :ref:`8.4 announcement <announce-8-4>`.
11+
See the :ref:`changelog <changelog-8-4-0-beta2>`
12+
for the full list of changes and head to :ref:`download` to obtain a copy.
13+
714
**2024-09-02 - MapServer 8.2.2 is released**
815

916
The maintenance release of MapServer 8.2.2 is now available.
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
.. _announce-8-4:
2+
3+
*****************************************************************************
4+
Version 8.4.0-beta1 Announcement
5+
*****************************************************************************
6+
7+
:Authors: Project Steering Committee
8+
:Drafted: 2024-12-14
9+
10+
The MapServer Team is pleased to announce the first beta of the major release of
11+
MapServer 8.4.0
12+
13+
This 8.4 release will bring a number of major new features that are briefly
14+
summarized in this document. The full list of changes can be found in :ref:`changelog-8-4`.
15+
The :ref:`Migration Guide <migration-8-4>` also contains more detailed examples of
16+
the major changes.
17+
18+
Major New Features in MapServer 8.4
19+
-----------------------------------
20+
21+
- add option to build against the PCRE2 library (`#7073 <https://github.com/MapServer/MapServer/pull/7073>`__)
22+
23+
- add CONNECTIONTYPE RASTERLABEL (`#7135 <https://github.com/MapServer/MapServer/pull/7135>`__)
24+
25+
- set MS_LEGEND_KEYSIZE_MAX to 1000 (`#7154 <https://github.com/MapServer/MapServer/pull/7154>`__)
26+
27+
- add 4 new COMPOSITE.COMPOP blending operations (`#7065 <https://github.com/MapServer/MapServer/pull/7065>`__)
28+
29+
- allow encryption key files to use paths relative to a mapfile (`#7181 <https://github.com/MapServer/MapServer/pull/7181>`__)
30+
31+
- allow use_default_extent_for_getfeature to be used for OGC Features API and PostGIS (`#7197 <https://github.com/MapServer/MapServer/pull/7197>`__)
32+
33+
Other Related Updates
34+
---------------------
35+
36+
- the demo server hosting many live OGC endpoints has been updated &
37+
constantly maintained, as it is so important for the community:
38+
https://demo.mapserver.org
39+
40+
Migration Guide
41+
---------------
42+
43+
Head to the :ref:`Migration Guide <migration-8-4>` for mapfile examples of the major 8.4.0 changes.
44+
45+
Source Code Download
46+
--------------------
47+
48+
The source for this release can be downloaded at:
49+
50+
https://mapserver.org/download.html
51+
52+
Binary Distributions
53+
--------------------
54+
55+
Binary distributions will be available in the coming days:
56+
57+
- Debian binaries of 8.4.0 are already available: https://tracker.debian.org/pkg/mapserver
58+
- `OSGeoLive <https://live.osgeo.org>`__ 17.0 release process is happening now, but
59+
it will soon include MapServer 8.4.0
60+
- `UbuntuGIS <https://wiki.ubuntu.com/UbuntuGIS>`__ will follow the OSGeoLive
61+
release and will then include MapServer 8.4.0
62+
- MS4W users have already been using branch-8-4 code, but watch for
63+
a new release shortly containing the 8.4.0 changes at: https://ms4w.com
64+
65+
.. TBD
66+
- `RHEL and CentOS` TODO
67+
- `OpenSUSE` TODO
68+
69+
Other binary distributions listed on the download page should also be updated
70+
with binaries for the new release shortly.
71+
72+
Documentation
73+
-------------
74+
75+
The entire 8.4.0 documentation is also available as a `PDF document <https://download.osgeo.org/mapserver/docs/MapServer.pdf>`__ |image|
76+
(1143 pages, with clickable table of contents as well).
77+
78+
.. |image| image:: ../../../_static/pdf.png
79+
:height: 15
80+
:width: 15
81+
:alt: PDF icon
82+
:target: https://download.osgeo.org/mapserver/docs/MapServer.pdf
83+
84+
Thanks
85+
------
86+
87+
Thank you to all of the users, developers, and supporters of MapServer. Enjoy!
88+
89+
*The MapServer Team*
90+

_sources/development/announce/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.. toctree::
99
:maxdepth: 2
1010

11+
8-4
1112
8-2
1213
8-0
1314
7-6

0 commit comments

Comments
 (0)