[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha2-26-g80f9e8a
git at osgeo.org
git at osgeo.org
Wed Jul 29 18:50:39 PDT 2020
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 80f9e8af473ad69328f547483c7d6da79015f5db (commit)
from 5a37d81ad14b7eeb3a41732ca49bfc0e41ec307e (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 80f9e8af473ad69328f547483c7d6da79015f5db
Author: Regina Obe <lr at pcorp.us>
Date: Wed Jul 29 21:50:13 2020 -0400
Address some geos3.9 overlay topology failures by normalizing - references #4730 for postgis 3.1.0
diff --git a/topology/test/query_features.sql b/topology/test/query_features.sql
index cd3dd6d..c52c2ee 100644
--- a/topology/test/query_features.sql
+++ b/topology/test/query_features.sql
@@ -19,27 +19,27 @@ BEGIN;
-- 7. Query the data.
SELECT a.feature_name, id(a.feature) as tg_id,
- ST_AsText(topology.Geometry(a.feature)) as geom
+ ST_AsText(ST_Normalize(topology.Geometry(a.feature)) ) as geom
FROM features.land_parcels a;
-- Query not in original example --strk;
SELECT a.feature_name, id(a.feature) as tg_id,
- ST_AsText(topology.Geometry(a.feature)) as geom
+ ST_AsText(ST_Normalize(topology.Geometry(a.feature)) ) as geom
FROM features.traffic_signs a;
-- Query not in original example --strk;
SELECT a.feature_name, id(a.feature) as tg_id,
- ST_AsText(topology.Geometry(a.feature)) as geom
+ ST_AsText(ST_Normalize(topology.Geometry(a.feature)) ) as geom
FROM features.city_streets a;
-- Query hierarchical feautures
-SELECT feature_name, ST_AsText(topology.geometry(feature))
+SELECT feature_name, ST_AsText(ST_Normalize(topology.geometry(feature)))
FROM features.big_signs;
-SELECT feature_name,ST_AsText(topology.geometry(feature))
+SELECT feature_name,ST_AsText(ST_Normalize(topology.geometry(feature)))
FROM features.big_streets;
-SELECT feature_name,ST_AsText(topology.geometry(feature))
+SELECT feature_name,ST_AsText(ST_Normalize(topology.geometry(feature)))
FROM features.big_parcels;
--NOTYET--
diff --git a/topology/test/regress/legacy_query_expected b/topology/test/regress/legacy_query_expected
index 2faf4d5..e43c73a 100644
--- a/topology/test/regress/legacy_query_expected
+++ b/topology/test/regress/legacy_query_expected
@@ -10,22 +10,22 @@ features.big_parcels.the_geom SRID:0 TYPE:MULTIPOLYGON DIMS:2
5
6
features.big_signs.the_geom SRID:0 TYPE:MULTIPOINT DIMS:2
-P1|1|MULTIPOLYGON(((21 14,21 6,9 6,9 14,9 22,21 22,21 14)))
-P2|2|MULTIPOLYGON(((35 14,35 6,21 6,21 14,21 22,35 22,35 14)))
-P3|3|MULTIPOLYGON(((47 14,47 6,35 6,35 14,35 22,47 22,47 14)))
-P4|4|MULTIPOLYGON(((25 30,17 30,17 40,31 40,31 30,25 30)))
-P5|5|MULTIPOLYGON(((8 30,3 30,3 38,16 38,16 30,8 30),(4 31,7 31,7 34,4 34,4 31)))
-F3|6|MULTIPOLYGON(((9 22,21 22,21 14,9 14,9 22)))
-F6|7|MULTIPOLYGON(((9 14,21 14,21 6,9 6,9 14)))
-F3F4|8|MULTIPOLYGON(((9 22,21 22,35 22,35 14,21 14,9 14,9 22)))
-F1|9|MULTIPOLYGON(((8 30,3 30,3 38,16 38,16 30,8 30),(4 31,7 31,7 34,4 34,4 31)))
+P1|1|MULTIPOLYGON(((9 6,9 14,9 22,21 22,21 14,21 6,9 6)))
+P2|2|MULTIPOLYGON(((21 6,21 14,21 22,35 22,35 14,35 6,21 6)))
+P3|3|MULTIPOLYGON(((35 6,35 14,35 22,47 22,47 14,47 6,35 6)))
+P4|4|MULTIPOLYGON(((17 30,17 40,31 40,31 30,25 30,17 30)))
+P5|5|MULTIPOLYGON(((3 30,3 38,16 38,16 30,8 30,3 30),(4 31,7 31,7 34,4 34,4 31)))
+F3|6|MULTIPOLYGON(((9 14,9 22,21 22,21 14,9 14)))
+F6|7|MULTIPOLYGON(((9 6,9 14,21 14,21 6,9 6)))
+F3F4|8|MULTIPOLYGON(((9 14,9 22,21 22,35 22,35 14,21 14,9 14)))
+F1|9|MULTIPOLYGON(((3 30,3 38,16 38,16 30,8 30,3 30),(4 31,7 31,7 34,4 34,4 31)))
S1|1|MULTIPOINT(21 14)
S2|2|MULTIPOINT(35 14)
S3|3|MULTIPOINT(57 33)
S4|4|MULTIPOINT(20 37)
-N1N2N3|5|MULTIPOINT(8 30,25 30,25 35)
-N1N6N14|6|MULTIPOINT(8 30,21 14,57 33)
-N3N4|7|MULTIPOINT(20 37,25 35)
+N1N2N3|5|MULTIPOINT(25 35,25 30,8 30)
+N1N6N14|6|MULTIPOINT(57 33,21 14,8 30)
+N3N4|7|MULTIPOINT(25 35,20 37)
N4|8|MULTIPOINT(20 37)
R1|1|MULTILINESTRING((9 14,21 14,35 14))
R2|2|MULTILINESTRING((36 38,38 35,41 34,42 33,45 32,47 28,50 28,52 32,57 33,57 36,59 39,61 38,62 41,47 42,45 40,41 40))
@@ -35,10 +35,10 @@ E7E8|5|MULTILINESTRING((21 22,35 22,47 22))
E20E19|6|MULTILINESTRING((21 6,21 14,21 22))
E25|7|MULTILINESTRING((9 35,13 35))
R1a|8|MULTILINESTRING((9 14,21 14,35 14))
-S1S2|MULTIPOINT(21 14,35 14)
-R1R2|MULTILINESTRING((9 14,21 14,35 14),(36 38,38 35,41 34,42 33,45 32,47 28,50 28,52 32,57 33,57 36,59 39,61 38,62 41,47 42,45 40,41 40))
+S1S2|MULTIPOINT(35 14,21 14)
+R1R2|MULTILINESTRING((36 38,38 35,41 34,42 33,45 32,47 28,50 28,52 32,57 33,57 36,59 39,61 38,62 41,47 42,45 40,41 40),(9 14,21 14,35 14))
R4|MULTILINESTRING((25 30,25 35))
-P1P2|MULTIPOLYGON(((21 6,9 6,9 14,9 22,21 22,35 22,35 14,35 6,21 6)))
-P3P4|MULTIPOLYGON(((47 14,47 6,35 6,35 14,35 22,47 22,47 14)),((25 30,17 30,17 40,31 40,31 30,25 30)))
-F3F6|MULTIPOLYGON(((21 14,21 6,9 6,9 14,9 22,21 22,21 14)))
+P1P2|MULTIPOLYGON(((9 6,9 14,9 22,21 22,35 22,35 14,35 6,21 6,9 6)))
+P3P4|MULTIPOLYGON(((35 6,35 14,35 22,47 22,47 14,47 6,35 6)),((17 30,17 40,31 40,31 30,25 30,17 30)))
+F3F6|MULTIPOLYGON(((9 6,9 14,9 22,21 22,21 14,21 6,9 6)))
Topology 'city_data' dropped
-----------------------------------------------------------------------
Summary of changes:
topology/test/query_features.sql | 12 +++++-----
topology/test/regress/legacy_query_expected | 34 ++++++++++++++---------------
2 files changed, 23 insertions(+), 23 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list