[Git][debian-gis-team/postgis][master] Update delaunaytriangles.patch with upstream changes.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Nov 19 11:58:06 GMT 2023
Bas Couwenberg pushed to branch master at Debian GIS Project / postgis
Commits:
aca1e600 by Bas Couwenberg at 2023-11-19T12:23:28+01:00
Update delaunaytriangles.patch with upstream changes.
- - - - -
2 changed files:
- debian/changelog
- debian/patches/delaunaytriangles.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+postgis (3.4.0+dfsg-5) UNRELEASED; urgency=medium
+
+ * Update delaunaytriangles.patch with upstream changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 19 Nov 2023 12:23:14 +0100
+
postgis (3.4.0+dfsg-4) unstable; urgency=medium
* Add patch to fix FTBFS due to test failure.
=====================================
debian/patches/delaunaytriangles.patch
=====================================
@@ -1,24 +1,51 @@
-Description: Fix FTBFS due to test failure.
-Author: Bas Couwenberg <sebastic at debian.org>
+Description: Normalize results from ST_DelaunayTriangles
+ GEOS recent commit changed starting point of polygon rings
+ ref: https://debbie.postgis.net/view/GEOS/job/GEOS_Master/1793/
+Author: Sandro Santilli <strk at kbt.io>
Bug: https://trac.osgeo.org/postgis/ticket/5614
+--- a/regress/core/delaunaytriangles.sql
++++ b/regress/core/delaunaytriangles.sql
+@@ -1,12 +1,11 @@
+--- TODO: normalize !
+-SELECT 1, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9)'::geometry));
+-SELECT 2, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry));
+-SELECT 3, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry, 2));
+-SELECT 4, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry, 2, 1));
+-SELECT 5, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9)'::geometry, 0.0, 2));
+-SELECT 6, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry, 0.0, 2));
+-SELECT 7, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry, 2.0, 2));
++SELECT 1, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9)'::geometry)));
++SELECT 2, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry)));
++SELECT 3, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry, 2)));
++SELECT 4, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry, 2, 1)));
++SELECT 5, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9)'::geometry, 0.0, 2)));
++SELECT 6, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry, 0.0, 2)));
++SELECT 7, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5, 6 0, 7 9, 8 9)'::geometry, 2.0, 2)));
+
+ -- 3DZ
+-SELECT 10, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5 3, 6 0 2, 7 9 1)'::geometry));
+-SELECT 11, ST_AsText(ST_DelaunayTriangles('MULTIPOINT(5 5 1, 6 0 2, 7 9 3)'::geometry, 0.0, 2));
++SELECT 10, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5 3, 6 0 2, 7 9 1)'::geometry)));
++SELECT 11, ST_AsText(ST_Normalize(ST_DelaunayTriangles('MULTIPOINT(5 5 1, 6 0 2, 7 9 3)'::geometry, 0.0, 2)));
--- a/regress/core/delaunaytriangles_expected
+++ b/regress/core/delaunaytriangles_expected
@@ -1,9 +1,9 @@
-1|GEOMETRYCOLLECTION(POLYGON((5 5,6 0,7 9,5 5)))
-2|GEOMETRYCOLLECTION(POLYGON((5 5,6 0,8 9,5 5)),POLYGON((5 5,8 9,7 9,5 5)))
-3|GEOMETRYCOLLECTION(POLYGON((5 5,6 0,7 9,5 5)))
-+1|GEOMETRYCOLLECTION(POLYGON((7 9,5 5,6 0,7 9)))
-+2|GEOMETRYCOLLECTION(POLYGON((7 9,5 5,8 9,7 9)),POLYGON((8 9,5 5,6 0,8 9)))
-+3|GEOMETRYCOLLECTION(POLYGON((7 9,5 5,6 0,7 9)))
- 4|MULTILINESTRING((5 5,7 9),(5 5,6 0),(6 0,7 9))
+-4|MULTILINESTRING((5 5,7 9),(5 5,6 0),(6 0,7 9))
-5|TIN(((5 5,6 0,7 9,5 5)))
-6|TIN(((5 5,6 0,8 9,5 5)),((5 5,8 9,7 9,5 5)))
-7|TIN(((5 5,6 0,7 9,5 5)))
-10|GEOMETRYCOLLECTION Z (POLYGON Z ((5 5 3,6 0 2,7 9 1,5 5 3)))
-11|TIN Z (((5 5 1,6 0 2,7 9 3,5 5 1)))
-+5|TIN(((7 9,5 5,6 0,7 9)))
-+6|TIN(((7 9,5 5,8 9,7 9)),((8 9,5 5,6 0,8 9)))
-+7|TIN(((7 9,5 5,6 0,7 9)))
-+10|GEOMETRYCOLLECTION Z (POLYGON Z ((7 9 1,5 5 3,6 0 2,7 9 1)))
-+11|TIN Z (((7 9 3,5 5 1,6 0 2,7 9 3)))
++1|GEOMETRYCOLLECTION(POLYGON((5 5,7 9,6 0,5 5)))
++2|GEOMETRYCOLLECTION(POLYGON((5 5,8 9,6 0,5 5)),POLYGON((5 5,7 9,8 9,5 5)))
++3|GEOMETRYCOLLECTION(POLYGON((5 5,7 9,6 0,5 5)))
++4|MULTILINESTRING((6 0,7 9),(5 5,7 9),(5 5,6 0))
++5|GEOMETRYCOLLECTION(POLYGON((5 5,7 9,6 0,5 5)))
++6|GEOMETRYCOLLECTION(POLYGON((5 5,8 9,6 0,5 5)),POLYGON((5 5,7 9,8 9,5 5)))
++7|GEOMETRYCOLLECTION(POLYGON((5 5,7 9,6 0,5 5)))
++10|GEOMETRYCOLLECTION Z (POLYGON Z ((5 5 3,7 9 1,6 0 2,5 5 3)))
++11|GEOMETRYCOLLECTION Z (POLYGON Z ((5 5 1,7 9 3,6 0 2,5 5 1)))
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/aca1e600b577958718c17895ab8ad9959ccfce55
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/aca1e600b577958718c17895ab8ad9959ccfce55
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/20231119/c34673e6/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list