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

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."""