From 775409f83d77eb4f98fbcac9419b99721f5c7815 Mon Sep 17 00:00:00 2001 From: user Date: Sun, 7 Apr 2024 18:08:45 +0200 Subject: derive colors from database, verify icons are in sync --- src/shop_map_node5_net.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/shop_map_node5_net.py') diff --git a/src/shop_map_node5_net.py b/src/shop_map_node5_net.py index 44c6cb5..3be40e2 100644 --- a/src/shop_map_node5_net.py +++ b/src/shop_map_node5_net.py @@ -15,10 +15,16 @@ def index(): @app.route("/chains") def chains(): - icons = os.listdir(os.path.join(os.getcwd(), 'src', 'static', 'icons')) - icons.pop(icons.index('Unknown.png')) - chains = [os.path.splitext(a)[0] for a in icons] - return json.dumps(chains) + files = os.listdir(os.path.join(os.getcwd(), 'src', 'static', 'icons')) + files.pop(files.index('Unknown.png')) + icon_names = set([os.path.splitext(a)[0] for a in files]) + + chains = db_handler.get_chains() + chain_names = set((a['name'] for a in chains)) + if icon_names != chain_names: + print(f'WARNING ICON MISSING, OR DB ENTRY MISSING') + color_by_name = {a['name']: a['color'] for a in chains} + return json.dumps(color_by_name) @app.route("/supermarkets.json") @@ -35,10 +41,8 @@ def voronoi_polygons(): def all(): rows = db_handler.get_all() for row in rows: - print(row['polygon']) coordinates = [] for coordinate in json.loads(row['polygon'])['coordinates'][0]: coordinates.append([coordinate[1], coordinate[0]]) row['polygon'] = coordinates - print(row['polygon']) return json.dumps(rows) -- cgit v1.2.3