Skip to content

Commit 2c0e7ce

Browse files
author
MapServer deploybot
committed
update with results of commit MapServer/MapServer-documentation@8e80cae
1 parent b78ce8c commit 2c0e7ce

File tree

6 files changed

+17
-21
lines changed

6 files changed

+17
-21
lines changed

_sources/ogc/wfs_server.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ certain libraries:
7272
- GDAL/OGR: I/O support libraries. Version 1.6.0 or greater is required.
7373

7474
Please see the MapServer :ref:`UNIX Compilation and Installation HowTo
75-
<unix>` for detailed instructions on compiling mapserver with support
75+
<unix>` for detailed instructions on compiling MapServer with support
7676
for these libraries and features. For Windows users, the `MS4W`_
7777
installer comes ready to serve both WFS and WMS.
7878

@@ -746,7 +746,7 @@ Web Object Metadata
746746
**wfs_features_cache_size**
747747
(Optional, since MapServer 7.2) Maximum amount of RAM allowed to cache
748748
features during the first query pass, so as not to be asked again to
749-
the datasource when geneating the GML or OGR output.
749+
the datasource when generating the GML or OGR output.
750750
If wfs_features_cache_count is also set, the most limiting will be honoured.
751751
By default the value is in bytes, unless the " MB" suffix is specified.
752752
Note: this is an advanced setting.
@@ -1030,8 +1030,7 @@ Layer Object
10301030
a mix of geometry types, and "None" is sometimes suitable for layers without
10311031
geometry. Note that layers which are a mix of polygon and multipolygon
10321032
would normally have to be described as "Geometry". To produce 2.5D output
1033-
append "25D" to the geometry type (ie. "Polygon25D"). Note that Z values
1034-
are only carried by MapServer if built with USE_POINT_Z_M support.
1033+
append "25D" to the geometry type (i.e. "Polygon25D").
10351034

10361035
::
10371036

@@ -1259,7 +1258,7 @@ Layer Object
12591258
triple: WFS; METADATA; wfs_getfeature_formatlist
12601259

12611260
**wfs_getfeature_formatlist**
1262-
(Optional) Comma-separted list of formats that should be valid for a
1261+
(Optional) Comma-separated list of formats that should be valid for a
12631262
GetFeature request. If defined, only these formats are advertised
12641263
in the Capabilities document.
12651264

@@ -1353,7 +1352,7 @@ Layer Object
13531352

13541353
**wfs_srs**
13551354
If there is no SRS defined at the top-level in the mapfile then this
1356-
SRS will be used to advertize this feature type (layer) in the
1355+
SRS will be used to advertise this feature type (layer) in the
13571356
capabilities. See the note about the SRS rules in WFS.
13581357

13591358
.. index::

_sources/output/ogr_output.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,7 @@ primarily intended to support WFS.
243243
a mix of geometry types, and "None" is sometimes suitable for layers without
244244
geometry. Note that layers which are a mix of polygon and multipolygon
245245
would normally have to be described as "Geometry". To produce 2.5D output
246-
append "25D" to the geometry type (ie. "Polygon25D"). Note that Z values
247-
are only carried by MapServer if built with USE_POINT_Z_M support.
246+
append "25D" to the geometry type (i.e. "Polygon25D").
248247

249248
::
250249

@@ -305,7 +304,7 @@ types (ie. polygons and multipolygons) the geometry type should be set to
305304

306305
In order 2.5D support (geometries with Z coordinates) to be enabled, the "25D"
307306
suffix must be add to the value of the "ows_geomtype" metadata item
308-
(i.e. "Polygon25D"), and MapServer must be built with USE_POINT_Z_M support.
307+
(i.e. "Polygon25D").
309308

310309
.. note::
311310
Empty geometries are supported from the MapServer 8.0 release.

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='140416385020128'&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='139920931205344'&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='140416385020128'&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='139920931205344'&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.

ogc/wfs_server.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ <h3>Software Requirements<a class="headerlink" href="#software-requirements" tit
199199
<li><p>PROJ: The reprojection library. Version 4.4.3 or greater is required.</p></li>
200200
<li><p>GDAL/OGR: I/O support libraries. Version 1.6.0 or greater is required.</p></li>
201201
</ul>
202-
<p>Please see the MapServer <a class="reference internal" href="../installation/unix.html#unix"><span class="std std-ref">UNIX Compilation and Installation HowTo</span></a> for detailed instructions on compiling mapserver with support
202+
<p>Please see the MapServer <a class="reference internal" href="../installation/unix.html#unix"><span class="std std-ref">UNIX Compilation and Installation HowTo</span></a> for detailed instructions on compiling MapServer with support
203203
for these libraries and features. For Windows users, the <a class="reference external" href="https://ms4w.com">MS4W</a>
204204
installer comes ready to serve both WFS and WMS.</p>
205205
</section>
@@ -756,7 +756,7 @@ <h2><a class="toc-backref" href="#contents" role="doc-backlink">Reference Sectio
756756
<dl class="simple" id="index-21">
757757
<dt><strong>wfs_features_cache_size</strong></dt><dd><p>(Optional, since MapServer 7.2) Maximum amount of RAM allowed to cache
758758
features during the first query pass, so as not to be asked again to
759-
the datasource when geneating the GML or OGR output.
759+
the datasource when generating the GML or OGR output.
760760
If wfs_features_cache_count is also set, the most limiting will be honoured.
761761
By default the value is in bytes, unless the “ MB” suffix is specified.
762762
Note: this is an advanced setting.</p>
@@ -979,8 +979,7 @@ <h2><a class="toc-backref" href="#contents" role="doc-backlink">Reference Sectio
979979
a mix of geometry types, and “None” is sometimes suitable for layers without
980980
geometry. Note that layers which are a mix of polygon and multipolygon
981981
would normally have to be described as “Geometry”. To produce 2.5D output
982-
append “25D” to the geometry type (ie. “Polygon25D”). Note that Z values
983-
are only carried by MapServer if built with USE_POINT_Z_M support.</p>
982+
append “25D” to the geometry type (i.e. “Polygon25D”).</p>
984983
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="s2">&quot;ows_geomtype&quot;</span> <span class="s2">&quot;Polygon25D&quot;</span>
985984
</pre></div>
986985
</div>
@@ -1159,7 +1158,7 @@ <h2><a class="toc-backref" href="#contents" role="doc-backlink">Reference Sectio
11591158
</dd>
11601159
</dl>
11611160
<dl class="simple" id="index-66">
1162-
<dt><strong>wfs_getfeature_formatlist</strong></dt><dd><p>(Optional) Comma-separted list of formats that should be valid for a
1161+
<dt><strong>wfs_getfeature_formatlist</strong></dt><dd><p>(Optional) Comma-separated list of formats that should be valid for a
11631162
GetFeature request. If defined, only these formats are advertised
11641163
in the Capabilities document.</p>
11651164
</dd>
@@ -1236,7 +1235,7 @@ <h2><a class="toc-backref" href="#contents" role="doc-backlink">Reference Sectio
12361235
</ul>
12371236
<dl class="simple" id="index-73">
12381237
<dt><strong>wfs_srs</strong></dt><dd><p>If there is no SRS defined at the top-level in the mapfile then this
1239-
SRS will be used to advertize this feature type (layer) in the
1238+
SRS will be used to advertise this feature type (layer) in the
12401239
capabilities. See the note about the SRS rules in WFS.</p>
12411240
</dd>
12421241
</dl>

output/ogr_output.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,7 @@ <h2><a class="toc-backref" href="#table-of-contents" role="doc-backlink">LAYER M
356356
a mix of geometry types, and “None” is sometimes suitable for layers without
357357
geometry. Note that layers which are a mix of polygon and multipolygon
358358
would normally have to be described as “Geometry”. To produce 2.5D output
359-
append “25D” to the geometry type (ie. “Polygon25D”). Note that Z values
360-
are only carried by MapServer if built with USE_POINT_Z_M support.</p>
359+
append “25D” to the geometry type (i.e. “Polygon25D”).</p>
361360
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="s2">&quot;ows_geomtype&quot;</span> <span class="s2">&quot;Polygon&quot;</span>
362361
</pre></div>
363362
</div>
@@ -413,7 +412,7 @@ <h2><a class="toc-backref" href="#table-of-contents" role="doc-backlink">Geometr
413412
</div></blockquote>
414413
<p>In order 2.5D support (geometries with Z coordinates) to be enabled, the “25D”
415414
suffix must be add to the value of the “ows_geomtype” metadata item
416-
(i.e. “Polygon25D”), and MapServer must be built with USE_POINT_Z_M support.</p>
415+
(i.e. “Polygon25D”).</p>
417416
<div class="admonition note">
418417
<p class="admonition-title">Note</p>
419418
<p>Empty geometries are supported from the MapServer 8.0 release.</p>

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)