shapely 1.2.13__py2.7-win-amd64.egg → 1.2.18__py2.7-win-amd64.egg

shapely/tests/test_unary_union.py

@@ -0,0 +1,40 @@
+from itertools import islice
+import unittest
+from shapely.geometry import Point
+from shapely.ops import unary_union
+
+def halton(base):
+    """Returns an iterator over an infinite Halton sequence"""
+    def value(index):
+        result = 0.0
+        f = 1.0/base
+        i = index
+        while i > 0:
+            result += f * (i % base)
+            i = i/base
+            f = f/base
+        return result
+    i = 1
+    while i > 0:
+        yield value(i)
+        i += 1
+
+class UnionTestCase(unittest.TestCase):
+    def test_1(self):
+        # Instead of random points, use deterministic, pseudo-random Halton
+        # sequences for repeatability sake.
+        coords = zip(
+            list(islice(halton(5), 20, 120)),
+            list(islice(halton(7), 20, 120)) )
+        patches = [Point(xy).buffer(0.05) for xy in coords]
+        u = unary_union(patches)
+        self.failUnlessEqual(u.geom_type, 'MultiPolygon')
+        self.failUnlessAlmostEqual(u.area, 0.71857254056)
+
+def test_suite():
+    try:
+        patches = [Point((0, 0)).buffer(0.05)]
+        unary_union(patches)
+    except KeyError:
+        return lambda x: None
+    return unittest.TestLoader().loadTestsFromTestCase(UnionTestCase)

shapely/tests/wkt_locale.txt

@@ -0,0 +1,28 @@
+Test locale independence of WKT
+===============================
+
+Set locale to one that uses a comma as decimal seperator`
+
+  >>> import locale, sys
+  >>> if sys.platform == 'win32':
+  ...     _ = locale.setlocale(locale.LC_ALL, 'portuguese_brazil')
+  ... else:
+  ...     _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8')
+
+Test reading and writing`
+
+  >>> from shapely.wkt import loads
+  >>> p = loads('POINT (0.0 0.0)')
+  >>> p.x == 0.0
+  True
+  >>> p.y == 0.0
+  True
+  >>> p.wkt
+  'POINT (0.0...)'
+  >>> from shapely.wkt import dumps
+  >>> dumps(p)
+  'POINT (0.0...)'
+
+Reset locale
+
+  >>> _ = locale.setlocale(locale.LC_ALL, '')

shapely/wkb.py

@@ -1,24 +1,13 @@
 """Load/dump geometries using the well-known binary (WKB) format
 """
 
-from ctypes import pointer, c_size_t, c_char_p, c_void_p
-
-from shapely.geos import lgeos, ReadingError
-
+from shapely.geometry.base import geom_from_wkb, geom_to_wkb
 
 # Pickle-like convenience functions
 
-def deserialize(data):
-    geom = lgeos.GEOSGeomFromWKB_buf(c_char_p(data), c_size_t(len(data)));
-    if not geom:
-        raise ReadingError(
-            "Could not create geometry because of errors while reading input.")
-    return geom
-
 def loads(data):
     """Load a geometry from a WKB string."""
-    from shapely.geometry.base import geom_factory
-    return geom_factory(deserialize(data))
+    return geom_from_wkb(data)
 
 def load(fp):
     """Load a geometry from an open file."""
@@ -27,10 +16,7 @@ def load(fp):
 
 def dumps(ob):
     """Dump a WKB representation of a geometry to a byte string."""
-    if ob is None or ob._geom is None:
-        raise ValueError("Null geometry supports no operations")
-    size = c_size_t()
-    return lgeos.GEOSGeomToWKB_buf(c_void_p(ob._geom), pointer(size))
+    return geom_to_wkb(ob)
 
 def dump(ob, fp):
     """Dump a geometry to an open file."""

shapely/wkt.py

@@ -1,21 +1,13 @@
 """Load/dump geometries using the well-known text (WKT) format
 """
 
-from ctypes import c_char_p
-
-from shapely.geos import lgeos, ReadingError
-
+from shapely.geometry.base import geom_from_wkt, geom_to_wkt
 
 # Pickle-like convenience functions
 
 def loads(data):
     """Load a geometry from a WKT string."""
-    from shapely.geometry.base import geom_factory
-    geom = lgeos.GEOSGeomFromWKT(c_char_p(data))
-    if not geom:
-        raise ReadingError, \
-        "Could not create geometry because of errors while reading input."
-    return geom_factory(geom)
+    return geom_from_wkt(data) #factory(geom)
 
 def load(fp):
     """Load a geometry from an open file."""
@@ -24,9 +16,7 @@ def load(fp):
 
 def dumps(ob):
     """Dump a WKB representation of a geometry to a byte string."""
-    if ob is None or ob._geom is None:
-        raise ValueError("Null geometry supports no operations")
-    return lgeos.GEOSGeomToWKT(ob._geom)
+    return geom_to_wkt(ob)
 
 def dump(ob, fp):
     """Dump a geometry to an open file."""