[SCM] PostGIS branch master updated. 3.6.0rc2-585-g014d02c42

[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  014d02c42befac740f904b1cceca52391b671097 (commit)
       via  cff529aa81f12c0dc12b2b273a0e836e38c3f122 (commit)
      from  857652e24926f169f74f0caf921e674bb65f5d8b (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 014d02c42befac740f904b1cceca52391b671097
Merge: 857652e24 cff529aa8
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Thu Jun 18 16:18:43 2026 +0400

    Merge PR #959: Stabilize NURBS approximation regression output
    
    Apply explicit two-decimal ST_AsText output for the high-tolerance NURBS approximation regression so SFCGAL/CGAL precision drift does not fail otherwise unrelated CI runs.
    
    Validation: GitHub CI green on cff529aa81f12c0dc12b2b273a0e836e38c3f122; local git diff --check upstream/master..HEAD passed; local make -C sfcgal/regress check RUNTESTFLAGS='--verbose --extension' TESTS="/home/kom/proj/osgeo/postgis/sfcgal/regress/nurbs.sql" passed, including automatic upgrade rerun.


commit cff529aa81f12c0dc12b2b273a0e836e38c3f122
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Thu Jun 18 11:23:12 2026 +0400

    Stabilize NURBS approximation regression output

diff --git a/sfcgal/regress/nurbs.sql b/sfcgal/regress/nurbs.sql
index a71fc9f54..bed1a0361 100644
--- a/sfcgal/regress/nurbs.sql
+++ b/sfcgal/regress/nurbs.sql
@@ -96,7 +96,7 @@ SELECT 'approximate_high_tol', ST_AsText(CG_NurbsCurveApproximate(
     'LINESTRING(0 0, 1 2.1, 2 1.9, 3 3.2, 4 2.8, 5 1)'::geometry,
     2,
     0.5
-));
+), 2);
 
 -- Test approximation with 3D points
 SELECT 'approximate_3d', ST_AsText(CG_NurbsCurveApproximate(
diff --git a/sfcgal/regress/nurbs_expected b/sfcgal/regress/nurbs_expected
index a7e2856fb..9ccee264f 100644
--- a/sfcgal/regress/nurbs_expected
+++ b/sfcgal/regress/nurbs_expected
@@ -10,6 +10,6 @@ ERROR:  Data points must be a LINESTRING
 ERROR:  Need at least 4 data points for degree 3 interpolation
 approximate_default|NURBSCURVE(DEGREE 3,CONTROLPOINTS(NURBSPOINT(WEIGHTEDPOINT(0 0),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(0.18 -0.15),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(1.49 4.36),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(3.33 1.33),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(4.34 0.83),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(5 0),WEIGHT 1)),KNOTS (KNOT(0,4),KNOT(0.46,1),KNOT(0.64,1),KNOT(1,4)))
 approximate_max_ctrl|NURBSCURVE(DEGREE 3,CONTROLPOINTS(NURBSPOINT(WEIGHTEDPOINT(0 0),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(3.3 6.18),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(6.48 40.13),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(8.84 73.32),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(10 100),WEIGHT 1)),KNOTS (KNOT(0,4),KNOT(0.21,1),KNOT(1,4)))
-approximate_high_tol|NURBSCURVE(DEGREE 2,CONTROLPOINTS(NURBSPOINT(WEIGHTEDPOINT(0 0),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(-0.048424154393691 2.640915492953116),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(2.237552942255657 1.646186724700419),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(2.786598026195684 3.476253776863865),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(4.840573182610214 2.429625830321494),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(5 1),WEIGHT 1)),KNOTS (KNOT(0,3),KNOT(0.349154606588781,1),KNOT(0.512902297757245,1),KNOT(0.680173066921787,1),KNOT(1,3)))
+approximate_high_tol|NURBSCURVE(DEGREE 2,CONTROLPOINTS(NURBSPOINT(WEIGHTEDPOINT(0 0),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(-0.05 2.64),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(2.24 1.65),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(2.79 3.48),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(4.84 2.43),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT(5 1),WEIGHT 1)),KNOTS (KNOT(0,3),KNOT(0.35,1),KNOT(0.51,1),KNOT(0.68,1),KNOT(1,3)))
 approximate_3d|NURBSCURVE Z (DEGREE 3,CONTROLPOINTS Z (NURBSPOINT(WEIGHTEDPOINT Z (0 0 0),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT Z (0.18 -0.15 -1.29),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT Z (1.49 4.36 3.35),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT Z (3.33 1.33 0.38),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT Z (4.34 0.83 -0.44),WEIGHT 1),NURBSPOINT(WEIGHTEDPOINT Z (5 0 0),WEIGHT 1)),KNOTS (KNOT(0,4),KNOT(0.46,1),KNOT(0.64,1),KNOT(1,4)))
 ERROR:  Need at least 4 data points for degree 3 approximation

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

Summary of changes:
 sfcgal/regress/nurbs.sql      | 2 +-
 sfcgal/regress/nurbs_expected | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS