From bb9315419e13a7448275392857782c3c1a384343 Mon Sep 17 00:00:00 2001 From: Madeleine Bonsma-Fisher Date: Thu, 19 Mar 2026 16:12:46 -0400 Subject: [PATCH 1/3] Update some speed cutoffs and LTS values to better reflect Furth 2016 --- lts_functions.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lts_functions.py b/lts_functions.py index 19f0528..146c6a2 100644 --- a/lts_functions.py +++ b/lts_functions.py @@ -167,13 +167,13 @@ def bike_lane_analysis_with_parking(gdf_edges): # create a list of lts conditions # When multiple conditions are satisfied, the first one encountered in conditions is used conditions = [ - (gdf_edges['lanes_assumed'] >= 3) & (gdf_edges['maxspeed_assumed'] <= 55), + (gdf_edges['lanes_assumed'] >= 3) & (gdf_edges['maxspeed_assumed'] <= 56), (gdf_edges['width'] <= 4.1), (gdf_edges['width'] <= 4.25), (gdf_edges['width'] <= 4.5) & ((gdf_edges['maxspeed_assumed'] <= 40) & (gdf_edges['highway'] == 'residential')), (gdf_edges['maxspeed_assumed'] > 40) & (gdf_edges['maxspeed_assumed'] <= 50), - (gdf_edges['maxspeed_assumed'] > 50) & (gdf_edges['maxspeed_assumed'] <= 55), - (gdf_edges['maxspeed_assumed'] > 55), + (gdf_edges['maxspeed_assumed'] > 50) & (gdf_edges['maxspeed_assumed'] <= 56), + (gdf_edges['maxspeed_assumed'] > 56), (gdf_edges['highway'] != 'residential') ] @@ -201,10 +201,10 @@ def bike_lane_analysis_no_parking(gdf_edges): # create a list of lts conditions # When multiple conditions are satisfied, the first one encountered in conditions is used conditions = [ - (gdf_edges['lanes_assumed'] >= 3) & (gdf_edges['maxspeed_assumed'] <= 65), + (gdf_edges['lanes_assumed'] >= 3) & (gdf_edges['maxspeed_assumed'] <= 56), (gdf_edges[['width']].applymap(lambda x: isinstance(x, float))['width']) & (gdf_edges['width'] <= 1.7), - (gdf_edges['maxspeed_assumed'] > 50) & (gdf_edges['maxspeed_assumed'] <= 65), - (gdf_edges['maxspeed_assumed'] > 65), + (gdf_edges['maxspeed_assumed'] > 50) & (gdf_edges['maxspeed_assumed'] <= 56), + (gdf_edges['maxspeed_assumed'] > 56), (gdf_edges['highway'] != 'residential') ] @@ -247,7 +247,7 @@ def mixed_traffic(gdf_edges): # create a new column and use np.select to assign values to it using our lists as arguments gdf_edges['rule'] = np.select(conditions, values, default='m0') - rule_dict = {'m17':1, 'm13':1, 'm14':2, 'm2':2, 'm15':2, 'm3':2, 'm4':2, 'm16':2, 'm5':2, 'm6':3, 'm7':3, 'm8':4, 'm9':2, 'm10':3, 'm11':4, 'm12':4} + rule_dict = {'m17':1, 'm13':1, 'm14':2, 'm2':2, 'm15':2, 'm3':2, 'm4':2, 'm16':2, 'm5':1, 'm6':2, 'm7':3, 'm8':4, 'm9':2, 'm10':3, 'm11':4, 'm12':4} gdf_edges['lts'] = gdf_edges['rule'].map(rule_dict) @@ -256,4 +256,4 @@ def mixed_traffic(gdf_edges): ### TESTS ### def test_answer(): df = pd.DataFrame() - assert biking_permitted(df) == 5 \ No newline at end of file + assert biking_permitted(df) == 5 From 35295852cf8017077789ac50703e8524425e71c6 Mon Sep 17 00:00:00 2001 From: Madeleine Bonsma-Fisher Date: Fri, 5 Jun 2026 09:58:31 -0400 Subject: [PATCH 2/3] add environment file --- environment.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 environment.yml diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000..f8a60af --- /dev/null +++ b/environment.yml @@ -0,0 +1,17 @@ +name: lts +channels: + - defaults +dependencies: + - pandas + - python=3 + - matplotlib + - geopandas + - scipy + - numpy + - contextily + - jupyterlab + - jupytext + - matplotlib-scalebar + - seaborn + - osmnx +prefix: /home/madeleine/miniconda3/envs/geo From cdb228571b61025465e60a9f643f49c67ad195c2 Mon Sep 17 00:00:00 2001 From: Madeleine Bonsma-Fisher Date: Fri, 5 Jun 2026 11:43:29 -0400 Subject: [PATCH 3/3] Add missing channel and package to environment.yml --- environment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environment.yml b/environment.yml index f8a60af..0a01b7b 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,7 @@ name: lts channels: - defaults + - conda-forge dependencies: - pandas - python=3 @@ -14,4 +15,5 @@ dependencies: - matplotlib-scalebar - seaborn - osmnx + - tqdm prefix: /home/madeleine/miniconda3/envs/geo