[SCM] PostGIS branch stable-3.3 updated. 3.3.6-36-g36b151593
git at osgeo.org
git at osgeo.org
Wed Sep 4 14:33:59 PDT 2024
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, stable-3.3 has been updated
via 36b1515938115efda53f18e2b4d859bd4e7ea5bd (commit)
from 278b9696ef457caf7cf8278bed20822278b1d98e (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 36b1515938115efda53f18e2b4d859bd4e7ea5bd
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Wed Sep 4 14:25:59 2024 -0700
Prepare 3.3 for GEOS 3.13
diff --git a/regress/core/relate.sql b/regress/core/relate.sql
index 07e2233db..5148787fb 100644
--- a/regress/core/relate.sql
+++ b/regress/core/relate.sql
@@ -23,8 +23,6 @@ SELECT '22', ST_Relate('LINESTRING(100 140,100 40)','MULTIPOLYGON(((20 80,180 79
SELECT '23', ST_Relate('LINESTRING(100 140,100 40)','MULTIPOLYGON(((20 80,180 80,100 0,20 80)),((20 160,180 160,100 80,20 160)))');
SELECT '24', ST_Relate('LINESTRING(110 60,20 150,200 150,110 60)','POLYGON((20 20,200 20,110 110,20 20))');
SELECT '25', ST_Relate('LINESTRING(0 0,0 50,50 50,50 0,0 0)','MULTILINESTRING((0 0,0 50),(0 50,50 50),(50 50,50 0),(50 0,0 0))');
-SELECT '26', ST_Relate('LINESTRING(40 180,140 180)','MULTIPOLYGON(((20 320,180 320,180 180,20 180,20 320)),((20 180,20 80,180 80,180 180,20 180)))');
-SELECT '27', ST_Relate('LINESTRING(40 180,140 180)','MULTIPOLYGON(((20 320,180 320,180 180,20 180,20 320)),((60 180,60 80,180 80,180 180,60 180)))');
SELECT '28', ST_Relate('LINESTRING(0 0,60 0,60 60,60 0,120 0)','MULTILINESTRING((0 0,60 0),(60 0,120 0),(60 0,60 60))');
SELECT '29', ST_Relate('LINESTRING(60 0,20 80,100 80,80 120,40 140)','LINESTRING(140 300,220 160,260 200,240 260)');
SELECT '30', ST_Relate('LINESTRING(60 0,20 80,100 80,80 120,40 140)','LINESTRING(60 40,140 40,140 160,0 160)');
@@ -253,8 +251,6 @@ SELECT '252', ST_Relate('MULTILINESTRING((20 110,200 110,200 160),(110 110,200 1
SELECT '253', ST_Relate('MULTILINESTRING((20 160,70 110,150 110,200 160),(110 110,20 110,50 80,70 110,200 110))','MULTIPOLYGON(((110 110,20 20,200 20,110 110)),((110 110,20 200,200 200,110 110)))');
SELECT '254', ST_Relate('MULTILINESTRING((20 110,200 110),(110 110,20 170,20 130,200 90))','MULTIPOLYGON(((110 110,20 20,200 20,110 110)),((110 110,20 200,200 200,110 110)))');
SELECT '255', ST_Relate('LINESTRING(0 0,0 50,50 50,50 0,0 0)','MULTILINESTRING((0 0,0 50),(0 50,50 50),(50 50,50 0),(50 0,0 0))');
-SELECT '256', ST_Relate('LINESTRING(40 180,140 180)','MULTIPOLYGON(((20 320,180 320,180 180,20 180,20 320)),((20 180,20 80,180 80,180 180,20 180)))');
-SELECT '257', ST_Relate('LINESTRING(40 180,140 180)','MULTIPOLYGON(((20 320,180 320,180 180,20 180,20 320)),((60 180,60 80,180 80,180 180,60 180)))');
SELECT '258', ST_Relate('LINESTRING(0 0,60 0,60 60,60 0,120 0)','MULTILINESTRING((0 0,60 0),(60 0,120 0),(60 0,60 60))');
SELECT '259', ST_Relate('LINESTRING(40 40,120 120)','LINESTRING(40 40,60 120)');
SELECT '260', ST_Relate('LINESTRING(40 40,120 120)','LINESTRING(60 240,40 40)');
diff --git a/regress/core/relate_expected b/regress/core/relate_expected
index b48ef45fc..3f721ec4d 100644
--- a/regress/core/relate_expected
+++ b/regress/core/relate_expected
@@ -23,8 +23,6 @@
23|10F0FF212
24|101FFF212
25|1FFFFFFF2
-26|1FF0FF212
-27|11F00F212
28|10FF0FFF2
29|FF1FF0102
30|FF1FF0102
@@ -253,8 +251,6 @@
253|FF1F00212
254|FF1F00212
255|1FFFFFFF2
-256|1FF0FF212
-257|11F00F212
258|10FF0FFF2
259|FF1F00102
260|FF1F00102
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index e1b6b987a..342ca44c1 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -127,7 +127,6 @@ TESTS += \
$(top_srcdir)/regress/core/unaryunion \
$(top_srcdir)/regress/core/union \
$(top_srcdir)/regress/core/clean \
- $(top_srcdir)/regress/core/relate_bnr \
$(top_srcdir)/regress/core/delaunaytriangles \
$(top_srcdir)/regress/core/clipbybox2d \
$(top_srcdir)/regress/core/subdivide \
@@ -190,6 +189,11 @@ ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 31200),1)
$(top_srcdir)/regress/core/geos312
endif
+ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" "<=" 31200),1)
+ TESTS += \
+ $(top_srcdir)/regress/core/relate_bnr
+endif
+
ifeq ($(INTERRUPTTESTS),yes)
# Allow CI servers to configure --with-interrupt-tests
TESTS += \
diff --git a/utils/check_tests_enabled.sh b/utils/check_tests_enabled.sh
index caaca5ceb..6e7a36345 100755
--- a/utils/check_tests_enabled.sh
+++ b/utils/check_tests_enabled.sh
@@ -33,6 +33,7 @@ check_enabled() {
#cat ${TMPDIR}/enabled_tests
find ${bd} -name '*_expected' |
+ sed 's|//|/|' |
sed 's|_expected$||' > ${TMPDIR}/available_tests
#cat ${TMPDIR}/available_tests
-----------------------------------------------------------------------
Summary of changes:
regress/core/relate.sql | 4 ----
regress/core/relate_expected | 4 ----
regress/core/tests.mk.in | 6 +++++-
utils/check_tests_enabled.sh | 1 +
4 files changed, 6 insertions(+), 9 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list