[SCM] PostGIS branch stable-3.4 updated. 3.4.0-64-gcc695fd30
git at osgeo.org
git at osgeo.org
Fri Nov 10 15:38:59 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 cc695fd305a9e3ec2003026d8e63d92887ab2009 (commit)
from 48fb165a4efaaa03369ed22d11b209e47d6bd681 (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 cc695fd305a9e3ec2003026d8e63d92887ab2009
Author: Regina Obe <lr at pcorp.us>
Date: Fri Nov 10 18:38:52 2023 -0500
Fix regress issues with GEOS 3.13. Closes #5605 for PostGIS 3.4.1
diff --git a/NEWS b/NEWS
index 0b98b7c6f..942d77acf 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,7 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.
- Fix JsonB casting issue (Paul Ramsey)
- #5535, Cleanup String handling in debug_standardize_address
and standardize_address (Regina Obe)
+ - #5605, Fix regression failure with GEOS 3.13, main branch (Regina Obe)
* Enhancements *
diff --git a/regress/core/regress_buffer_params.sql b/regress/core/regress_buffer_params.sql
index cb239341d..dae12b4fd 100644
--- a/regress/core/regress_buffer_params.sql
+++ b/regress/core/regress_buffer_params.sql
@@ -6,14 +6,14 @@
-- Ouput is snapped to grid to account for small floating numbers
-- differences between architectures
SELECT 'point quadsegs=2', ST_AsText( ST_SnapToGrid(st_buffer('POINT(0 0)', 1, 'quad_segs=2'), 0.0001), 4);
-SELECT 'line quadsegs=2', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2'), 3);
-SELECT 'line quadsegs=2 endcap=flat', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=flat'), 5);
-SELECT 'line quadsegs=2 endcap=butt', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=butt'), 5);
-SELECT 'line quadsegs=2 endcap=square', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=square'), 5);
+SELECT 'line quadsegs=2', ST_AsText(ST_Normalize(ST_SnapToGrid(ST_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2'), 0.0001)), 3);
+SELECT 'line quadsegs=2 endcap=flat', ST_AsText(ST_SnapToGrid(ST_Buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=flat'),0.0001), 5);
+SELECT 'line quadsegs=2 endcap=butt', ST_AsText(ST_Normalize(ST_Buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=butt')), 5);
+SELECT 'line quadsegs=2 endcap=square', ST_AsText(ST_Normalize(ST_Buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=square')), 5);
--SELECT 'line join=mitre mitre_limit=1.0 side=both', ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'join=mitre mitre_limit=1.0 side=both'), 5);
-SELECT 'line side=left',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=left'), 5);
-SELECT 'line side=right',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=right'),5);
-SELECT 'line side=left join=mitre',ST_AsText(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=left join=mitre'),5);
+SELECT 'line side=left',ST_AsText(ST_Normalize(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=left')), 5);
+SELECT 'line side=right',ST_AsText(ST_Normalize(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=right')),5);
+SELECT 'line side=left join=mitre',ST_AsText(ST_Normalize(ST_Buffer('LINESTRING(50 50,150 150,150 50)',10,'side=left join=mitre')),5);
SELECT 'poly quadsegs=2 join=round', ST_AsText(ST_Normalize(st_buffer(
'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))',
2, 'quad_segs=2 join=round'
diff --git a/regress/core/regress_buffer_params_expected b/regress/core/regress_buffer_params_expected
index d32aa2507..c882917fa 100644
--- a/regress/core/regress_buffer_params_expected
+++ b/regress/core/regress_buffer_params_expected
@@ -1,11 +1,11 @@
point quadsegs=2|POLYGON((1 0,0.7071 -0.7071,0 -1,-0.7071 -0.7071,-1 0,-0.7071 0.7071,0 1,0.7071 0.7071,1 0))
-line quadsegs=2|POLYGON((10 2,11.414 1.414,12 0,11.414 -1.414,10 -2,0 -2,-1.414 -1.414,-2 2.449e-16,-1.414 1.414,0 2,10 2))
+line quadsegs=2|POLYGON((-2 0,-1.414 1.414,0 2,10 2,11.414 1.414,12 0,11.414 -1.414,10 -2,0 -2,-1.414 -1.414,-2 0))
line quadsegs=2 endcap=flat|POLYGON((10 2,10 -2,0 -2,0 2,10 2))
-line quadsegs=2 endcap=butt|POLYGON((10 2,10 -2,0 -2,0 2,10 2))
-line quadsegs=2 endcap=square|POLYGON((10 2,12 2,12 -2,0 -2,-2 -2,-2 2,10 2))
-line side=left|POLYGON((150 50,150 150,50 50,42.92893 57.07107,142.92893 157.07107,144.4443 158.3147,146.17317 159.2388,148.0491 159.80785,150 160,151.9509 159.80785,153.82683 159.2388,155.5557 158.3147,157.07107 157.07107,158.3147 155.5557,159.2388 153.82683,159.80785 151.9509,160 150,160 50,150 50))
+line quadsegs=2 endcap=butt|POLYGON((0 -2,0 2,10 2,10 -2,0 -2))
+line quadsegs=2 endcap=square|POLYGON((-2 -2,-2 2,10 2,12 2,12 -2,0 -2,-2 -2))
+line side=left|POLYGON((42.92893 57.07107,142.92893 157.07107,144.4443 158.3147,146.17317 159.2388,148.0491 159.80785,150 160,151.9509 159.80785,153.82683 159.2388,155.5557 158.3147,157.07107 157.07107,158.3147 155.5557,159.2388 153.82683,159.80785 151.9509,160 150,160 50,150 50,150 150,50 50,42.92893 57.07107))
line side=right|POLYGON((50 50,150 150,150 50,140 50,140 125.85786,57.07107 42.92893,50 50))
-line side=left join=mitre|POLYGON((150 50,150 150,50 50,42.92893 57.07107,160 174.14214,160 50,150 50))
+line side=left join=mitre|POLYGON((42.92893 57.07107,160 174.14214,160 50,150 50,150 150,50 50,42.92893 57.07107))
poly quadsegs=2 join=round|POLYGON((-2 0,-2 10,-1.41421 11.41421,0 12,10 12,11.41421 11.41421,12 10,12 0,11.41421 -1.41421,10 -2,0 -2,-1.41421 -1.41421,-2 0))
poly quadsegs=2 join=bevel|POLYGON((-2 0,-2 10,0 12,10 12,12 10,12 0,10 -2,0 -2,-2 0))
poly boundary rhr side=left|POLYGON((10 20,10 50,50 50,50 10,20 10,20 20,10 20),(20 20,40 20,40 40,20 40,20 20))
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
regress/core/regress_buffer_params.sql | 14 +++++++-------
regress/core/regress_buffer_params_expected | 10 +++++-----
3 files changed, 13 insertions(+), 12 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list