seb/group-1-db23
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SYNC COMMIT

Browse Source
This commit is contained in:
Sebastian Lenzlinger 2024-01-05 16:46:35 +01:00
parent d563a0af0b
commit 0605036052
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
analysis/db_utils.py
View File

@ -8,6 +8,7 @@ formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(messag
stream_handler.setFormatter(formatter) stream_handler.setFormatter(formatter)
logger.addHandler(stream_handler) logger.addHandler(stream_handler)
# Generic DB Methods ================================================================================================== # Generic DB Methods ==================================================================================================
def drop_view(view_name): def drop_view(view_name):
drop_view_sql = f""" drop_view_sql = f"""
@ -62,6 +63,7 @@ def create_heat_view():
remote_db.close() remote_db.close()
logger.info("Heat View Created") logger.info("Heat View Created")
def create_bike_heat_view(): def create_bike_heat_view():
create_heat_view_sql = """ create_heat_view_sql = """
CREATE VIEW bikeheat AS CREATE VIEW bikeheat AS
@ -83,6 +85,7 @@ def create_bike_heat_view():
remote_db.close() remote_db.close()
logger.info("Heat View Created") logger.info("Heat View Created")
def create_pedestrian_heat_view(): def create_pedestrian_heat_view():
create_heat_view_sql = """ create_heat_view_sql = """
CREATE VIEW pedestrianheat AS CREATE VIEW pedestrianheat AS

5
analysis/map.py
View File

@ -77,6 +77,7 @@ color_dict = {
"T100": "gray" "T100": "gray"
} }
# Create Maps ========================================================================================================= # Create Maps =========================================================================================================
def create_heat_map_with_time(): def create_heat_map_with_time():
@ -107,9 +108,8 @@ def create_heat_map_toggle():
folium.LayerControl(collapsed=True).add_to(interactive_map_toggle) folium.LayerControl(collapsed=True).add_to(interactive_map_toggle)
# Layer Adding Methods ================================================================================================ # Layer Adding Methods ================================================================================================
def add_heat_map_time(heat_df, map): 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 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)] i in range(2011, 2023)]
@ -152,6 +152,7 @@ def add_signaled_speeds(map):
line_cap="butt", line_cap="butt",
).add_to(map) ).add_to(map)
def add_heat_year_toggle(heat_gdf, map): def add_heat_year_toggle(heat_gdf, map):
index = [2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022] index = [2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022]
# plot heat map # plot heat map