Fix ST_SnapToGrid output having an outdated bbox

References #4495
Closes https://github.com/postgis/postgis/pull/473

git-svn-id: http://svn.osgeo.org/postgis/trunk@17798 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index bef75a5b19fb8a0482b3184220c3229471803323..0cc955b3089bc0411bb02580dcc3d48e199921c6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
   - #4492, Fix ST_Simplify ignoring the value of the 3rd parameter (Raúl Marín)
   - #4494, Fix ST_Simplify output having an outdated bbox (Raúl Marín)
   - #4493, Fix ST_RemoveRepeatedPoints output having an outdated bbox (Raúl Marín)
+  - #4495, Fix ST_SnapToGrid output having an outdated bbox (Raúl Marín)
 
 PostGIS 3.0.0alpha4
 2019/08/10

diff --git a/postgis/lwgeom_functions_analytic.c b/postgis/lwgeom_functions_analytic.c
index d4f294ecb90c213389b046495c41a8627559ca8e..2667ed6b1dd32910895b7b450bada59e46846b18 100644 (file)
--- a/postgis/lwgeom_functions_analytic.c
+++ b/postgis/lwgeom_functions_analytic.c
@@ -374,8 +374,7 @@ Datum LWGEOM_snaptogrid(PG_FUNCTION_ARGS)
 
        /* COMPUTE_BBOX TAINTING */
        if ( in_lwgeom->bbox )
-               lwgeom_add_bbox(out_lwgeom);
-
+               lwgeom_refresh_bbox(out_lwgeom);
 
        POSTGIS_DEBUGF(3, "SnapToGrid made a %s", lwtype_name(out_lwgeom->type));
 
@@ -454,7 +453,10 @@ Datum LWGEOM_snaptogrid_pointoff(PG_FUNCTION_ARGS)
        if ( out_lwgeom == NULL ) PG_RETURN_NULL();
 
        /* COMPUTE_BBOX TAINTING */
-       if ( in_lwgeom->bbox ) lwgeom_add_bbox(out_lwgeom);
+       if (in_lwgeom->bbox)
+       {
+               lwgeom_refresh_bbox(out_lwgeom);
+       }
 
        POSTGIS_DEBUGF(3, "SnapToGrid made a %s", lwtype_name(out_lwgeom->type));
 

diff --git a/regress/core/chaikin.sql b/regress/core/chaikin.sql
index f799c71fbd82bb9ab326ac8d08bab867badbdd2d..8bcd067b03b601037082187708bcfa695dad1fe0 100644 (file)
--- a/regress/core/chaikin.sql
+++ b/regress/core/chaikin.sql
@@ -4,3 +4,10 @@ SELECT '3', ST_astext(ST_ChaikinSmoothing('LINESTRING(0 0, 8 8, 0 16)',0));
 SELECT '4', ST_astext(ST_ChaikinSmoothing('LINESTRING(0 0, 8 8, 0 16)',2));
 SELECT '5', ST_astext(ST_ChaikinSmoothing('POINT(0 0)'));
 SELECT '6', ST_astext(ST_ChaikinSmoothing('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING(1 1, 1 3, 1 5), POLYGON((5 5, 5 10, 10 10, 10 5, 5 5), (6 6, 6 7, 7 7, 7 6, 6 6 )))', 2, 't'));
+
+-- The geometry bbox is updated
+WITH geom AS
+(
+    SELECT ST_ChaikinSmoothing('POLYGON((0 0, 8 8, 0 16, 0 0))') AS g
+)
+SELECT '7', ST_AsText(g) as geometry, postgis_getbbox(g) AS box from geom;
\ No newline at end of file

diff --git a/regress/core/chaikin_expected b/regress/core/chaikin_expected
index b4d19f2f2557436c87696b9a1a29ed3d59ac2cab..b6f2d3439b6bafdb202cae13608e463faf9828cf 100644 (file)
--- a/regress/core/chaikin_expected
+++ b/regress/core/chaikin_expected
@@ -4,3 +4,4 @@ ERROR:  Number of iterations must be between 1 and 5 : LWGEOM_ChaikinSmoothing
 4|LINESTRING(0 0,4.5 4.5,6 7,6 9,4.5 11.5,0 16)
 5|POINT(0 0)
 6|GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(1 1,1 2.125,1 2.75,1 3.25,1 3.875,1 5),POLYGON((5 5,5 7.8125,5.3125 9.0625,5.9375 9.6875,6.875 10,8.125 10,9.0625 9.6875,9.6875 9.0625,10 8.125,10 6.875,9.6875 5.9375,9.0625 5.3125,7.8125 5,5 5),(6 6,6 6.5625,6.0625 6.8125,6.1875 6.9375,6.375 7,6.625 7,6.8125 6.9375,6.9375 6.8125,7 6.625,7 6.375,6.9375 6.1875,6.8125 6.0625,6.5625 6,6 6)))
