From 0605036052b915aab8aaa43ec4623783cbfe20f3 Mon Sep 17 00:00:00 2001 From: Sebastian Lenzlinger <74497638+sebaschi@users.noreply.github.com> Date: Fri, 5 Jan 2024 16:46:35 +0100 Subject: [PATCH] SYNC COMMIT --- analysis/db_utils.py | 3 +++ analysis/map.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/analysis/db_utils.py b/analysis/db_utils.py index 60b8758..a1bd880 100644 --- a/analysis/db_utils.py +++ b/analysis/db_utils.py @@ -8,6 +8,7 @@ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(messag stream_handler.setFormatter(formatter) logger.addHandler(stream_handler) + # Generic DB Methods ================================================================================================== def drop_view(view_name): drop_view_sql = f""" @@ -62,6 +63,7 @@ def create_heat_view(): remote_db.close() logger.info("Heat View Created") + def create_bike_heat_view(): create_heat_view_sql = """ CREATE VIEW bikeheat AS @@ -83,6 +85,7 @@ def create_bike_heat_view(): remote_db.close() logger.info("Heat View Created") + def create_pedestrian_heat_view(): create_heat_view_sql = """ CREATE VIEW pedestrianheat AS diff --git a/analysis/map.py b/analysis/map.py index f482f96..ea1ba25 100644 --- a/analysis/map.py +++ b/analysis/map.py @@ -77,6 +77,7 @@ color_dict = { "T100": "gray" } + # Create Maps ========================================================================================================= def create_heat_map_with_time(): @@ -107,9 +108,8 @@ def create_heat_map_toggle(): folium.LayerControl(collapsed=True).add_to(interactive_map_toggle) + # Layer Adding Methods ================================================================================================ - - def add_heat_map_time(heat_df, map): heat_data = [[[row['latitude'], row['longitude'], 0.1] for index, row in heat_df[heat_df['year'] == i].iterrows()] for i in range(2011, 2023)] @@ -152,6 +152,7 @@ def add_signaled_speeds(map): line_cap="butt", ).add_to(map) + def add_heat_year_toggle(heat_gdf, map): index = [2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022] # plot heat map