[SCM] PostGIS branch master updated. 3.6.0rc2-589-gea9c759b0

[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  ea9c759b0b8d6c9b27fa5e12c5bb0be8b3405c66 (commit)
       via  8c034d0faef7819f920cb4d921068217f679c1cd (commit)
      from  9b9950de1262a24c41e9e4d647627b1816a6ac52 (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 ea9c759b0b8d6c9b27fa5e12c5bb0be8b3405c66
Merge: 9b9950de1 8c034d0fa
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Thu Jun 18 16:37:46 2026 +0400

    Merge PR #900: Fix SFCGAL regression gating and roof checks
    
    Gate polygon-repair regression tests on the CGAL version that provides the exercised behavior, keep SFCGAL 2.3-only regression selection together, and add generic roof-generation checks against the specialized wrappers.


commit 8c034d0faef7819f920cb4d921068217f679c1cd
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Tue Jun 16 23:37:32 2026 +0400

    sfcgal: fix regression gating and roof checks

diff --git a/sfcgal/regress/roofgeneration.sql b/sfcgal/regress/roofgeneration.sql
index 106f5105e..50b11ab16 100644
--- a/sfcgal/regress/roofgeneration.sql
+++ b/sfcgal/regress/roofgeneration.sql
@@ -13,4 +13,10 @@ SELECT 'generic_hipped', ST_AsText(CG_GenerateRoof('POLYGON((0 0,4 0,4 4,0 4,0 0
 SELECT 'generic_flat', ST_AsText(CG_GenerateRoof('POLYGON((0 0,4 0,4 4,0 4,0 0))', 'FLAT', 2.0, 30.0, 0));
 SELECT 'generic_gable_3d', ST_CoordDim(CG_GenerateRoof('POLYGON((0 0,4 0,4 4,0 4,0 0))', 'GABLE', 2.0, 30.0, 0));
 SELECT 'generic_skillion_3d', ST_CoordDim(CG_GenerateRoof('POLYGON((0 0,4 0,4 4,0 4,0 0))', 'SKILLION', 2.0, 30.0, 0));
+SELECT 'generic_gable_matches_specialized',
+  ST_AsText(CG_GenerateRoof('POLYGON((0 0,4 0,4 4,0 4,0 0))', 'GABLE', 5.0, 15.0, 0)) =
+  ST_AsText(CG_GenerateGableRoof('POLYGON((0 0,4 0,4 4,0 4,0 0))', 5.0, 15.0));
+SELECT 'generic_skillion_matches_specialized',
+  ST_AsText(CG_GenerateRoof('POLYGON((0 0,4 0,4 4,0 4,0 0))', 'SKILLION', 5.0, 15.0, 0)) =
+  ST_AsText(CG_GenerateSkillionRoof('POLYGON((0 0,4 0,4 4,0 4,0 0))', 5.0, 15.0, 0));
 SELECT 'invalid_type', CG_GenerateRoof('POLYGON((0 0,4 0,4 4,0 4,0 0))', 'DOME', 2.0, 30.0, 0);
diff --git a/sfcgal/regress/roofgeneration_expected b/sfcgal/regress/roofgeneration_expected
index d67b1e24d..d90fef96f 100644
--- a/sfcgal/regress/roofgeneration_expected
+++ b/sfcgal/regress/roofgeneration_expected
@@ -8,4 +8,6 @@ generic_hipped|POLYHEDRALSURFACE Z (((0 4 0,4 4 0,4 0 0,0 0 0,0 4 0)),((0 4 0,0
 generic_flat|POLYHEDRALSURFACE Z (((0 0 0,0 4 0,4 4 0,4 0 0,0 0 0)),((0 0 2,4 0 2,4 4 2,0 4 2,0 0 2)),((0 0 0,0 0 2,0 4 2,0 4 0,0 0 0)),((0 4 0,0 4 2,4 4 2,4 4 0,0 4 0)),((4 4 0,4 4 2,4 0 2,4 0 0,4 4 0)),((4 0 0,4 0 2,0 0 2,0 0 0,4 0 0)))
 generic_gable_3d|3
 generic_skillion_3d|3
+generic_gable_matches_specialized|t
+generic_skillion_matches_specialized|t
 ERROR:  CG_GenerateRoof: unknown roof type 'DOME', expected FLAT, HIPPED, GABLE or SKILLION
diff --git a/sfcgal/regress/tests.mk.in b/sfcgal/regress/tests.mk.in
index 89b2e4627..c1c39d069 100644
--- a/sfcgal/regress/tests.mk.in
+++ b/sfcgal/regress/tests.mk.in
@@ -49,13 +49,15 @@ ifeq ($(shell expr "$(POSTGIS_SFCGAL_VERSION)" ">=" 20300),1)
 	TESTS += \
 		$(top_srcdir)/sfcgal/regress/alphashape_components.sql \
 		$(top_srcdir)/sfcgal/regress/roofgeneration.sql \
-		$(top_srcdir)/sfcgal/regress/polygonrepair.sql \
 		$(top_srcdir)/sfcgal/regress/approximatemedialaxis_projected.sql \
 		$(top_srcdir)/sfcgal/regress/nurbs.sql
-	ifeq ($(shell expr "$(POSTGIS_CGAL_VERSION)" ">=" 601),1)
-		TESTS += $(top_srcdir)/sfcgal/regress/polygonrepair_union.sql
-	else
-		TESTS += $(top_srcdir)/sfcgal/regress/polygonrepair_union_pre61.sql
+	ifeq ($(shell expr "$(POSTGIS_CGAL_VERSION)" ">=" 600),1)
+		TESTS += $(top_srcdir)/sfcgal/regress/polygonrepair.sql
+		ifeq ($(shell expr "$(POSTGIS_CGAL_VERSION)" ">=" 601),1)
+			TESTS += $(top_srcdir)/sfcgal/regress/polygonrepair_union.sql
+		else
+			TESTS += $(top_srcdir)/sfcgal/regress/polygonrepair_union_pre61.sql
+		endif
 	endif
 else
 	TESTS += \

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

Summary of changes:
 sfcgal/regress/roofgeneration.sql      |  6 ++++++
 sfcgal/regress/roofgeneration_expected |  2 ++
 sfcgal/regress/tests.mk.in             | 12 +++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS