[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-24-ga41108f

[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  a41108ffac49d726ec13b3420ba3e08a43ef94f8 (commit)
      from  81b9af77b10e713dffd0af4e3f945e6a8a842a9f (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 a41108ffac49d726ec13b3420ba3e08a43ef94f8
Author: leoregina <lr at pcorp.us>
Date:   Wed Jul 29 20:36:42 2020 -0400

    Address some geos3.9 by normalizing - references #4730 for postgis 3.1.0

diff --git a/regress/core/clean.sql b/regress/core/clean.sql
index 02287a7..d641075 100644
--- a/regress/core/clean.sql
+++ b/regress/core/clean.sql
@@ -46,7 +46,7 @@ SELECT origin,caseno,
 ORDER BY 1, 2;
 
 SELECT '#1719.1', ST_AsEWKT(ST_MakeValid('POINT(0 0)'));
-SELECT '#1719.2', ST_AsEWKT(ST_MakeValid('GEOMETRYCOLLECTION(POINT(0 0),MULTIPOINT(3 4,5 2),LINESTRING(4 4, 4 4),POLYGON((0 0,10 10,0 10,10 0,0 0)))'));
+SELECT '#1719.2', ST_AsEWKT(ST_Normalize(ST_MakeValid('GEOMETRYCOLLECTION(POINT(0 0),MULTIPOINT(3 4,5 2),LINESTRING(4 4, 4 4),POLYGON((0 0,10 10,0 10,10 0,0 0)))')));
 SELECT '#1719.3', ST_AsEWKT(ST_MakeValid('MULTIPOINT(3 4,5 2)'));
 
 DROP TABLE clean_cases;
diff --git a/regress/core/clean_expected b/regress/core/clean_expected
index 04775b8..307d75b 100644
--- a/regress/core/clean_expected
+++ b/regress/core/clean_expected
@@ -27,5 +27,5 @@ RT|16.3|t|t|f
 RT|16.4|t|t|f
 RT|17.1|t|t|f
 #1719.1|POINT(0 0)
-#1719.2|GEOMETRYCOLLECTION(POINT(0 0),MULTIPOINT(3 4,5 2),POINT(4 4),MULTIPOLYGON(((0 0,5 5,10 0,0 0)),((5 5,0 10,10 10,5 5))))
+#1719.2|GEOMETRYCOLLECTION(MULTIPOLYGON(((0 10,10 10,5 5,0 10)),((0 0,5 5,10 0,0 0))),MULTIPOINT(5 2,3 4),POINT(4 4),POINT(0 0))
 #1719.3|MULTIPOINT(3 4,5 2)
diff --git a/regress/core/unaryunion.sql b/regress/core/unaryunion.sql
index 7882673..21e33d3 100644
--- a/regress/core/unaryunion.sql
+++ b/regress/core/unaryunion.sql
@@ -1,10 +1,10 @@
 
 -- Noding a multilinestring
-SELECT 1, ST_AsText(ST_UnaryUnion('MULTILINESTRING((0 0, 10 0), (5 -5, 5 5))'));
+SELECT 1, ST_AsText(ST_Normalize(ST_UnaryUnion('MULTILINESTRING((0 0, 10 0), (5 -5, 5 5))')) );
 
 -- Unioning a set of polygons (CascadedUnion)
-SELECT 2, ST_AsText(ST_UnaryUnion('GEOMETRYCOLLECTION(POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),POLYGON((5 5, 15 5, 15 15, 5 15, 5 5)))'));
+SELECT 2, ST_AsText(ST_Normalize(ST_UnaryUnion('GEOMETRYCOLLECTION(POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),POLYGON((5 5, 15 5, 15 15, 5 15, 5 5)))')));
 
 -- Unioning an heterogeneous collection of geometries
-SELECT 3, ST_AsText(ST_UnaryUnion('GEOMETRYCOLLECTION(POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),POLYGON((5 5, 15 5, 15 15, 5 15, 5 5)), MULTIPOINT(5 4, -5 4),LINESTRING(2 -10, 2 20))'));
+SELECT 3, ST_AsText(ST_Normalize(ST_UnaryUnion('GEOMETRYCOLLECTION(POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),POLYGON((5 5, 15 5, 15 15, 5 15, 5 5)), MULTIPOINT(5 4, -5 4),LINESTRING(2 -10, 2 20))')));
 
diff --git a/regress/core/unaryunion_expected b/regress/core/unaryunion_expected
index 074bc6c..815f73b 100644
--- a/regress/core/unaryunion_expected
+++ b/regress/core/unaryunion_expected
@@ -1,3 +1,3 @@
-1|MULTILINESTRING((0 0,5 0),(5 0,10 0),(5 -5,5 0),(5 0,5 5))
-2|POLYGON((10 5,10 0,0 0,0 10,5 10,5 15,15 15,15 5,10 5))
-3|GEOMETRYCOLLECTION(POINT(-5 4),LINESTRING(2 -10,2 0),LINESTRING(2 10,2 20),POLYGON((10 5,10 0,2 0,0 0,0 10,2 10,5 10,5 15,15 15,15 5,10 5)))
+1|MULTILINESTRING((5 0,10 0),(5 0,5 5),(5 -5,5 0),(0 0,5 0))
+2|POLYGON((0 0,0 10,5 10,5 15,15 15,15 5,10 5,10 0,0 0))
+3|GEOMETRYCOLLECTION(POLYGON((0 0,0 10,2 10,5 10,5 15,15 15,15 5,10 5,10 0,2 0,0 0)),LINESTRING(2 10,2 20),LINESTRING(2 -10,2 0),POINT(-5 4))

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

Summary of changes:
 regress/core/clean.sql           | 2 +-
 regress/core/clean_expected      | 2 +-
 regress/core/unaryunion.sql      | 6 +++---
 regress/core/unaryunion_expected | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS