Changeset 918

Timestamp:

05/25/07 13:48:44 (5 years ago)

Author:

bycycle

Message:

Fixed bicycle travel mode so that it takes into account MAX lines. In
particular, if a street has a MAX line and a bike lane, we need to convert
the street classification code to an equivalent non-MAX code (e.g., 5301 =>
1300).

Related to this, don't set lengths for unknown street class codes in
_adjustRowForMatrix. Before, if the code didn't have certain values,
the length for the corresponding segment would be set to something big
so the segment wouldn't get used. Beside the fact that this was already
being handled in getEdgeWeight, getEdgeWeight is the *correct*
place to do stuff like that anyway.

Location:

core/trunk/byCycle/model

Files:

• portlandor/__init__.py (modified) (2 diffs)
• portlandor/bicycle.py (modified) (3 diffs)
• route.py (modified) (1 diff)

core/trunk/byCycle/model/portlandor/__init__.py

@@ -23 +23 @@
 from byCycle.model.data.sqltypes import POINT, LINESTRING
 from byCycle.model.portlandor.data import SRID, slug
+
+from dijkstar import infinity
 
 __all__ = ['Edge', 'Node', 'StreetName', 'City', 'State', 'Place']
@@ -64 +66 @@
             'up_frac': encodeFloat(row.up_frac),
         }
-        code = row.code
-        if not ((1200 <= code < 1600) or (3200 <= code < 3300)):
-            adjustments['length'] = 5280000
         return adjustments
 

core/trunk/byCycle/model/portlandor/bicycle.py

@@ -18 +18 @@
 # Preferences
 FASTER, SHORTER, FLATTER, SAFER, DEFAULT = range(5)
+
+# This maps MAX street class codes to "normal" codes, for use with bike lanes
+max_codes = {
+    5301: 1300,
+    5401: 1400,
+    5501: 1500,
+}
 
 
@@ -115 +122 @@
         node_f_id = edge_attrs[node_f_id_index]
         street_name_id = edge_attrs[street_name_id_index]
-        #cpd = edge_attrs[cpd_index]
- 
+
         # -- Calculate base weight of edge (in hours)
         
@@ -160 +166 @@
 
         # -- Adjust weight based on user preference
-        
-        if bikemode is not 'n':
+        if bikemode != 'n':
             # Adjust bike network street
             if   bikemode == 't':          hours *= mu
             elif bikemode == 'p':          hours *= mm
             elif bikemode == 'b':
+                code = max_codes.get(code, code)
                 # Adjust bike lane for traffic (est. from st. type)
                 if   code in (1500, 1521): hours *= blt    #lt

core/trunk/byCycle/model/route.py

@@ -81 +81 @@
                 d['toward'],
                 '%.2f' % (d['distance']['miles']),
-                self.region.units,
+                'miles',
                 bm,
             ))