Review fixes.

2 files changed, 18 insertions, 16 deletions

diff --git a/tools/python/transit/transit_color_palette.py b/tools/python/transit/transit_color_palette.py
index a395e51f75..054dfd92ae 100644
--- a/tools/python/transit/transit_color_palette.py
+++ b/tools/python/transit/transit_color_palette.py
@@ -9,26 +9,23 @@ def to_rgb(color_str):
 
 class Palette:
     def __init__(self, colors):
-        self.colors = []
-        for color in colors['colors']:
-            color_info = {'name': color['name'],
-                          'clear': to_rgb(color['clear'])}
-            self.colors.append(color_info)
+        self.colors = {}
+        for name, color_info in colors['colors'].iteritems():
+            self.colors[name] = to_rgb(color_info['clear'])
 
     def get_default_color(self):
-        return self.colors[0]['name']
+        return 'default'
 
     def get_nearest_color(self, color_str):
         """Returns the nearest color from the palette."""
-        nearest_color_info = None
+        nearest_color_name = self.get_default_color()
         color = to_rgb(color_str)
         min_diff = None
-        for color_info in self.colors:
-            palette_color = color_info['clear']
+        for name, palette_color in self.colors.iteritems():
             diff = 30 * (palette_color[0] - color[0]) ** 2 +\
                    59 * (palette_color[1] - color[1]) ** 2 +\
                    11 * (palette_color[2] - color[2]) ** 2
             if min_diff is None or diff < min_diff:
                 min_diff = diff
-                nearest_color_info = color_info
-        return nearest_color_info['name']
+                nearest_color_name = name
+        return nearest_color_name
diff --git a/tools/python/transit/transit_graph_generator.py b/tools/python/transit/transit_graph_generator.py
index 310564a990..21f7fa4227 100755
--- a/tools/python/transit/transit_graph_generator.py
+++ b/tools/python/transit/transit_graph_generator.py
@@ -96,7 +96,8 @@ class TransitGraphBuilder:
                 'weight': weight,
                 'stop_ids': [stop_id],
                 'entrance': is_entrance,
-                'exit': is_exit}
+                'exit': is_exit
+                }
         self.gates[(osm_id, weight)] = gate
 
     def __get_interchange_node(self, stop_id):
@@ -142,7 +143,8 @@ class TransitGraphBuilder:
             transfer_edge = {'stop1_id': transfer_item[0],
                              'stop2_id': transfer_item[1],
                              'weight': transfer_item[2],
-                             'transfer': True}
+                             'transfer': True
+                             }
             self.edges.append(transfer_edge)
 
     def __read_networks(self):
@@ -169,7 +171,8 @@ class TransitGraphBuilder:
                             'title': line_name,
                             'number': route_item['ref'],
                             'interval': line_item['interval'],
-                            'stop_ids': []}
+                            'stop_ids': []
+                            }
                     if 'colour' in route_item:
                         line['color'] = self.palette.get_nearest_color(route_item['colour'])
                     else:
@@ -190,7 +193,8 @@ class TransitGraphBuilder:
                                     'weight': stop2[1] - stop1[1],
                                     'transfer': False,
                                     'line_id': line_id,
-                                    'shape_ids': []}
+                                    'shape_ids': []
+                                    }
                             self.edges.append(edge)
 
                     self.lines.append(line)
@@ -212,7 +216,8 @@ class TransitGraphBuilder:
             transfer = {'id': get_interchange_node_id(self.stops[node_stop_ids[0]]['id']),
                         'stop_ids': list(node_stop_ids),
                         'point': {'x': point[0], 'y': point[1]},
-                        'title_anchors': []}
+                        'title_anchors': []
+                        }
 
             for stop_id in node_stop_ids:
                 self.stops[stop_id]['transfer_id'] = transfer['id']