Merge pull request #1392 from cal-itp/funnel-swap

Swap `gtfs_funnel` vp preprocessing with `fct_vehicle_locations_grouped`
cal-itp · Feb 20, 2025 · 13d33a2 · 13d33a2
2 parents a63f2ee + 236982f
commit 13d33a2
Show file tree

Hide file tree

Showing 17 changed files with 2,036 additions and 1,906 deletions.
diff --git a/_shared_utils/shared_utils/gtfs_analytics_data.yml b/_shared_utils/shared_utils/gtfs_analytics_data.yml
@@ -28,8 +28,9 @@ schedule_downloads:
 
 speeds_tables:
   dir: ${gcs_paths.SEGMENT_GCS}
-  raw_vp: vp
-  usable_vp: vp_usable
+  #raw_vp: vp
+  raw_vp: vp_grouped
+  #usable_vp: vp_usable # this can be dropped
   vp_dwell: vp_usable_dwell
   vp_condensed_line: condensed/vp_condensed
   timestamp_col: ${speed_vars.timestamp_col}

diff --git a/_shared_utils/shared_utils/rt_dates.py b/_shared_utils/shared_utils/rt_dates.py
@@ -84,6 +84,7 @@
 
 y2024_dates = [v for k, v in DATES.items() if k.endswith("2024") and k not in ["oct2024g"]]
 
+y2025_dates = [v for k, v in DATES.items() if k.endswith("2025")]
 
 valid_weeks = ["apr2023", "oct2023", "apr2024", "oct2024"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,6 +84,7 @@

		y2024_dates = [v for k, v in DATES.items() if k.endswith("2024") and k not in ["oct2024g"]]

		y2025_dates = [v for k, v in DATES.items() if k.endswith("2025")]

		valid_weeks = ["apr2023", "oct2023", "apr2024", "oct2024"]

Expand Down