In fact Nested GeometryCollection are never been supported in SVG and GeoJSON. Update...

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

diff --git a/liblwgeom/cunit/cu_out_geojson.c b/liblwgeom/cunit/cu_out_geojson.c
index a1e8aa00e68fb0ec69d284e90acb12444097883e..7ffcf72f2c07e2881fda52640bb4515af5f88fba 100644 (file)
--- a/liblwgeom/cunit/cu_out_geojson.c
+++ b/liblwgeom/cunit/cu_out_geojson.c
@@ -188,12 +188,6 @@ void out_geojson_test_srid(void)
            "GEOMETRYCOLLECTION EMPTY",
            "{\"type\":\"GeometryCollection\",\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}},\"geometries\":[]}",
            "EPSG:4326", 0, 0);
-
-       /* Nested GeometryCollection */
-       do_geojson_test(
-           "GEOMETRYCOLLECTION(POINT(0 1),GEOMETRYCOLLECTION(LINESTRING(2 3,4 5)))",
-           "{\"type\":\"GeometryCollection\",\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}},\"geometries\":[{\"type\":\"Point\",\"coordinates\":[0,1]},]}",
-           "EPSG:4326", 0, 0);
 }
 
 void out_geojson_test_bbox(void)
@@ -239,14 +233,6 @@ void out_geojson_test_bbox(void)
            "GEOMETRYCOLLECTION EMPTY",
            "{\"type\":\"GeometryCollection\",\"geometries\":[]}",
            NULL, 0, 1);
-
-#if 0
-       /* Nested GeometryCollection */
-       do_geojson_test(
-           "GEOMETRYCOLLECTION(POINT(0 1),GEOMETRYCOLLECTION(LINESTRING(2 3,4 5)))",
-           "",
-           NULL, 0, 1);
-#endif
 }
 
 void out_geojson_test_geoms(void)
@@ -294,10 +280,9 @@ void out_geojson_test_geoms(void)
            NULL, 0, 0);
 
        /* Nested GeometryCollection */
-       do_geojson_test(
+       do_geojson_unsupported(
            "GEOMETRYCOLLECTION(POINT(0 1),GEOMETRYCOLLECTION(LINESTRING(2 3,4 5)))",
-           "{\"type\":\"GeometryCollection\",\"geometries\":[{\"type\":\"Point\",\"coordinates\":[0,1]},]}",
-           NULL, 0, 0);
+           "GeoJson: geometry not supported.");
 
        /* CircularString */
        do_geojson_unsupported(

diff --git a/liblwgeom/cunit/cu_out_svg.c b/liblwgeom/cunit/cu_out_svg.c
index a1699fe840dbe8d302b1ae21ba9ea7e64ac8c07f..3609a0e9465e18f70310b91d5b98c6a8e4a0d5cd 100644 (file)
--- a/liblwgeom/cunit/cu_out_svg.c
+++ b/liblwgeom/cunit/cu_out_svg.c
@@ -251,13 +251,10 @@ void out_svg_test_geoms(void)
            "",
            0, 0);
 
-#if 0
        /* Nested GeometryCollection */
-       do_svg_test(
+       do_svg_unsupported(
            "GEOMETRYCOLLECTION(POINT(0 1),GEOMETRYCOLLECTION(LINESTRING(2 3,4 5)))",
-           "cx=\"0\" cy=\"-1\";M 2 -3 L 4 -5",
-           0, 0);
-#endif
+           "ST_AsSVG: 'GeometryCollection' geometry type not supported.");
 
        /* CircularString */
        do_svg_unsupported(