From 775df60663802ca517b75583bd9dd05d36e6338d Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Thu, 2 Nov 2017 14:35:05 +0300 Subject: [PATCH] Review fixes. --- data/transit_colors.txt | 109 ++++++------------ tools/python/transit/transit_color_palette.py | 19 ++- .../python/transit/transit_graph_generator.py | 15 ++- 3 files changed, 55 insertions(+), 88 deletions(-) diff --git a/data/transit_colors.txt b/data/transit_colors.txt index 92c27d125f..676d18a108 100644 --- a/data/transit_colors.txt +++ b/data/transit_colors.txt @@ -1,214 +1,179 @@ { - "colors": [ - { - "name": "default", + "colors": { + "default": { "clear": "231F20", "night": "231F20", "text": "231F20" }, - { - "name": "gray", + "gray": { "clear": "8B8B8C", "night": "464647", "text": "231F20" }, - { - "name": "brown", + "brown": { "clear": "9C491F", "night": "4D210B", "text": "3E2723" }, - { - "name": "brown_light", + "brown_light": { "clear": "B39B8F", "night": "5A4E48", "text": "3E2723" }, - { - "name": "red_dark", + "red_dark": { "clear": "7A1212", "night": "3E0A0A", "text": "7A1212" }, - { - "name": "red", + "red": { "clear": "FA1E38", "night": "800B19", "text": "7A1212" }, - { - "name": "red_light", + "red_light": { "clear": "E57373", "night": "733A3A", "text": "7A1212" }, - { - "name": "orange", + "orange": { "clear": "FF5722", "night": "802C12", "text": "E65100" }, - { - "name": "orange_light", + "orange_light": { "clear": "FF8A65", "night": "804633", "text": "E65100" }, - { - "name": "amber_dark", + "amber_dark": { "clear": "EF6C00", "night": "703400", "text": "FF6F00" }, - { - "name": "amber", + "amber": { "clear": "FF9800", "night": "804D00", "text": "FF6F00" }, - { - "name": "yellow_dark", + "yellow_dark": { "clear": "E69B22", "night": "744E12", "text": "F57F17" }, - { - "name": "yellow", + "yellow": { "clear": "FFCC09", "night": "8F7F06", "text": "F57F17" }, - { - "name": "lime_dark", + "lime_dark": { "clear": "827717", "night": "423C0C", "text": "827717" }, - { - "name": "lime", + "lime": { "clear": "33C73B", "night": "34691B", "text": "827717" }, - { - "name": "lime_light", + "lime_light": { "clear": "B2D636", "night": "4D661A", "text": "827717" }, - { - "name": "green_dark", + "green_dark": { "clear": "1B5E20", "night": "0E3011", "text": "1B5E20" }, - { - "name": "green", + "green": { "clear": "009A2C", "night": "004D1A", "text": "1B5E20" }, - { - "name": "green_light", + "green_light": { "clear": "81C784", "night": "416443", "text": "1B5E20" }, - { - "name": "teal_dark", + "teal_dark": { "clear": "00695C", "night": "00352F", "text": "004D40" }, - { - "name": "teal", + "teal": { "clear": "00BFA5", "night": "005441", "text": "004D40" }, - { - "name": "teal_light", + "teal_light": { "clear": "80CBC4", "night": "34524F", "text": "004D40" }, - { - "name": "blue_dark", + "blue_dark": { "clear": "02729C", "night": "023A4F", "text": "01579B" }, - { - "name": "blue", + "blue": { "clear": "03A9F4", "night": "02557B", "text": "01579B" }, - { - "name": "blue_light", + "blue_light": { "clear": "90CAF9", "night": "466178", "text": "01579B" }, - { - "name": "navy_dark", + "navy_dark": { "clear": "1A357D", "night": "0F1B42", "text": "1A357D" }, - { - "name": "navy", + "navy": { "clear": "0068AD", "night": "003557", "text": "1A357D" }, - { - "name": "navy_light", + "navy_light": { "clear": "7A96CC", "night": "3D4866", "text": "1A357D" }, - { - "name": "indigo", + "indigo": { "clear": "4824B5", "night": "25135B", "text": "4A148C" }, - { - "name": "purple_dark", + "purple_dark": { "clear": "4A148C", "night": "360E66", "text": "4A148C" }, - { - "name": "purple", + "purple": { "clear": "BF00AF", "night": "600058", "text": "4A148C" }, - { - "name": "purple_light", + "purple_light": { "clear": "CE93D8", "night": "684A6D", "text": "4A148C" }, - { - "name": "pink_dark", + "pink_dark": { "clear": "880E4F", "night": "660A3B", "text": "880E4F" }, - { - "name": "pink", + "pink": { "clear": "F50057", "night": "7B002C", "text": "880E4F" }, - { - "name": "pink_light", + "pink_light": { "clear": "F48FB1", "night": "7B4859", "text": "880E4F" } - ] + } } 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']