Merge pull request #946 from cal-itp/speeds-on-roads

Clean up segment speeds methodology and refactor trip speeds and route speeds
cal-itp · Nov 7, 2023 · 9fe222f · 9fe222f
2 parents 9f3ec33 + 52e7914
commit 9fe222f
Show file tree

Hide file tree

Showing 40 changed files with 2,068 additions and 3,021 deletions.
diff --git a/gtfs_funnel/stop_times_with_direction.py b/gtfs_funnel/stop_times_with_direction.py
@@ -9,6 +9,8 @@
 import numpy as np
 import pandas as pd
 
+from typing import Literal
+
 from calitp_data_analysis import utils
 from shared_utils import rt_utils
 from segment_speed_utils import helpers, wrangle_shapes
@@ -79,15 +81,31 @@ def find_prior_stop(
             .groupby("trip_instance_key")
             .stop_sequence
             .shift(1)
+        ),
+        subseq_stop_sequence = (
+            prior_stop
+            .sort_values(["trip_instance_key", "stop_sequence"])
+            .groupby("trip_instance_key")
+            .stop_sequence
+            .shift(-1)        
         )
     )
 
-    prior_stop_geom = stop_times[
-        ["trip_instance_key", "stop_sequence", "geometry"]
-    ].rename(columns = {
-        "stop_sequence": "prior_stop_sequence",
-        "geometry": "prior_geometry"
-    }).set_geometry("prior_geometry").repartition(npartitions=1)
+    def renamed_geom_stop_times(
+        stop_times: dd.DataFrame, 
+        suffix: Literal["prior", "subseq"]
+    ) -> dd.DataFrame:
+
+        renamed_stop_geom = stop_times[
+            ["trip_instance_key", "stop_sequence", "geometry"]
+        ].rename(columns = {
+            "stop_sequence": f"{suffix}_stop_sequence",
+            "geometry": f"{suffix}_geometry"
+        }).set_geometry(f"{suffix}_geometry").repartition(npartitions=1)
+
+        return renamed_stop_geom
+
+    prior_stop_geom = renamed_geom_stop_times(stop_times, suffix="prior")
 
     stop_times_with_prior = dd.merge(
         stop_times,
@@ -101,7 +119,10 @@ def find_prior_stop(
         prior_stop_geom,
         on = ["trip_instance_key", "prior_stop_sequence"],
         how = "left"
-    ).astype({"prior_stop_sequence": "Int64"})
+    ).astype({
+        "prior_stop_sequence": "Int64",
+        "subseq_stop_sequence": "Int64"
+    })
 
     return stop_times_with_prior_geom
 

diff --git a/gtfs_funnel/update_vars.py b/gtfs_funnel/update_vars.py
@@ -3,12 +3,15 @@
 from shared_utils import rt_dates
 
 months = [
+    "mar", "apr", "may",
+    "jun", "jul", "aug",
+    "sep",
     "oct"
 ]         
 
 analysis_date_list = [
-    rt_dates.DATES["oct2023a"],
-    rt_dates.DATES["oct2023b"]
+    #rt_dates.DATES["sep2023"],
+    rt_dates.DATES[f"{m}2023"] for m in months
 ]
 
 CONFIG_PATH = Path("config.yml")