Merge pull request #4 from bjorkegeek/master

Fixed bug causing invalid WKT to be produced for many geometries

Author: yohanboniface

postgis/multi.py

@@ -1,5 +1,5 @@
 from .geometry import Geometry
-
+from .point import Point
 
 class Multi(Geometry):
 
@@ -31,7 +31,8 @@ def from_ewkb_body(cls, reader, srid=None):
 
     @property
     def wkt_coords(self):
-        return ', '.join('({})'.format(g.wkt_coords) for g in self)
+        fmt = '{}' if self.SUBCLASS == Point else '({})' 
+        return ', '.join(fmt.format(g.wkt_coords) for g in self)
 
     def write_ewkb_body(self, writer):
         writer.write_int(len(self.geoms))

postgis/point.py

@@ -15,8 +15,8 @@ def __init__(self, x, y=None, z=None, m=None, srid=None):
                     m = extra[0]
         self.x = float(x)
         self.y = float(y)
-        self.z = int(z) if z is not None else None
-        self.m = int(m) if m is not None else None
+        self.z = float(z) if z is not None else None
+        self.m = float(m) if m is not None else None
         if srid is not None:
             self.srid = srid
 

tests/test_multipolygon.py

@@ -27,3 +27,11 @@ def test_geom_should_compare_with_coords():
 def test_multipolygon_get_item():
     multi = MultiPolygon(MULTI)
     assert multi[0] == Polygon(MULTI[0])
+
+
+def test_multipolygon_wkt():
+    multi = MultiPolygon(MULTI)
+    wkt = multi.wkt
+    wkt = wkt.replace('.0','')
+    wkt = wkt.replace(', ',',')
+    assert wkt == 'MULTIPOLYGON(((35 10,45 45,15 40,10 20,35 10),(20 30,35 35,30 20,20 30)),((36 10,46 45,16 40,16 20,36 10),(21 30,36 35,36 20,21 30)))'

tests/test_polygon.py

@@ -9,3 +9,11 @@ def test_polygon_geojson():
     poly = Polygon((((1, 2), (3, 4), (5, 6), (1, 2)),))
     assert poly.geojson == {"type": "Polygon",
                             "coordinates": (((1, 2), (3, 4), (5, 6), (1, 2)),)}
+
+
+def test_polygon_wkt():
+    poly = Polygon((((1, 2), (3, 4), (5, 6), (1, 2)),))
+    wkt = poly.wkt
+    wkt = wkt.replace('.0','')
+    wkt = wkt.replace(', ',',')
+    assert wkt == 'POLYGON((1 2,3 4,5 6,1 2))'