[SCM] PostGIS branch master updated. 3.4.0rc1-722-gf6a7ce541
git at osgeo.org
git at osgeo.org
Mon Oct 30 11:03:25 PDT 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via f6a7ce541d1badaa46f9d3785d52680cab572db9 (commit)
via cac91cf88e1315477ac1964b2e810208dea56dfe (commit)
from a6aec22a64d7bcad2ac76cac3e68fd7579db2a36 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f6a7ce541d1badaa46f9d3785d52680cab572db9
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Oct 30 19:02:54 2023 +0100
Update PostGIS Manual translation template
diff --git a/doc/po/templates/postgis-manual.pot b/doc/po/templates/postgis-manual.pot
index 3418a21ce..5ddb31ef2 100644
--- a/doc/po/templates/postgis-manual.pot
+++ b/doc/po/templates/postgis-manual.pot
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2023-10-06 06:13+0000\n"
+"POT-Creation-Date: 2023-10-30 18:01+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <kde-i18n-doc at kde.org>\n"
@@ -7989,6 +7989,11 @@ msgstr ""
msgid "Han Wang"
msgstr ""
+#. Tag: member
+#, no-c-format
+msgid "Hans Lemuet"
+msgstr ""
+
#. Tag: member
#, no-c-format
msgid "Haribabu Kommi"
@@ -18801,17 +18806,37 @@ msgstr ""
#. Tag: refpurpose
#, no-c-format
-msgid "Return a geometry as a GeoJSON element."
+msgid "Return a geometry or feature in GeoJSON format."
msgstr ""
#. Tag: para
#, no-c-format
msgid ""
-"Returns a geometry as a GeoJSON \"geometry\", or a row as a GeoJSON "
-"\"feature\". (See the <link xlink:href=\"https://tools.ietf.org/html/"
-"rfc7946\">GeoJSON specifications RFC 7946</link>). 2D and 3D Geometries are "
-"both supported. GeoJSON only support SFS 1.1 geometry types (no curve "
-"support for example)."
+"Returns a geometry as a GeoJSON \"geometry\" object, or a row as a GeoJSON "
+"\"feature\" object."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The resulting GeoJSON geometry and feature representations conform with the "
+"<link xlink:href=\"https://tools.ietf.org/html/rfc7946\">GeoJSON "
+"specifications RFC 7946</link>, except when the parsed geometries are "
+"referenced with a CRS other than WGS84 longitude and latitude (<link xlink:"
+"href=\"https://epsg.io/4326\">EPSG:4326</link>, <link xlink:href=\"http://"
+"epsg.io/4326.gml\">urn:ogc:def:crs:OGC::CRS84</link>); the GeoJSON geometry "
+"object will then have a short CRS SRID identifier attached by default. 2D "
+"and 3D Geometries are both supported. GeoJSON only supports SFS 1.1 geometry "
+"types (no curve support for example)."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The <varname>geom_column</varname> parameter is used to distinguish between "
+"multiple geometry columns. If omitted, the first geometry column in the "
+"record will be determined. Conversely, passing the parameter will save "
+"column type lookups."
msgstr ""
#. Tag: para
@@ -23124,6 +23149,41 @@ msgid ""
"parameters are ignored."
msgstr ""
+#. Tag: para
+#, no-c-format
+msgid "Input parameters are:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The raster to generate the contour of"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The band to generate the contour of"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "The elevation interval between contours generated"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The \"base\" relative to which contour intervals are applied, this is "
+"normally zero, but could be different. To generate 10m contours at 5, 15, "
+"25, ... the LEVEL_BASE would be 5."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"If <literal>true</literal>, contour polygons will be created, rather than "
+"polygon lines."
+msgstr ""
+
#. Tag: para
#, no-c-format
msgid "Return values are a set of records with the following attributes:"
@@ -23169,11 +23229,6 @@ msgid ""
"gdal_grid_tut.html\">GDAL grid tutorial</link>."
msgstr ""
-#. Tag: para
-#, no-c-format
-msgid "Input parameters are:"
-msgstr ""
-
#. Tag: para
#, no-c-format
msgid ""
@@ -32066,7 +32121,7 @@ msgstr ""
#, no-c-format
msgid ""
"Returns the smallest measure at which points interpolated along the given "
-"trajectories are at the smallest distance."
+"trajectories are the least distance apart."
msgstr ""
#. Tag: para
@@ -32080,8 +32135,8 @@ msgstr ""
#. Tag: para
#, no-c-format
msgid ""
-"See <xref linkend=\"ST_LocateAlong\"/> for getting the actual points at the "
-"given measure."
+"To obtain the actual points at the computed measure use <xref "
+"linkend=\"ST_LocateAlong\"/> ."
msgstr ""
#. Tag: para
@@ -32101,7 +32156,8 @@ msgstr ""
#. Tag: para
#, no-c-format
msgid ""
-"Returns the minimum distance two moving objects have ever been each other."
+"Returns the distance (in 2D) between two trajectories at their closest point "
+"of approach."
msgstr ""
#. Tag: para
commit cac91cf88e1315477ac1964b2e810208dea56dfe
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Oct 30 18:59:33 2023 +0100
Update ST_AsGeoJSON docs - patch by Andre Siefken
Closes #4764
diff --git a/doc/reference_output.xml b/doc/reference_output.xml
index fa8e28b94..428a85742 100644
--- a/doc/reference_output.xml
+++ b/doc/reference_output.xml
@@ -612,7 +612,7 @@ F000000000000000000000000000000000000000000000000');
<refnamediv>
<refname>ST_AsGeoJSON</refname>
- <refpurpose>Return a geometry as a GeoJSON element.</refpurpose>
+ <refpurpose>Return a geometry or feature in GeoJSON format.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -620,7 +620,7 @@ F000000000000000000000000000000000000000000000000');
<funcprototype>
<funcdef>text <function>ST_AsGeoJSON</function></funcdef>
<paramdef><type>record </type> <parameter>feature</parameter></paramdef>
- <paramdef choice="opt"><type>text </type> <parameter>geomcolumnname</parameter></paramdef>
+ <paramdef choice="opt"><type>text </type> <parameter>geom_column=""</parameter></paramdef>
<paramdef choice="opt"><type>integer </type> <parameter>maxdecimaldigits=9</parameter></paramdef>
<paramdef choice="opt"><type>boolean </type> <parameter>pretty_bool=false</parameter></paramdef>
</funcprototype>
@@ -642,10 +642,32 @@ F000000000000000000000000000000000000000000000000');
<refsection>
<title>Description</title>
- <para>Returns a geometry as a GeoJSON "geometry", or a row as a GeoJSON "feature".
- (See the <link xlink:href="https://tools.ietf.org/html/rfc7946">GeoJSON specifications RFC 7946</link>).
- 2D and 3D Geometries are both supported.
- GeoJSON only support SFS 1.1 geometry types (no curve support for example).</para>
+ <para>
+Returns a geometry as a GeoJSON "geometry" object,
+or a row as a GeoJSON "feature" object.
+ </para>
+
+ <para>
+The resulting GeoJSON geometry and feature representations conform
+with the <link xlink:href="https://tools.ietf.org/html/rfc7946">GeoJSON
+specifications RFC 7946</link>, except when the parsed geometries
+are referenced with a CRS other than WGS84 longitude and latitude
+(<link xlink:href="https://epsg.io/4326">EPSG:4326</link>, <link
+xlink:href="http://epsg.io/4326.gml">urn:ogc:def:crs:OGC::CRS84</link>);
+the GeoJSON geometry object will then have a short CRS SRID identifier
+attached by default.
+
+2D and 3D Geometries are both supported.
+GeoJSON only supports SFS 1.1 geometry types
+(no curve support for example).
+ </para>
+
+ <para>
+The <varname>geom_column</varname> parameter is used to distinguish
+between multiple geometry columns.
+If omitted, the first geometry column in the record will be determined.
+Conversely, passing the parameter will save column type lookups.
+</para>
<para>The <varname>maxdecimaldigits</varname> argument may be used to reduce the maximum number of decimal places used in output (defaults to 9). If you are using EPSG:4326 and are outputting the geometry only for display, <varname>maxdecimaldigits</varname>=6 can be a good choice for many maps.</para>
-----------------------------------------------------------------------
Summary of changes:
doc/po/templates/postgis-manual.pot | 88 ++++++++++++++++++++++++++++++-------
doc/reference_output.xml | 34 +++++++++++---
2 files changed, 100 insertions(+), 22 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list