[Git][debian-gis-team/postgis][upstream] New upstream version 3.5.0+dfsg
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Sep 26 04:01:18 BST 2024
Bas Couwenberg pushed to branch upstream at Debian GIS Project / postgis
Commits:
f1104861 by Bas Couwenberg at 2024-09-26T04:44:38+02:00
New upstream version 3.5.0+dfsg
- - - - -
24 changed files:
- ChangeLog
- NEWS
- README.postgis
- Version.config
- doc/po/de/postgis-manual.po
- doc/po/es/postgis-manual.po
- doc/po/fr/postgis-manual.po
- doc/po/it_IT/postgis-manual.po
- doc/po/ja/postgis-manual.po
- doc/po/ka/postgis-manual.po
- doc/po/ko_KR/postgis-manual.po
- doc/po/pl/postgis-manual.po
- doc/po/pt_BR/postgis-manual.po
- doc/po/ro/postgis-manual.po
- doc/po/ru/postgis-manual.po
- doc/po/templates/postgis-manual.pot
- doc/po/uk/postgis-manual.po
- doc/po/zh_Hans/postgis-manual.po
- doc/reference_sfcgal.xml
- doc/release_notes.xml
- extensions/address_standardizer/Makefile
- extensions/upgradeable_versions.mk
- liblwgeom/topo/lwgeom_topo.c
- postgis_revision.h
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,55 @@
+2024-09-25 Regina Obe <lr at pcorp.us>
+
+ * extensions/upgradeable_versions.mk: Fix typo
+
+2024-09-25 Weblate <noreply at weblate.org>
+
+ * doc/po/de/postgis-manual.po, doc/po/es/postgis-manual.po,
+ doc/po/fr/postgis-manual.po, doc/po/it_IT/postgis-manual.po,
+ doc/po/ja/postgis-manual.po, doc/po/ka/postgis-manual.po,
+ doc/po/ko_KR/postgis-manual.po, doc/po/pl/postgis-manual.po,
+ doc/po/pt_BR/postgis-manual.po, doc/po/ro/postgis-manual.po,
+ doc/po/ru/postgis-manual.po, doc/po/uk/postgis-manual.po,
+ doc/po/zh_Hans/postgis-manual.po: Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in
+ Weblate. Translation: postgis/PostGIS Manual Translate-URL:
+ https://weblate.osgeo.org/projects/postgis/postgis-manual/
+
+2024-09-25 Regina Obe <lr at pcorp.us>
+
+ * HOWTO_RELEASE, NEWS, README.postgis, Version.config,
+ doc/po/templates/postgis-manual.pot, doc/release_notes.xml,
+ extensions/upgradeable_versions.mk: Prep for 3.5.0 release
+
+2024-09-25 Loïc Bartoletti <loic.bartoletti at oslandia.com>
+
+ * doc/reference_sfcgal.xml: fix(doc): fix wrong deprecated warning
+ CG_xxx is deprecated use CG_xxx Closes
+ https://git.osgeo.org/gitea/postgis/postgis/pulls/216
+
+2024-09-25 Teramoto Ikuhiro <yellow at affrc.go.jp>
+
+ * doc/po/ja/postgis-manual.po: Translated PostGIS Manual using
+ Weblate (Japanese) Currently translated at 100.0% (5762 of 5762 strings) Translation: postgis/PostGIS Manual Translate-URL:
+ https://weblate.osgeo.org/projects/postgis/postgis-manual/ja/
+
+2024-09-24 Sandro Santilli <strk at kbt.io>
+
+ * liblwgeom/topo/lwgeom_topo.c: Fix some format strings
+
+2024-09-24 Sandro Santilli <strk at kbt.io>
+
+ * liblwgeom/topo/lwgeom_topo.c: Improve debugging output of finding
+ face containing point References #5782
+
+2024-09-23 Regina Obe <lr at pcorp.us>
+
+ * NEWS: Change NEWS prepping for final release
+
+2024-09-22 Regina Obe <lr at pcorp.us>
+
+ * Version.config, extensions/upgradeable_versions.mk: Flip back to
+ 3.5.0dev
+
2024-09-22 Regina Obe <lr at pcorp.us>
* NEWS, README.postgis, Version.config,
@@ -68,49 +120,5 @@
2024-09-16 Regina Obe <lr at pcorp.us>
- * NEWS, Version.config, extensions/upgradeable_versions.mk: Flip
- back to dev mode
-
-2024-09-16 Regina Obe <lr at pcorp.us>
-
- * NEWS, doc/postgis.xml: Final prep for PostGIS 3.5.0beta1
-
-2024-09-16 Regina Obe <lr at pcorp.us>
-
- * Version.config, ci/winnie/package_postgis.sh,
- ci/winnie/regress_postgis.sh, ci/winnie/winnie_common.sh,
- extensions/upgradeable_versions.mk: Flip to beta1 and upgrade winnie
- dependencies
-
-2024-09-14 Regina Obe <lr at pcorp.us>
-
- * NEWS, README.postgis, ci/winnie/regress_postgis.sh,
- ci/winnie/winnie_common.sh, extensions/upgradeable_versions.mk:
- Prepping for 3.5.0beta1 release
-
-2024-09-13 Sandro Santilli <strk at kbt.io>
-
- * GNUmakefile.in: Make sure raster is built after libpgcommon References #5099
-
-2024-09-12 Sandro Santilli <strk at kbt.io>
-
- * .editorconfig, liblwgeom/topo/lwgeom_topo.c: Fix indenting in
- lwgeom_topo.c
-
-2024-09-11 Sandro Santilli <strk at kbt.io>
-
- * topology/loader/pgtopo_export: Quote pgtopo_export output path
-
-2024-09-10 Sandro Santilli <strk at kbt.io>
-
- * extensions/upgradeable_versions.mk: Add 3.3.7 as upgradeable
-
-2024-09-04 Paul Ramsey <pramsey at cleverelephant.ca>
-
- * extensions/upgradeable_versions.mk: Add 3.4.3 as upgradeable
-
-2024-09-03 Loïc Bartoletti <loic.bartoletti at oslandia.com>
-
- * utils/check_all_upgrades.sh: Improve shell compatibility and OS
- detection - Add OS detection to use gmake on FreeBSD, Darwin, and OpenBSD - Replace 'make' with '${MAKE}' to use the correct make command - Fix CURRENTVERSION extraction using tr instead of paste
+ * Flip back to dev mode
=====================================
NEWS
=====================================
@@ -1,5 +1,5 @@
-PostGIS 3.5.0rc1
-2024/09/22
+PostGIS 3.5.0
+2024/09/25
To take advantage of all postgis_sfcgal extension features SFCGAL 1.5+ is needed.
PostgreSQL 12-17 required. GEOS 3.8+ required. Proj 6.1+ required.
=====================================
README.postgis
=====================================
@@ -1,8 +1,8 @@
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
-:Version: 3.5.0rc1
-:Date: 2024-09-22
+:Version: 3.5.0
+:Date: 2024-09-25
:Website: https://postgis.net
This distribution contains a module which implements GIS simple features, ties
=====================================
Version.config
=====================================
@@ -5,7 +5,7 @@
POSTGIS_MAJOR_VERSION=3
POSTGIS_MINOR_VERSION=5
-POSTGIS_MICRO_VERSION=0rc1
+POSTGIS_MICRO_VERSION=0
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
=====================================
doc/po/de/postgis-manual.po
=====================================
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2024-02-26 08:45+0000\n"
"Last-Translator: Andreas Schild <andreas.schild at bfw.gv.at>\n"
"Language-Team: German <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -45174,7 +45174,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/es/postgis-manual.po
=====================================
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-09-22 19:23+0000\n"
"Last-Translator: Anonymous <noreply at weblate.org>\n"
"Language-Team: Spanish <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -36606,7 +36606,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/fr/postgis-manual.po
=====================================
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2024-06-18 14:45+0000\n"
"Last-Translator: Thomas Muguet <thomas.muguet at oslandia.com>\n"
"Language-Team: French <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -45031,7 +45031,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/it_IT/postgis-manual.po
=====================================
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-12-15 20:10+0000\n"
"Last-Translator: Regina Obe <regina at arrival3d.com>\n"
"Language-Team: Italian <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -37154,7 +37154,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/ja/postgis-manual.po
=====================================
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
-"PO-Revision-Date: 2024-09-18 10:06+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
+"PO-Revision-Date: 2024-09-25 03:47+0000\n"
"Last-Translator: Teramoto Ikuhiro <yellow at affrc.go.jp>\n"
"Language-Team: Japanese <https://weblate.osgeo.org/projects/postgis/postgis-"
"manual/ja/>\n"
@@ -5386,6 +5386,8 @@ msgid ""
"Adds a linestring to an existing topology using a tolerance and possibly "
"splitting existing edges/faces."
msgstr ""
+"許容差を使って既存のトポロジにラインストリングを追加し、可能ならエッジ/フェイ"
+"スを分割します。"
#. Tag: para
#, no-c-format
@@ -5396,6 +5398,11 @@ msgid ""
"existing nodes or edges within given tolerance. Existing edges and faces may "
"be split by the line. New nodes and faces may be added."
msgstr ""
+"許容差を使って既存のトポロジにラインストリングを追加し、それを形成する符号付"
+"きエッジ識別子 (負符号は入力ラインストリングの逆方向に進む場合に付きます)の集"
+"合を返します。与えられたリンは既存のノードまたはエッジに指定した許容値内でス"
+"ナップします。既存のエッジやフェイスはラインで分割される可能性があります。新"
+"しいノードとフェイスが追加される可能性があります。"
#. Tag: para
#, no-c-format
@@ -5409,7 +5416,7 @@ msgstr ""
#. Tag: para
#, no-c-format
msgid "Enhanced: 3.2.0 added support for returning signed identifier."
-msgstr ""
+msgstr "Enhanced: 3.2.0 符号付き識別子を返す機能が追加されました。"
#. Tag: para
#, no-c-format
@@ -13810,6 +13817,10 @@ msgid ""
"afterwards remove the first and last double-quote character. For geometry "
"column pass as is.\""
msgstr ""
+"テーブルや名前空間の名前のうち特殊文字や引用符をエスケープすると、特別な処理"
+"が必要になる可能性があります。あるユーザは「スキーマとテーブルでは、識別子エ"
+"スケープ規則を使って、二重引用符を付けた文字列を生成して、その後最初と最後の"
+"二重引用符を削ります。ジオメトリカラムについてはそのまま渡します」"
#. Tag: para
#, no-c-format
@@ -17185,6 +17196,11 @@ msgid ""
"introduce rendering artifacts if the resulting coordinates are projected "
"into another (non-cartesian) coordinate system before rendering."
msgstr ""
+"<code>cartesian_hint</code>を<code>TRUE</code>に設定した場合には、アルゴリズ"
+"ムは、結果のポイント数をさらに減らすために、デカルト数学を含む、追加の最適化"
+"を適用します。結果の座標が他の (非デカルト)座標系に投影変換される場合には、こ"
+"の任意引数を使用することで、描画の不自然な諧調やノイズが現れる可能性があるこ"
+"とに注意して下さい。"
#. Tag: para
#, no-c-format
@@ -24045,7 +24061,7 @@ msgstr "3次元ジオメトリへの対応:"
#. Tag: para
#, no-c-format
msgid "Options argument can be used to add BBOX and CRS in GeoJSON output:"
-msgstr ""
+msgstr "Options引数は、GeoJSON出力でBBOXまたはCRSを追加するために使われます:"
#. Tag: para
#, no-c-format
@@ -33605,6 +33621,11 @@ msgid ""
"varname> is set to TRUE, then touched pixels are included, otherwise only if "
"the center of the pixel is in the geometry it is included."
msgstr ""
+"入力ジオメトリで切り取ったラスタを返します。バンドが指定されていない場合に"
+"は、全てのバンドが処理されます。<varname>crop</varname>が指定されていなかった"
+"りTRUE となっている場合には、出力ラスタは切り取られます。<varname>touched</"
+"varname>がTRUEの場合には、接触するピクセルは取り込まれ、TRUEでない場合には、"
+"中心がジオメトリ内にあるピクセルだけが取り込まれます。"
#. Tag: para
#, no-c-format
@@ -39891,7 +39912,7 @@ msgstr ""
#. Tag: refpurpose
#, no-c-format
msgid "Perform 3D union using postgis_sfcgal."
-msgstr ""
+msgstr "postgis_sfcgalを使用して3次元結合を実行します。"
#. Tag: para
#, no-c-format
@@ -42581,12 +42602,12 @@ msgstr ""
#. Tag: refpurpose
#, no-c-format
msgid "Returns the version number of the libjson-c library."
-msgstr ""
+msgstr "libjson-cライブラリのバージョン番号を返します。"
#. Tag: para
#, no-c-format
msgid "Returns the version number of the LibJSON-C library."
-msgstr ""
+msgstr "LibJSON-Cライブラリのバージョン番号を返します。"
#. Tag: refpurpose
#, no-c-format
@@ -42840,8 +42861,8 @@ msgstr "PostGIS 3.5.0"
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
-msgstr "2024/xx/xx"
+msgid "2024/09/25"
+msgstr ""
#. Tag: para
#, no-c-format
@@ -42985,6 +43006,9 @@ msgid ""
"<link xlink:href=\"https://github.com/postgis/postgis/pull/776\">GH-776</"
"link>, ST_Length: Return 0 for CurvePolygon (Dan Baston)"
msgstr ""
+"<link xlink:href=\"https://trac.osgeo.org/postgis/ticket/5747\">5747</link>, "
+"<link xlink:href=\"https://github.com/postgis/postgis/pull/776\">GH-776</"
+"link>, ST_Length: 曲線ポリゴンで0を返す (Dan Bastonさん)"
#. Tag: para
#, no-c-format
@@ -42993,6 +43017,9 @@ msgid ""
"support for GEOS 3.13 and RelateNG. Most functionality remains the same, but "
"new GEOS predicate implementation has a few small changes."
msgstr ""
+"<link xlink:href=\"https://trac.osgeo.org/postgis/ticket/5770\">5770</link>, "
+"GEOS 3.13とRelateNGに対応しました。ほとんどの機能は同じですが、新しいGEOS述語"
+"の実装では若干の変更があります。"
#. Tag: para
#, no-c-format
@@ -43000,6 +43027,8 @@ msgid ""
"Boundary Node Rule relate matrices might be different when using the \"multi-"
"valent end point\" rule."
msgstr ""
+"\"multi-valent end point\" 規則 (他のジオメトリの境界になっている終点も境界と"
+"する)を使う時、境界ノード規則の関係行列が異なる場合があります。"
#. Tag: para
#, no-c-format
@@ -43008,6 +43037,8 @@ msgid ""
"boundaries might be different. Run ST_MakeValid to get valid inputs to feed "
"to the calculation."
msgstr ""
+"境界を共有する不正なマルチポリゴンの関係行列は異なる可能性があります。入力ジ"
+"オメトリをST_MakeValidで妥当なものにしてから計算に渡して下さい。"
#. Tag: para
#, no-c-format
@@ -43015,6 +43046,7 @@ msgid ""
"Zero length LineStrings are treated as if they are the equivalent Point "
"object."
msgstr ""
+"長さが0のラインストリングは、等価なポイントオブジェクトとして扱われます。"
#. Tag: title
#, no-c-format
@@ -43207,6 +43239,8 @@ msgid ""
"<link xlink:href=\"https://trac.osgeo.org/postgis/ticket/5550\">5550</link>, "
"Fix upgrades from 2.x in sandboxed systems (Sandro Santilli)"
msgstr ""
+"<link xlink:href=\"https://trac.osgeo.org/postgis/ticket/5550\">5550</link>, "
+"酸度ボックスシステムでの2.xからのアップグレードの修正 (Sandro Santilliさん)"
#. Tag: para
#, no-c-format
@@ -49396,6 +49430,10 @@ msgstr "2.5次元/3次元対応"
msgid "Supports geography"
msgstr "ジオグラフィ対応"
+#, no-c-format
+#~ msgid "2024/xx/xx"
+#~ msgstr "2024/xx/xx"
+
#, no-c-format
#~ msgid ""
#~ "Adds a linestring to an existing topology using a tolerance and possibly "
=====================================
doc/po/ka/postgis-manual.po
=====================================
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2024-06-29 07:45+0000\n"
"Last-Translator: Temuri Doghonadze <temuri.doghonadze at gmail.com>\n"
"Language-Team: Georgian <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -34450,7 +34450,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/ko_KR/postgis-manual.po
=====================================
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-10-14 20:23+0000\n"
"Last-Translator: Anonymous <noreply at weblate.org>\n"
"Language-Team: Korean <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -38997,7 +38997,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/pl/postgis-manual.po
=====================================
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-09-22 19:23+0000\n"
"Last-Translator: Anonymous <noreply at weblate.org>\n"
"Language-Team: Polish <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -34644,7 +34644,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/pt_BR/postgis-manual.po
=====================================
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-09-22 19:23+0000\n"
"Last-Translator: Anonymous <noreply at weblate.org>\n"
"Language-Team: Portuguese (Brazil) <https://weblate.osgeo.org/projects/"
@@ -39414,7 +39414,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/ro/postgis-manual.po
=====================================
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-10-14 20:23+0000\n"
"Last-Translator: Anonymous <noreply at weblate.org>\n"
"Language-Team: Romanian <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -34485,7 +34485,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/ru/postgis-manual.po
=====================================
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-09-25 16:23+0000\n"
"Last-Translator: Anonymous <noreply at weblate.org>\n"
"Language-Team: Russian <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -34502,7 +34502,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
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: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+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"
@@ -34448,7 +34448,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/uk/postgis-manual.po
=====================================
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-10-14 20:23+0000\n"
"Last-Translator: Anonymous <noreply at weblate.org>\n"
"Language-Team: Ukrainian <https://weblate.osgeo.org/projects/postgis/postgis-"
@@ -34452,7 +34452,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/po/zh_Hans/postgis-manual.po
=====================================
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: postgis 3.5\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2024-09-22 00:49+0000\n"
+"POT-Creation-Date: 2024-09-25 17:55+0000\n"
"PO-Revision-Date: 2023-12-28 09:45+0000\n"
"Last-Translator: Zuochenwei <zuochenwei5 at gmail.com>\n"
"Language-Team: Chinese (Simplified) <https://weblate.osgeo.org/projects/"
@@ -40441,7 +40441,7 @@ msgstr ""
#. Tag: para
#, no-c-format
-msgid "2024/xx/xx"
+msgid "2024/09/25"
msgstr ""
#. Tag: para
=====================================
doc/reference_sfcgal.xml
=====================================
@@ -913,12 +913,6 @@
<refsection>
<title>Description</title>
- <warning>
- <para>
- <xref linkend="CG_3DDifference"/> is deprecated as of 3.5.0. Use <xref linkend="CG_3DDifference"/> instead.
- </para>
- </warning>
-
<para>Returns that part of geom1 that is not part of geom2.</para>
<para role="availability" conformance="3.5.0">Availability: 3.5.0</para>
<para>&sfcgal_required;</para>
@@ -1427,13 +1421,6 @@ ST_GeomFromText('POLYHEDRALSURFACE Z( ((0 0 0, 0 0 1, 0 1 1, 0 1 0, 0 0 0)),
<refsection>
<title>Description</title>
- <warning>
- <para>
- <xref linkend="CG_3DUnion"/> is deprecated as of 3.5.0. Use <xref linkend="CG_3DUnion"/> instead.
- </para>
- </warning>
-
-
<para role="availability" conformance="3.5.0">Availability: 3.5.0</para>
<para>&sfcgal_required;</para>
<para>&sqlmm_compliant; SQL-MM IEC 13249-3: 5.1</para>
@@ -1886,12 +1873,6 @@ ST_GeomFromText('POLYHEDRALSURFACE Z( ((0 0 0, 0 0 1, 0 1 1, 0 1 0, 0 0 0)),
<refsection>
<title>Description</title>
- <warning>
- <para>
- <xref linkend="CG_ConstrainedDelaunayTriangles"/> is deprecated as of 3.5.0. Use <xref linkend="CG_ConstrainedDelaunayTriangles"/> instead.
- </para>
- </warning>
-
<para>
Return a <link xlink:href="https://en.wikipedia.org/wiki/Constrained_Delaunay_triangulation">Constrained Delaunay
triangulation</link> around the vertices of the input geometry.
=====================================
doc/release_notes.xml
=====================================
@@ -4,7 +4,7 @@
<subtitle>Release Notes</subtitle>
<section>
<title>PostGIS 3.5.0</title>
- <para>2024/xx/xx</para>
+ <para>2024/09/25</para>
<para>This version requires PostgreSQL 12-17, GEOS 3.8 or higher, and Proj 6.1+.
To take advantage of all features, GEOS 3.12+ is needed.
To take advantage of all SFCGAL features, SFCGAL 1.5.0+ is needed.</para>
=====================================
extensions/address_standardizer/Makefile
=====================================
@@ -30,7 +30,7 @@ POSTGIS_PGSQL_VERSION=130
# SQL preprocessor
SQLPP = /usr/bin/cpp -traditional-cpp -w -P -Upixel -Ubool
GREP=/bin/grep
-EXTVERSION = 3.5.0rc1
+EXTVERSION = 3.5.0
MODULE_big = address_standardizer-3
MODULEPATH = $$libdir/address_standardizer-3
ifeq (no,yes)
@@ -48,7 +48,7 @@ DATA_built = \
$(NULL)
all: sql/address_standardizer_pre.sql sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql \
- sql/$(EXTENSION)_data_us.sql sql/address_standardizer--3.5.0rc1.sql sql/$(EXTENSION)_data_us--3.5.0rc1.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
+ sql/$(EXTENSION)_data_us.sql sql/address_standardizer--3.5.0.sql sql/$(EXTENSION)_data_us--3.5.0.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql sql/$(EXTENSION)_data_us--ANY--$(EXTVERSION).sql \
sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql sql/test-debug_standardize_address.sql
=====================================
extensions/upgradeable_versions.mk
=====================================
@@ -104,6 +104,5 @@ UPGRADEABLE_VERSIONS = \
3.4.1 \
3.4.2 \
3.4.3 \
- 3.5.0alpha2 \
- 3.5.0beta1 \
+ 3.5.0rc1 \
3.5.0dev
=====================================
liblwgeom/topo/lwgeom_topo.c
=====================================
@@ -626,7 +626,7 @@ _lwt_CheckEdgeCrossing( LWT_TOPOLOGY* topo,
/* loop over each node within the edge's gbox */
nodes = lwt_be_getNodeWithinBox2D( topo, edgebox, &num_nodes,
LWT_COL_NODE_ALL, 0 );
- LWDEBUGF(1, "lwt_be_getNodeWithinBox2D returned %d nodes", num_nodes);
+ LWDEBUGF(1, "lwt_be_getNodeWithinBox2D returned %lu nodes", num_nodes);
if (num_nodes == UINT64_MAX)
{
PGTOPO_BE_ERROR();
@@ -655,7 +655,7 @@ _lwt_CheckEdgeCrossing( LWT_TOPOLOGY* topo,
/* loop over each edge within the edge's gbox */
edges = lwt_be_getEdgeWithinBox2D( topo, edgebox, &num_edges, LWT_COL_EDGE_ALL, 0 );
- LWDEBUGF(1, "lwt_be_getEdgeWithinBox2D returned %d edges", num_edges);
+ LWDEBUGF(1, "lwt_be_getEdgeWithinBox2D returned %lu edges", num_edges);
if (num_edges == UINT64_MAX)
{
GEOSGeom_destroy(edgegg);
@@ -686,7 +686,7 @@ _lwt_CheckEdgeCrossing( LWT_TOPOLOGY* topo,
return -1;
}
- LWDEBUGF(2, "Edge %d converted to GEOS", edge_id);
+ LWDEBUGF(2, "Edge %" LWTFMT_ELEMID " converted to GEOS", edge_id);
/* check if the edge has a non-boundary-boundary intersection with our edge */
@@ -699,7 +699,7 @@ _lwt_CheckEdgeCrossing( LWT_TOPOLOGY* topo,
return -1;
}
- LWDEBUGF(2, "Edge %d relate pattern is %s", edge_id, relate);
+ LWDEBUGF(2, "Edge %" LWTFMT_ELEMID " relate pattern is %s", edge_id, relate);
match = GEOSRelatePatternMatch(relate, "FF*F*****");
if ( match ) {
@@ -789,12 +789,12 @@ _lwt_CheckEdgeCrossing( LWT_TOPOLOGY* topo,
return -1;
}
- LWDEBUGF(2, "Edge %d analisys completed, it does no harm", edge_id);
+ LWDEBUGF(2, "Edge %" LWTFMT_ELEMID " analisys completed, it does no harm", edge_id);
GEOSFree(relate);
GEOSGeom_destroy(eegg);
}
- LWDEBUGF(1, "No edge crossing detected among the %d candidate edges", num_edges);
+ LWDEBUGF(1, "No edge crossing detected among the %lu candidate edges", num_edges);
if ( edges ) _lwt_release_edges(edges, num_edges);
/* would be NULL if num_edges was 0 */
@@ -1545,7 +1545,8 @@ _lwt_FindAdjacentEdges( LWT_TOPOLOGY* topo, LWT_ELEMID node, edgeend *data,
if ( azdif < 0 ) azdif += 2 * M_PI;
minaz = maxaz = azdif;
/* TODO: set nextCW/nextCCW/cwFace/ccwFace to other->something ? */
- LWDEBUGF(1, "Other edge end has cwFace=%d and ccwFace=%d",
+ LWDEBUGF(1, "Other edge end has cwFace=%" LWTFMT_ELEMID
+ " and ccwFace=%" LWTFMT_ELEMID,
other->cwFace, other->ccwFace);
} else {
minaz = maxaz = -1;
@@ -2508,8 +2509,9 @@ _lwt_AddEdge( LWT_TOPOLOGY* topo,
span.was_isolated = 0;
newedge.next_right = span.nextCW ? span.nextCW : -newedge.edge_id;
prev_left = span.nextCCW ? -span.nextCCW : newedge.edge_id;
- LWDEBUGF(1, "New edge %d is connected on start node, "
- "next_right is %d, prev_left is %d",
+ LWDEBUGF(1, "New edge %" LWTFMT_ELEMID " is connected on start node, "
+ "next_right is %" LWTFMT_ELEMID
+ ", prev_left is %" LWTFMT_ELEMID,
newedge.edge_id, newedge.next_right, prev_left);
if ( modFace != -1 )
{
@@ -2524,8 +2526,9 @@ _lwt_AddEdge( LWT_TOPOLOGY* topo,
span.was_isolated = 1;
newedge.next_right = isclosed ? -newedge.edge_id : newedge.edge_id;
prev_left = isclosed ? newedge.edge_id : -newedge.edge_id;
- LWDEBUGF(1, "New edge %d is isolated on start node, "
- "next_right is %d, prev_left is %d",
+ LWDEBUGF(1, "New edge %" LWTFMT_ELEMID " is isolated on start node, "
+ "next_right is %" LWTFMT_ELEMID
+ ", prev_left is %" LWTFMT_ELEMID,
newedge.edge_id, newedge.next_right, prev_left);
}
@@ -2535,8 +2538,9 @@ _lwt_AddEdge( LWT_TOPOLOGY* topo,
epan.was_isolated = 0;
newedge.next_left = epan.nextCW ? epan.nextCW : newedge.edge_id;
prev_right = epan.nextCCW ? -epan.nextCCW : -newedge.edge_id;
- LWDEBUGF(1, "New edge %d is connected on end node, "
- "next_left is %d, prev_right is %d",
+ LWDEBUGF(1, "New edge %" LWTFMT_ELEMID " is connected on end node, "
+ "next_left is %" LWTFMT_ELEMID
+ ", prev_right is %" LWTFMT_ELEMID,
newedge.edge_id, newedge.next_left, prev_right);
if ( modFace != -1 )
{
@@ -2569,8 +2573,9 @@ _lwt_AddEdge( LWT_TOPOLOGY* topo,
epan.was_isolated = 1;
newedge.next_left = isclosed ? newedge.edge_id : -newedge.edge_id;
prev_right = isclosed ? -newedge.edge_id : newedge.edge_id;
- LWDEBUGF(1, "New edge %d is isolated on end node, "
- "next_left is %d, prev_right is %d",
+ LWDEBUGF(1, "New edge %" LWTFMT_ELEMID " is isolated on end node, "
+ "next_left is %" LWTFMT_ELEMID
+ ", prev_right is %" LWTFMT_ELEMID,
newedge.edge_id, newedge.next_left, prev_right);
}
@@ -5186,7 +5191,7 @@ _lwt_SnapEdgeToExistingNode(
existingEdges[n] = NULL;
if ( existingEdgeId == 0 )
{
- LWDEBUGF(1, "Split component %d is a new edge, computing edgeEndInfo", n);
+ LWDEBUGF(1, "Split component %lu is a new edge, computing edgeEndInfo", n);
{
// Compute nextCW and nextCCW of the split edge now
// incident to the split point
@@ -5227,7 +5232,7 @@ _lwt_SnapEdgeToExistingNode(
);
return -1;
}
- LWDEBUGF(1, "Azimuth of split component %d edgeend [%.15g %.15g,%.15g %.15g] is %.15g",
+ LWDEBUGF(1, "Azimuth of split component %lu edgeend [%.15g %.15g,%.15g %.15g] is %.15g",
n, op.x, op.y, pt->x, pt->y, splitNodeEdgeEnds[n].myaz);
ret = _lwt_FindAdjacentEdges( topo, node->node_id, &(splitNodeEdgeEnds[n]), NULL, -1 );
if ( ! ret ) {
@@ -5237,13 +5242,14 @@ _lwt_SnapEdgeToExistingNode(
node->node_id, edge->edge_id);
return -1;
}
- LWDEBUGF(1, "Component %d of split edge %d next CW is %d, next CCW is %d",
+ LWDEBUGF(1, "Component %lu of split edge %" LWTFMT_ELEMID
+ " next CW is %" LWTFMT_ELEMID ", next CCW is %" LWTFMT_ELEMID,
n, edge->edge_id, splitNodeEdgeEnds[n].nextCW, splitNodeEdgeEnds[n].nextCCW);
}
}
else
{
- LWDEBUGF(1, "Split component %d matches existing edge %" LWTFMT_ELEMID
+ LWDEBUGF(1, "Split component %lu matches existing edge %" LWTFMT_ELEMID
" (%s)", n, existingEdgeId, forward ? "forward" : "backward" );
/* Get existing edge */
for ( uint64_t t=0; t<splitNodeEdges->numEdges; t++ )
@@ -5332,7 +5338,7 @@ _lwt_SnapEdgeToExistingNode(
}
LWDEBUGF(1, "Setting nextEdge/sideFace of CCW edge %" LWTFMT_ELEMID
- " to %d/%d",
+ " to %" LWTFMT_ELEMID "/%" LWTFMT_ELEMID,
splitNodeEdgeEndInfo->nextCCW,
nextEdge, sideFace
);
@@ -5345,7 +5351,7 @@ _lwt_SnapEdgeToExistingNode(
updateFlags = LWT_COL_EDGE_NEXT_RIGHT|
LWT_COL_EDGE_FACE_RIGHT;
LWDEBUGF(1, "Will update next_right/face_right of outgoing CCW edge %" LWTFMT_ELEMID
- " to %d/%d",
+ " to %" LWTFMT_ELEMID "/%" LWTFMT_ELEMID,
selEdge.edge_id,
nextEdge, sideFace
);
@@ -5358,7 +5364,7 @@ _lwt_SnapEdgeToExistingNode(
updateFlags = LWT_COL_EDGE_NEXT_LEFT|
LWT_COL_EDGE_FACE_LEFT;
LWDEBUGF(1, "Will update next_left/face_left of incoming CCW edge %" LWTFMT_ELEMID
- " to %d/%d",
+ " to %" LWTFMT_ELEMID "/%" LWTFMT_ELEMID,
selEdge.edge_id,
nextEdge, sideFace
);
@@ -5391,7 +5397,7 @@ _lwt_SnapEdgeToExistingNode(
}
LWDEBUGF(1, "Setting sideFace of CW edge %" LWTFMT_ELEMID
- " to %d",
+ " to %" LWTFMT_ELEMID,
splitNodeEdgeEndInfo->nextCW, sideFace
);
@@ -5461,7 +5467,7 @@ _lwt_SnapEdgeToExistingNode(
LWDEBUGF(1, "Looking for next CCW edge of split edge %"
LWTFMT_ELEMID " on common node %" LWTFMT_ELEMID
- " having %d attached edges",
+ " having %lu attached edges",
edge->edge_id,
commonNodeID, commonNodeEdges->numEdges
);
@@ -5816,7 +5822,7 @@ _lwt_SnapEdgeToExistingNode(
lwt_EdgeEndStar_debugPrint( nodeStar );
const LWT_EDGEEND *ee0 = lwt_edgeEndStar_getNextCW( nodeStar, &updatedEdge, 0); // incoming
- LWDEBUGF(1, "* NextCW of incoming snap-edge component is %s %d",
+ LWDEBUGF(1, "* NextCW of incoming snap-edge component is %s %" LWTFMT_ELEMID,
ee0->outgoing ? "outgoing" : "incoming", ee0->edge->edge_id);
if ( ee0->outgoing ) {
updatedEdge.next_left = ee0->edge->edge_id;
@@ -5830,7 +5836,7 @@ _lwt_SnapEdgeToExistingNode(
}
const LWT_EDGEEND *ee1 = lwt_edgeEndStar_getNextCW( nodeStar, &newEdge, 1); // outgoing
- LWDEBUGF(1, "* NextCW of outgoing snap-edge component is %s %d",
+ LWDEBUGF(1, "* NextCW of outgoing snap-edge component is %s %" LWTFMT_ELEMID,
ee1->outgoing ? "outgoing" : "incoming", ee1->edge->edge_id);
if ( ee1->outgoing ) {
newEdge.next_right = ee1->edge->edge_id;
@@ -5865,7 +5871,7 @@ _lwt_SnapEdgeToExistingNode(
/* Update CCW edges if needed */
ee0 = lwt_edgeEndStar_getNextCCW( nodeStar, &updatedEdge, 0); // incoming
- LWDEBUGF(1, "* NextCCW of incoming snap-edge component is %s %d",
+ LWDEBUGF(1, "* NextCCW of incoming snap-edge component is %s %" LWTFMT_ELEMID,
ee0->outgoing ? "outgoing" : "incoming", ee0->edge->edge_id);
if ( ee0->edge->edge_id != newEdge.edge_id )
{
@@ -5878,7 +5884,7 @@ _lwt_SnapEdgeToExistingNode(
updateFlags = LWT_COL_EDGE_NEXT_LEFT;
}
- LWDEBUGF(1, "Updating edge %d, %s nextCCW of incoming snap-edge",
+ LWDEBUGF(1, "Updating edge %" LWTFMT_ELEMID ", %s nextCCW of incoming snap-edge",
selEdge.edge_id, ee0->outgoing ? "outgoing" : "incoming");
ret = lwt_be_updateEdges(topo,
&selEdge, LWT_COL_EDGE_EDGE_ID,
@@ -5899,7 +5905,7 @@ _lwt_SnapEdgeToExistingNode(
/* Update CCW edge of outgoing portion if needed */
ee1 = lwt_edgeEndStar_getNextCCW( nodeStar, &newEdge, 1); // outgoing
- LWDEBUGF(1, "* NextCCW of outgoing snap-edge component is %s %d",
+ LWDEBUGF(1, "* NextCCW of outgoing snap-edge component is %s %" LWTFMT_ELEMID,
ee1->outgoing ? "outgoing" : "incoming", ee1->edge->edge_id);
if ( ee1->edge->edge_id != edge->edge_id )
{
@@ -5912,7 +5918,7 @@ _lwt_SnapEdgeToExistingNode(
updateFlags = LWT_COL_EDGE_NEXT_LEFT;
}
- LWDEBUGF(1, "Updating edge %d, %s nextCCW of outgoing snap-edge",
+ LWDEBUGF(1, "Updating edge %" LWTFMT_ELEMID ", %s nextCCW of outgoing snap-edge",
selEdge.edge_id, ee1->outgoing ? "outgoing" : "incoming");
ret = lwt_be_updateEdges(topo,
&selEdge, LWT_COL_EDGE_EDGE_ID,
@@ -5958,7 +5964,7 @@ _lwt_SnapEdgeToExistingNode(
}
if ( updateFlags != 0 )
{
- LWDEBUGF(1, "Updating edge %d, %s nextCCW of outgoing snap-edge",
+ LWDEBUGF(1, "Updating edge %" LWTFMT_ELEMID ", %s nextCCW of outgoing snap-edge",
selEdge.edge_id,
updateFlags & LWT_COL_EDGE_NEXT_LEFT ? "incoming" : "outgoing");
ret = lwt_be_updateEdges(topo,
@@ -5988,13 +5994,15 @@ _lwt_SnapEdgeToExistingNode(
LWDEBUGF(1, "Adding face split for left side of new edge %" LWTFMT_ELEMID, newEdge.edge_id);
newFaceId1 = _lwt_AddFaceSplit( topo, newEdge.edge_id, oldFaceId, 0 );
- LWDEBUGF(1, "_lwt_AddFaceSplit(%d) returned %d", newEdge.edge_id, newFaceId1);
+ LWDEBUGF(1, "_lwt_AddFaceSplit(%" LWTFMT_ELEMID ") returned %" LWTFMT_ELEMID,
+ newEdge.edge_id, newFaceId1);
// TODO: retain oldFaceID rather than creating a new one, if a
// new one was already created for the new edge ring !
LWDEBUGF(1, "Adding face split for left side of updated edge %" LWTFMT_ELEMID, edge->edge_id);
newFaceId2 = _lwt_AddFaceSplit( topo, edge->edge_id, oldFaceId, 0 );
- LWDEBUGF(1, "_lwt_AddFaceSplit(%d) returned %d", edge->edge_id, newFaceId2);
+ LWDEBUGF(1, "_lwt_AddFaceSplit(%" LWTFMT_ELEMID ") returned %" LWTFMT_ELEMID,
+ edge->edge_id, newFaceId2);
} else {
@@ -6003,13 +6011,15 @@ _lwt_SnapEdgeToExistingNode(
LWDEBUGF(1, "Adding face split for right side of new edge %" LWTFMT_ELEMID, newEdge.edge_id);
newFaceId1 = _lwt_AddFaceSplit( topo, -newEdge.edge_id, oldFaceId, 0 );
- LWDEBUGF(1, "_lwt_AddFaceSplit(%d) returned %d", -newEdge.edge_id, newFaceId1);
+ LWDEBUGF(1, "_lwt_AddFaceSplit(%" LWTFMT_ELEMID ") returned %" LWTFMT_ELEMID,
+ -newEdge.edge_id, newFaceId1);
// TODO: retain oldFaceID rather than creating a new one, if a
// new one was already created on the new edge ring !
LWDEBUGF(1, "Adding face split for right side of updated edge %" LWTFMT_ELEMID, edge->edge_id);
newFaceId2 = _lwt_AddFaceSplit( topo, -edge->edge_id, oldFaceId, 0 );
- LWDEBUGF(1, "_lwt_AddFaceSplit(%d) returned %d", -edge->edge_id, newFaceId2);
+ LWDEBUGF(1, "_lwt_AddFaceSplit(%" LWTFMT_ELEMID ") returned %" LWTFMT_ELEMID,
+ -edge->edge_id, newFaceId2);
}
@@ -6025,7 +6035,9 @@ _lwt_SnapEdgeToExistingNode(
return -1;
}
- LWDEBUGF(1, "New faces %d and %d split from from old face %d", newFaceId1, newFaceId2, oldFaceId);
+ LWDEBUGF(1, "New faces %" LWTFMT_ELEMID " and %" LWTFMT_ELEMID
+ "split from from old face %" LWTFMT_ELEMID,
+ newFaceId1, newFaceId2, oldFaceId);
if ( newFaceId1 || newFaceId2 )
{
ret = lwt_be_updateTopoGeomFaceSplit(
@@ -6117,7 +6129,7 @@ _lwt_SnapEdgeToExistingNode(
}
if ( updateFlags != 0 )
{
- LWDEBUGF(1, "Updating edge %d, %s nextCCW of outgoing snap-edge",
+ LWDEBUGF(1, "Updating edge %" LWTFMT_ELEMID ", %s nextCCW of outgoing snap-edge",
selEdge.edge_id,
updateFlags & LWT_COL_EDGE_NEXT_LEFT ? "incoming" : "outgoing");
ret = lwt_be_updateEdges(topo,
@@ -6168,7 +6180,7 @@ _lwt_SnapEdgeToExistingNode(
}
if ( updateFlags != 0 )
{
- LWDEBUGF(1, "Updating edge %d, %s nextCCW of incoming snap-edge",
+ LWDEBUGF(1, "Updating edge %" LWTFMT_ELEMID ", %s nextCCW of incoming snap-edge",
selEdge.edge_id,
updateFlags & LWT_COL_EDGE_NEXT_LEFT ? "incoming" : "outgoing");
ret = lwt_be_updateEdges(topo,
@@ -6202,7 +6214,7 @@ _lwt_SnapEdgeToExistingNode(
updatedEdge.face_left = replacingFace;
updateFlags = LWT_COL_EDGE_FACE_LEFT;
}
- LWDEBUGF(1, "Updating %s face of edge %d, %s nextCW of outgoing snap-edge",
+ LWDEBUGF(1, "Updating %s face of edge %" LWTFMT_ELEMID ", %s nextCW of outgoing snap-edge",
updateFlags & LWT_COL_EDGE_FACE_LEFT ? "left" : "right",
selEdge.edge_id,
updateFlags & LWT_COL_EDGE_FACE_RIGHT ? "incoming" : "outgoing");
@@ -6236,7 +6248,7 @@ _lwt_SnapEdgeToExistingNode(
updatedEdge.face_left = replacingFace;
updateFlags = LWT_COL_EDGE_FACE_LEFT;
}
- LWDEBUGF(1, "Updating %s face of edge %d, %s nextCW of incoming snap-edge",
+ LWDEBUGF(1, "Updating %s face of edge %" LWTFMT_ELEMID ", %s nextCW of incoming snap-edge",
updateFlags & LWT_COL_EDGE_FACE_LEFT ? "left" : "right",
selEdge.edge_id,
updateFlags & LWT_COL_EDGE_FACE_RIGHT ? "incoming" : "outgoing");
@@ -6572,7 +6584,7 @@ _lwt_AddPoint(LWT_TOPOLOGY* topo, LWPOINT* point, double tol, int
}
if ( num )
{
- LWDEBUGF(1, "New point is within %.15g units of %d nodes", tol, num);
+ LWDEBUGF(1, "New point is within %.15g units of %lu nodes", tol, num);
/* Order by distance if there are more than a single return */
if ( num > 1 )
{{
@@ -6632,7 +6644,7 @@ _lwt_AddPoint(LWT_TOPOLOGY* topo, LWPOINT* point, double tol, int
PGTOPO_BE_ERROR();
return -1;
}
- LWDEBUGF(1, "New point is within %.15g units of %d edges", tol, num);
+ LWDEBUGF(1, "New point is within %.15g units of %lu edges", tol, num);
if ( num )
{
id = _lwt_SplitAllEdgesToNewNode(topo, edges, num, lwgeom_as_lwpoint(pt), tol, moved);
@@ -6967,7 +6979,7 @@ _lwt_AddLine(LWT_TOPOLOGY* topo, LWLINE* line, double tol, int* nedges,
PGTOPO_BE_ERROR();
return NULL;
}
- LWDEBUGF(1, "Line has %d points, its bbox intersects %d edges bboxes",
+ LWDEBUGF(1, "Line has %u points, its bbox intersects %lu edges bboxes",
line->points->npoints, numedges);
if ( numedges )
{{
@@ -6982,7 +6994,7 @@ _lwt_AddLine(LWT_TOPOLOGY* topo, LWLINE* line, double tol, int* nedges,
LWT_ISO_EDGE *e = &(edges[i]);
LWGEOM *g = lwline_as_lwgeom(e->geom);
GEOSGeometry *edge_g = LWGEOM2GEOS(g, 0);
- LWDEBUGF(2, "Computing distance from edge %d with %d points", i, e->geom->points->npoints);
+ LWDEBUGF(2, "Computing distance from edge %" LWTFMT_ELEMID " with %u points", i, e->geom->points->npoints);
double dist;
if ( 0 == GEOSDistanceIndexed(edge_g, noded_g, &dist) ) {
GEOSGeom_destroy(edge_g);
@@ -7011,7 +7023,7 @@ _lwt_AddLine(LWT_TOPOLOGY* topo, LWLINE* line, double tol, int* nedges,
PGTOPO_BE_ERROR();
return NULL;
}
- LWDEBUGF(1, "Line bbox intersects %d nodes bboxes", numnodes);
+ LWDEBUGF(1, "Line bbox intersects %lu nodes bboxes", numnodes);
if ( numnodes )
{{
/* collect those whose distance from us is < tol */
@@ -7031,7 +7043,7 @@ _lwt_AddLine(LWT_TOPOLOGY* topo, LWLINE* line, double tol, int* nedges,
/* must be closer than tolerated, unless distance is zero */
if ( dist && dist >= tol )
{
- LWDEBUGF(1, "Node %d is %g units away, we tolerate only %g", n->node_id, dist, tol);
+ LWDEBUGF(1, "Node %" LWTFMT_ELEMID " is %g units away, we tolerate only %g", n->node_id, dist, tol);
continue;
}
nearby[nearbyindex++] = g;
@@ -7245,7 +7257,7 @@ _lwt_AddLine(LWT_TOPOLOGY* topo, LWLINE* line, double tol, int* nedges,
{
size_t sz;
char *wkt1 = lwgeom_to_wkt(g, WKT_EXTENDED, 15, &sz);
- LWDEBUGF(1, "Component %d of split line is: %s", i, wkt1);
+ LWDEBUGF(1, "Component %lu of split line is: %s", i, wkt1);
lwfree(wkt1);
}
#endif
@@ -7260,11 +7272,11 @@ _lwt_AddLine(LWT_TOPOLOGY* topo, LWLINE* line, double tol, int* nedges,
}
if ( ! id )
{
- LWDEBUGF(1, "Component %d of split line collapsed", i);
+ LWDEBUGF(1, "Component %lu of split line collapsed", i);
continue;
}
- LWDEBUGF(1, "Component %d of split line is %s edge %" LWTFMT_ELEMID,
+ LWDEBUGF(1, "Component %lu of split line is %s edge %" LWTFMT_ELEMID,
i, forward ? "forward" : "backward", id);
ids[num++] = forward ? id : -id; /* TODO: skip duplicates */
}
@@ -7553,10 +7565,10 @@ lwt_GetFaceContainingPoint(LWT_TOPOLOGY* topo, const LWPOINT* pt)
if ( closestNode != 0 )
{
- LWDEBUGF(1, "Closest point is node %d", closestNode);
+ LWDEBUGF(1, "Closest point is node %" LWTFMT_ELEMID, closestNode);
if ( dist == 0 )
{
- LWDEBUGF(1, "Query point is node %d", closestNode);
+ LWDEBUGF(1, "Query point is node %" LWTFMT_ELEMID, closestNode);
/* Query point is the node
*
* If all edges incident to the node are
@@ -7767,7 +7779,8 @@ lwt_GetFaceContainingPoint(LWT_TOPOLOGY* topo, const LWPOINT* pt)
);
closestSegmentSide = lw_segment_side(closestSegmentP0, closestSegmentP1, queryPoint);
- LWDEBUGF(1, "Side of closest segment query point falls on: %d", closestSegmentSide);
+ LWDEBUGF(1, "Side of closest segment query point falls on: %d (%s)",
+ closestSegmentSide, closestSegmentSide == -1 ? "left" : closestSegmentSide == 1 ? "right" : "collinear" );
if ( closestSegmentSide == -1 ) /* left */
{
=====================================
postgis_revision.h
=====================================
@@ -1 +1 @@
-#define POSTGIS_REVISION df93177
+#define POSTGIS_REVISION d2c3ca4
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/f1104861e396ec4ef78a2171aac85afbd0f709c4
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/f1104861e396ec4ef78a2171aac85afbd0f709c4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240926/5bb64056/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list