2024 HQTA Methodology Revisions

Makefile

@@ -2,19 +2,20 @@
 # To specify different Makefile: make build_parallel_corridors -f Makefile
 
 build_portfolio_site:
-	#cd portfolio/ && pip install -r requirements.txt && cd ../
+	cd portfolio/ && pip install -r requirements.txt && cd ../
 	#need git rm because otherwise, just local removal, but git change is untracked
-	git rm portfolio/$(site)/ -rf
+	#git rm portfolio/$(site)/ -rf
 	python portfolio/portfolio.py clean $(site)
 	python portfolio/portfolio.py build $(site) --deploy 
-	make git_check 
+	git add portfolio/$(site)/*.yml portfolio/$(site)/*.md  
+	git add portfolio/sites/$(site).yml     
 	#make production_portfolio
 
-git_check:
-	git add portfolio/$(site)/*.yml portfolio/$(site)/*.md  
+git_check_sections:
 	git add portfolio/$(site)/*.ipynb # this one is most common, where operators nested under district
-	#git add portfolio/$(site)/district_*/*.ipynb # this one less common, but it's district pages only
-	git add portfolio/sites/$(site).yml 
+
+git_check_no_sections:
+	git add portfolio/$(site)/district_*/*.ipynb # this one less common, but it's district pages only
 
 build_competitive_corridors:
 	$(eval export site = competitive_corridors)
@@ -46,6 +47,8 @@ build_gtfs_digest:
 	#cd gtfs_digest/ && python deploy_portfolio_yaml.py && make assemble_data && cd ..   
 	cd gtfs_digest/ && python deploy_portfolio_yaml.py
 	make build_portfolio_site
+	make git_check_sections
+
 
 build_gtfs_digest_testing:
 	$(eval export site = gtfs_digest_testing)
@@ -57,7 +60,14 @@ build_district_digest:
 	$(eval export site = district_digest)
 	#cd data-analyses/rt_segment_speeds && pip install -r requirements.txt && cd ../_shared_utils && make setup_env && cd ..
 	make build_portfolio_site 
-	git add portfolio/$(site)/district_*/*.ipynb 
+	make git_check_no_sections
+
+build_legislative_district_digest:
+	$(eval export site = legislative_district_digest)
+	#cd data-analyses/rt_segment_speeds && pip install -r requirements.txt && cd ../_shared_utils && make setup_env && cd ..
+	make build_portfolio_site 
+	make git_check_no_sections
+
 
 add_precommit:
 	pip install pre-commit

_shared_utils/setup.py

@@ -4,7 +4,7 @@
 setup(
     name="shared_utils",
     packages=find_packages(),
-    version="2.6",
+    version="2.8",
     description="Shared utility functions for data analyses",
     author="Cal-ITP",
     license="Apache",

_shared_utils/shared_utils/catalog_utils.py

@@ -5,7 +5,6 @@
 from typing import Literal
 
 import intake
-import yaml
 from omegaconf import OmegaConf  # this is yaml parser
 
 repo_name = "data-analyses/"
@@ -22,20 +21,3 @@ def get_catalog(catalog_name: Literal["shared_data_catalog", "gtfs_analytics_dat
 
     else:
         return intake.open_catalog(catalog_path)
-
-
-def get_parameters(config_file: str, key: str) -> dict:
-    """
-    Parse the config.yml file to get the parameters needed
-    for working with route or stop segments.
-    These parameters will be passed through the scripts when working
-    with vehicle position data.
-
-    Returns a dictionary of parameters.
-    """
-    # https://aaltoscicomp.github.io/python-for-scicomp/scripts/
-    with open(config_file) as f:
-        my_dict = yaml.safe_load(f)
-        params_dict = my_dict[key]
-
-    return params_dict

_shared_utils/shared_utils/gtfs_analytics_data.yml

@@ -52,17 +52,23 @@ rt_vs_schedule_tables:
   sched_route_direction_metrics: "schedule_route_dir/schedule_route_direction_metrics"
   vp_trip_metrics: "vp_trip/trip_metrics"
   vp_route_direction_metrics: "vp_route_dir/route_direction_metrics"
+  vp_operator_metrics: "vp_operator/operator_metrics"
+  sched_stop_metrics: "schedule_stop/schedule_stop_metrics"
+  #vp_stop_metrics: "vp_stop/vp_stop_metrics" # WIP: transit bunching
   schedule_rt_stop_times: "schedule_rt_stop_times"
   early_trip_minutes: -5
   late_trip_minutes: 5
 
+
 digest_tables:
   dir: ${gcs_paths.RT_SCHED_GCS}
   route_schedule_vp: "digest/schedule_vp_metrics"
   route_segment_speeds: "digest/segment_speeds"
+  route_segment_geometry: "digest/segment_speeds_geom"
   operator_profiles: "digest/operator_profiles"
   operator_routes_map: "digest/operator_routes"
   operator_sched_rt: "digest/operator_schedule_rt_category"
+  operator_metrics: "digest/operator_metrics"
   scheduled_service_hours: "digest/total_scheduled_service_hours"
 
 stop_segments: