[postgis-tickets] r15077 - Fix regress tests for builds without JSON support

[Sandro Santilli]

Author: strk
Date: 2016-09-07 10:45:16 -0700 (Wed, 07 Sep 2016)
New Revision: 15077

Modified:
   trunk/regress/in_geojson.sql
   trunk/regress/in_geojson_expected
   trunk/regress/tickets.sql
   trunk/regress/tickets_expected
Log:
Fix regress tests for builds without JSON support

Modified: trunk/regress/in_geojson.sql
===================================================================
--- trunk/regress/in_geojson.sql	2016-09-06 22:59:56 UTC (rev 15076)
+++ trunk/regress/in_geojson.sql	2016-09-07 17:45:16 UTC (rev 15077)
@@ -45,3 +45,6 @@
 SELECT 'geomfromgeojson_srs_2', ST_AsEWKT(ST_GeomFromGeoJSON('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[100.0,0.0]},{"type":"LineString","coordinates":[[101.0,0.0],[102.0,1.0]]}],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}}'));
 SELECT 'geomfromgeojson_srs_3', ST_AsEWKT(ST_GeomFromGeoJSON('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[100.0,0.0]},{"type":"LineString","coordinates":[[101.0,0.0],[102.0,1.0]]}],"crs":{"type":"name","props":{"name":"urn:ogc:def:crs:EPSG::4326"}}}'));
 SELECT 'geomfromgeojson_srs_4', ST_AsEWKT(ST_GeomFromGeoJSON('{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[100.0,0.0]},{"type":"LineString","coordinates":[[101.0,0.0],[102.0,1.0]]}],"crs":{"type":"name","properties":{"nm":"EPSG:4326"}}}'));
+
+-- #3583
+SELECT '#3583', ST_AsText(ST_GeomFromGeoJSON('{"type":"MultiPolygon", "coordinates":[[[139.10030364990232,35.16777444430609],5842.4224490305424]]}'));

Modified: trunk/regress/in_geojson_expected
===================================================================
--- trunk/regress/in_geojson_expected	2016-09-06 22:59:56 UTC (rev 15076)
+++ trunk/regress/in_geojson_expected	2016-09-07 17:45:16 UTC (rev 15077)
@@ -27,3 +27,4 @@
 geomfromgeojson_srs_2|GEOMETRYCOLLECTION(POINT(100 0),LINESTRING(101 0,102 1))
 geomfromgeojson_srs_3|GEOMETRYCOLLECTION(POINT(100 0),LINESTRING(101 0,102 1))
 geomfromgeojson_srs_4|GEOMETRYCOLLECTION(POINT(100 0),LINESTRING(101 0,102 1))
+#3583|MULTIPOLYGON Z (EMPTY)

Modified: trunk/regress/tickets.sql
===================================================================
--- trunk/regress/tickets.sql	2016-09-06 22:59:56 UTC (rev 15076)
+++ trunk/regress/tickets.sql	2016-09-07 17:45:16 UTC (rev 15077)
@@ -990,9 +990,6 @@
     ST_Intersects(ST_Buffer(road.geom, sidewalk_offset + epsilon), sidewalks.geom) -- should be true
 from road, sidewalks, params;
 
--- #3583
-Select '#3583', ST_AsText(ST_GeomFromGeoJSON('{"type":"MultiPolygon", "coordinates":[[[139.10030364990232,35.16777444430609],5842.4224490305424]]}')); 
-
 -- #3627
 SELECT '#3627a', ST_AsEncodedPolyline('SRID=4326;LINESTRING(-0.250691 49.283048,-0.250633 49.283376,-0.250502 49.283972,-0.251245 49.284028,-0.251938 49.284232,-0.251938 49.2842)', 6);
 SELECT '#3627b', ST_Equals(geom, ST_LineFromEncodedPolyline(ST_AsEncodedPolyline(geom, 7), 7)) FROM (VALUES ('SRID=4326;LINESTRING (0 0, 1 1)')) AS v (geom);

Modified: trunk/regress/tickets_expected
===================================================================
--- trunk/regress/tickets_expected	2016-09-06 22:59:56 UTC (rev 15076)
+++ trunk/regress/tickets_expected	2016-09-07 17:45:16 UTC (rev 15077)
@@ -295,6 +295,5 @@
 #3470|t
 #3470b|50
 #3579|f|t
-#3583|MULTIPOLYGON Z (EMPTY)
 #3627a|o}~~|AdshNoSsBgd at eGoBlm@wKhj@~@?
 #3627b|t