Merge pull request #1326 from cal-itp/readability-pass

Clean up functions in segment_speed_utils

rt_segment_speeds/scripts/interpolate_stop_arrival.py

@@ -17,8 +17,7 @@
 from pathlib import Path
 from typing import Literal, Optional
 
-from segment_speed_utils import (array_utils, helpers, 
-                                 segment_calcs)
+from segment_speed_utils import helpers, segment_calcs
 from update_vars import SEGMENT_GCS, GTFS_DATA_DICT
 from segment_speed_utils.project_vars import PROJECT_CRS, SEGMENT_TYPES
 from shared_utils import rt_dates
@@ -166,7 +165,7 @@ def enforce_monotonicity_and_interpolate_across_stops(
     df = segment_calcs.convert_timestamp_to_seconds(
         df, ["arrival_time"])
 
-    df = array_utils.rolling_window_make_array(
+    df = segment_calcs.rolling_window_make_array(
         df, 
         window = 3, rolling_col = "arrival_time_sec"
     )

rt_segment_speeds/scripts/nearest_vp_to_stop.py

@@ -4,6 +4,7 @@
 """
 import datetime
 import geopandas as gpd
+import numpy as np
 import pandas as pd
 import sys
 
@@ -158,7 +159,7 @@ def nearest_neighbor_for_stop(
     gdf = neighbor.merge_stop_vp_for_nearest_neighbor(stop_times, analysis_date)
 
     vp_before, vp_after, vp_before_meters, vp_after_meters = np.vectorize(
-        neighbor.subset_arrays_to_valid_directions
+        neighbor.two_nearest_neighbor_near_stop
     )(
         gdf.vp_primary_direction, 
         gdf.vp_geometry, 

rt_segment_speeds/scripts/pipeline_rt_stop_times.py

@@ -38,7 +38,7 @@
 
     logger.remove()
 
-
+    
     LOG_FILE = "../logs/interpolate_stop_arrival.log"
     logger.add(LOG_FILE, retention="3 months")
     logger.add(sys.stderr, 
@@ -57,7 +57,7 @@
 
     logger.remove()
 
-
+    
     LOG_FILE = "../logs/speeds_by_segment_trip.log"
     logger.add(LOG_FILE, retention="3 months")
     logger.add(sys.stderr, 
@@ -75,3 +75,4 @@
     [compute(i)[0] for i in delayed_dfs]
 
     logger.remove()
+

rt_segment_speeds/scripts/pipeline_segment_speeds.py

@@ -17,7 +17,7 @@
 if __name__ == "__main__":
 
     from segment_speed_utils.project_vars import analysis_date_list    
-
+    
     segment_type = "stop_segments"
     print(f"segment_type: {segment_type}")
 
@@ -59,7 +59,7 @@
 
     logger.remove()
 
-
+    
     LOG_FILE = "../logs/speeds_by_segment_trip.log"
     logger.add(LOG_FILE, retention="3 months")
     logger.add(sys.stderr, 
@@ -76,4 +76,5 @@
 
     [compute(i)[0] for i in delayed_dfs]
 
-    logger.remove()
+    logger.remove()
+

rt_segment_speeds/scripts/pipeline_speedmap.py

@@ -90,7 +90,7 @@ def concatenate_speedmap_proxy_arrivals_with_remaining(
 
     logger.remove()
 
-
+    
     LOG_FILE = "../logs/interpolate_stop_arrival.log"
     logger.add(LOG_FILE, retention="3 months")
     logger.add(sys.stderr, 
@@ -109,7 +109,7 @@ def concatenate_speedmap_proxy_arrivals_with_remaining(
 
     logger.remove()
 
-        
+
     t0 = datetime.datetime.now()
     delayed_dfs = [
         delayed(concatenate_speedmap_proxy_arrivals_with_remaining)(
@@ -139,4 +139,5 @@ def concatenate_speedmap_proxy_arrivals_with_remaining(
 
     [compute(i)[0] for i in delayed_dfs]
 
-    logger.remove()
+    logger.remove()
+

rt_segment_speeds/segment_speed_utils/__init__.py

@@ -1,5 +1,4 @@
 from . import (
-    array_utils,
     gtfs_schedule_wrangling,
     helpers,
     metrics,
@@ -12,7 +11,6 @@
 )
 
 __all__ = [
-    "array_utils",
     "gtfs_schedule_wrangling",
     "helpers",
     "metrics",