[postgis-tickets] [SCM] PostGIS branch stable-2.4 updated. 84540ae8858611e7c9c0b84295ac7015216f4423

[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, stable-2.4 has been updated
       via  84540ae8858611e7c9c0b84295ac7015216f4423 (commit)
      from  2cec61e64a94dab4560149b68fc9948ad91d5ed5 (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 84540ae8858611e7c9c0b84295ac7015216f4423
Author: Regina Obe <lr at pcorp.us>
Date:   Tue Jun 9 17:25:53 2020 -0400

    Ensure sfcgal tests pass regardless version of sfcgal. Closes #4703

diff --git a/regress/regress_ogc.sql b/regress/regress_ogc.sql
index e53e373..a4d25e8 100644
--- a/regress/regress_ogc.sql
+++ b/regress/regress_ogc.sql
@@ -157,7 +157,7 @@ SELECT 'overlaps', ST_overlaps('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometr
 SELECT 'isvalid', ST_isvalid('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))'::geometry);
 SELECT 'isvalid', ST_isvalid('POLYGON((0 0, 0 10, 10 10, -5 10, 10 0, 0 0))'::geometry);
 SELECT 'isvalid', ST_isvalid('GEOMETRYCOLLECTION EMPTY'::geometry);
-SELECT 'intersection', ST_astext(ST_intersection('LINESTRING(0 10, 0 -10)'::geometry, 'LINESTRING(0 0, 1 1)'::geometry));
+SELECT 'intersection', ST_astext(ST_intersection('LINESTRING(0 10, 0 -10, 0 5)'::geometry, 'LINESTRING(0 1, 1 1)'::geometry));
 SELECT 'difference', ST_astext(ST_difference('LINESTRING(0 10, 0 -10)'::GEOMETRY, 'LINESTRING(0 2, 0 -2)'::GEOMETRY));
 SELECT 'boundary', ST_astext(ST_boundary('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'::geometry));
 SELECT 'symdifference', ST_astext(ST_symdifference('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0),(2 2, 2 4, 4 4, 4 2, 2 2))'::geometry, 'LINESTRING(0 0, 20 20)'::geometry));
diff --git a/regress/regress_ogc_expected b/regress/regress_ogc_expected
index 5ab5f91..06a517a 100644
--- a/regress/regress_ogc_expected
+++ b/regress/regress_ogc_expected
@@ -88,7 +88,7 @@ isvalid|t
 NOTICE:  Self-intersection
 isvalid|f
 isvalid|t
-intersection|POINT(0 0)
+intersection|POINT(0 1)
 difference|MULTILINESTRING((0 10,0 2),(0 -2,0 -10))
 boundary|MULTILINESTRING((0 0,0 10,10 10,10 0,0 0),(2 2,2 4,4 4,4 2,2 2))
 symdifference|GEOMETRYCOLLECTION(LINESTRING(2 2,4 4),LINESTRING(10 10,20 20),POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,2 4,2 2,4 2,4 4)))
diff --git a/regress/regress_sfcgal.sql b/regress/regress_sfcgal.sql
index e8a107d..a6292bb 100644
--- a/regress/regress_sfcgal.sql
+++ b/regress/regress_sfcgal.sql
@@ -32,10 +32,10 @@ SELECT 'ST_StraightSkeleton', ST_AsText(ST_StraightSkeleton('POLYGON((1 1,2 1,2
 
 -- Backend switch tests
 SET postgis.backend = 'geos';
-SELECT 'intersection_geos', ST_astext(ST_intersection('LINESTRING(0 10, 0 -10)', 'LINESTRING(0 0, 1 1)'));
+SELECT 'intersection_geos', ST_astext(ST_intersection('LINESTRING(0 10, 0 -10)', 'POINT(0 0)'));
 
 SET postgis.backend = 'sfcgal';
-SELECT 'intersection_sfcgal', ST_astext(ST_intersection('LINESTRING(0 10, 0 0)', 'LINESTRING(0 0, 1 1)'));
+SELECT 'intersection_sfcgal', ST_astext(ST_intersection('LINESTRING(0 10, 0 0, 0 -10)', 'POINT(0 0)'));
 
 SET postgis.backend = 'foo';
 SET postgis.backend = '';

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

Summary of changes:
 regress/regress_ogc.sql      | 2 +-
 regress/regress_ogc_expected | 2 +-
 regress/regress_sfcgal.sql   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
PostGIS