[SCM] PostGIS branch stable-3.4 updated. 3.4.1-6-g47ecd2486

git at osgeo.org git at osgeo.org
Wed Nov 29 18:53:25 PST 2023


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.4 has been updated
       via  47ecd2486161454f5658363a200803063b44cf33 (commit)
      from  4cf0c6cb7c0db81f5af0a10c7982c0c209b78b11 (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 47ecd2486161454f5658363a200803063b44cf33
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Nov 29 21:06:22 2023 -0500

    Revert #5319
    no nonfinite reject needed for ST_SetPoint
    References #5610 for PostGIS 3.4.2

diff --git a/NEWS b/NEWS
index 0237f5b77..d107c8a2f 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.
 * Bug Fixes *
 
  - #5571, Memory over-allocation for narrow inputs (Paul Ramsey)
+ - #5610, Regression fix: Allow Nan and infinity again
+          in ST_SetPoint (Regina Obe)
 
 
 * Bug Fixes and Enhancments *
diff --git a/postgis/lwgeom_functions_basic.c b/postgis/lwgeom_functions_basic.c
index b0aa4b9b3..0be7433ca 100644
--- a/postgis/lwgeom_functions_basic.c
+++ b/postgis/lwgeom_functions_basic.c
@@ -2459,12 +2459,6 @@ Datum LWGEOM_setpoint_linestring(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 	}
 
-	if (!lwgeom_isfinite(lwg))
-	{
-		elog(ERROR, "Geometry contains invalid coordinate");
-		PG_RETURN_NULL();
-	}
-
 	if (which < 0)
 	{
 		/* Use backward indexing for negative values */
diff --git a/regress/core/setpoint.sql b/regress/core/setpoint.sql
index 553e50309..c6c7a0a50 100644
--- a/regress/core/setpoint.sql
+++ b/regress/core/setpoint.sql
@@ -29,3 +29,8 @@ SELECT ST_asewkt(ST_SetPoint('LINESTRING(0 0 0 0, 1 1 1 1, 2 2 2 2, 4 4 4 4)', 0
 -- https://trac.osgeo.org/postgis/ticket/5319
 SELECT '#5319', ST_SetPoint('0102000020E610000005000000000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F'::geometry, 1,ST_GeomFromText('POINT(0 0)',4326)  )  As result;
 
+-- https://trac.osgeo.org/postgis/ticket/5610 (NaN check)
+SELECT '#5610', ST_AsText(ST_SetPoint(
+ST_Makeline(ARRAY[ST_MakePoint(1,2,'Nan'), ST_MakePoint(3,4,10), ST_MakePoint(5,6, 20)]),
+2, ST_MakePoint(5,6, 'Nan'))) AS result;
+
diff --git a/regress/core/setpoint_expected b/regress/core/setpoint_expected
index cbc622b07..c340c9886 100644
--- a/regress/core/setpoint_expected
+++ b/regress/core/setpoint_expected
@@ -11,4 +11,5 @@ LINESTRING(0 0 0 0,1 1 1 1,2 2 2 2,90 91 0 0)
 LINESTRING(0 0 0 0,1 1 1 1,90 91 92 0,4 4 4 4)
 LINESTRING(0 0 0 0,90 91 0 92,2 2 2 2,4 4 4 4)
 LINESTRING(90 91 92 93,1 1 1 1,2 2 2 2,4 4 4 4)
-ERROR:  Geometry contains invalid coordinate
+#5319|0102000020E610000005000000000000000000F07F000000000000F07F00000000000000000000000000000000000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F
+#5610|LINESTRING Z (1 2 NaN,3 4 10,5 6 NaN)

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

Summary of changes:
 NEWS                             | 2 ++
 postgis/lwgeom_functions_basic.c | 6 ------
 regress/core/setpoint.sql        | 5 +++++
 regress/core/setpoint_expected   | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list