Changeset 920

Timestamp:

05/31/07 19:30:14 (5 years ago)

Author:

bycycle

Message:

Added Seattle, WA. Converted Daniel's code from MySQL version.

* region.js

• Added seattlewa to regions

* seattlewa.html

• Added empty template for region

* model.regions

• Added seattlewa aliases

* data.integrator

• Use strings instead of the actual methods in actions

* model.seattlewa.*

• Copied portlandor and modified for Seattle

Files:

• apps/web/tripplanner/trunk/tripplanner/public/javascripts/regions.js (modified) (1 diff)
• apps/web/tripplanner/trunk/tripplanner/templates/regions/seattlewa.html (added)
• core/trunk/byCycle/model/data/integrator.py (modified) (4 diffs)
• core/trunk/byCycle/model/regions.py (modified) (2 diffs)
• core/trunk/byCycle/model/seattlewa (added)
• core/trunk/byCycle/model/seattlewa/__init__.py (added)
• core/trunk/byCycle/model/seattlewa/bicycle.py (added)
• core/trunk/byCycle/model/seattlewa/data (added)
• core/trunk/byCycle/model/seattlewa/data/__init__.py (added)
• core/trunk/byCycle/model/seattlewa/data/integrator.py (added)

apps/web/tripplanner/trunk/tripplanner/public/javascripts/regions.js

@@ -16 +16 @@
     },
 
+    seattlewa: {
+      key: 'seattlewa',
+      bounds: {
+        sw: {x: -122.419091, y: 47.453598},
+        ne: {x: -122.217088, y: 47.734137}
+      }
+    },
+  
     milwaukeewi: {
       key: 'milwaukeewi',

core/trunk/byCycle/model/data/integrator.py

@@ -59 +59 @@
     overall_timer = meter.Timer(start_now=True)
     timer = meter.Timer(start_now=False)
-    
+    actions = [
+        'shp2sql',
+        'shp2db',
+        'create_public_tables',
+        'delete_region',
+        'get_or_create_region',
+        'drop_schema',
+        'create_schema',
+        'drop_tables',
+        'create_tables',
+        'transfer_street_names',
+        'transfer_cities',
+        'transfer_states',
+        'transfer_places',
+        'transfer_nodes',
+        'transfer_edges',
+        'vacuum_all_tables',
+        'create_matrix',
+    ]
+
     def __init__(self, region_key, source, layer, no_prompt, **opts):
         self.region_key = region_key
@@ -83 +102 @@
         print
         for i, action in enumerate(self.actions):
-            msg = action.__doc__
+            method = getattr(self, action, lambda: 0)
+            msg = method.__doc__ or ''
             if i < start or i > end:
                 print '%s: Skipping "%s"' % (i, msg)
@@ -98 +118 @@
                     self.timer.start()
                     try:
-                        action(self)
+                        method()
                     except Exception, e:
                         print ('\n*** Errors encountered in action %s.' % i)
@@ -605 +625 @@
         for msg in args:
             print '    - %s' % msg
-
-    #-- Default actions and the order in which they will be run --#
-    actions = [
-        shp2sql,
-        shp2db,
-        create_public_tables,
-        delete_region,
-        get_or_create_region,
-        drop_schema,
-        create_schema,
-        drop_tables,
-        create_tables,
-        transfer_street_names,
-        transfer_cities,
-        transfer_states,
-        transfer_places,
-        transfer_nodes,
-        transfer_edges,
-        vacuum_all_tables,
-        create_matrix,
-    ]

core/trunk/byCycle/model/regions.py

@@ -14 +14 @@
 """Info on regions.
 
-TODO: This should stored in the database.
+TODO: This should stored in the database or derived from data that's already
+in the DB.
 
 """
@@ -99 +100 @@
 region_aliases.update(dict([(a, pittsburghpa) for a in aliases]))
 
+aliases = (seattlewa, 'seattle')
+region_aliases.update(dict([(a, seattlewa) for a in aliases]))
+
 
 def getRegionKey(region):