+7|POLYGON((2 2,6 6,6 10,2 14,0 12,0 4,2 2))|BOX(0 2,6 14)

diff --git a/regress/core/simplifyvw.sql b/regress/core/simplifyvw.sql
index 68e16c92e34e3bd79c0d9fe6fb7f587b45f27848..e349af1a8c1c164d273202383d54090c74c59f42 100644 (file)
--- a/regress/core/simplifyvw.sql
+++ b/regress/core/simplifyvw.sql
@@ -12,3 +12,10 @@ SELECT '9', ST_astext(ST_Simplifyvw('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(5 5,
 SELECT '10', ST_astext(ST_Simplifyvw('LINESTRING(0 0, 0 10)', 20));
 SELECT '11', ST_astext(ST_Simplifyvw('MULTIPOLYGON(((100 100, 100 130, 130 130, 130 100, 100 100)), ((0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 5 6, 6 6, 8 5, 5 5)) )', 20));
 SELECT '12', ST_astext(ST_Simplifyvw('MULTIPOLYGON(((0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 5 6, 6 6, 8 5, 5 5)),((100 100, 100 130, 130 130, 130 100, 100 100)))', 200));
+
+-- The geometry bbox is updated
+WITH geom AS
+(
+    SELECT ST_Simplifyvw('MULTIPOLYGON(((0 0, 10 0, 10 10, 0 10, 0 0),(5 5, 5 6, 6 6, 8 5, 5 5)),((100 100, 100 130, 130 130, 130 131, 130 130, 130 100, 100 100)))', 200) AS g
+)
+SELECT '13', ST_AsText(g) as geometry, postgis_getbbox(g) AS box from geom;

diff --git a/regress/core/simplifyvw_expected b/regress/core/simplifyvw_expected
index a9ea8d69aebc8505f885476028abf46ff8eec119..d37ee6ada9a502c47c3ac9b75e1165f5e60f61ee 100644 (file)
--- a/regress/core/simplifyvw_expected
+++ b/regress/core/simplifyvw_expected
@@ -10,3 +10,4 @@
 10|LINESTRING(0 0,0 10)
 11|MULTIPOLYGON(((100 100,100 130,130 130,130 100,100 100)),((0 0,10 0,10 10,0 10,0 0)))
 12|MULTIPOLYGON(((0 0,10 10,0 10,0 0)),((100 100,100 130,130 130,130 100,100 100)))
+13|MULTIPOLYGON(((0 0,10 10,0 10,0 0)),((100 100,100 130,130 130,130 100,100 100)))|BOX(0 0,130 130)

diff --git a/regress/core/snaptogrid.sql b/regress/core/snaptogrid.sql
index 571cd2c41fec41b2af5541a1e8ab54a435f193e9..0b6f5bd979c98027f61f4f4434fafa25b7d7db89 100644 (file)
--- a/regress/core/snaptogrid.sql
+++ b/regress/core/snaptogrid.sql
@@ -10,3 +10,12 @@ SELECT ST_snaptogrid(orig, 0.002) ~= ST_snaptogrid(ST_snaptogrid(orig, 0.002), 0
 SELECT ST_snaptogrid(orig, 0.003) ~= ST_snaptogrid(ST_snaptogrid(orig, 0.003), 0.003) FROM tmp;
 SELECT ST_snaptogrid(orig, 0.0002) ~= ST_snaptogrid(ST_snaptogrid(orig, 0.0002), 0.0002) FROM tmp;
 DROP TABLE tmp;
+
+-- The geometry bbox is updated
+WITH geom AS
+(
+    SELECT ST_SnapToGrid('POLYGON((0 0, 10 0, 10 10, 10.6 10, 10.5 10.5, 10 10, 0 10, 0 0))', 10) as g
+    UNION ALL
+    SELECT ST_SnapToGrid('POLYGON((0 0, 10 0, 10 10, 10.6 10, 10.5 10.5, 10 10, 0 10, 0 0))', 'POINT(0 0)', 10, 10, 10, 10) as g
+)
+Select ST_AsText(g) as geometry, postgis_getbbox(g) AS box from geom;

diff --git a/regress/core/snaptogrid_expected b/regress/core/snaptogrid_expected
index 04e7be33b65a9e7e876caf83a8de9d0e013a42eb..518c1734ba139253467f43f125ee111971ec1877 100644 (file)
--- a/regress/core/snaptogrid_expected
+++ b/regress/core/snaptogrid_expected
@@ -3,3 +3,5 @@ t
 t
 t
 t
+POLYGON((0 0,10 0,10 10,0 10,0 0))|BOX(0 0,10 10)
+POLYGON((0 0,10 0,10 10,0 10,0 0))|BOX(0 0,10 10)