Changeset 1186

Timestamp:

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

Author:

wyatt

Message:

More movement toward 'modernization'.

Files:

• Core/trunk/bycycle/core/model/data/integrator.py (modified) (1 diff)
• Core/trunk/bycycle/core/model/data/sqltypes.py (modified) (4 diffs)
• Core/trunk/bycycle/core/model/entities/base.py (modified) (5 diffs)
• Core/trunk/bycycle/core/model/entities/public.py (modified) (3 diffs)
• Core/trunk/bycycle/core/model/portlandor/data/__init__.py (modified) (1 diff)
• TripPlanner/trunk/bycycle/tripplanner/controllers/regions.py (modified) (1 diff)
• TripPlanner/trunk/bycycle/tripplanner/lib/base.py (modified) (2 diffs)

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

@@ -471 +471 @@
             record = dict(
                 id=id,
-                geom=r.geom.geometryN(0),
+                geom=(r.geom.geoms[0] if r.geom is not None else None),
                 permanent_id=r.permanent_id,
                 bikemode=bikemodes[r.bikemode],

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
 

Core/trunk/bycycle/core/model/entities/base.py

@@ -20 +20 @@
 """
 import sys
+import json
+import decimal
+import datetime
 
 from sqlalchemy import func, select, Column, ForeignKey
@@ -27 +30 @@
 
 from shapely import geometry, wkt
-
-import simplejson
+from shapely.geometry.base import BaseGeometry
 
 from bycycle.core.util import gis, joinAttrs
@@ -36 +38 @@
 
 __all__ = ['DeclarativeBase', 'Node', 'Edge']
+
+
+datetime_types = (datetime.time, datetime.date, datetime.datetime)
 
 
@@ -87 +92 @@
         return result
 
-    def to_simple_object(self):
-        """Return an object that can be serialized by ``simplejson.dumps``."""
-        obj = dict(type=self.__class__.__name__)
-        attrs = set(self._attrs)
+    @classmethod
+    def simplify_object(cls, obj):
+        """Convert ``obj`` to something JSON encoder can handle."""
         try:
-            self.__table__
+            obj = obj.to_simple_object()
         except AttributeError:
             pass
-        else:
-            attrs = attrs.union(set(self.__table__.columns.keys()))
-        for name in attrs:
-            value = getattr(self, name)
-            try:
-                value = value.to_simple_object()
-            except AttributeError:
-                pass
-            obj[name] = value
+        if isinstance(obj, decimal.Decimal):
+            obj = float(obj)
+            # HACK: Convert decimal with 0 fractional part to int
+            decimal_part = int(str(obj).split('.')[1])
+            if decimal_part == 0:
+                obj = int(obj)
+        elif isinstance(obj, datetime_types):
+            obj = str(obj)
+        elif isinstance(obj, BaseGeometry):
+            obj = obj.__geo_interface__
         return obj
 
-    def to_json(self):
-        return simplejson.dumps(self.to_simple_object())
-
-    @staticmethod
-    def to_json_collection(instances):
-        simple_obj = {'result': [i.to_simple_object() for i in instances]}
-        return simplejson.dumps(simple_obj)
+    def to_simple_object(self, fields=None):
+        obj = dict(type=self.__class__.__name__)
+        names = fields or self.public_names
+        for name in names:
+            val = getattr(self, name)
+            val = self.simplify_object(val)
+            obj[name] = val
+        return obj
+
+    def to_json(self, fields=None):
+        return json.dumps(self.to_simple_object(fields=fields))
+
+    @classmethod
+    def to_simple_collection(cls, collection=None, fields=None):
+        if collection is None:
+            collection = cls.q()
+        return [i.to_simple_object() for i in collection]
+
+    @classmethod
+    def to_json_collection(cls, collection=None, fields=None):
+        simple_obj = cls.to_simple_collection(collection, fields=fields)
+        return json.dumps(simple_obj)
 
     def __setattr__(self, name, value):
@@ -133 +153 @@
         else:
             return str(self.to_simple_object())
+
+    @property
+    def public_names(self):
+        """We want all public DB columns and `property`s by default."""
+        try:
+            self._public_names
+        except AttributeError:
+            names = []
+            class_attrs = self.__class__.__dict__
+            for name in class_attrs:
+                if name.startswith('_'):
+                    continue
+                attr = class_attrs[name]
+                if isinstance(attr, property):
+                    names.append(name)
+                else:
+                    try:
+                        clause_el = attr.__clause_element__()
+                    except AttributeError:
+                        pass
+                    else:
+                        if issubclass(clause_el.__class__, Column):
+                            names.append(name)
+            names = set(names)
+            self._public_names = names
+        return self._public_names
 
 

Core/trunk/bycycle/core/model/entities/public.py

@@ -19 +19 @@
 from sqlalchemy.types import Integer, String, CHAR, Float, Date
 
-from shapely import geometry
+from shapely import geometry, wkt
 import pyproj
 
@@ -78 +78 @@
 
     def bounds(self, srid=None):
-        srs = str(SpatialReference(epsg=self.srid))
-        f = func.extent(self.module.Node.__table__.c.geom)
-        result = select([f.label('ext')], bind=db.engine).execute()
-        result = result.fetchone()
-        extent = result.ext.lstrip('BOX').strip().lstrip('(').rstrip(')')
-        sw, ne = extent.split(',')
-        sw, ne = 'POINT(%s)' % sw, 'POINT(%s)' % ne
-        sw = geometry.Geometry.fromWKT(sw, srs=srs)
-        ne = geometry.Geometry.fromWKT(ne, srs=srs)
-        if srid is not None:
-            srid = int(srid)
-            new_srs = str(SpatialReference(epsg=srid))
-            sw.transform(src_proj=srs, dst_proj=new_srs)
-            ne.transform(src_proj=srs, dst_proj=new_srs)
+        f = func.astext(func.envelope(func.extent(self.module.Node.__table__.c.geom)))
+        result = select([f.label('envelope')], bind=db.engine).execute()
+        envelope = wkt.loads(result.fetchone().envelope)
+        bounds = envelope.bounds
         return {
-            'sw': {'x': sw.x, 'y': sw.y},
-            'ne': {'x': ne.x, 'y': ne.y}
+            'sw': {'x': bounds[0], 'y': bounds[1]},
+            'ne': {'x': bounds[2], 'y': bounds[3]}
         }
 
-    def to_simple_object(self):
+    def to_simple_object(self, fields=None):
         # Append dynamically computed geometries to default simple object
-        obj = super(Region, self).to_simple_object();
+        obj = super(Region, self).to_simple_object(fields=fields);
         obj['geometry'] = {'4326': {}}
 
@@ -118 +108 @@
         bounds = self.bounds(srid)
         set_geom(obj['geometry'][srid], bounds)
+        
+        obj.pop('module', None)
+        obj.pop('proj', None)
 
         return obj

Core/trunk/bycycle/core/model/portlandor/data/__init__.py

@@ -91 +91 @@
 
     # To places table
-    zipcolef = Column(Integer, key='zip_code_l')
-    zipcorgt = Column(Integer, key='zip_code_r')
+    lzip = Column(Integer, key='zip_code_l')
+    rzip = Column(Integer, key='zip_code_r')
 
     # To edge table (supplemental)

TripPlanner/trunk/bycycle/tripplanner/controllers/regions.py

@@ -7 +7 @@
 
 class RegionsController(RestController):
+
+    entity = Region
 
     def __before__(self):

TripPlanner/trunk/bycycle/tripplanner/lib/base.py

@@ -6 +6 @@
 from pylons.templating import render_mako as render
 
-import restler as _restler
+import restler.controller
 
 from bycycle.core import model
@@ -13 +13 @@
 
 
-RestController = _restler.RestController(model)
+class RestController(restler.controller.Controller):
+
+    default_format = 'html'
+
+    def get_db_session(self):
+        return model.Session