Changeset: b3df92a7710c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3df92a7710c Branch: mtest Log Message:
merge heads diffs (148 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 @@ -24,10 +24,10 @@ POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) NULL 2 POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) -BOX (1 2, 3 4) +BOX (1.000000 2.000000, 3.000000 4.000000) 3 POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) -BOX (1 2, 3 4) +BOX (1.000000 2.000000, 3.000000 4.000000) 4 NULL NULL @@ -43,13 +43,13 @@ SELECT * FROM geom ORDER BY id ---- 1 POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) -BOX (1 2, 3 4) +BOX (1.000000 2.000000, 3.000000 4.000000) 2 POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) -BOX (1 2, 3 4) +BOX (1.000000 2.000000, 3.000000 4.000000) 3 POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) -BOX (1 2, 3 4) +BOX (1.000000 2.000000, 3.000000 4.000000) 4 NULL NULL @@ -68,13 +68,13 @@ SELECT * FROM newgeom ORDER BY id ---- 1 POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) -BOX (1 2, 3 4) +BOX (1.000000 2.000000, 3.000000 4.000000) 2 POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) -BOX (1 2, 3 4) +BOX (1.000000 2.000000, 3.000000 4.000000) 3 POLYGON ((1 2, 3 2, 3 4, 1 4, 1 2)) -BOX (1 2, 3 4) +BOX (1.000000 2.000000, 3.000000 4.000000) 4 NULL NULL diff --git a/geom/sql/functions/Tests/ST_MakeBox2D.test b/geom/sql/functions/Tests/ST_MakeBox2D.test --- a/geom/sql/functions/Tests/ST_MakeBox2D.test +++ b/geom/sql/functions/Tests/ST_MakeBox2D.test @@ -1,7 +1,7 @@ query T nosort select ST_MakeBox2D(ST_Point(-989502.1875, 528439.5625), ST_Point(-987121.375 ,529933.1875)) ---- -BOX (-989502.1875 528439.5625, -987121.375 529933.1875) +BOX (-989502.187500 528439.562500, -987121.375000 529933.187500) query T rowsort select ST_MakeBox2D(ST_Point(-989502.1875, 528439.5625), null) @@ -21,65 +21,65 @@ query TT nosort SELECT geom AS "P", ST_MakeBox2D(geom, ST_Point(90, 90)) AS "BOX2D" FROM t ---- POINT (10 20) -BOX (10 20, 90 90) +BOX (10.000000 20.000000, 90.000000 90.000000) POINT (30 40) -BOX (30 40, 90 90) +BOX (30.000000 40.000000, 90.000000 90.000000) POINT (50 60) -BOX (50 60, 90 90) +BOX (50.000000 60.000000, 90.000000 90.000000) POINT (70 80) -BOX (70 80, 90 90) +BOX (70.000000 80.000000, 90.000000 90.000000) query TTT nosort SELECT g1.geom AS "P1", g2.geom AS "P2", ST_MakeBox2D(g1.geom, g2.geom) AS "BOX2D" FROM t g1, t g2 ---- POINT (10 20) POINT (10 20) -BOX (10 20, 10 20) +BOX (10.000000 20.000000, 10.000000 20.000000) POINT (10 20) POINT (30 40) -BOX (10 20, 30 40) +BOX (10.000000 20.000000, 30.000000 40.000000) POINT (10 20) POINT (50 60) -BOX (10 20, 50 60) +BOX (10.000000 20.000000, 50.000000 60.000000) POINT (10 20) POINT (70 80) -BOX (10 20, 70 80) +BOX (10.000000 20.000000, 70.000000 80.000000) POINT (30 40) POINT (10 20) -BOX (10 20, 30 40) +BOX (10.000000 20.000000, 30.000000 40.000000) POINT (30 40) POINT (30 40) -BOX (30 40, 30 40) +BOX (30.000000 40.000000, 30.000000 40.000000) POINT (30 40) POINT (50 60) -BOX (30 40, 50 60) +BOX (30.000000 40.000000, 50.000000 60.000000) POINT (30 40) POINT (70 80) -BOX (30 40, 70 80) +BOX (30.000000 40.000000, 70.000000 80.000000) POINT (50 60) POINT (10 20) -BOX (10 20, 50 60) +BOX (10.000000 20.000000, 50.000000 60.000000) POINT (50 60) POINT (30 40) -BOX (30 40, 50 60) +BOX (30.000000 40.000000, 50.000000 60.000000) POINT (50 60) POINT (50 60) -BOX (50 60, 50 60) +BOX (50.000000 60.000000, 50.000000 60.000000) POINT (50 60) POINT (70 80) -BOX (50 60, 70 80) +BOX (50.000000 60.000000, 70.000000 80.000000) POINT (70 80) POINT (10 20) -BOX (10 20, 70 80) +BOX (10.000000 20.000000, 70.000000 80.000000) POINT (70 80) POINT (30 40) -BOX (30 40, 70 80) +BOX (30.000000 40.000000, 70.000000 80.000000) POINT (70 80) POINT (50 60) -BOX (50 60, 70 80) +BOX (50.000000 60.000000, 70.000000 80.000000) POINT (70 80) POINT (70 80) -BOX (70 80, 70 80) +BOX (70.000000 80.000000, 70.000000 80.000000) statement ok DROP TABLE t _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
