diff --git a/lasso/mtc.py b/lasso/mtc.py index 78085fd..d88c923 100644 --- a/lasso/mtc.py +++ b/lasso/mtc.py @@ -1481,6 +1481,8 @@ def add_tap_id_to_node( ) ) + return roadway_network + def roadway_standard_to_mtc_network( roadway_network = None, parameters = None, @@ -1829,6 +1831,12 @@ def _is_express_bus(x): if x.agency_name == "WestCat (Western Contra Costa)": if (x.route_short_name.startswith("J")) | (x.route_short_name.startswith("Lynx")): return 1 + if x.agency_name == "SolTrans": + if (x.route_short_name in ["80", "92", "78"]) | (x.route_long_name in ["80", "92", "78"]): + return 1 + if x.agency_name == "Vine (Napa County)": + if x.route_short_name in ["29"]: + return 1 return 0 def _special_vehicle_type(x): diff --git a/mtc_data/lookups/gtfs_to_tm2_mode_crosswalk.csv b/mtc_data/lookups/gtfs_to_tm2_mode_crosswalk.csv index 82bd28e..89885e4 100644 --- a/mtc_data/lookups/gtfs_to_tm2_mode_crosswalk.csv +++ b/mtc_data/lookups/gtfs_to_tm2_mode_crosswalk.csv @@ -29,6 +29,7 @@ SamTrans_2015_8_20,SamTrans,samtrans-ca-us,6,3,24,Local bus,4,0,Motor Standard B SamTrans_2015_8_20,SamTrans,samtrans-ca-us,6,3,80,Express bus,25,1,SamTrans Plus Bus SantaRosa_google_transit_08_28_15,Santa Rosa CityBus,SRCityBus,1,3,66,Local bus,21,0,Motor Standard Bus Soltrans_2016_5_20,SolTrans,247,12,3,49,Local bus,13,0,Motor Standard Bus +Soltrans_2016_5_20,SolTrans,247,12,3,91,Express bus,13,1,Motor Standard Bus SonomaCounty_2015_8_18,Sonoma County Transit,175,19,3,63,Local bus,20,0,Motor Standard Bus SonomaCounty_2015_8_18,Cloverdale Transit,183,19,3,63,Local bus,20,0,Motor Standard Bus TriDelta-GTFS-2018-05-24_21-43-17,Tri Delta Transit,tri-delta-transit,4,3,44,Local bus,11,0,Motor Standard Bus @@ -37,6 +38,7 @@ VTA_2015_8_27,VTA,VTA,31,0,111,Light rail,40,0,VTA LRT2 VTA_2015_8_27,VTA,VTA,31,3,28,Local bus,5,0,Motor Standard Bus VTA_2015_8_27,VTA,VTA,31,3,81,Express bus,26,1,Motor Standard Bus Vine_GTFS_PLUS_2015,Vine (Napa County),362,38,3,60,Local bus,19,0,Motor Standard Bus +Vine_GTFS_PLUS_2015,Vine (Napa County),362,38,3,94,Express bus,19,1,Motor Standard Bus WestCAT_2016_5_26,WestCat (Western Contra Costa),392,37,3,46,Local bus,12,0,Motor Standard Bus WestCAT_2016_5_26,WestCat (Western Contra Costa),392,37,3,90,Express bus,31,1,AC Plus Bus petalumatransit-petaluma-ca-us__11_12_15,Petaluma Transit,267,21,3,68,Local bus,22,0,Motor Standard Bus