Move protobuf specific ticket lines to mvt test

Closes #4472

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

diff --git a/NEWS b/NEWS
index 3285489a15a2b5164fca70f37bb8bff7bc967138..4b24864320d6e40a13f7cb548e7c485f9db7deea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 PostGIS 3.0.0alpha4
-2019/xx/xx
+2019/08/xx
 For full changes and enhancements, refer to PostGIS 3.0.0.
 This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
 Additional features enabled if you are running Proj6+ and PostgreSQL 12

diff --git a/regress/core/mvt.sql b/regress/core/mvt.sql
index b9fcca0a4ee78cd2fff9699fa27b209bf080aa61..33141e37717aa82e1b7575990433fe5aa61aef38 100644 (file)
--- a/regress/core/mvt.sql
+++ b/regress/core/mvt.sql
@@ -725,3 +725,14 @@ SELECT '#4348Crash', COALESCE(ST_Npoints(ST_AsMVTGeom(
     16,
     true
 )), 0) BETWEEN 0 AND 100;
+
+WITH geom AS (
+       SELECT 'TRIANGLE((0 0, 1 1, 0 1, 0 0))'::geometry geom
+       union all
+       SELECT 'TIN(((0 0, 1 1, 0 1, 0 0)))'::geometry geom
+       union all
+       SELECT 'TRIANGLE EMPTY'::geometry geom
+)
+select '#4399', 'ST_AsGeobuf', ST_AsGeobuf(geom.*)::text from geom
+union all
+select '#4399', 'ST_AsMVTGeom', ST_AsMVTGeom(geom, ST_MakeBox2D(ST_Point(0, 0), ST_Point(32, 32)))::text from geom;

diff --git a/regress/core/mvt_expected b/regress/core/mvt_expected
index 5635adf6108aa40485996e0d0031176a13ecaf41..fcff3169dbbad32a4f7c5685e770d4f1fd932a53 100644 (file)
--- a/regress/core/mvt_expected
+++ b/regress/core/mvt_expected
@@ -142,3 +142,7 @@ Ag==
 #4348Reversed2|t
 #4348Point|t
 #4348Crash|t
+#4399|ST_AsGeobuf|\x180022260a0c0a0a08041a060000020201000a100a0e0806220a08041a060000020201000a040a020804
+#4399|ST_AsMVTGeom|011100000001000000040000000000000000000000000000000000B0400000000000000000000000000000AF400000000000006040000000000000AF400000000000000000000000000000B040
+#4399|ST_AsMVTGeom|011100000001000000040000000000000000000000000000000000B0400000000000000000000000000000AF400000000000006040000000000000AF400000000000000000000000000000B040
+#4399|ST_AsMVTGeom|

diff --git a/regress/core/tickets.sql b/regress/core/tickets.sql
index ba87cb8e37e0dc1b661b6b5a176c4d89dec57641..adb64fbf97861e8266448e31c7a19c2f4c2024d8 100644 (file)
--- a/regress/core/tickets.sql
+++ b/regress/core/tickets.sql
@@ -1283,9 +1283,4 @@ select '#4399', 'ST_AsX3D', ST_AsX3D(geom)::text from geom
 union all
 select '#4399', 'ST_GeoHash', ST_GeoHash(geom)::text from geom
 union all
-select '#4399', 'ST_AsGeobuf', ST_AsGeobuf(geom.*)::text from geom
-union all
-select '#4399', 'ST_AsMVTGeom', ST_AsMVTGeom(geom, ST_MakeBox2D(ST_Point(0, 0), ST_Point(32, 32)))::text from geom
-union all
 select '#4399', 'ST_AsGeoJSON', ST_AsGeoJSON(geom)::text from geom;
-

diff --git a/regress/core/tickets_expected b/regress/core/tickets_expected
index 82a5f90b78d9811934cf3549d653e07b4b2271f8..e821f1c07b144cdc88cbf21cb18ae2bafe49dd0a 100644 (file)
--- a/regress/core/tickets_expected
+++ b/regress/core/tickets_expected
@@ -421,10 +421,6 @@ ERROR:  BOX2D_construct: args can not be empty points
 #4399|ST_GeoHash|
 #4399|ST_GeoHash|
 #4399|ST_GeoHash|
-#4399|ST_AsGeobuf|\x180022260a0c0a0a08041a060000020201000a100a0e0806220a08041a060000020201000a040a020804
-#4399|ST_AsMVTGeom|011100000001000000040000000000000000000000000000000000B0400000000000000000000000000000AF400000000000006040000000000000AF400000000000000000000000000000B040
-#4399|ST_AsMVTGeom|011100000001000000040000000000000000000000000000000000B0400000000000000000000000000000AF400000000000006040000000000000AF400000000000000000000000000000B040
-#4399|ST_AsMVTGeom|
 #4399|ST_AsGeoJSON|{"type":"Polygon","coordinates":[[[0,0],[1,1],[0,1],[0,0]]]}
 #4399|ST_AsGeoJSON|{"type":"GeometryCollection","geometries":[{"type":"Polygon","coordinates":[[[0,0],[1,1],[0,1],[0,0]]]}]}
 #4399|ST_AsGeoJSON|{"type":"Polygon","coordinates":[[]]}