Changeset 1186 for Core/trunk/bycycle/core/model/data/sqltypes.py

Timestamp:

07/17/09 14:29:31 (3 years ago)

Author:

wyatt

Message:

More movement toward 'modernization'.

Files:

• Core/trunk/bycycle/core/model/data/sqltypes.py (modified) (4 diffs)

Core/trunk/bycycle/core/model/data/sqltypes.py

@@ -2 +2 @@
 
 from shapely import geometry, wkb
-import pyproj
-
-from binascii import a2b_hex, b2a_hex
 
 
@@ -13 +10 @@
         super(Geometry, self).__init__()
         self.SRID = SRID
-        self.proj = pyproj.Proj(init='epsg:%s' % SRID)
         self.type = type_.upper()
         self.dimension = dimension
@@ -23 +19 @@
         """Convert from Python type to database type."""
         def process(value):
+            """``value`` is a Python/Shapely geometry object."""
             if value is None:
                 return None
             else:
-                return 'SRID=%s;%s' % (self.SRID, b2a_hex(value.to_wkb()))
+                return 'SRID=%s;%s' % (self.SRID, value)
         return process
 
@@ -32 +29 @@
         """Convert from database type to Python type."""
         def process(value):
+            """``value`` is a hex-encoded WKB string."""
             if value is None:
                 return None
             else:
-                return wkb.loads(a2b_hex(value))
+                return wkb.loads(value.decode('hex'))
         return process