Skip to content

Commit c61618e

Browse files
author
MapServer deploybot
committed
update with results of commit MapServer/MapServer-documentation@0c2a497
1 parent 62f1fbc commit c61618e

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

_sources/cgi/openlayers.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ only, and not for production or deploying full-featured sites. You
1313
can preview, test, and navigate a mapfile by accessing a special URL
1414
which will return a built-in OpenLayers template.
1515

16-
.. note:: This feature was discussed in
17-
`RFC 63 <https://mapserver.org/development/rfc/ms-rfc-63.html>`_
18-
and in the ticket https://github.com/MapServer/MapServer/issues/3549
16+
.. note::
17+
This feature was discussed in
18+
`RFC 63 <https://mapserver.org/development/rfc/ms-rfc-63.html>`_
19+
and in ticket `#3549 <https://github.com/MapServer/MapServer/issues/3549>`_
1920

2021
Up to the MapServer 8.4 release the OpenLayers Viewer was based on `OpenLayers 2 <https://openlayers.org/two/>`_.
2122
As of MapServer 8.6-dev the OpenLayers viewer was updated to work with `OpenLayers 10.5+ <https://openlayers.org/>`_.
@@ -59,8 +60,9 @@ In this case you will need to set your :ref:`IMAGEPATH <mapfile-web-imagepath>`
5960

6061
**That's it!**
6162

62-
If you don't have a live MapServer install to play with, you can also try the
63-
`MapServer demo <https://demo.mapserver.org/cgi-bin/wms?mode=browse&template=openlayers&layer=continents&layer=country_bounds>`__.
63+
.. tip::
64+
If you don't have a live MapServer install to play with, you can also try the
65+
`MapServer demo <https://demo.mapserver.org/cgi-bin/wms?mode=browse&template=openlayers&layer=continents&layer=country_bounds>`_.
6466

6567
Opening the OpenLayers viewer in the form of a WMS request
6668
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -104,8 +106,9 @@ Here is a quick breakdown of the interesting parts of that URL:
104106
BBOX=-90,-180,90,180
105107
STYLES=
106108

107-
If you don't have a live MapServer install to play with, you try the
108-
`MapServer demo <https://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=-90,-180,90,180&CRS=EPSG:4326&WIDTH=953&HEIGHT=480&LAYERS=bluemarble,continents,country_bounds,cities&STYLES=&FORMAT=application/openlayers&TRANSPARENT=true`__.>`__.
109+
.. tip::
110+
If you don't have a live MapServer install to play with, you can also try the
111+
`MapServer demo in the form of a WMS request <https://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=-90,-180,90,180&CRS=EPSG:4326&WIDTH=953&HEIGHT=480&LAYERS=bluemarble,continents,country_bounds,cities&STYLES=&FORMAT=application/openlayers&TRANSPARENT=true>`_.
109112

110113
Customizing settings
111114
~~~~~~~~~~~~~~~~~~~~

