Allow point unpacking

Author: yohanboniface

postgis/point.py

@@ -29,6 +29,17 @@ def __getitem__(self, item):
         elif item in (3, 'm'):
             return self.m
 
+    def __iter__(self):
+        return iter(self.values())
+
+    _keys = ['x', 'y', 'z', 'm']
+
+    def keys(self):
+        return [k for k in self._keys if self[k] is not None]
+
+    def values(self):
+        return tuple(self[k] for k in self.keys())
+
     @property
     def has_z(self):
         return self.z is not None
@@ -46,5 +57,4 @@ def wkt_coords(self):
 
     @property
     def coords(self):
-        return tuple(p for p in (self.x, self.y, self.z, self.m)
-                     if p is not None)
+        return self.values()

tests/test_point.py

@@ -51,3 +51,35 @@ def test_can_create_point_with_z():
 def test_point_geojson_with_z():
     point = Point(1, 2, 3)
     assert point.geojson == {"type": "Point", "coordinates": (1, 2, 3)}
+
+
+def test_point_can_be_unpacked():
+    point = Point(1, 2)
+    x, y = point
+    assert x == 1
+    assert y == 2
+
+
+def test_point_can_be_unpacked_to_dict():
+    point = Point(1, 2)
+    data = dict(point)
+    assert data['x'] == 1
+    assert data['y'] == 2
+    assert len(data) == 2
+
+
+def test_point_with_z_can_be_unpacked():
+    point = Point(1, 2, 3)
+    x, y, z = point
+    assert x == 1
+    assert y == 2
+    assert z == 3
+
+
+def test_point_with_z_can_be_unpacked_to_dict():
+    point = Point(1, 2, 3)
+    data = dict(point)
+    assert data['x'] == 1
+    assert data['y'] == 2
+    assert data['z'] == 3
+    assert len(data) == 3