[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-462-g40b4abf29

[git at osgeo.org]

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  40b4abf2957c9cbb20b98148134ccb648bd29631 (commit)
       via  6b8fec2128001f127502b6361d0c9da06a63c3c9 (commit)
      from  8549294e8c8b289e24a141f99e1859f640937a7d (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 40b4abf2957c9cbb20b98148134ccb648bd29631
Merge: 6b8fec212 8549294e8
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Feb 2 11:24:15 2022 -0800

    Merge branch 'master' of https://git.osgeo.org/gitea/postgis/postgis


commit 6b8fec2128001f127502b6361d0c9da06a63c3c9
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Feb 2 11:24:05 2022 -0800

    Add in some proof-of-life tests for GEOS 3.11+ concavehull

diff --git a/regress/core/geos311.sql b/regress/core/geos311.sql
new file mode 100644
index 000000000..f2eafd51c
--- /dev/null
+++ b/regress/core/geos311.sql
@@ -0,0 +1,19 @@
+
+-- ST_ConcaveHull --
+WITH hull AS (
+	SELECT ST_Buffer(ST_MakePoint(0,0),1) AS geom
+)
+SELECT 'concavehull01',
+	abs(ST_Area(geom) - ST_Area(ST_ConcaveHull(geom, 1.0))) < 0.01 AS area_convex
+FROM hull;
+
+WITH hull AS (
+	SELECT ST_Difference(
+		ST_Buffer(ST_MakePoint(0,0),10),
+		ST_Translate(ST_Buffer(ST_MakePoint(0,0),10), 5, 0)) AS geom
+)
+SELECT 'concavehull02',
+	ST_Area(ST_ConcaveHull(geom, 0.5)) > 0.0 AS area_non_zero,
+	ST_GeometryType(ST_ConcaveHull(geom, 0.5)) AS type,
+	ST_Area(ST_ConcaveHull(geom, 0.5, true)) > 0.0 AS nohole_area_non_zero
+FROM hull;
diff --git a/regress/core/geos311_expected b/regress/core/geos311_expected
new file mode 100644
index 000000000..b42456e4e
--- /dev/null
+++ b/regress/core/geos311_expected
@@ -0,0 +1,2 @@
+concavehull01|t
+concavehull02|t|ST_Polygon|t
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index 2e4342230..62c9dc73f 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -169,8 +169,11 @@ ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 31000),1)
 		$(topsrcdir)/regress/core/geos310
 endif
 
-# Only run the internal concavehull tests for GEOS < 3.11
-ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" "<" 31100),1)
+ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 31100),1)
+	TESTS += \
+		$(topsrcdir)/regress/core/geos311
+# Only run the old internal concavehull tests for GEOS < 3.11
+else
 	TESTS += \
 		$(topsrcdir)/regress/core/concave_hull
 endif

-----------------------------------------------------------------------

Summary of changes:
 regress/core/geos311.sql      | 19 +++++++++++++++++++
 regress/core/geos311_expected |  2 ++
 regress/core/tests.mk.in      |  7 +++++--
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 regress/core/geos311.sql
 create mode 100644 regress/core/geos311_expected


hooks/post-receive
-- 
PostGIS