GeoJSON IO test - valid/invalid "empty" geometries test.

Author: artemp

test/python_tests/geometry_io_test.py

@@ -3,7 +3,7 @@
 import os
 from binascii import unhexlify
 
-from nose.tools import eq_
+from nose.tools import eq_, assert_raises
 
 import mapnik
 
@@ -101,23 +101,25 @@ def setup():
     '{"coordinates":[[[[-178.32319,71.518365],[-178.321586,71.518439],[-178.259635,71.510688],[-178.304862,71.513129],[-178.32319,71.518365]]],[[[-178.32319,71.518365],[-178.341544,71.517524],[-178.32244,71.505439],[-178.215323,71.478034],[-178.193473,71.47663],[-178.147757,71.485175],[-178.124442,71.481879],[-178.005729,71.448615],[-178.017203,71.441413],[-178.054191,71.428778],[-178.047049,71.425727],[-178.033439,71.417792],[-178.026236,71.415107],[-178.030082,71.413459],[-178.039908,71.40766],[-177.970878,71.39643],[-177.779837,71.333197],[-177.718375,71.305243],[-177.706412,71.3039],[-177.68212,71.304877],[-177.670279,71.301825],[-177.655387,71.293158],[-177.587577,71.285956],[-177.548575,71.294867],[-177.531119,71.296332],[-177.51409,71.293402],[-177.498649,71.284735],[-177.506217,71.268622],[-177.486991,71.258734],[-177.459708,71.249884],[-177.443412,71.237006],[-177.445914,71.222663],[-177.457755,71.209357],[-177.507804,71.173774],[-177.581168,71.147589],[-177.637626,71.117011],[-177.684134,71.110968],[-177.751883,71.092963],[-177.819266,71.084662],[-177.877677,71.052558],[-177.930472,71.041449],[-178.206595,71.038398],[-178.310111,71.013617],[-178.875907,70.981024],[-178.980277,70.95069],[-179.342093,70.908026],[-179.336234,70.911078],[-179.322257,70.921698],[-179.364493,70.930243],[-179.457511,70.915534],[-179.501212,70.919684],[-179.666007,70.965461],[-179.853385,70.979438],[-179.888785,70.993598],[-179.907523,70.996772],[-179.999989,70.992011],[-179.999989,71.024848],[-179.999989,71.058661],[-179.999989,71.126166],[-179.999989,71.187018],[-179.999989,71.224189],[-179.999989,71.27497],[-179.999989,71.312079],[-179.999989,71.356024],[-179.999989,71.410041],[-179.999989,71.487799],[-179.999989,71.536689],[-179.862845,71.538642],[-179.912223,71.555854],[-179.900748,71.558478],[-179.798819,71.569098],[-179.757438,71.583197],[-179.735953,71.586432],[-179.715445,71.583258],[-179.697501,71.577338],[-179.678702,71.573676],[-179.610831,71.585211],[-179.372062,71.569098],[-179.326774,71.555487],[-179.306815,71.557563],[-179.287162,71.562934],[-179.24285,71.569098],[-179.204642,71.583197],[-179.074576,71.600043],[-178.395438,71.539008],[-178.32319,71.518365]]]],"type":"MultiPolygon"}'
 ]
 
-geojson_nulls = [
-    '{ "type": "Feature", "properties": { }, "geometry": null }',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "Point", "coordinates": [] }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [] ] }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "Polygon", "coordinates": [ [ [] ] ] } }',
-    '{ "type": "Feature", "properties": { }, "geometry": { "coordinates": [], "type": "Point" }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "coordinates": [ [] ], "type": "LineString" }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "coordinates": [ [ [] ] ], "type": "Polygon" } }',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "MultiPoint", "coordinates": [ [] ] }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "MultiPoint", "coordinates": [ [],[] ] }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "MultiLineString", "coordinates": [ [] ] }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "MultiLineString", "coordinates": [ [ [] ] ] }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "MultiPolygon", "coordinates": [ [] ] }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [] ] ] }}',
-    '{ "type": "Feature", "properties": { }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [] ] ] ] }}',
+valid_empty_geometries = [
+    'null', # Point can't be empty
+    '{ "type": "LineString" , "coordinates": []}',
+    '{ "type": "Polygon" , "coordinates": [[]]}',
+    '{ "type": "MultiPoint" , "coordinates": []}',
+    '{ "type": "MultiLineString" , "coordinates": [[]]}',
+    '{ "type": "MultiPolygon" , "coordinates": [[[]]]}',
 ]
 
+invalid_empty_geometries = [
+    '{ "type": "Point" , "coordinates": []}', # Point can't be empty
+    '{ "type": "LineString" , "coordinates": [[]]}',
+    '{ "type": "Polygon" , "coordinates": [[[]]]}',
+    '{ "type": "MultiPoint" , "coordinates": [[]]}',
+    '{ "type": "MultiLineString" , "coordinates": [[[]]]}',
+    '{ "type": "MultiPolygon" , "coordinates": [[[[]]]]}',
+]
+
+
 # valid, but empty wkb's
 # (http://trac.osgeo.org/postgis/wiki/DevWikiEmptyGeometry)
 empty_wkbs = [
@@ -329,15 +331,17 @@ def test_creating_feature_from_geojson():
     eq_(feat['name'], u'value')
 
 
-def test_handling_geojson_null_geoms():
-    for j in geojson_nulls:
-        ctx = mapnik.Context()
-        out_json = mapnik.Feature.from_geojson(j, ctx).to_geojson()
-        expected = '{"type":"Feature","id":1,"geometry":null,"properties":{}}'
-        eq_(out_json, expected)
-        # ensure it round trips
-        eq_(mapnik.Feature.from_geojson(out_json, ctx).to_geojson(), expected)
+def test_handling_valid_geojson_empty_geometries():
+    for json in valid_empty_geometries:
+        geom = mapnik.Geometry.from_geojson(json)
+        out_json = geom.to_geojson()
+        # check round trip
+        eq_(json.replace(" ",""), out_json)
+
 
+def test_handling_invalid_geojson_empty_geometries():
+    for json in invalid_empty_geometries:
+        assert_raises(RuntimeError, mapnik.Geometry.from_geojson, json)
 
 if __name__ == "__main__":
     setup()