Skip to content

Commit b892abc

Browse files
author
MapServer deploybot
committed
update with results of commit MapServer/MapServer-documentation@4a85945
1 parent c949240 commit b892abc

File tree

8 files changed

+91
-39
lines changed

8 files changed

+91
-39
lines changed

_sources/mapfile/map.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ DEFRESOLUTION [double]
291291
symbology. Default is 72. Minimum is 10 and maximum is 1000.
292292

293293
Used to automatically scale the symbology when :ref:`RESOLUTION
294-
<resolution-parameter>` is changed, so the map maintains the same
294+
<mapfile-map-resolution>` is changed, so the map maintains the same
295295
look at each resolution. The scale factor is `RESOLUTION` /
296296
`DEFRESOLUTION`.
297297

@@ -451,10 +451,9 @@ NAME [name]
451451
.. index::
452452
pair: MAP; RESOLUTION
453453
:name: mapfile-map-resolution
454-
455-
.. _resolution-parameter:
456454

457-
RESOLUTION [double] Sets the pixels per inch for output, only affects
455+
RESOLUTION [double]
456+
Sets the pixels per inch for output, only affects
458457
scale computations. Default is 72. Minimum is 10 and maximum is 1000.
459458

460459
.. index::

_sources/ogc/wms_server.txt

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,6 +2143,25 @@ Vendor specific WMS parameters
21432143
.. note::
21442144
The angle value is in degrees clockwise.
21452145

2146+
.. index::
2147+
triple: WMS; Vendor specific parameters; bbox_pixel_is_point
2148+
2149+
**bbox_pixel_is_point**
2150+
2151+
- If this parameter is "TRUE", MapServer will treat the BBOX received in WMS
2152+
GetMap requests as if it was provided in pixel_is_point mode. Essentially
2153+
disabling the conversion from pixel_is_area (WMS model) to pixel_is_point that
2154+
is present in mapwms.c for that specific mapfile.
2155+
2156+
.. index::
2157+
triple: WMS; Vendor specific parameters; map_resolution
2158+
2159+
**map_resolution**
2160+
2161+
- Set this parameter to change the Map :ref:`RESOLUTION <mapfile-map-resolution>`.
2162+
MapServer uses a default screen resolution of 72 DPI. For high-resolution screens,
2163+
pass this parameter to ensure fonts and symbols appear at the correct size.
2164+
21462165
.. index::
21472166
triple: WMS; Vendor specific parameters; radius
21482167

@@ -2155,15 +2174,8 @@ Vendor specific WMS parameters
21552174
- The special value `bbox` that will change the query into a bbox
21562175
query based on the bbox given in the request parameters.
21572176

2158-
**bbox_pixel_is_point**
2159-
2160-
- If this parameter is "TRUE", MapServer will treat the BBOX received in WMS
2161-
GetMap requests as if it was provided in pixel_is_point mode. Essentially
2162-
disabling the conversion from pixel_is_area (WMS model) to pixel_is_point that
2163-
is present in mapwms.c for that specific mapfile.
2164-
21652177
.. index::
2166-
pair: WMS; Cascading requests
2178+
pair: WMS; HTTP status error codes
21672179

21682180
HTTP status error codes
21692181
-----------------------
@@ -2196,6 +2208,9 @@ to return HTTP 4xx or 5xx status codes in case of error.
21962208
END
21972209
END
21982210

2211+
.. index::
2212+
pair: WMS; Cascading requests
2213+
21992214
Cascading WMS Requests
22002215
----------------------
22012216

genindex.html

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,13 @@ <h2 id="B">B</h2>
508508
<li><a href="mapfile/geomtransform.html#index-1">GEOMTRANSFORM</a>
509509
</li>
510510
<li><a href="mapfile/style.html#index-1">STYLE GEOMTRANSFORM</a>
511+
</li>
512+
</ul></li>
513+
<li>
514+
bbox_pixel_is_point
515+
516+
<ul>
517+
<li><a href="ogc/wms_server.html#index-127">WMS Vendor specific parameters</a>
511518
</li>
512519
</ul></li>
513520
<li>
@@ -642,7 +649,7 @@ <h2 id="C">C</h2>
642649
Cascading requests
643650

644651
<ul>
645-
<li><a href="ogc/wms_server.html#index-128">WMS</a>
652+
<li><a href="ogc/wms_server.html#index-131">WMS</a>
646653
</li>
647654
</ul></li>
648655
<li>
@@ -2904,10 +2911,10 @@ <h2 id="H">H</h2>
29042911
<li><a href="mapfile/symbol.html#index-2">SYMBOL TYPE</a>
29052912
</li>
29062913
</ul></li>
2907-
</ul></td>
2908-
<td style="width: 33%; vertical-align: top;"><ul>
29092914
<li><a href="mapfile/symbology/construction.html#index-21">Hatch polygon fill</a>
29102915
</li>
2916+
</ul></td>
2917+
<td style="width: 33%; vertical-align: top;"><ul>
29112918
<li>
29122919
HEADER
29132920

@@ -2917,6 +2924,13 @@ <h2 id="H">H</h2>
29172924
<li><a href="mapfile/layer.html#mapfile-layer-header">LAYER</a>
29182925
</li>
29192926
<li><a href="mapfile/web.html#mapfile-web-header">WEB</a>
2927+
</li>
2928+
</ul></li>
2929+
<li>
2930+
HTTP status error codes
2931+
2932+
<ul>
2933+
<li><a href="ogc/wms_server.html#index-130">WMS</a>
29202934
</li>
29212935
</ul></li>
29222936
<li><a href="ogc/wxs_secure.html#index-0">https connections</a>
@@ -4378,6 +4392,13 @@ <h2 id="M">M</h2>
43784392
<li><a href="optimization/debugging.html#index-7">Debugging</a>
43794393
</li>
43804394
<li><a href="utilities/map2img.html#index-0">Utility</a>
4395+
</li>
4396+
</ul></li>
4397+
<li>
4398+
map_resolution
4399+
4400+
<ul>
4401+
<li><a href="ogc/wms_server.html#index-128">WMS Vendor specific parameters</a>
43814402
</li>
43824403
</ul></li>
43834404
<li>
@@ -7657,7 +7678,7 @@ <h2 id="R">R</h2>
76577678
radius
76587679

76597680
<ul>
7660-
<li><a href="ogc/wms_server.html#index-127">WMS Vendor specific parameters</a>
7681+
<li><a href="ogc/wms_server.html#index-129">WMS Vendor specific parameters</a>
76617682
</li>
76627683
</ul></li>
76637684
<li>
@@ -9910,15 +9931,15 @@ <h2 id="V">V</h2>
99109931
<li><a href="optimization/vector.html#index-0">Optimization</a>
99119932
</li>
99129933
</ul></li>
9913-
</ul></td>
9914-
<td style="width: 33%; vertical-align: top;"><ul>
99159934
<li>
99169935
vector
99179936

99189937
<ul>
99199938
<li><a href="mapfile/symbol.html#index-6">SYMBOL TYPE</a>
99209939
</li>
99219940
</ul></li>
9941+
</ul></td>
9942+
<td style="width: 33%; vertical-align: top;"><ul>
99229943
<li><a href="input/vector/vector_field.html#index-0">Vector field</a>
99239944
</li>
99249945
<li><a href="mapfile/symbology/construction.html#index-23">Vector polygon fill</a>
@@ -9931,7 +9952,11 @@ <h2 id="V">V</h2>
99319952
<ul>
99329953
<li><a href="ogc/wms_server.html#index-126">angle, WMS</a>
99339954
</li>
9934-
<li><a href="ogc/wms_server.html#index-127">radius, WMS</a>
9955+
<li><a href="ogc/wms_server.html#index-127">bbox_pixel_is_point, WMS</a>
9956+
</li>
9957+
<li><a href="ogc/wms_server.html#index-128">map_resolution, WMS</a>
9958+
</li>
9959+
<li><a href="ogc/wms_server.html#index-129">radius, WMS</a>
99359960
</li>
99369961
<li><a href="ogc/wms_server.html#index-125">WMS</a>
99379962
</li>
@@ -10833,15 +10858,15 @@ <h2 id="W">W</h2>
1083310858
<li><a href="ogc/wfs_server.html#index-25">WFS METADATA</a>, <a href="ogc/wfs_server.html#index-67">[1]</a>
1083410859
</li>
1083510860
</ul></li>
10836-
</ul></td>
10837-
<td style="width: 33%; vertical-align: top;"><ul>
1083810861
<li>
1083910862
wfs_languages
1084010863

1084110864
<ul>
1084210865
<li><a href="ogc/wfs_server.html#index-26">WFS METADATA</a>
1084310866
</li>
1084410867
</ul></li>
10868+
</ul></td>
10869+
<td style="width: 33%; vertical-align: top;"><ul>
1084510870
<li>
1084610871
wfs_maxfeatures
1084710872

@@ -10999,11 +11024,13 @@ <h2 id="W">W</h2>
1099911024
<li><a href="glossary.html#term-WMS"><strong>WMS</strong></a>
1100011025

1100111026
<ul>
11002-
<li><a href="ogc/wms_server.html#index-128">Cascading requests</a>
11027+
<li><a href="ogc/wms_server.html#index-131">Cascading requests</a>
1100311028
</li>
1100411029
<li><a href="ogc/wms_server.html#index-4">GetLegendGraphic</a>
1100511030
</li>
1100611031
<li><a href="ogc/wms_server.html#index-3">GetMap</a>
11032+
</li>
11033+
<li><a href="ogc/wms_server.html#index-130">HTTP status error codes</a>
1100711034
</li>
1100811035
<li><a href="ogc/wms_server.html#index-71">LAYER METADATA</a>
1100911036
</li>
@@ -11191,7 +11218,11 @@ <h2 id="W">W</h2>
1119111218
</li>
1119211219
<li><a href="ogc/wms_server.html#index-126">Vendor specific parameters angle</a>
1119311220
</li>
11194-
<li><a href="ogc/wms_server.html#index-127">Vendor specific parameters radius</a>
11221+
<li><a href="ogc/wms_server.html#index-127">Vendor specific parameters bbox_pixel_is_point</a>
11222+
</li>
11223+
<li><a href="ogc/wms_server.html#index-128">Vendor specific parameters map_resolution</a>
11224+
</li>
11225+
<li><a href="ogc/wms_server.html#index-129">Vendor specific parameters radius</a>
1119511226
</li>
1119611227
<li><a href="ogc/mapcontext.html#index-0">Web map context</a>
1119711228
</li>

mapfile/map.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ <h3>Navigation</h3>
348348
</div>
349349
<p>Sets the reference resolution (pixels per inch) used for
350350
symbology. Default is 72. Minimum is 10 and maximum is 1000.</p>
351-
<p>Used to automatically scale the symbology when <a class="reference internal" href="#resolution-parameter"><span class="std std-ref">RESOLUTION</span></a> is changed, so the map maintains the same
351+
<p>Used to automatically scale the symbology when <a class="reference internal" href="#mapfile-map-resolution"><span class="std std-ref">RESOLUTION</span></a> is changed, so the map maintains the same
352352
look at each resolution. The scale factor is <cite>RESOLUTION</cite> /
353353
<cite>DEFRESOLUTION</cite>.</p>
354354
</dd>
@@ -459,8 +459,9 @@ <h3>Navigation</h3>
459459
<dt><a class="reference internal" href="reference.html#reference"><span class="std std-ref">REFERENCE</span></a></dt><dd><p>Signals the start of a <a class="reference internal" href="reference.html#reference"><span class="std std-ref">REFERENCE</span></a> MAP object.</p>
460460
</dd>
461461
</dl>
462-
<span id="mapfile-map-resolution"></span><dl class="simple" id="resolution-parameter">
463-
<dt>RESOLUTION [double] Sets the pixels per inch for output, only affects</dt><dd><p>scale computations. Default is 72. Minimum is 10 and maximum is 1000.</p>
462+
<dl class="simple" id="mapfile-map-resolution">
463+
<dt>RESOLUTION [double]</dt><dd><p>Sets the pixels per inch for output, only affects
464+
scale computations. Default is 72. Minimum is 10 and maximum is 1000.</p>
464465
</dd>
465466
</dl>
466467
<dl id="mapfile-map-scaledenom">

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="pre">class</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='139720414706512'&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="pre">class</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='139658716478288'&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='139720414706512'&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='139658716478288'&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.

objects.inv

-31 Bytes
Binary file not shown.

ogc/wms_server.html

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,7 +1853,20 @@ <h3><a class="toc-backref" href="#table-of-contents" role="doc-backlink">Vendor
18531853
<p>The angle value is in degrees clockwise.</p>
18541854
</div>
18551855
</div></blockquote>
1856-
<p id="index-127"><strong>radius</strong></p>
1856+
<p id="index-127"><strong>bbox_pixel_is_point</strong></p>
1857+
<ul class="simple">
1858+
<li><p>If this parameter is “TRUE”, MapServer will treat the BBOX received in WMS
1859+
GetMap requests as if it was provided in pixel_is_point mode. Essentially
1860+
disabling the conversion from pixel_is_area (WMS model) to pixel_is_point that
1861+
is present in mapwms.c for that specific mapfile.</p></li>
1862+
</ul>
1863+
<p id="index-128"><strong>map_resolution</strong></p>
1864+
<ul class="simple">
1865+
<li><p>Set this parameter to change the Map <a class="reference internal" href="../mapfile/map.html#mapfile-map-resolution"><span class="std std-ref">RESOLUTION</span></a>.
1866+
MapServer uses a default screen resolution of 72 DPI. For high-resolution screens,
1867+
pass this parameter to ensure fonts and symbols appear at the correct size.</p></li>
1868+
</ul>
1869+
<p id="index-129"><strong>radius</strong></p>
18571870
<ul class="simple">
18581871
<li><p>This parameter accepts two types of input:</p>
18591872
<ul>
@@ -1863,16 +1876,9 @@ <h3><a class="toc-backref" href="#table-of-contents" role="doc-backlink">Vendor
18631876
</ul>
18641877
</li>
18651878
</ul>
1866-
<p><strong>bbox_pixel_is_point</strong></p>
1867-
<ul class="simple">
1868-
<li><p>If this parameter is “TRUE”, MapServer will treat the BBOX received in WMS
1869-
GetMap requests as if it was provided in pixel_is_point mode. Essentially
1870-
disabling the conversion from pixel_is_area (WMS model) to pixel_is_point that
1871-
is present in mapwms.c for that specific mapfile.</p></li>
1872-
</ul>
18731879
</section>
18741880
<section id="http-status-error-codes">
1875-
<span id="index-128"></span><h3><a class="toc-backref" href="#table-of-contents" role="doc-backlink">HTTP status error codes</a><a class="headerlink" href="#http-status-error-codes" title="Link to this heading"></a></h3>
1881+
<span id="index-130"></span><h3><a class="toc-backref" href="#table-of-contents" role="doc-backlink">HTTP status error codes</a><a class="headerlink" href="#http-status-error-codes" title="Link to this heading"></a></h3>
18761882
<p>The OGC WMS specification is not explicit about which HTTP status error code
18771883
servers should return in case of errors. Traditionaly most WMS implementation
18781884
return “200 OK” in those situations. Starting with MapServer 8.4, it is
@@ -1899,7 +1905,7 @@ <h3><a class="toc-backref" href="#table-of-contents" role="doc-backlink">Vendor
18991905
</div>
19001906
</section>
19011907
<section id="cascading-wms-requests">
1902-
<h3><a class="toc-backref" href="#table-of-contents" role="doc-backlink">Cascading WMS Requests</a><a class="headerlink" href="#cascading-wms-requests" title="Link to this heading"></a></h3>
1908+
<span id="index-131"></span><h3><a class="toc-backref" href="#table-of-contents" role="doc-backlink">Cascading WMS Requests</a><a class="headerlink" href="#cascading-wms-requests" title="Link to this heading"></a></h3>
19031909
<p>Currently, there are 3 requests that support WMS cascading:</p>
19041910
<ul>
19051911
<li><p>GetMap</p></li>

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)