diff --git a/gtfs_funnel/concatenate_monthly_scheduled_service.py b/gtfs_funnel/concatenate_monthly_scheduled_service.py index da2a9f615..b736c0e49 100644 --- a/gtfs_funnel/concatenate_monthly_scheduled_service.py +++ b/gtfs_funnel/concatenate_monthly_scheduled_service.py @@ -6,8 +6,8 @@ schedule_gtfs_dataset_key. """ import pandas as pd -from segment_speed_utils import helpers, time_helpers, time_series_utils -from shared_utils import rt_dates +from segment_speed_utils import helpers, time_series_utils +from shared_utils import rt_dates, time_helpers from update_vars import GTFS_DATA_DICT, SCHED_GCS def parse_service_date(df: pd.DataFrame) -> pd.DataFrame: diff --git a/gtfs_funnel/stop_arrivals_in_roads.py b/gtfs_funnel/stop_arrivals_in_roads.py index 488435c00..6d623d57b 100644 --- a/gtfs_funnel/stop_arrivals_in_roads.py +++ b/gtfs_funnel/stop_arrivals_in_roads.py @@ -8,10 +8,9 @@ from segment_speed_utils import (helpers, gtfs_schedule_wrangling, - time_helpers ) from segment_speed_utils.project_vars import PROJECT_CRS -from shared_utils import rt_dates +from shared_utils import rt_dates, time_helpers from update_vars import SHARED_GCS, SCHED_GCS road_cols = ["linearid", "mtfcc", "fullname"] diff --git a/open_data/data_dictionary.yml b/open_data/data_dictionary.yml index b8ff9e42b..e3e009814 100644 --- a/open_data/data_dictionary.yml +++ b/open_data/data_dictionary.yml @@ -60,7 +60,7 @@ common-fields: offpeak - offpeak hours are 12am-6:59am inclusive, 10am-2:59pm inclusive, and 8pm-11:59pm inclusive. peak - peak hours are 7am-9:59am inclusive and 3pm-7:59pm inclusive. all_day - definition_source: "https://github.com/cal-itp/data-analyses/blob/main/rt_segment_speeds/segment_speed_utils/time_helpers.py" + definition_source: "https://github.com/cal-itp/data-analyses/blob/main/_shared_utils/shared_utils/time_helpers.py" - &hqta_type definition: |- Indicates the type of High Quality Transit Area as defined in the Public Resources Code that a stop is and/or falls within. Valid options are: hq_corridor_bus (PRC 21155), major_stop_bus (PRC 21064.3), major_stop_rail (PRC 21064.3), major_stop_ferry (PRC 21064.3), major_stop_brt (PRC 21064.3, 21060.2) diff --git a/open_data/xml/speeds_by_route_time_of_day_fgdc.xml b/open_data/xml/speeds_by_route_time_of_day_fgdc.xml index a50f6fc57..9adee1a3a 100644 --- a/open_data/xml/speeds_by_route_time_of_day_fgdc.xml +++ b/open_data/xml/speeds_by_route_time_of_day_fgdc.xml @@ -96,7 +96,7 @@ offpeak - offpeak hours are 12am-6:59am inclusive, 10am-2:59pm inclusive, and 8pm-11:59pm inclusive. peak - peak hours are 7am-9:59am inclusive and 3pm-7:59pm inclusive. all_day - https://github.com/cal-itp/data-analyses/blob/main/rt_segment_speeds/segment_speed_utils/time_helpers.py + https://github.com/cal-itp/data-analyses/blob/main/_shared_utils/shared_utils/time_helpers.py speed_mph diff --git a/open_data/xml/speeds_by_stop_segments_fgdc.xml b/open_data/xml/speeds_by_stop_segments_fgdc.xml index 6cf551592..4f2d5f246 100644 --- a/open_data/xml/speeds_by_stop_segments_fgdc.xml +++ b/open_data/xml/speeds_by_stop_segments_fgdc.xml @@ -115,7 +115,7 @@ offpeak - offpeak hours are 12am-6:59am inclusive, 10am-2:59pm inclusive, and 8pm-11:59pm inclusive. peak - peak hours are 7am-9:59am inclusive and 3pm-7:59pm inclusive. all_day - https://github.com/cal-itp/data-analyses/blob/main/rt_segment_speeds/segment_speed_utils/time_helpers.py + https://github.com/cal-itp/data-analyses/blob/main/_shared_utils/shared_utils/time_helpers.py base64_url diff --git a/rt_segment_speeds/scripts/average_segment_speeds.py b/rt_segment_speeds/scripts/average_segment_speeds.py index c7b0b6368..ad9e68170 100644 --- a/rt_segment_speeds/scripts/average_segment_speeds.py +++ b/rt_segment_speeds/scripts/average_segment_speeds.py @@ -16,12 +16,13 @@ helpers, metrics, segment_calcs, - time_helpers, time_series_utils ) +from shared_utils import time_helpers from update_vars import GTFS_DATA_DICT, SEGMENT_GCS from segment_speed_utils.project_vars import SEGMENT_TYPES + OPERATOR_COLS = [ "schedule_gtfs_dataset_key", ] diff --git a/rt_segment_speeds/scripts/average_summary_speeds.py b/rt_segment_speeds/scripts/average_summary_speeds.py index 7ddb66a7b..d3c3ad25e 100644 --- a/rt_segment_speeds/scripts/average_summary_speeds.py +++ b/rt_segment_speeds/scripts/average_summary_speeds.py @@ -14,8 +14,8 @@ from calitp_data_analysis import utils from segment_speed_utils import (gtfs_schedule_wrangling, metrics, - time_helpers, ) +from shared_utils import time_helpers from segment_speed_utils.project_vars import SEGMENT_TYPES from update_vars import SEGMENT_GCS, GTFS_DATA_DICT from average_segment_speeds import (OPERATOR_COLS, CROSSWALK_COLS,