Changeset: 56b71ec422ce for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/56b71ec422ce
Modified Files:
geom/BugTracker/Tests/copy_into_mbr.3492.test
geom/monetdb5/geom.c
geom/sql/conformance/Tests/T13.test
geom/sql/conformance/Tests/T14.test
geom/sql/conformance/Tests/T27.test
geom/sql/conformance/Tests/T29.test
geom/sql/conformance/Tests/T48.test
geom/sql/conformance/Tests/T50.test
geom/sql/conformance/Tests/T8.test
geom/sql/functions/Tests/ST_AsEWKT.test
geom/sql/functions/Tests/ST_AsText.test
geom/sql/functions/Tests/ST_Boundary.test
geom/sql/functions/Tests/ST_Contains.test
geom/sql/functions/Tests/ST_CoordDim.test
geom/sql/functions/Tests/ST_GeomFromText.test
geom/sql/functions/Tests/ST_GeometryN.test
geom/sql/functions/Tests/ST_IsClosed.test
geom/sql/functions/Tests/ST_IsSimple.test
geom/sql/functions/Tests/ST_IsValid.test
geom/sql/functions/Tests/ST_MLineFromText.test
geom/sql/functions/Tests/ST_MPointFromText.test
geom/sql/functions/Tests/ST_MPolygonFromText.test
geom/sql/functions/Tests/ST_NRings.test
geom/sql/functions/Tests/ST_NumInteriorRings.test
geom/sql/pg_regression/Tests/boundary.test
geom/sql/pg_regression/Tests/delaunaytriangles.test
geom/sql/pg_regression/Tests/dump.test
sql/test/pg_regress/Tests/polygon.test
Branch: Jan2022
Log Message:
Backed out changeset 536bfc77c604: different geos versions normalize
differently.
diffs (truncated from 1246 to 300 lines):
diff --git a/geom/BugTracker/Tests/copy_into_mbr.3492.test
b/geom/BugTracker/Tests/copy_into_mbr.3492.test
--- a/geom/BugTracker/Tests/copy_into_mbr.3492.test
+++ b/geom/BugTracker/Tests/copy_into_mbr.3492.test
@@ -20,13 +20,13 @@ query ITT nosort
SELECT * FROM geom ORDER BY id
----
1
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
NULL
2
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
BOX (1.000000 2.000000, 3.000000 4.000000)
3
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
BOX (1.000000 2.000000, 3.000000 4.000000)
4
NULL
@@ -42,13 +42,13 @@ query ITT nosort
SELECT * FROM geom ORDER BY id
----
1
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
BOX (1.000000 2.000000, 3.000000 4.000000)
2
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
BOX (1.000000 2.000000, 3.000000 4.000000)
3
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
BOX (1.000000 2.000000, 3.000000 4.000000)
4
NULL
@@ -67,13 +67,13 @@ query ITT nosort
SELECT * FROM newgeom ORDER BY id
----
1
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
BOX (1.000000 2.000000, 3.000000 4.000000)
2
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
BOX (1.000000 2.000000, 3.000000 4.000000)
3
-POLYGON ((1 2, 1 4, 3 4, 3 2, 1 2))
+POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2))
BOX (1.000000 2.000000, 3.000000 4.000000)
4
NULL
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -5087,8 +5087,6 @@ wkbTOSTR(char **geomWKT, size_t *len, co
GEOSWKTWriter *WKT_wr = GEOSWKTWriter_create();
//set the number of dimensions in the writer so that it can
//read correctly the geometry coordinates
- if (GDKdebug & FORCEMITOMASK && GEOSNormalize(geosGeometry) !=
0)
- fprintf(stderr, "GEOSNormalize failed\n");
GEOSWKTWriter_setOutputDimension(WKT_wr,
GEOSGeom_getCoordinateDimension(geosGeometry));
GEOSWKTWriter_setTrim(WKT_wr, 1);
wkt = GEOSWKTWriter_write(WKT_wr, geosGeometry);
diff --git a/geom/sql/conformance/Tests/T13.test
b/geom/sql/conformance/Tests/T13.test
--- a/geom/sql/conformance/Tests/T13.test
+++ b/geom/sql/conformance/Tests/T13.test
@@ -1,5 +1,5 @@
query T rowsort
SELECT ST_AsText(ST_Boundary(boundary)) FROM named_places WHERE name = 'Goose
Island'
----
-LINESTRING (59 13, 59 18, 67 18, 67 13, 59 13)
+LINESTRING (67 13, 67 18, 59 18, 59 13, 67 13)
diff --git a/geom/sql/conformance/Tests/T14.test
b/geom/sql/conformance/Tests/T14.test
--- a/geom/sql/conformance/Tests/T14.test
+++ b/geom/sql/conformance/Tests/T14.test
@@ -1,5 +1,5 @@
query T rowsort
SELECT ST_AsText(ST_Envelope(boundary)) FROM named_places WHERE name = 'Goose
Island'
----
-POLYGON ((59 13, 59 18, 67 18, 67 13, 59 13))
+POLYGON ((59 13, 67 13, 67 18, 59 18, 59 13))
diff --git a/geom/sql/conformance/Tests/T27.test
b/geom/sql/conformance/Tests/T27.test
--- a/geom/sql/conformance/Tests/T27.test
+++ b/geom/sql/conformance/Tests/T27.test
@@ -1,5 +1,5 @@
query T rowsort
SELECT ST_AsText(ST_ExteriorRing(shore)) FROM lakes WHERE name = 'Blue Lake'
----
-LINESTRING (48 6, 52 18, 66 23, 73 9, 48 6)
+LINESTRING (52 18, 66 23, 73 9, 48 6, 52 18)
diff --git a/geom/sql/conformance/Tests/T29.test
b/geom/sql/conformance/Tests/T29.test
--- a/geom/sql/conformance/Tests/T29.test
+++ b/geom/sql/conformance/Tests/T29.test
@@ -1,5 +1,5 @@
query T rowsort
SELECT ST_AsText(ST_InteriorRingN(shore, 1)) FROM lakes WHERE name = 'Blue
Lake'
----
-LINESTRING (59 13, 59 18, 67 18, 67 13, 59 13)
+LINESTRING (59 18, 67 18, 67 13, 59 13, 59 18)
diff --git a/geom/sql/conformance/Tests/T48.test
b/geom/sql/conformance/Tests/T48.test
--- a/geom/sql/conformance/Tests/T48.test
+++ b/geom/sql/conformance/Tests/T48.test
@@ -1,5 +1,5 @@
query T rowsort
SELECT ST_AsText(ST_Difference(named_places.boundary, forests.boundary)) FROM
named_places, forests WHERE named_places.name = 'Ashton' AND forests.name =
'Green Forest'
----
-POLYGON ((56 34, 62 48, 84 48, 84 42, 56 34))
+POLYGON ((84 48, 84 42, 56 34, 62 48, 84 48))
diff --git a/geom/sql/conformance/Tests/T50.test
b/geom/sql/conformance/Tests/T50.test
--- a/geom/sql/conformance/Tests/T50.test
+++ b/geom/sql/conformance/Tests/T50.test
@@ -1,5 +1,5 @@
query T rowsort
SELECT ST_AsText(ST_SymDifference(shore, boundary)) FROM lakes, named_places
WHERE lakes.name = 'Blue Lake' AND named_places.name = 'Ashton'
----
-MULTIPOLYGON (((56 30, 56 34, 62 48, 84 48, 84 30, 56 30)), ((48 6, 52 18, 66
23, 73 9, 48 6), (59 13, 67 13, 67 18, 59 18, 59 13)))
+MULTIPOLYGON (((52 18, 66 23, 73 9, 48 6, 52 18), (59 18, 67 18, 67 13, 59 13,
59 18)), ((62 48, 84 48, 84 30, 56 30, 56 34, 62 48)))
diff --git a/geom/sql/conformance/Tests/T8.test
b/geom/sql/conformance/Tests/T8.test
--- a/geom/sql/conformance/Tests/T8.test
+++ b/geom/sql/conformance/Tests/T8.test
@@ -1,5 +1,5 @@
query T rowsort
SELECT ST_AsText(boundary) FROM named_places WHERE name = 'Goose Island'
----
-POLYGON ((59 13, 59 18, 67 18, 67 13, 59 13))
+POLYGON ((67 13, 67 18, 59 18, 59 13, 67 13))
diff --git a/geom/sql/functions/Tests/ST_AsEWKT.test
b/geom/sql/functions/Tests/ST_AsEWKT.test
--- a/geom/sql/functions/Tests/ST_AsEWKT.test
+++ b/geom/sql/functions/Tests/ST_AsEWKT.test
@@ -61,47 +61,47 @@ SRID:0;POLYGON Z ((10 10 10, 20 20 20, 3
query T rowsort
select st_asEWKT(st_mpointfromtext('multipoint(10 10, 20 20)'))
----
-SRID:0;MULTIPOINT (20 20, 10 10)
+SRID:0;MULTIPOINT (10 10, 20 20)
query T rowsort
select st_asEWKT(st_mpointfromtext('multipoint(20 20, 30 30)', 4326))
----
-SRID:4326;MULTIPOINT (30 30, 20 20)
+SRID:4326;MULTIPOINT (20 20, 30 30)
query T rowsort
select st_asEWKT(st_mpointfromtext('multipoint(20 20 20, 30 30 30)', 4326))
----
-SRID:4326;MULTIPOINT Z (30 30 30, 20 20 20)
+SRID:4326;MULTIPOINT Z (20 20 20, 30 30 30)
query T rowsort
select st_asEWKT(st_mlinefromtext('multilinestring((10 10, 20 20, 30 30), (40
40, 50 50, 60 60))'))
----
-SRID:0;MULTILINESTRING ((40 40, 50 50, 60 60), (10 10, 20 20, 30 30))
+SRID:0;MULTILINESTRING ((10 10, 20 20, 30 30), (40 40, 50 50, 60 60))
query T rowsort
select st_asEWKT(st_mlinefromtext('multilinestring((20 20, 30 30, 40 40), (50
50, 60 60, 70 70))', 4326))
----
-SRID:4326;MULTILINESTRING ((50 50, 60 60, 70 70), (20 20, 30 30, 40 40))
+SRID:4326;MULTILINESTRING ((20 20, 30 30, 40 40), (50 50, 60 60, 70 70))
query T rowsort
select st_asEWKT(st_mlinefromtext('multilinestring((20 20 20, 30 30 30, 40 40
40), (50 50 50, 60 60 60, 70 70 70))', 4326))
----
-SRID:4326;MULTILINESTRING Z ((50 50 50, 60 60 60, 70 70 70), (20 20 20, 30 30
30, 40 40 40))
+SRID:4326;MULTILINESTRING Z ((20 20 20, 30 30 30, 40 40 40), (50 50 50, 60 60
60, 70 70 70))
query T rowsort
select st_asEWKT(st_mpolyfromtext('multipolygon(((10 10, 20 20, 30 30, 10
10),(100 100, 200 200, 300 300, 100 100)))'))
----
-SRID:0;MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 300 300, 200
200, 100 100)))
+SRID:0;MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 200 200, 300
300, 100 100)))
query T rowsort
select st_asEWKT(st_mpolyfromtext('multipolygon(((20 20, 30 30, 40 40, 20
20),(200 200, 300 300, 400 400, 200 200)))', 4326))
----
-SRID:4326;MULTIPOLYGON (((20 20, 30 30, 40 40, 20 20), (200 200, 400 400, 300
300, 200 200)))
+SRID:4326;MULTIPOLYGON (((20 20, 30 30, 40 40, 20 20), (200 200, 300 300, 400
400, 200 200)))
query T rowsort
select st_asEWKT(st_mpolyfromtext('multipolygon(((10 10 10, 20 20 20, 30 30
30, 10 10 10),(100 100 100, 200 200 200, 300 300 300, 100 100 100)))'))
----
-SRID:0;MULTIPOLYGON Z (((10 10 10, 20 20 20, 30 30 30, 10 10 10), (100 100
100, 300 300 300, 200 200 200, 100 100 100)))
+SRID:0;MULTIPOLYGON Z (((10 10 10, 20 20 20, 30 30 30, 10 10 10), (100 100
100, 200 200 200, 300 300 300, 100 100 100)))
query T rowsort
select st_asEWKT(st_geomfromtext('point(10 10)'))
@@ -121,17 +121,17 @@ SRID:0;POLYGON ((10 10, 20 20, 30 30, 10
query T rowsort
select st_asEWKT(st_geomfromtext('multipoint(10 10, 20 20)'))
----
-SRID:0;MULTIPOINT (20 20, 10 10)
+SRID:0;MULTIPOINT (10 10, 20 20)
query T rowsort
select st_asEWKT(st_geomfromtext('multilinestring((10 10, 20 20, 30 30), (40
40, 50 50, 60 60))'))
----
-SRID:0;MULTILINESTRING ((40 40, 50 50, 60 60), (10 10, 20 20, 30 30))
+SRID:0;MULTILINESTRING ((10 10, 20 20, 30 30), (40 40, 50 50, 60 60))
query T rowsort
select st_asEWKT(st_geomfromtext('multipolygon(((10 10, 20 20, 30 30, 10
10),(100 100, 200 200, 300 300, 100 100)))'))
----
-SRID:0;MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 300 300, 200
200, 100 100)))
+SRID:0;MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 200 200, 300
300, 100 100)))
statement ok
create table points_tbl(g geometry(point))
diff --git a/geom/sql/functions/Tests/ST_AsText.test
b/geom/sql/functions/Tests/ST_AsText.test
--- a/geom/sql/functions/Tests/ST_AsText.test
+++ b/geom/sql/functions/Tests/ST_AsText.test
@@ -61,47 +61,47 @@ POLYGON Z ((10 10 10, 20 20 20, 30 30 30
query T rowsort
select st_astext(st_mpointfromtext('multipoint(10 10, 20 20)'))
----
-MULTIPOINT (20 20, 10 10)
+MULTIPOINT (10 10, 20 20)
query T rowsort
select st_astext(st_mpointfromtext('multipoint(20 20, 30 30)', 4326))
----
-MULTIPOINT (30 30, 20 20)
+MULTIPOINT (20 20, 30 30)
query T rowsort
select st_astext(st_mpointfromtext('multipoint(20 20 20, 30 30 30)', 4326))
----
-MULTIPOINT Z (30 30 30, 20 20 20)
+MULTIPOINT Z (20 20 20, 30 30 30)
query T rowsort
select st_astext(st_mlinefromtext('multilinestring((10 10, 20 20, 30 30), (40
40, 50 50, 60 60))'))
----
-MULTILINESTRING ((40 40, 50 50, 60 60), (10 10, 20 20, 30 30))
+MULTILINESTRING ((10 10, 20 20, 30 30), (40 40, 50 50, 60 60))
query T rowsort
select st_astext(st_mlinefromtext('multilinestring((20 20, 30 30, 40 40), (50
50, 60 60, 70 70))', 4326))
----
-MULTILINESTRING ((50 50, 60 60, 70 70), (20 20, 30 30, 40 40))
+MULTILINESTRING ((20 20, 30 30, 40 40), (50 50, 60 60, 70 70))
query T rowsort
select st_astext(st_mlinefromtext('multilinestring((20 20 20, 30 30 30, 40 40
40), (50 50 50, 60 60 60, 70 70 70))', 4326))
----
-MULTILINESTRING Z ((50 50 50, 60 60 60, 70 70 70), (20 20 20, 30 30 30, 40 40
40))
+MULTILINESTRING Z ((20 20 20, 30 30 30, 40 40 40), (50 50 50, 60 60 60, 70 70
70))
query T rowsort
select st_astext(st_mpolyfromtext('multipolygon(((10 10, 20 20, 30 30, 10
10),(100 100, 200 200, 300 300, 100 100)))'))
----
-MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 300 300, 200 200, 100
100)))
+MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 200 200, 300 300, 100
100)))
query T rowsort
select st_astext(st_mpolyfromtext('multipolygon(((20 20, 30 30, 40 40, 20
20),(200 200, 300 300, 400 400, 200 200)))', 4326))
----
-MULTIPOLYGON (((20 20, 30 30, 40 40, 20 20), (200 200, 400 400, 300 300, 200
200)))
+MULTIPOLYGON (((20 20, 30 30, 40 40, 20 20), (200 200, 300 300, 400 400, 200
200)))
query T rowsort
select st_astext(st_mpolyfromtext('multipolygon(((10 10 10, 20 20 20, 30 30
30, 10 10 10),(100 100 100, 200 200 200, 300 300 300, 100 100 100)))'))
----
-MULTIPOLYGON Z (((10 10 10, 20 20 20, 30 30 30, 10 10 10), (100 100 100, 300
300 300, 200 200 200, 100 100 100)))
+MULTIPOLYGON Z (((10 10 10, 20 20 20, 30 30 30, 10 10 10), (100 100 100, 200
200 200, 300 300 300, 100 100 100)))
query T rowsort
select st_astext(st_geomfromtext('point(10 10)'))
@@ -121,17 +121,17 @@ POLYGON ((10 10, 20 20, 30 30, 10 10))
query T rowsort
select st_astext(st_geomfromtext('multipoint(10 10, 20 20)'))
----
-MULTIPOINT (20 20, 10 10)
+MULTIPOINT (10 10, 20 20)
query T rowsort
select st_astext(st_geomfromtext('multilinestring((10 10, 20 20, 30 30), (40
40, 50 50, 60 60))'))
----
-MULTILINESTRING ((40 40, 50 50, 60 60), (10 10, 20 20, 30 30))
+MULTILINESTRING ((10 10, 20 20, 30 30), (40 40, 50 50, 60 60))
query T rowsort
select st_astext(st_geomfromtext('multipolygon(((10 10, 20 20, 30 30, 10
10),(100 100, 200 200, 300 300, 100 100)))'))
----
-MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 300 300, 200 200, 100
100)))
+MULTIPOLYGON (((10 10, 20 20, 30 30, 10 10), (100 100, 200 200, 300 300, 100
100)))
statement ok
create table points_tbl(g geometry(point))
diff --git a/geom/sql/functions/Tests/ST_Boundary.test
b/geom/sql/functions/Tests/ST_Boundary.test
--- a/geom/sql/functions/Tests/ST_Boundary.test
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