cgi/openlayers.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ <h3>Navigation</h3>
134134
<p class="admonition-title">Note</p>
135135
<p>This feature was discussed in
136136
<a class="reference external" href="https://mapserver.org/development/rfc/ms-rfc-63.html">RFC 63</a>
137-
and in the ticket <a class="reference external" href="https://github.com/MapServer/MapServer/issues/3549">https://github.com/MapServer/MapServer/issues/3549</a></p>
137+
and in ticket <a class="reference external" href="https://github.com/MapServer/MapServer/issues/3549">#3549</a></p>
138138
</div>
139139
<p>Up to the MapServer 8.4 release the OpenLayers Viewer was based on <a class="reference external" href="https://openlayers.org/two/">OpenLayers 2</a>.
140140
As of MapServer 8.6-dev the OpenLayers viewer was updated to work with <a class="reference external" href="https://openlayers.org/">OpenLayers 10.5+</a>.
@@ -172,8 +172,11 @@ <h3>Opening the OpenLayers viewer in your browser<a class="headerlink" href="#op
172172
</div>
173173
<p>In this case you will need to set your <a class="reference internal" href="../mapfile/web.html#mapfile-web-imagepath"><span class="std std-ref">IMAGEPATH</span></a> to a folder MapServer can write to.</p>
174174
<p><strong>That’s it!</strong></p>
175+
<div class="admonition tip">
176+
<p class="admonition-title">Tip</p>
175177
<p>If you don’t have a live MapServer install to play with, you can also try the
176178
<a class="reference external" href="https://demo.mapserver.org/cgi-bin/wms?mode=browse&amp;template=openlayers&amp;layer=continents&amp;layer=country_bounds">MapServer demo</a>.</p>
179+
</div>
177180
</section>
178181
<section id="opening-the-openlayers-viewer-in-the-form-of-a-wms-request">
179182
<h3>Opening the OpenLayers viewer in the form of a WMS request<a class="headerlink" href="#opening-the-openlayers-viewer-in-the-form-of-a-wms-request" title="Link to this heading"></a></h3>
@@ -219,8 +222,11 @@ <h3>Opening the OpenLayers viewer in the form of a WMS request<a class="headerli
219222
</div>
220223
</li>
221224
</ul>
222-
<p>If you don’t have a live MapServer install to play with, you try the
223-
<a href="#id1"><span class="problematic" id="id2">`MapServer demo &lt;https://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetMap&amp;BBOX=-90,-180,90,180&amp;CRS=EPSG:4326&amp;WIDTH=953&amp;HEIGHT=480&amp;LAYERS=bluemarble,continents,country_bounds,cities&amp;STYLES=&amp;FORMAT=application/openlayers&amp;TRANSPARENT=true`__</span></a>.&gt;`__.</p>
225+
<div class="admonition tip">
226+
<p class="admonition-title">Tip</p>
227+
<p>If you don’t have a live MapServer install to play with, you can also try the
228+
<a class="reference external" href="https://demo.mapserver.org/cgi-bin/wms?SERVICE=WMS&amp;VERSION=1.3.0&amp;REQUEST=GetMap&amp;BBOX=-90,-180,90,180&amp;CRS=EPSG:4326&amp;WIDTH=953&amp;HEIGHT=480&amp;LAYERS=bluemarble,continents,country_bounds,cities&amp;STYLES=&amp;FORMAT=application/openlayers&amp;TRANSPARENT=true">MapServer demo in the form of a WMS request</a>.</p>
229+
</div>
224230
</section>
225231
<section id="customizing-settings">
226232
<h3>Customizing settings<a class="headerlink" href="#customizing-settings" title="Link to this heading"></a></h3>

mapscript/mapscript-api/stub/mapscript.shapeObj.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ <h3>Navigation</h3>
128128
<h1>mapscript.shapeObj<a class="headerlink" href="#mapscript-shapeobj" title="Link to this heading"></a></h1>
129129
<dl class="py class">
130130
<dt class="sig sig-object py" id="mapscript.shapeObj">
131-
<em class="property"><span class="k"><span class="pre">class</span></span><span class="w"> </span></em><span class="sig-prename descclassname"><span class="pre">mapscript.</span></span><span class="sig-name descname"><span class="pre">shapeObj</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">type:</span> <span class="pre">int</span> <span class="pre">=</span> <span class="pre">&lt;MagicMock</span> <span class="pre">id='139754963415264'&gt;</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#mapscript.shapeObj" title="Link to this definition"></a></dt>
131+
<em class="property"><span class="k"><span class="pre">class</span></span><span class="w"> </span></em><span class="sig-prename descclassname"><span class="pre">mapscript.</span></span><span class="sig-name descname"><span class="pre">shapeObj</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">type:</span> <span class="pre">int</span> <span class="pre">=</span> <span class="pre">&lt;MagicMock</span> <span class="pre">id='140128572305632'&gt;</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#mapscript.shapeObj" title="Link to this definition"></a></dt>
132132
<dd><p>Each feature of a layer’s data is a <a class="reference internal" href="#mapscript.shapeObj" title="mapscript.shapeObj"><code class="xref py py-class docutils literal notranslate"><span class="pre">shapeObj</span></code></a>. Each part of the shape is
133133
a closed <a class="reference internal" href="mapscript.lineObj.html#mapscript.lineObj" title="mapscript.lineObj"><code class="xref py py-class docutils literal notranslate"><span class="pre">lineObj</span></code></a>.</p>
134134
<p class="rubric">Overview</p>
@@ -186,7 +186,7 @@ <h1>mapscript.shapeObj<a class="headerlink" href="#mapscript-shapeobj" title="Li
186186

187187
<dl class="py method">
188188
<dt class="sig sig-object py" id="mapscript.shapeObj.__init__">
189-
<span class="sig-name descname"><span class="pre">__init__</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">type:</span> <span class="pre">int</span> <span class="pre">=</span> <span class="pre">&lt;MagicMock</span> <span class="pre">id='139754963415264'&gt;</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../../../_modules/mapscript/mapscript.html#shapeObj.__init__"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#mapscript.shapeObj.__init__" title="Link to this definition"></a></dt>
189+
<span class="sig-name descname"><span class="pre">__init__</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">type:</span> <span class="pre">int</span> <span class="pre">=</span> <span class="pre">&lt;MagicMock</span> <span class="pre">id='140128572305632'&gt;</span></span></em><span class="sig-paren">)</span><a class="reference internal" href="../../../_modules/mapscript/mapscript.html#shapeObj.__init__"><span class="viewcode-link"><span class="pre">[source]</span></span></a><a class="headerlink" href="#mapscript.shapeObj.__init__" title="Link to this definition"></a></dt>
190190
<dd><p>Return a new shapeObj of the specified type. See the type attribute.
191191
No attribute values created by default.
192192
initValues should be explicitly called to create the required number of values.

searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)