[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-27-gc6d89b4
git at osgeo.org
git at osgeo.org
Mon Mar 2 15:16:35 PST 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 c6d89b476d95bc6c6fb3e9ced843fff553319144 (commit)
from 7f4426716f561187175d73bfff330343b25a7be9 (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 c6d89b476d95bc6c6fb3e9ced843fff553319144
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Mon Mar 2 15:16:29 2020 -0800
harmonize outputs with new precise base srs, reference #4641
diff --git a/regress/core/regress.sql b/regress/core/regress.sql
index 5503d05..b8e8249 100644
--- a/regress/core/regress.sql
+++ b/regress/core/regress.sql
@@ -265,26 +265,26 @@ select '225', ST_Expand('BOX(-2 3, -1 6'::BOX2D, 4, 2);
select '226', ST_SRID(ST_Expand('SRID=4326;POINT (0 0)'::geometry, 1))=4326;
-- ST_TileEnvelope()
-select '227', ST_AsEWKT(ST_TileEnvelope(-1, 0, 0));
-select '228', ST_AsEWKT(ST_TileEnvelope(0, 0, 1));
-select '229', ST_AsEWKT(ST_TileEnvelope(0, 0, 0));
-select '230', ST_AsText(ST_TileEnvelope(4, 8, 8), 7);
-select '231', ST_AsEWKT(ST_TileEnvelope(4, 15, 15));
-select '232', ST_AsEWKT(ST_TileEnvelope(4, 8, 8, ST_MakeEnvelope(-100, -100, 100, 100, 0)));
-select '233', ST_AsEWKT(ST_TileEnvelope(4, 15, 15, ST_MakeEnvelope(-100, -100, 100, 100, 0)));
-select '234', ST_AsEWKT(ST_TileEnvelope(4, 0, 0, ST_MakeEnvelope(-100, -100, 100, 100, 0)));
-select '235', ST_AsEWKT(ST_TileEnvelope(4, 8, 8, ST_MakeEnvelope(-200, -100, 200, 100, 0)));
-select '236', ST_AsEWKT(ST_TileEnvelope(0, 0, 0, margin => 0.1));
-select '237', ST_AsEWKT(ST_TileEnvelope(1, 0, 0, margin => 0.1));
-select '238', ST_AsEWKT(ST_TileEnvelope(2, 1, 3, margin => 0.5));
-select '239', ST_AsEWKT(ST_TileEnvelope(0, 0, 0, margin => -0.5));
-select '240', ST_AsEWKT(ST_TileEnvelope(0, 0, 0, margin => -0.51));
-select '241', ST_AsEWKT(ST_TileEnvelope(0, 0, 0, margin => -0.4));
-select '250', ST_AsEWKT(ST_TileEnvelope(10,300,387));
-select '251', ST_AsEWKT(ST_TileEnvelope(10,300,387, margin => 0.1));
-select '252', ST_AsEWKT(ST_TileEnvelope(10,300,387, margin => 0.5));
-select '253', ST_AsEWKT(ST_TileEnvelope(10,300,387, margin => 2));
-select '254', ST_AsEWKT(ST_TileEnvelope(10,300,387, margin => -0.3));
+select '227', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(-1, 0, 0) ,0.01));
+select '228', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(0, 0, 1), 0.01));
+select '229', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(0, 0, 0), 0.01));
+select '230', ST_AsText(ST_SnapToGrid(ST_TileEnvelope(4, 8, 8), 0.01));
+select '231', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(4, 15, 15),0.01));
+select '232', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(4, 8, 8, ST_MakeEnvelope(-100, -100, 100, 100, 0)), 0.01));
+select '233', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(4, 15, 15, ST_MakeEnvelope(-100, -100, 100, 100, 0)), 0.01));
+select '234', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(4, 0, 0, ST_MakeEnvelope(-100, -100, 100, 100, 0)), 0.01));
+select '235', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(4, 8, 8, ST_MakeEnvelope(-200, -100, 200, 100, 0)), 0.01));
+select '236', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(0, 0, 0, margin => 0.1), 0.01));
+select '237', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(1, 0, 0, margin => 0.1), 0.01));
+select '238', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(2, 1, 3, margin => 0.5), 0.01));
+select '239', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(0, 0, 0, margin => -0.5), 0.01));
+select '240', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(0, 0, 0, margin => -0.51), 0.01));
+select '241', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(0, 0, 0, margin => -0.4), 0.01));
+select '250', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(10,300,387), 0.01));
+select '251', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(10,300,387, margin => 0.1), 0.01));
+select '252', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(10,300,387, margin => 0.5), 0.01));
+select '253', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(10,300,387, margin => 2), 0.01));
+select '254', ST_AsEWKT(ST_SnapToGrid(ST_TileEnvelope(10,300,387, margin => -0.3), 0.01));
-- ST_Hexagon()
select '300', ST_AsEWKT(ST_SnapToGrid(ST_Hexagon(10, 0, 0),0.00001));
diff --git a/regress/core/regress_expected b/regress/core/regress_expected
index aed3e61..7e1c312 100644
--- a/regress/core/regress_expected
+++ b/regress/core/regress_expected
@@ -196,24 +196,24 @@ ERROR: geometry contains non-closed rings
226|t
ERROR: ST_TileEnvelope: Invalid tile zoom value, -1
ERROR: ST_TileEnvelope: Invalid tile y value, 1
-229|SRID=3857;POLYGON((-20037508.342789 -20037508.342789,-20037508.342789 20037508.342789,20037508.342789 20037508.342789,20037508.342789 -20037508.342789,-20037508.342789 -20037508.342789))
-230|POLYGON((0 -2504688.5428486,0 0,2504688.5428486 0,2504688.5428486 -2504688.5428486,0 -2504688.5428486))
-231|SRID=3857;POLYGON((17532819.7999404 -20037508.342789,17532819.7999404 -17532819.7999404,20037508.342789 -17532819.7999404,20037508.342789 -20037508.342789,17532819.7999404 -20037508.342789))
+229|SRID=3857;POLYGON((-20037508.34 -20037508.34,-20037508.34 20037508.34,20037508.34 20037508.34,20037508.34 -20037508.34,-20037508.34 -20037508.34))
+230|POLYGON((0 -2504688.54,0 0,2504688.54 0,2504688.54 -2504688.54,0 -2504688.54))
+231|SRID=3857;POLYGON((17532819.8 -20037508.34,17532819.8 -17532819.8,20037508.34 -17532819.8,20037508.34 -20037508.34,17532819.8 -20037508.34))
232|POLYGON((0 -12.5,0 0,12.5 0,12.5 -12.5,0 -12.5))
233|POLYGON((87.5 -100,87.5 -87.5,100 -87.5,100 -100,87.5 -100))
234|POLYGON((-100 87.5,-100 100,-87.5 100,-87.5 87.5,-100 87.5))
235|POLYGON((0 -12.5,0 0,25 0,25 -12.5,0 -12.5))
-236|SRID=3857;POLYGON((-20037508.342789 -20037508.342789,-20037508.342789 20037508.342789,20037508.342789 20037508.342789,20037508.342789 -20037508.342789,-20037508.342789 -20037508.342789))
-237|SRID=3857;POLYGON((-22041259.1770679 -2003750.8342789,-22041259.1770679 20037508.342789,2003750.8342789 20037508.342789,2003750.8342789 -2003750.8342789,-22041259.1770679 -2003750.8342789))
-238|SRID=3857;POLYGON((-15028131.2570918 -20037508.342789,-15028131.2570918 -5009377.08569725,5009377.08569725 -5009377.08569725,5009377.08569725 -20037508.342789,-15028131.2570918 -20037508.342789))
-239|SRID=3857;POLYGON((0 0,0 0,0 0,0 0,0 0))
+236|SRID=3857;POLYGON((-20037508.34 -20037508.34,-20037508.34 20037508.34,20037508.34 20037508.34,20037508.34 -20037508.34,-20037508.34 -20037508.34))
+237|SRID=3857;POLYGON((-22041259.18 -2003750.83,-22041259.18 20037508.34,2003750.83 20037508.34,2003750.83 -2003750.83,-22041259.18 -2003750.83))
+238|SRID=3857;POLYGON((-15028131.26 -20037508.34,-15028131.26 -5009377.09,5009377.09 -5009377.09,5009377.09 -20037508.34,-15028131.26 -20037508.34))
+239|SRID=3857;POLYGON EMPTY
ERROR: ST_TileEnvelope: Margin must not be less than -50%, margin=-0.510000
-241|SRID=3857;POLYGON((-4007501.6685578 -4007501.6685578,-4007501.6685578 4007501.6685578,4007501.6685578 4007501.6685578,4007501.6685578 -4007501.6685578,-4007501.6685578 -4007501.6685578))
-250|SRID=3857;POLYGON((-8296780.79818607 4852834.05176921,-8296780.79818607 4891969.81025122,-8257645.03970406 4891969.81025122,-8257645.03970406 4852834.05176921,-8296780.79818607 4852834.05176921))
-251|SRID=3857;POLYGON((-8300694.37403427 4848920.47592101,-8300694.37403427 4895883.38609942,-8253731.46385586 4895883.38609942,-8253731.46385586 4848920.47592101,-8300694.37403427 4848920.47592101))
-252|SRID=3857;POLYGON((-8316348.67742708 4833266.17252821,-8316348.67742708 4911537.68949223,-8238077.16046306 4911537.68949223,-8238077.16046306 4833266.17252821,-8316348.67742708 4833266.17252821))
-253|SRID=3857;POLYGON((-8375052.31515009 4774562.53480519,-8375052.31515009 4970241.32721524,-8179373.52274004 4970241.32721524,-8179373.52274004 4774562.53480519,-8375052.31515009 4774562.53480519))
-254|SRID=3857;POLYGON((-8285040.07064147 4864574.77931381,-8285040.07064147 4880229.08270662,-8269385.76724866 4880229.08270662,-8269385.76724866 4864574.77931381,-8285040.07064147 4864574.77931381))
+241|SRID=3857;POLYGON((-4007501.67 -4007501.67,-4007501.67 4007501.67,4007501.67 4007501.67,4007501.67 -4007501.67,-4007501.67 -4007501.67))
+250|SRID=3857;POLYGON((-8296780.8 4852834.05,-8296780.8 4891969.81,-8257645.04 4891969.81,-8257645.04 4852834.05,-8296780.8 4852834.05))
+251|SRID=3857;POLYGON((-8300694.37 4848920.48,-8300694.37 4895883.39,-8253731.46 4895883.39,-8253731.46 4848920.48,-8300694.37 4848920.48))
+252|SRID=3857;POLYGON((-8316348.68 4833266.17,-8316348.68 4911537.69,-8238077.16 4911537.69,-8238077.16 4833266.17,-8316348.68 4833266.17))
+253|SRID=3857;POLYGON((-8375052.32 4774562.53,-8375052.32 4970241.33,-8179373.52 4970241.33,-8179373.52 4774562.53,-8375052.32 4774562.53))
+254|SRID=3857;POLYGON((-8285040.07 4864574.78,-8285040.07 4880229.08,-8269385.77 4880229.08,-8269385.77 4864574.78,-8285040.07 4864574.78))
300|POLYGON((-10 0,-5 -8.66025,5 -8.66025,10 0,5 8.66025,-5 8.66025,-10 0))
301|POLYGON((5 25.98076,10 17.32051,20 17.32051,25 25.98076,20 34.64102,10 34.64102,5 25.98076))
302|POLYGON((-25 -8.66025,-20 -17.32051,-10 -17.32051,-5 -8.66025,-10 0,-20 0,-25 -8.66025))
-----------------------------------------------------------------------
Summary of changes:
regress/core/regress.sql | 40 ++++++++++++++++++++--------------------
regress/core/regress_expected | 26 +++++++++++++-------------
2 files changed, 33 insertions(+), 33 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list