add 2035 high-quality transit stop summary

Author: yuqiww

scripts/metrics/metrics_connected.py

@@ -444,6 +444,7 @@ def transit_service_area_share_v2(
         "NP":'np',
         "Plus": "dbp",
         "Final Blueprint": "fbp",
+        "Final Blueprint 2035": "fbp2035", # added for final SCS submittal
         "Draft Blueprint": "dbp",
         "DBP": "dbp", 
         "Alt1": "fbp",
@@ -460,7 +461,6 @@ def transit_service_area_share_v2(
 
     logging.info(f"Calculating connected for {modelrun_alias} / {modelrun_id}")
     logging.debug(f"Modelrun data years: {modelrun_data.keys()}")
-    logging.debug(f"Modelrun data 2050 datasets: {modelrun_data[2050].keys()}")
 
     # convenience function for easy groupby percentages
     def pct(x):
@@ -535,13 +535,22 @@ def groupby_summaries(df, group_vars):
                 logging.info(f'Skipping {year} for {modelrun_alias}.')
                 continue
 
-        # Skip any other years
+        # Skip any other years except for year 2035 for Final Blueprint
+        elif year == 2035:
+            if modelrun_alias in ['Final Blueprint']:
+                logging.info(f'Processing {year} for {modelrun_alias}.')
+            else:
+                logging.info(f'Skipping {year} for {modelrun_alias}.')
         else:
             logging.info(f'Skipping {year} for {modelrun_alias}.')
-            continue
 
         # Continue processing for each year and scenario
-        transit_scenario = transit_scenario_mapping.get(modelrun_alias, 'fbp') # Set default to fbp
+        if (year == 2035) & (modelrun_alias == 'Final Blueprint'):
+            transit_scenario = "fbp2035"
+        else:
+            transit_scenario = transit_scenario_mapping.get(modelrun_alias, 'fbp') # Set default to fbp
+        
+        logging.debug(f"Modelrun data {year} datasets: {modelrun_data[year].keys()}")
         parcel_output = modelrun_data[year]["parcel"].copy(deep=True)
         # report shape of parcel_output df
         len_parcels = len(parcel_output)

scripts/metrics/metrics_utils.py

@@ -74,12 +74,10 @@
 USERNAME = getpass.getuser()
 HOME_DIR = pathlib.Path.home()
 
-if USERNAME.lower() in ['lzorn', 'jahrenholtz']: # need to standardize to E:Box
+if USERNAME.lower() in ['lzorn', 'jahrenholtz', 'ywang']: # need to standardize to E:Box
     BOX_DIR = pathlib.Path("E:/Box")
 elif USERNAME.lower() in ['aolsen']:
     BOX_DIR = HOME_DIR /'Library/CloudStorage/Box-Box'
-elif USERNAME.lower() in ['ywang']:
-    BOX_DIR = pathlib.Path("C:/Users/ywang/Box")
 else:
     BOX_DIR = HOME_DIR / 'Box'
 
@@ -255,8 +253,8 @@ def load_data_for_runs(
             import geopandas as gpd
             PARCEL_TRANSITSERVICE_FILE = pathlib.Path(BOX_DIR, 'Modeling and Surveys', 'Urban Modeling', 
                 'Spatial', 'transit', 'transit_service_levels', 'update_2025', 'outputs', 
-                'parcels10_x_high_quality_stop_buffer.csv')
-            rtp2025_transit_service_df = pd.read_csv(PARCEL_TRANSITSERVICE_FILE, usecols=['parcel_id', 'cur', 'np', 'dbp', 'fbp'])
+                'parcels10_x_high_quality_stop_buffer_with2035.csv')
+            rtp2025_transit_service_df = pd.read_csv(PARCEL_TRANSITSERVICE_FILE, usecols=['parcel_id', 'cur', 'np', 'dbp', 'fbp', 'fbp2035'])
             logging.info("  Read {:,} rows from crosswalk {}".format(len(rtp2025_transit_service_df), PARCEL_TRANSITSERVICE_FILE))
             logging.debug("  rtp2025_transit_service_df.head():\n{}".format(rtp2025_transit_service_df.head()))
 
@@ -909,7 +907,7 @@ def load_data_for_runs(
                                 'tract10_epc', 'tract10_DispRisk', 'tract10_hra', 'tract10_growth_geo', 'tract10_tra',
 
                                 # transit-related columns
-                                'np','dbp','fbp',
+                                'np','dbp','fbp','fbp2035',
 
                                 # sea level rise column
                                 "inundation"]