Fix regress tests for builds without JSON support

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

diff --git a/regress/in_geojson.sql b/regress/in_geojson.sql
index e535f42062899b53988fa94f4ee7a4dec750cebe..8e41fc40a1a8ec87ad3d8f0f29299a51f8bf7d95 100644 (file)
--- a/regress/in_geojson.sql
+++ b/regress/in_geojson.sql
@@ -45,3 +45,6 @@ SELECT 'geomfromgeojson_srs_1', ST_AsEWKT(ST_GeomFromGeoJSON('{"type":"GeometryC
 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]]}'));

diff --git a/regress/in_geojson_expected b/regress/in_geojson_expected
index ddedb906d57c4ff073d1cb158d2ac22c869dff3a..fc66ab8bc2a5d2bf0f489c2c53d8adcf4bd3eace 100644 (file)
--- a/regress/in_geojson_expected
+++ b/regress/in_geojson_expected
@@ -27,3 +27,4 @@ geomfromgeojson_srs_1|GEOMETRYCOLLECTION(POINT(100 0),LINESTRING(101 0,102 1))
 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)

diff --git a/regress/tickets.sql b/regress/tickets.sql
index b477d07ad6db9fd78da045597ab143781c0c7943..cdb7a53de56ec84fc99fd11fc7dc3bf33031a922 100644 (file)
--- a/regress/tickets.sql
+++ b/regress/tickets.sql
@@ -990,9 +990,6 @@ select
     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);

diff --git a/regress/tickets_expected b/regress/tickets_expected
index 8cd896d4f57881d983c9ca75ec9dcf9c4124ba77..edcc0e2f61205875d77b0fd5f9ce6007ac966f9f 100644 (file)
--- a/regress/tickets_expected
+++ b/regress/tickets_expected
@@ -295,6 +295,5 @@ ERROR:  invalid KML representation
 #3470|t
 #3470b|50
 #3579|f|t
-#3583|MULTIPOLYGON Z (EMPTY)
 #3627a|o}~~|AdshNoSsBgd@eGoBlm@wKhj@~@?
 #3627b|t