Merge pull request jazzband#92 from udos/issue-79

fix for issue jazzband#79

Author: frewsxcv

README.rst

@@ -287,7 +287,7 @@ validation
 
   >>> import geojson
 
-  >>> validation = geojson.is_valid(geojson.Point((-3.68,40.41,25.14)))
+  >>> validation = geojson.is_valid(geojson.Point((-3.68,40.41,25.14,10.34)))
   >>> validation['valid']
   'no'
   >>> validation['message']

geojson/validation.py

@@ -26,11 +26,11 @@ def is_valid(obj):
         return output('this is not GeoJSON object')
 
     if isinstance(obj, geojson.Point):
-        if len(obj['coordinates']) != 2:
+        if len(obj['coordinates']) not in (2, 3):
             return output('the "coordinates" member must be a single position')
 
     if isinstance(obj, geojson.MultiPoint):
-        if checkListOfObjects(obj['coordinates'], lambda x: len(x) == 2):
+        if checkListOfObjects(obj['coordinates'], lambda x: len(x) in (2, 3)):
             return output(
                 'the "coordinates" member must be an array of positions'
             )

tests/test_validation.py

@@ -16,7 +16,7 @@ class TestValidationGeometry(unittest.TestCase):
 
     def test_invalid_geometry_with_validate(self):
         self.assertRaises(
-            ValueError, geojson.Point, (10, 20, 30), validate=True)
+            ValueError, geojson.Point, (10, 20, 30, 40), validate=True)
 
     def test_invalid_geometry_without_validate(self):
         try:
@@ -32,6 +32,13 @@ def test_valid_geometry(self):
         except ValueError:
             self.fail("Point raised ValueError unexpectedly")
 
+    def test_valid_geometry_with_elevation(self):
+        try:
+            geojson.Point((10, 20, 30), validate=True)
+            geojson.Point((10, 20, 30), validate=False)
+        except ValueError:
+            self.fail("Point raised ValueError unexpectedly")
+
 
 class TestValidationGeoJSONObject(unittest.TestCase):
 
@@ -47,25 +54,34 @@ def test_valid_jsonobject(self):
 class TestValidationPoint(unittest.TestCase):
 
     def test_invalid_point(self):
-        point = geojson.Point((10, 20, 30))
+        point = geojson.Point((10, 20, 30, 40))
         self.assertEqual(is_valid(point)['valid'], NO)
 
     def test_valid_point(self):
         point = geojson.Point((-3.68, 40.41))
         self.assertEqual(is_valid(point)['valid'], YES)
 
+    def test_valid_point_with_elevation(self):
+        point = geojson.Point((-3.68, 40.41, 3.45))
+        self.assertEqual(is_valid(point)['valid'], YES)
+
 
 class TestValidationMultipoint(unittest.TestCase):
 
     def test_invalid_multipoint(self):
         mpoint = geojson.MultiPoint(
-            [(3.5887, 10.44558), (2.5555, 3.887), (2.44, 3.44, 2.555)])
+            [(3.5887,), (3.5887, 10.44558),
+             (2.5555, 3.887, 4.56), (2.44, 3.44, 2.555, 4.56)])
         self.assertEqual(is_valid(mpoint)['valid'], NO)
 
     def test_valid_multipoint(self):
         mpoint = geojson.MultiPoint([(10, 20), (30, 40)])
         self.assertEqual(is_valid(mpoint)['valid'], YES)
 
+    def test_valid_multipoint_with_elevation(self):
+        mpoint = geojson.MultiPoint([(10, 20, 30), (30, 40, 50)])
+        self.assertEqual(is_valid(mpoint)['valid'], YES)
+
 
 class TestValidationLineString(unittest.TestCase):