[SCM] PostGIS branch master updated. 3.5.0-404-g4e4b425e2
git at osgeo.org
git at osgeo.org
Mon Jun 16 14:10:52 PDT 2025
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 4e4b425e2b156632355903967e46595eb059955f (commit)
via f0682757859dc94d28811a9cdbd11f2db8c04961 (commit)
via f531fb328fb4cf4d03940d5749220a46afd16ed1 (commit)
from 13549324f0bb8fd62960eb4c57385d4d8688ffc2 (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 4e4b425e2b156632355903967e46595eb059955f
Merge: 13549324f f06827578
Author: Regina Obe <lr at pcorp.us>
Date: Mon Jun 16 17:09:18 2025 -0400
Closes https://git.osgeo.org/gitea/postgis/postgis/pulls/254
for PostGIS 3.6.0
commit f0682757859dc94d28811a9cdbd11f2db8c04961
Author: Regina Obe <lr at pcorp.us>
Date: Mon Jun 16 15:47:40 2025 -0400
Remove CG_Extrude_Straight_Skeleton from garden exclusion list
diff --git a/doc/xsl/sfcgal_gardentest.sql.xsl b/doc/xsl/sfcgal_gardentest.sql.xsl
index 819fd6733..5cd41b796 100644
--- a/doc/xsl/sfcgal_gardentest.sql.xsl
+++ b/doc/xsl/sfcgal_gardentest.sql.xsl
@@ -13,7 +13,7 @@
<xsl:output method="text" />
<xsl:variable name='testversion'>3.6.0</xsl:variable>
<xsl:variable name='fnexclude14'>AddGeometryColumn DropGeometryColumn DropGeometryTable</xsl:variable>
- <xsl:variable name='fnexclude'>CG_ExtrudeStraightSkeleton CG_Simplify CG_Visibility CG_YMonotonePartition ST_AlphaShape ST_OptimalAlphaShape</xsl:variable>
+ <xsl:variable name='fnexclude'>CG_Simplify CG_Visibility CG_YMonotonePartition ST_AlphaShape ST_OptimalAlphaShape</xsl:variable>
<!--This is just a place holder to state functions not supported or tested separately -->
<xsl:variable name='var_srid'>3395</xsl:variable>
commit f531fb328fb4cf4d03940d5749220a46afd16ed1
Author: Loïc Bartoletti <loic.bartoletti at oslandia.com>
Date: Fri Jun 6 09:23:41 2025 +0200
fix(StraightSkeleton): CG_ExtrudeStraightSkeleton returns PolyhedralSurface Empty and doesno'tchrash anymore
diff --git a/sfcgal/lwgeom_sfcgal.c b/sfcgal/lwgeom_sfcgal.c
index e55c36b62..b50a10c43 100644
--- a/sfcgal/lwgeom_sfcgal.c
+++ b/sfcgal/lwgeom_sfcgal.c
@@ -1129,6 +1129,8 @@ sfcgal_extrudestraightskeleton(PG_FUNCTION_ARGS)
POSTGIS_SFCGAL_VERSION);
PG_RETURN_NULL();
#else /* POSTGIS_SFCGAL_VERSION >= 10500 */
+
+
GSERIALIZED *input, *output;
sfcgal_geometry_t *geom;
sfcgal_geometry_t *result;
@@ -1139,6 +1141,18 @@ sfcgal_extrudestraightskeleton(PG_FUNCTION_ARGS)
input = PG_GETARG_GSERIALIZED_P(0);
srid = gserialized_get_srid(input);
+#if POSTGIS_SFCGAL_VERSION < 20200
+ if (gserialized_is_empty(input))
+ {
+ result = sfcgal_polyhedral_surface_create();
+ output = SFCGALGeometry2POSTGIS(result, 0, srid);
+ sfcgal_geometry_delete(result);
+
+ PG_FREE_IF_COPY(input, 0);
+ PG_RETURN_POINTER(output);
+ }
+#endif
+
geom = POSTGIS2SFCGALGeometry(input);
PG_FREE_IF_COPY(input, 0);
diff --git a/sfcgal/regress/extrudestraigthskeleton.sql b/sfcgal/regress/extrudestraigthskeleton.sql
index 434654a04..11d12dbf4 100644
--- a/sfcgal/regress/extrudestraigthskeleton.sql
+++ b/sfcgal/regress/extrudestraigthskeleton.sql
@@ -39,3 +39,5 @@ SELECT
test_result
FROM
check_patches;
+SELECT 'Empty building and roof', ST_AsText(CG_ExtrudeStraightSkeleton(ST_GeomFromText('POLYGON EMPTY',4326), 20.1, 20.1));
+SELECT 'Empty roof', ST_AsText(CG_ExtrudeStraightSkeleton(ST_GeomFromText('POLYGON EMPTY',4326), 20.1));
diff --git a/sfcgal/regress/extrudestraigthskeleton_expected b/sfcgal/regress/extrudestraigthskeleton_expected
index 840482c1d..8a8ac4ddc 100644
--- a/sfcgal/regress/extrudestraigthskeleton_expected
+++ b/sfcgal/regress/extrudestraigthskeleton_expected
@@ -1,2 +1,4 @@
Extrude roof|POLYHEDRALSURFACE Z (((4 5 0,5 5 0,4 4 0,4 5 0)),((2 1 0,5 0 0,0 0 0,2 1 0)),((5 5 0,5 0 0,4 4 0,5 5 0)),((2 1 0,0 0 0,1 1 0,2 1 0)),((1 2 0,1 1 0,0 0 0,1 2 0)),((0 4 0,2 2 0,1 2 0,0 4 0)),((0 4 0,1 2 0,0 0 0,0 4 0)),((4 4 0,5 0 0,2 2 0,4 4 0)),((4 4 0,2 2 0,0 4 0,4 4 0)),((2 2 0,5 0 0,2 1 0,2 2 0)),((0.5 2.5 0.5,0 0 0,0.5 0.5 0.5,0.5 2.5 0.5)),((1 3 1,0 4 0,0.5 2.5 0.5,1 3 1)),((0.5 2.5 0.5,0 4 0,0 0 0,0.5 2.5 0.5)),((2.5 0.5 0.5,5 0 0,3.5 1.5 1.5,2.5 0.5 0.5)),((0 0 0,5 0 0,2.5 0.5 0.5,0 0 0)),((0.5 0.5 0.5,0 0 0,2.5 0.5 0.5,0.5 0.5 0.5)),((4.5 3.5 0.5,5 5 0,4.5 4.5 0.5,4.5 3.5 0.5)),((3.5 2.5 1.5,3.5 1.5 1.5,4.5 3.5 0.5,3.5 2.5 1.5)),((4.5 3.5 0.5,5 0 0,5 5 0,4.5 3.5 0.5)),((3.5 1.5 1.5,5 0 0,4.5 3.5 0.5,3.5 1.5 1.5)),((5 5 0,4 5 0,4.5 4.5 0.5,5 5 0)),((4.5 4.5 0.5,4 4 0,4.5 3.5 0.5,4.5 4.5 0.5)),((4.5 4.5 0.5,4 5 0,4 4 0,4.5 4.5 0.5)),((3 3 1,0 4 0,1 3 1,3 3 1)),((3.5 2.5 1.5,4.5 3.5 0.5,3 3 1,3.5 2.5 1.5)),((3 3 1,4 4 0,0 4 0,3 3 1)),((4.5 3.5 0.5,4 4 0,3 3 1,4.5 3
.5 0.5)),((2 1 0,1 1 0,0.5 0.5 0.5,2 1 0)),((2.5 0.5 0.5,2 1 0,0.5 0.5 0.5,2.5 0.5 0.5)),((1 1 0,1 2 0,0.5 2.5 0.5,1 1 0)),((0.5 0.5 0.5,1 1 0,0.5 2.5 0.5,0.5 0.5 0.5)),((1 3 1,2 2 0,3 3 1,1 3 1)),((0.5 2.5 0.5,1 2 0,1 3 1,0.5 2.5 0.5)),((1 3 1,1 2 0,2 2 0,1 3 1)),((2 2 0,2 1 0,2.5 0.5 0.5,2 2 0)),((3.5 2.5 1.5,3 3 1,3.5 1.5 1.5,3.5 2.5 1.5)),((3.5 1.5 1.5,2 2 0,2.5 0.5 0.5,3.5 1.5 1.5)),((3 3 1,2 2 0,3.5 1.5 1.5,3 3 1)))
Extrude building and roof|t
+Empty building and roof|POLYHEDRALSURFACE EMPTY
+Empty roof|POLYHEDRALSURFACE EMPTY
-----------------------------------------------------------------------
Summary of changes:
doc/xsl/sfcgal_gardentest.sql.xsl | 2 +-
sfcgal/lwgeom_sfcgal.c | 14 ++++++++++++++
sfcgal/regress/extrudestraigthskeleton.sql | 2 ++
sfcgal/regress/extrudestraigthskeleton_expected | 2 ++
4 files changed, 19 insertions(+), 1 deletion(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list