diff --git a/app-android/src/main/play/release-notes/en-US/default.txt b/app-android/src/main/play/release-notes/en-US/default.txt
index ceffc335..7e99ab1f 100644
--- a/app-android/src/main/play/release-notes/en-US/default.txt
+++ b/app-android/src/main/play/release-notes/en-US/default.txt
@@ -1 +1 @@
-Schedule from August 18, 2024 to October 14, 2024.
+Schedule from August 25, 2024 to October 14, 2024.
diff --git a/app-android/src/main/res-current/raw/current_gtfs_rts_stops b/app-android/src/main/res-current/raw/current_gtfs_rts_stops
index f4dda6fd..6b00f2cc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_rts_stops
+++ b/app-android/src/main/res-current/raw/current_gtfs_rts_stops
@@ -459,7 +459,7 @@
107752,'107752','1st Ave @ James St',49.13445,-122.30825,0,1448850460
107754,'107754','Junction Mall',49.13014,-122.31907,0,1448850462
107755,'107755','Lougheed Hwy @ Haig St',49.13289,-122.32110,0,1448850463
-107756,'107756','Mission City Stn',49.13391,-122.30415,0,1448850464
+107756,'107756','Mission City Stn B:2',49.13389,-122.30416,0,1448850464
107758,'107758','Hurd St @ Lougheed Hwy',49.13347,-122.32942,0,1448850466
107759,'107759','Hurd St @ Scott Ave',49.13533,-122.33268,0,1448850467
107761,'107761','Hurd St @ Pleasantview Cres',49.13882,-122.33270,0,1448850490
@@ -601,3 +601,5 @@
120080,'120080','Cedar St @ 3rd Ave',49.13660,-122.31656,0,1450482329
120081,'120081','Marshall Rd @ Everett St',49.03850,-122.25475,0,1450482330
120082,'120082','11th Ave @ Taulbut St',49.14388,-122.30661,0,1450482331
+120092,'120092','Mission City Stn B:1',49.13393,-122.30507,0,1450482362
+120093,'120093','Mission City Stn B:3',49.13385,-122.30336,0,1450482363
diff --git a/app-android/src/main/res-current/raw/current_gtfs_rts_trip_stops b/app-android/src/main/res-current/raw/current_gtfs_rts_trip_stops
index 543feb69..a2c8c91a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_rts_trip_stops
+++ b/app-android/src/main/res-current/raw/current_gtfs_rts_trip_stops
@@ -768,29 +768,25 @@
3100,120013,13,0
3100,107754,14,0
3100,107755,15,0
-3100,107756,16,0
-3100,107751,17,0
-3100,120063,18,1
-3100,120064,19,1
-3101,120064,1,0
-3101,107756,2,0
-3101,107751,3,0
-3101,107752,4,0
-3101,120007,5,0
-3101,107754,6,0
-3101,120014,7,0
-3101,107256,8,0
-3101,107255,9,0
-3101,107254,10,0
-3101,107159,11,0
-3101,107160,12,0
-3101,107161,13,0
-3101,107162,14,0
-3101,107163,15,0
-3101,107164,16,0
-3101,107165,17,0
-3101,107166,18,0
-3101,107020,19,1
+3100,120092,16,1
+3101,107756,1,0
+3101,107751,2,0
+3101,107752,3,0
+3101,120007,4,0
+3101,107754,5,0
+3101,120014,6,0
+3101,107256,7,0
+3101,107255,8,0
+3101,107254,9,0
+3101,107159,10,0
+3101,107160,11,0
+3101,107161,12,0
+3101,107162,13,0
+3101,107163,14,0
+3101,107164,15,0
+3101,107165,16,0
+3101,107166,17,0
+3101,107020,18,1
3200,107773,1,0
3200,107774,2,0
3200,107775,3,0
@@ -801,10 +797,10 @@
3200,107870,8,0
3200,107871,9,0
3200,107755,10,0
-3200,107756,11,0
-3200,107751,12,0
-3200,120063,13,1
-3200,120064,14,1
+3200,120092,11,1
+3200,107756,12,0
+3200,107751,13,0
+3200,120063,14,1
3201,120064,1,0
3201,107756,2,0
3201,107751,3,0
@@ -837,29 +833,29 @@
3300,107807,9,0
3300,120077,10,0
3300,107755,11,0
-3300,107756,12,0
-3300,107751,13,0
-3300,120063,14,1
-3300,120064,15,1
-3301,120063,1,0
-3301,107751,2,0
-3301,107756,3,0
-3301,107819,4,0
-3301,107786,5,0
-3301,107787,6,0
-3301,107883,7,0
-3301,107788,8,0
-3301,107789,9,0
-3301,107790,10,0
-3301,107791,11,0
-3301,107792,12,0
-3301,107793,13,0
-3301,107794,14,0
-3301,107795,15,0
-3301,107796,16,0
-3301,107797,17,0
-3301,107798,18,0
-3301,120050,19,1
+3300,120092,12,1
+3300,107756,13,0
+3300,107751,14,0
+3300,120063,15,1
+3300,120064,16,1
+3301,120092,1,0
+3301,120063,2,0
+3301,107819,3,0
+3301,107786,4,0
+3301,107787,5,0
+3301,107883,6,0
+3301,107788,7,0
+3301,107789,8,0
+3301,107790,9,0
+3301,107791,10,0
+3301,107792,11,0
+3301,107793,12,0
+3301,107794,13,0
+3301,107795,14,0
+3301,107796,15,0
+3301,107797,16,0
+3301,107798,17,0
+3301,120050,18,1
3400,120079,1,0
3400,107835,2,0
3400,107836,3,0
@@ -876,74 +872,73 @@
3400,107787,14,0
3400,107883,15,0
3400,107847,16,0
-3400,107756,17,0
-3400,107751,18,0
-3400,120063,19,1
-3400,107819,20,1
-3400,120064,21,1
-3401,120063,1,0
-3401,107751,2,0
-3401,107756,3,0
-3401,107819,4,0
-3401,107820,5,0
-3401,107884,6,0
-3401,107822,7,0
-3401,107823,8,0
-3401,107824,9,0
-3401,107825,10,0
-3401,120055,11,0
-3401,107826,12,0
-3401,107827,13,0
-3401,107828,14,0
-3401,107829,15,0
-3401,107794,16,0
-3401,107830,17,0
-3401,107831,18,0
-3401,107832,19,0
-3401,107833,20,0
-3401,120079,21,1
+3400,120063,17,1
+3400,120092,18,1
+3401,120092,1,0
+3401,120063,2,0
+3401,107819,3,0
+3401,107820,4,0
+3401,107884,5,0
+3401,107822,6,0
+3401,107823,7,0
+3401,107824,8,0
+3401,107825,9,0
+3401,120055,10,0
+3401,107826,11,0
+3401,107827,12,0
+3401,107828,13,0
+3401,107829,14,0
+3401,107794,15,0
+3401,107830,16,0
+3401,107831,17,0
+3401,107832,18,0
+3401,107833,19,0
+3401,120079,20,1
3500,107855,1,0
3500,107856,2,0
3500,107857,3,0
3500,107751,4,0
-3500,120063,5,1
-3501,120063,1,0
-3501,107756,2,0
-3501,120059,3,0
-3501,107855,4,1
+3500,120093,5,1
+3500,120063,6,1
+3501,120093,1,0
+3501,120063,2,0
+3501,107756,3,0
+3501,120059,4,0
+3501,107855,5,1
3900,120063,1,0
-3900,107751,2,0
-3900,107752,3,0
-3900,107756,4,0
-3900,120031,5,0
-3900,120062,6,0
-3900,107783,7,0
-3900,120007,8,0
-3900,120067,9,0
-3900,107870,10,0
-3900,107871,11,0
-3900,120056,12,0
-3900,107781,13,0
-3900,107759,14,0
-3900,107880,15,0
-3900,107761,16,0
-3900,107762,17,0
-3900,107763,18,0
-3900,107764,19,0
-3900,107765,20,0
-3900,107766,21,0
-3900,107850,22,0
-3900,107851,23,0
-3900,120080,24,0
-3900,107849,25,0
-3900,107788,26,0
-3900,107789,27,0
-3900,120082,28,0
-3900,120057,29,0
-3900,107817,30,0
-3900,107877,31,0
-3900,107861,32,0
-3900,107818,33,0
+3900,120093,2,0
+3900,120031,3,0
+3900,107751,4,0
+3900,107752,5,0
+3900,107756,6,0
+3900,120062,7,0
+3900,107783,8,0
+3900,120007,9,0
+3900,120067,10,0
+3900,107870,11,0
+3900,107871,12,0
+3900,120056,13,0
+3900,107781,14,0
+3900,107759,15,0
+3900,107880,16,0
+3900,107761,17,0
+3900,107762,18,0
+3900,107763,19,0
+3900,107764,20,0
+3900,107765,21,0
+3900,107766,22,0
+3900,107850,23,0
+3900,107851,24,0
+3900,120080,25,0
+3900,107849,26,0
+3900,107788,27,0
+3900,107789,28,0
+3900,120082,29,0
+3900,120057,30,0
+3900,107817,31,0
+3900,107877,32,0
+3900,107861,33,0
+3900,107818,34,0
1000700,108262,1,0
1000700,107021,2,0
1000700,107022,3,0
@@ -1095,10 +1090,9 @@
1003100,107492,15,0
1003100,107754,16,0
1003100,107755,17,0
-1003100,107756,18,0
-1003100,107751,19,0
-1003100,120063,20,1
-1003100,120064,21,1
+1003100,120092,18,1
+1003100,107756,19,0
+1003100,120064,20,1
1003101,120064,1,0
1003101,107756,2,0
1003101,107751,3,0
@@ -1135,5 +1129,4 @@
24003100,107486,12,0
24003100,120013,13,0
24003100,107755,14,0
-24003100,107756,15,0
-24003100,120064,16,1
+24003100,120092,15,1
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates b/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
index c8631174..60ab5080 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_service_dates
@@ -1,16 +1,9 @@
-'2919',20240818,1
-'1798',20240819,1
-'1798',20240820,1
-'1798',20240821,1
-'1798',20240822,1
-'1798',20240823,1
-'1803',20240824,1
-'2919',20240825,1
+'2393',20240825,1
'1798',20240826,1
'1798',20240827,1
'1798',20240828,1
'1798',20240829,1
'1798',20240830,1
-'1803',20240831,1
-'2919',20240901,1
-'2919',20240902,1
+'3379',20240831,1
+'3380',20240901,1
+'3380',20240902,1
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105721 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105721
index 2115ba6d..ba22acce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105721
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105721
@@ -1,3 +1,4 @@
'1798',200,53900,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',200,60400,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2919',200,62100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60400,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3380',200,62100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105722 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105722
index e7359b84..f6b9434d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105722
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105722
@@ -1,3 +1,4 @@
'1798',201,54600,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2393',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3379',201,63700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,65100,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105727 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105727
index 9d73f6a7..3666473e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105727
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105727
@@ -1,2 +1,2 @@
'1798',1501,62200,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90600,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105731 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105731
index 2115ba6d..ba22acce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105731
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_105731
@@ -1,3 +1,4 @@
'1798',200,53900,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',200,60400,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2919',200,62100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60400,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3380',200,62100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107001 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107001
index af65270a..d233bcd0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107001
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107001
@@ -1,3 +1,4 @@
'1798',201,54400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63500,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2393',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3379',201,63500,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64900,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107005
index 6f50a314..b52f3bcb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107005
@@ -1,3 +1,4 @@
'1798',200,54300,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'1803',200,60900,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,62600,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62600,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60900,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,62600,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107006
index 1ad098db..027abbbf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107006
@@ -1,3 +1,4 @@
'1798',200,54500,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'1803',200,61100,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,62800,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62800,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,61100,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,62800,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107007
index fc88c2d9..3b624c2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107007
@@ -1,3 +1,4 @@
'1798',200,54600,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'1803',200,61200,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,62900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,62900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61200,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,62900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107008
index 26b84d4f..2d3c6c4a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107008
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107008
@@ -1,3 +1,4 @@
'1798',200,54600,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
-'1803',200,61200,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,62900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,62900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61200,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,62900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107009
index 770a0c14..c97efa39 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107009
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107009
@@ -1,3 +1,4 @@
'1798',200,54700,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'1803',200,61300,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63000,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63000,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61300,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63000,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107010
index df2f45e9..a8211079 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107010
@@ -1,3 +1,4 @@
'1798',200,54700,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
-'1803',200,61300,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63000,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63000,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61300,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63000,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107011 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107011
index ac19ea2c..3881337d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107011
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107011
@@ -1,9 +1,12 @@
'1798',200,54800,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6100,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
-'1803',200,61400,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61400,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
'1798',301,60500,,'',0,5300,,'',0,7200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'1803',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',601,61300,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8600,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2393',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'3379',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107012
index a45d9b94..7dd8b6e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107012
@@ -1,11 +1,14 @@
'1798',100,53500,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61800,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61500,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,61500,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,61800,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61500,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,54900,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
-'1803',200,61500,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63200,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63200,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61500,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63200,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
'1798',1700,65000,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
'1798',2100,65500,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11100,,'',0
-'1803',2100,82900,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82900,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,95200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152800,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107013
index ce795cdc..0bd61854 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107013
@@ -1,11 +1,14 @@
'1798',100,53600,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61600,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,61600,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,61900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61600,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55000,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
-'1803',200,61600,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63300,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63300,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61600,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63300,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
'1798',1700,65100,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
'1798',2100,65600,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11100,,'',0
-'1803',2100,83000,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,83000,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,95300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152900,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107014
index 3f414f6a..0dae6113 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107014
@@ -1,11 +1,14 @@
'1798',100,53600,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61600,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,61600,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,61900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61600,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55000,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,61600,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63300,,'',0,8300,,'',0,4200,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63300,,'',0,8300,,'',0,4200,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61600,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63300,,'',0,8300,,'',0,4200,,'',0,8700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
'1798',1700,65100,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
'1798',2100,65600,,'',0,7700,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11100,,'',0
-'1803',2100,83100,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,83100,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,95400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,153000,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107015 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107015
index e6391c4c..d0daa420 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107015
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107015
@@ -1,11 +1,14 @@
'1798',100,53700,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,62000,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,61700,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,61700,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62000,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,61700,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55100,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
-'1803',200,61700,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61700,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
'1798',1700,65200,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7500,,'',0
'1798',2100,65700,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12200,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11000,,'',0
-'1803',2100,83100,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13000,,'',0
-'2919',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,83100,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13000,,'',0
+'3380',2100,95400,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,153100,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107016
index 58b10410..0dbc43d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107016
@@ -1,11 +1,14 @@
'1798',100,53700,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62000,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,61700,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,61700,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62000,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,61700,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55200,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
-'1803',200,61700,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63500,,'',0,8300,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63500,,'',0,8300,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61700,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63500,,'',0,8300,,'',0,8200,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
'1798',1700,65300,,'',0,7200,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8400,,'',0,3600,,'',0,7500,,'',0
'1798',2100,65800,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12200,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11000,,'',0
-'1803',2100,83200,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13000,,'',0
-'2919',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,83200,,'',0,20300,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13000,,'',0
+'3380',2100,95500,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,153200,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107017
index 02c04eb3..361d2608 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107017
@@ -1,11 +1,14 @@
'1798',100,53800,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,3000,,'',0
-'1803',100,62100,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,61800,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,61800,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62100,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,61800,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55200,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,61800,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63500,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63500,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61800,,'',0,8500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63500,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
'1798',1700,65300,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7600,,'',0
'1798',2100,65800,,'',0,7700,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16200,,'',0,13600,,'',0,24500,,'',0,5200,,'',0,15500,,'',0,11100,,'',0
-'1803',2100,83300,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,83300,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,95600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,153300,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107018
index ad72f67a..47fd693e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107018
@@ -1,14 +1,18 @@
'1798',100,53800,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62100,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,61800,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,61800,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62100,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,61800,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55300,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,61800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8500,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
'1798',601,62100,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12200,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
-'1803',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
-'2919',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
+'3380',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
'1798',1700,65400,,'',0,7300,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7600,,'',0
'1798',2100,65900,,'',0,7700,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16200,,'',0,13600,,'',0,24500,,'',0,5200,,'',0,15500,,'',0,11100,,'',0
-'1803',2100,83400,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,83400,,'',0,20200,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,95700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,153400,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107019 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107019
index 9bbc858e..ce90fa34 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107019
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107019
@@ -1,14 +1,18 @@
'1798',100,53800,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2600,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62100,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,61800,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,61800,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62100,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,61800,,'',0,3900,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55300,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,61800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,5300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
'1798',601,62100,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12200,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
-'1803',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
-'2919',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62900,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,14300,,'',0,10700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
+'3380',601,62500,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
'1798',1700,65400,,'',0,7300,,'',0,8900,,'',0,72500,,'',0,7800,,'',0,8500,,'',0,3500,,'',0,7500,,'',0
'1798',2100,65900,,'',0,7700,,'',0,9200,,'',0,9700,,'',0,12200,,'',0,11200,,'',0,16200,,'',0,13600,,'',0,24500,,'',0,5200,,'',0,15500,,'',0,11000,,'',0
-'1803',2100,83400,,'',0,20300,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13000,,'',0
-'2919',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,83400,,'',0,20300,,'',0,11900,,'',0,19700,,'',0,15800,,'',0,11400,,'',0,9700,,'',0,9400,,'',0,13000,,'',0
+'3380',2100,95700,,'',0,17100,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,153500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107020 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107020
index adf6c11d..0eacd28a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107020
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107020
@@ -1,13 +1,16 @@
'1798',601,62200,4,'',0,8900,4,'',0,3100,4,'',0,7700,4,'',0,3500,4,'',0,7300,4,'',0,8000,4,'',0,12200,4,'',0,11600,4,'',0,15500,4,'',0,4700,4,'',0,8600,4,'',0,8200,4,'',0,4000,4,'',0,8500,4,'',0,7800,4,'',0,3800,4,'',0,15500,4,'',0,9800,4,'',0,11500,4,'',0,10900,4,'',0
-'1803',601,63000,4,'',0,12100,4,'',0,10200,4,'',0,10000,4,'',0,10500,4,'',0,14300,4,'',0,10700,4,'',0,10500,4,'',0,10100,4,'',0,10800,4,'',0,9700,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,8900,4,'',0
-'2919',601,62600,4,'',0,13100,4,'',0,9700,4,'',0,15100,4,'',0,4600,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9100,4,'',0,9400,4,'',0,9300,4,'',0,9000,4,'',0,5000,4,'',0,16000,4,'',0,11700,4,'',0
+'2393',601,62600,4,'',0,13100,4,'',0,9700,4,'',0,15100,4,'',0,4600,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9100,4,'',0,9400,4,'',0,9300,4,'',0,9000,4,'',0,5000,4,'',0,16000,4,'',0,11700,4,'',0
+'3379',601,63000,4,'',0,12100,4,'',0,10200,4,'',0,10000,4,'',0,10500,4,'',0,14300,4,'',0,10700,4,'',0,10500,4,'',0,10100,4,'',0,10800,4,'',0,9700,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,8900,4,'',0
+'3380',601,62600,4,'',0,13100,4,'',0,9700,4,'',0,15100,4,'',0,4600,4,'',0,9000,4,'',0,10100,4,'',0,9000,4,'',0,9100,4,'',0,9400,4,'',0,9300,4,'',0,9000,4,'',0,5000,4,'',0,16000,4,'',0,11700,4,'',0
'1798',1700,65500,4,'',0,7300,4,'',0,8900,4,'',0,72500,4,'',0,7800,4,'',0,8500,4,'',0,3500,4,'',0,7500,4,'',0
'1798',2100,70000,4,'',0,3700,4,'',0,9200,4,'',0,9700,4,'',0,12200,4,'',0,15200,4,'',0,12200,4,'',0,13600,4,'',0,24500,4,'',0,5200,4,'',0,15500,4,'',0,11000,4,'',0
-'1803',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19700,4,'',0,15800,4,'',0,11400,4,'',0,9700,4,'',0,9400,4,'',0,13000,4,'',0
-'2919',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16700,4,'',0,13100,4,'',0
+'2393',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16700,4,'',0,13100,4,'',0
+'3379',2100,83500,4,'',0,20300,4,'',0,11900,4,'',0,19700,4,'',0,15800,4,'',0,11400,4,'',0,9700,4,'',0,9400,4,'',0,13000,4,'',0
+'3380',2100,95800,4,'',0,17100,4,'',0,12900,4,'',0,17000,4,'',0,12900,4,'',0,16700,4,'',0,13100,4,'',0
'1798',3101,65000,4,'',0,8500,4,'',0,7000,4,'',0,3300,4,'',0,7300,4,'',0,4600,4,'',0,14500,4,'',0,11100,4,'',0,11000,4,'',0,11000,4,'',0,11600,4,'',0,7400,4,'',0,1200,4,'',0,7000,4,'',0,3500,4,'',0,6800,4,'',0,2900,4,'',0,1800,4,'',0,38400,4,'',0
-'1803',3101,83900,4,'',0,10000,4,'',0,10500,4,'',0,10800,4,'',0,15100,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,10900,4,'',0,10900,4,'',0
+'3379',3101,83900,4,'',0,10000,4,'',0,10500,4,'',0,10800,4,'',0,15100,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,10900,4,'',0,10900,4,'',0
'1798',1002100,153600,4,'',0,9100,4,'',0
'1798',1003101,72100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7400,4,'',0,10100,4,'',0,11000,4,'',0,11100,4,'',0,15000,4,'',0,11200,4,'',0,9300,4,'',0,4700,4,'',0,7100,4,'',0,3100,4,'',0,6800,4,'',0,10200,4,'',0,8500,4,'',0,12300,4,'',0
-'1803',1003101,91100,4,'',0,10100,4,'',0,10700,4,'',0,11100,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,14900,4,'',0,11000,4,'',0,10800,4,'',0,10500,4,'',0,10500,4,'',0
-'2919',1003101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
+'2393',1003101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
+'3379',1003101,91100,4,'',0,10100,4,'',0,10700,4,'',0,11100,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,14900,4,'',0,11000,4,'',0,10800,4,'',0,10500,4,'',0,10500,4,'',0
+'3380',1003101,110900,4,'',0,10600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107021
index f777bd8e..0dfd6ce9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107021
@@ -1,18 +1,25 @@
'1798',100,54100,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62400,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,62100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,62100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62400,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,62100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55600,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62100,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63900,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'1803',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',200,63900,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62100,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63900,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',501,60200,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'2919',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',700,70000,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'1803',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'3380',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
+'3379',700,70000,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
+'2393',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1201,71300,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'1803',1000700,60000,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
-'2919',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2393',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3379',1000700,60000,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
+'3380',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107022 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107022
index 0ce4f0ae..6707099f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107022
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107022
@@ -1,18 +1,25 @@
'1798',100,54200,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62500,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,62200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,62200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62500,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,62200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55700,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,64000,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'1803',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',200,64000,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,64000,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',501,60300,,'',0,2800,,'',0,2700,,'',0,6700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63600,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,61900,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',700,70100,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60100,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'1803',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',501,61900,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63600,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,61900,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',700,60100,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
+'3379',700,70100,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60100,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
+'2393',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1201,71400,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'1803',1000700,60100,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
-'2919',1000700,70100,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2393',1000700,70100,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3379',1000700,60100,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
+'3380',1000700,70100,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107023
index c8da7ae0..f3046a41 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107023
@@ -1,11 +1,15 @@
'1798',200,55700,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7200,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,64000,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'1803',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',200,64000,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,64000,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60100,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64300,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',501,60300,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'2919',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'3380',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63100,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1201,71400,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107024
index 1250bf84..68176a83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107024
@@ -1,11 +1,15 @@
'1798',200,55800,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62300,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,64100,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'1803',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',200,64100,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62300,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,64100,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',501,60300,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'2919',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63700,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'3380',501,62000,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1201,71400,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107025
index 75d05e6c..45f4a8a3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107025
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107025
@@ -1,7 +1,10 @@
'1798',200,55800,,'',0,6300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,7300,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62300,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,64100,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'1803',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'1803',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',200,64100,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62300,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,64100,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60200,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64400,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63200,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107026 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107026
index 76277106..e122620e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107026
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107026
@@ -1,7 +1,10 @@
'1798',200,55900,,'',0,6300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62400,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,64200,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'1803',401,60300,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'1803',900,64300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',200,64200,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62400,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,64200,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60300,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64500,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63300,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107027 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107027
index a24fcec0..a46a47ad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107027
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107027
@@ -1,7 +1,10 @@
'1798',200,60000,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62500,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,64300,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
-'1803',401,60400,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'1803',900,64400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',200,64300,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62500,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,64300,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60400,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64600,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,14300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63400,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107030 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107030
index 3c5f93e3..817d4326 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107030
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107030
@@ -1,6 +1,8 @@
'1798',200,60300,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,2000,,'',0,1500,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
-'1803',200,62800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,64600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,64600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,64600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
'1798',900,54600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,64600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2393',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'3379',900,64600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,63600,,'',0,17000,,'',0,13000,,'',0,12300,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107031 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107031
index 63ca779d..9a6701e1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107031
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107031
@@ -1,6 +1,8 @@
'1798',200,60300,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2200,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
-'1803',200,62800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,64600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,64600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62800,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,64600,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
'1798',900,54700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2393',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'3379',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63700,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107032 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107032
index 2d9274a4..976d1fb1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107032
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107032
@@ -1,6 +1,8 @@
'1798',200,60400,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
-'1803',200,62900,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,64700,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,64700,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62900,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,64700,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
'1798',900,54700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2393',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'3379',900,64700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,63700,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107033
index 2b7ebbc9..62f50507 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107033
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107033
@@ -1,6 +1,8 @@
'1798',200,60400,,'',0,2300,,'',0,3100,,'',0,7400,,'',0,6800,,'',0,2200,,'',0,2100,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
-'1803',200,62900,,'',0,8500,,'',0,3600,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,64700,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8100,,'',0
+'2393',200,64700,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8100,,'',0
+'3379',200,62900,,'',0,8500,,'',0,3600,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,64700,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8700,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8100,,'',0
'1798',900,54800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,64800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2393',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'3379',900,64800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,63800,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107034
index bb6d2126..eb65f73e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107034
@@ -1,6 +1,8 @@
'1798',200,60500,,'',0,2300,,'',0,3100,,'',0,7400,,'',0,6800,,'',0,2200,,'',0,2100,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,1500,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
-'1803',200,63000,,'',0,8500,,'',0,3600,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,64800,,'',0,8300,,'',0,8200,,'',0,8700,,'',0,4600,,'',0,8700,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8100,,'',0
+'2393',200,64800,,'',0,8300,,'',0,8200,,'',0,8700,,'',0,4600,,'',0,8700,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8100,,'',0
+'3379',200,63000,,'',0,8500,,'',0,3600,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,64800,,'',0,8300,,'',0,8200,,'',0,8700,,'',0,4600,,'',0,8700,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8100,,'',0
'1798',900,54900,,'',0,10000,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,64900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2393',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'3379',900,64900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63900,,'',0,17000,,'',0,13000,,'',0,16200,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107035
index 9f059045..46e2c81d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107035
@@ -1,6 +1,8 @@
'1798',200,60700,,'',0,2300,,'',0,7100,,'',0,3300,,'',0,6800,,'',0,2200,,'',0,2100,,'',0,5700,,'',0,1800,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,5800,,'',0,1800,,'',0,2000,,'',0,1500,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,2900,,'',0
-'1803',200,63200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,65000,,'',0,8300,,'',0,8200,,'',0,8700,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,65000,,'',0,8300,,'',0,8200,,'',0,8700,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,63200,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,65000,,'',0,8300,,'',0,8200,,'',0,8700,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,9100,,'',0,5200,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,4600,,'',0,8900,,'',0,8200,,'',0
'1798',900,55000,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2393',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'3379',900,65000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,64000,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107036 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107036
index df6f0b43..f8c1967b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107036
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107036
@@ -1,3 +1,4 @@
'1798',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2393',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'3379',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107037
index df6f0b43..f8c1967b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107037
@@ -1,3 +1,4 @@
'1798',900,55100,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'2393',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
+'3379',900,65100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,64100,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107038
index 129256f7..1a455539 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107038
@@ -1,3 +1,4 @@
'1798',900,55100,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107039
index 336ae5fb..649debd8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107039
@@ -1,3 +1,4 @@
'1798',900,55200,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,64200,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107040
index f3fe93ed..4c895912 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107040
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107040
@@ -1,3 +1,4 @@
'1798',900,55200,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107041
index ce5aeb8e..2b369c3a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107041
@@ -1,3 +1,4 @@
'1798',900,55300,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,64300,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107042
index 6ec3889f..9347b0d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107042
@@ -1,3 +1,4 @@
'1798',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107043
index 6ec3889f..9347b0d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107043
@@ -1,3 +1,4 @@
'1798',900,55300,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65300,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107044
index 6ae1a8c6..bda655d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107044
@@ -1,3 +1,4 @@
'1798',900,55400,,'',0,10100,,'',0,10100,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
-'2919',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,10000,,'',0
+'3380',900,64400,,'',0,17000,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107045
index 7c855ef6..b7d59365 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107045
@@ -1,5 +1,6 @@
'1798',900,55400,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,14500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
'1798',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107046
index 152856d5..1c3f7e6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107046
@@ -1,5 +1,6 @@
'1798',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
'1798',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107047
index 152856d5..1c3f7e6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107047
@@ -1,5 +1,6 @@
'1798',900,55500,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65500,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
'1798',1501,62300,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90800,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107048
index 7e515ba6..76f23644 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107048
@@ -1,3 +1,4 @@
'1798',900,55600,,'',0,10100,,'',0,10200,,'',0,9900,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107049
index d7d6fac4..71aaa3b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107049
@@ -1,3 +1,4 @@
'1798',900,55600,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65600,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107050
index 85fcf5a3..2ccfcd31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107050
@@ -1,3 +1,4 @@
'1798',900,55700,,'',0,10100,,'',0,14300,,'',0,5800,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,10100,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65700,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65700,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64700,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107051 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107051
index fcf66354..a9e08b68 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107051
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107051
@@ -1,3 +1,4 @@
'1798',900,55800,,'',0,10100,,'',0,14300,,'',0,9800,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10100,,'',0,14100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65800,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65800,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107052 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107052
index 7bcc9ac2..80371a31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107052
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107052
@@ -1,3 +1,4 @@
'1798',900,55900,,'',0,14100,,'',0,10200,,'',0,9900,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,14100,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',900,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107053
index e738e12f..6a4f1b5b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107053
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107053
@@ -1,6 +1,8 @@
'1798',900,55900,4,'',0,14100,4,'',0,10300,4,'',0,9800,4,'',0,5600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,14100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
'1798',901,55900,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,14100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',900,65900,4,'',0,9300,4,'',0,9800,4,'',0,10100,4,'',0,10500,4,'',0,10300,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,9900,4,'',0
-'1803',901,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0
-'2919',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0
+'2393',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',900,65900,4,'',0,9300,4,'',0,9800,4,'',0,10100,4,'',0,10500,4,'',0,10300,4,'',0,14500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0,10200,4,'',0,9900,4,'',0
+'3379',901,65900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',900,64900,4,'',0,17100,4,'',0,13000,4,'',0,16300,4,'',0,13100,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,11900,4,'',0,17500,4,'',0
+'3380',901,64900,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107054 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107054
index d3d698c4..25b7265e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107054
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107054
@@ -1,3 +1,4 @@
'1798',901,60000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70000,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70000,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65000,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107055
index f1cc20cc..cdf6bd8d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107055
@@ -1,3 +1,4 @@
'1798',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107056
index 7f3b4e74..670af050 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107056
@@ -1,5 +1,6 @@
'1798',901,60100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,5600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,14200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70100,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65100,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
'1798',1500,64100,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107057
index dd7a6a26..d01efc61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107057
@@ -1,5 +1,6 @@
'1798',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
'1798',1500,64200,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107058
index 5876310e..5947039e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107058
@@ -1,3 +1,4 @@
'1798',901,60200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70200,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,14300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65200,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107059
index d0c3568f..68a4ec94 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107059
@@ -1,3 +1,4 @@
'1798',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107060 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107060
index d0c3568f..68a4ec94 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107060
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107060
@@ -1,3 +1,4 @@
'1798',901,60300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70300,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65300,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107061
index ece64844..c4361ef4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107061
@@ -1,5 +1,6 @@
'1798',901,60400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70400,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70400,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65400,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
'1798',1501,62300,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90700,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107062
index f9d509f6..5415f17c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107062
@@ -1,2 +1,2 @@
'1798',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107063
index 834f3f79..3e4e895f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107063
@@ -1,3 +1,4 @@
'1798',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107064
index 834f3f79..3e4e895f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107064
@@ -1,3 +1,4 @@
'1798',901,60500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70500,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65500,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107065 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107065
index 8447a71e..3bb66550 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107065
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107065
@@ -1,3 +1,4 @@
'1798',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107066 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107066
index 8447a71e..3bb66550 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107066
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107066
@@ -1,3 +1,4 @@
'1798',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107067
index 8447a71e..3bb66550 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107067
@@ -1,3 +1,4 @@
'1798',901,60600,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70600,,'',0,5300,,'',0,9800,,'',0,10100,,'',0,14500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65600,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107068
index 1b4fb02d..652d3798 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107068
@@ -1,3 +1,4 @@
'1798',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107069
index 1b4fb02d..652d3798 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107069
@@ -1,3 +1,4 @@
'1798',901,60800,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70800,,'',0,9300,,'',0,5800,,'',0,14100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65800,,'',0,17100,,'',0,13000,,'',0,16300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107070
index c2202dc0..4999bd49 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107070
@@ -1,6 +1,8 @@
'1798',201,51500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,60700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'2919',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,60700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'3380',201,62100,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,60900,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,70900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,70900,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65900,,'',0,17100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107071
index e2e53191..c3ad1961 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107071
@@ -1,6 +1,8 @@
'1798',201,51600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,60800,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'2919',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,60800,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'3380',201,62200,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,61000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',901,70900,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2393',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,70900,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,65900,,'',0,17100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107072
index c066ca95..9e868d8e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107072
@@ -1,6 +1,8 @@
'1798',201,51700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1600,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5700,,'',0,1700,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,60900,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'2919',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,60900,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'3380',201,62300,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107073 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107073
index 2a509c43..7918a6af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107073
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107073
@@ -1,6 +1,8 @@
'1798',201,51800,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'2919',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'3380',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,61100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,71100,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70100,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107074 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107074
index 03e19ede..05c2819e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107074
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107074
@@ -1,6 +1,8 @@
'1798',201,51800,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'2919',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,61000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'3380',201,62400,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,61200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0
-'1803',901,71200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,71200,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70200,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107075 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107075
index c2d4d0c3..8df562ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107075
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107075
@@ -1,6 +1,8 @@
'1798',201,51900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1600,,'',0,2000,,'',0,6400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2393',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107076 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107076
index 7ffc048c..47faebdb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107076
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107076
@@ -1,6 +1,8 @@
'1798',201,51900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,2000,,'',0,6500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,61100,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,62500,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,61300,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2393',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,71200,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70200,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107077
index fb3e9112..24d8e9c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107077
@@ -1,6 +1,8 @@
'1798',201,52000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1600,,'',0,1600,,'',0,6000,,'',0,2500,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2393',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107078
index fe9ff860..c5b18c0a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107078
@@ -1,7 +1,9 @@
'1798',201,52000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5800,,'',0,1600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,61200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,62600,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',901,61400,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10400,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'2393',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,71300,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70300,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17400,,'',0
'1798',1601,80600,,'',0,11900,,'',0,68500,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107079
index fedecc7f..f3d99b35 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107079
@@ -1,18 +1,23 @@
'1798',100,54600,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2700,,'',0,6200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62900,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
-'2919',100,62600,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'2393',100,62600,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'3379',100,62900,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'3380',100,62600,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
'1798',201,52100,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,61300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,61300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,62700,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',300,60100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60500,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,64800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,64800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60500,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,64800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
-'2919',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'3380',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',901,61500,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10300,0,'Montrose Exch',0,9800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10200,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10500,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',901,71400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'2393',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
+'3379',901,71400,,'',0,9300,,'',0,9800,,'',0,10100,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70400,,'',0,13100,,'',0,17000,,'',0,12300,,'',0,13100,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,11900,,'',0,17500,,'',0
'1798',1500,65000,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,93300,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'3379',1500,93300,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
'1798',1601,80700,,'',0,11900,,'',0,68400,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107081
index 95855e71..1a8b322a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107081
@@ -1,7 +1,10 @@
'1798',201,52300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'1803',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'1803',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'2393',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107082
index d2b296ea..8d316989 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107082
@@ -1,7 +1,10 @@
'1798',201,52400,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,1700,,'',0,2100,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'1803',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'1803',901,71700,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'2393',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71800,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,71700,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70700,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107083 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107083
index 4e62307a..b90e37c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107083
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107083
@@ -1,11 +1,15 @@
'1798',201,52500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1700,,'',0,6200,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'1803',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,61600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63000,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71800,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',500,61900,,'',0,9300,,'',0,3500,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
-'2919',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'1803',901,71700,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'2393',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'3380',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'3379',901,71700,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70700,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
'1798',1200,73800,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11800,,'',0,17700,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107084 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107084
index 2b3a94b7..0eb71d11 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107084
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107084
@@ -1,11 +1,15 @@
'1798',201,52600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'1803',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',500,62000,,'',0,9300,,'',0,3400,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,7500,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
-'2919',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'1803',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'2393',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'3380',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'3379',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
'1798',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15700,,'',0,11600,,'',0,11900,,'',0,17600,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107085 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107085
index 3f643eda..375a0e3d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107085
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107085
@@ -1,18 +1,25 @@
'1798',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
-'2919',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'3380',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
'1798',201,52600,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'1803',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,61700,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63100,,'',0,8200,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,15500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71900,,'',0,20400,,'',0,12600,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',500,62000,,'',0,9300,,'',0,3500,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,7400,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
-'2919',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
-'1803',701,74000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'1803',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'2393',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,71400,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'3380',500,65000,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',701,63900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,74000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
+'3379',901,71800,,'',0,9300,,'',0,9800,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,9900,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70800,,'',0,13100,,'',0,17200,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17300,,'',0
'1798',1200,73900,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,15800,,'',0,11600,,'',0,11900,,'',0,17600,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
-'1803',1000701,64100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,25200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,74200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,74200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,64100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,25200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,74200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107087 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107087
index 4d4ff78f..ff7c350a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107087
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107087
@@ -1,11 +1,14 @@
'1798',101,54800,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0
-'1803',101,62100,,'',0,3800,,'',0,8700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
-'2919',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2393',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'3379',101,62100,,'',0,3800,,'',0,8700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
+'3380',101,62500,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
'1798',201,53000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
'1798',1701,62700,,'',0,3200,,'',0,8700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60100,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,11100,,'',0,15700,,'',0,12900,,'',0,7100,,'',0,4500,,'',0,8600,,'',0,10200,,'',0,15900,,'',0,11300,,'',0
-'1803',2101,73800,,'',0,20000,,'',0,11600,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'2393',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'3379',2101,73800,,'',0,20000,,'',0,11600,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90000,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
'1798',1002101,72000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107088
index e5fe18f0..895063e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107088
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107088
@@ -1,11 +1,14 @@
'1798',101,54900,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,62200,,'',0,7800,,'',0,4700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
-'2919',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,62200,,'',0,7800,,'',0,4700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
+'3380',101,62600,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
'1798',201,53100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62200,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
'1798',1701,62800,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60200,,'',0,3600,,'',0,18200,,'',0,12600,,'',0,11200,,'',0,15700,,'',0,12900,,'',0,7100,,'',0,8500,,'',0,4600,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
-'1803',2101,73800,,'',0,20000,,'',0,11700,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90000,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'2393',2101,90000,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'3379',2101,73800,,'',0,20000,,'',0,11700,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90000,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
'1798',1002101,72000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107089 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107089
index a0de9d71..af78a47e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107089
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107089
@@ -1,11 +1,14 @@
'1798',101,54900,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0
-'1803',101,62200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
-'2919',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2393',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'3379',101,62200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
+'3380',101,62600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
'1798',201,53100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
'1798',1701,62800,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60200,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,11100,,'',0,15700,,'',0,13000,,'',0,7100,,'',0,8500,,'',0,4600,,'',0,10200,,'',0,15900,,'',0,11200,,'',0
-'1803',2101,73900,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90100,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'2393',2101,90100,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'3379',2101,73900,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90100,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
'1798',1002101,72100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107090 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107090
index 98c9ac4a..e0036aea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107090
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107090
@@ -1,11 +1,14 @@
'1798',101,55000,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62300,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
-'2919',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2393',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'3379',101,62300,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2800,,'',0,8700,,'',0
+'3380',101,62700,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
'1798',201,53200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62300,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
'1798',1701,62900,,'',0,7200,,'',0,4700,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60300,,'',0,3600,,'',0,18200,,'',0,12600,,'',0,11200,,'',0,15700,,'',0,12900,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11200,,'',0
-'1803',2101,73900,,'',0,20000,,'',0,11700,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90100,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'2393',2101,90100,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'3379',2101,73900,,'',0,20000,,'',0,11700,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90100,,'',0,13000,,'',0,12600,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
'1798',1002101,72100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107091 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107091
index 75a82553..1bf656d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107091
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107091
@@ -1,11 +1,14 @@
'1798',101,55100,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2393',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'3379',101,62400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3200,,'',0,7300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,62800,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
'1798',201,53300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,62400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63800,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
'1798',1701,63000,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60400,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15100,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11200,,'',0
-'1803',2101,74100,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'2393',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'3379',2101,74100,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90300,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
'1798',1002101,72300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107092
index cdf10cc2..a51aef45 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107092
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107092
@@ -1,6 +1,8 @@
'1798',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
'1798',201,53400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,1900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,62500,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62500,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63900,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107093
index 35862702..e8940220 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107093
@@ -1,6 +1,8 @@
'1798',101,55200,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,62500,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,62900,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
'1798',201,53400,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,62600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64000,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107094 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107094
index e6968de5..14f467d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107094
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107094
@@ -1,6 +1,8 @@
'1798',201,53500,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
'1798',300,54500,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55000,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55000,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107095 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107095
index 67b7f5e8..34aaafa0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107095
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107095
@@ -1,3 +1,4 @@
'1798',201,53600,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62700,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64100,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107096 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107096
index ebc1016b..582a7646 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107096
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107096
@@ -1,3 +1,4 @@
'1798',201,53700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,62800,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62800,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64200,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107097 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107097
index 98ba8f41..78b67df6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107097
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107097
@@ -1,3 +1,4 @@
'1798',201,53800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2900,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,62900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64300,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107098 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107098
index 891d5df7..452c2b7e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107098
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107098
@@ -1,3 +1,4 @@
'1798',201,53900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3379',201,63000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107099 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107099
index 1b646434..f9218462 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107099
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107099
@@ -1,3 +1,4 @@
'1798',201,54100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63200,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'3379',201,63200,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64600,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107100 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107100
index 64be8cc0..feb71d37 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107100
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107100
@@ -1,3 +1,4 @@
'1798',201,54200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'3379',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107101 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107101
index 600d123d..12d7419c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107101
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107101
@@ -1,3 +1,4 @@
'1798',201,54200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2393',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3379',201,63300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64700,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107102 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107102
index 8dde3e3d..cdd10c40 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107102
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107102
@@ -1,3 +1,4 @@
'1798',201,54300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
+'3379',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107107 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107107
index 03c4c201..4b210868 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107107
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107107
@@ -1,6 +1,8 @@
'1798',100,52500,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,60800,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
-'2919',100,60600,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,60600,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,60800,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
+'3380',100,60600,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
'1798',200,53600,,'',0,2200,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',200,60100,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2919',200,61800,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
+'2393',200,61800,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
+'3379',200,60100,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3380',200,61800,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107108 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107108
index a8f593a4..1c11e210 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107108
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107108
@@ -1,3 +1,4 @@
'1798',100,52500,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,60800,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
-'2919',100,60600,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,60600,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,60800,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
+'3380',100,60600,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107109 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107109
index 79c13436..95638910 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107109
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107109
@@ -1,3 +1,4 @@
'1798',100,52600,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,60900,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
-'2919',100,60700,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,60700,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,60900,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
+'3380',100,60700,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107110 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107110
index 7b4abb70..6311aa70 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107110
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107110
@@ -1,6 +1,8 @@
'1798',100,52600,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,60900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,60700,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,60700,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,60900,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,60700,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
'1798',200,53700,,'',0,2200,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',200,60200,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2919',200,61900,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
+'2393',200,61900,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
+'3379',200,60200,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3380',200,61900,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107111 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107111
index fa4337b9..a1185408 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107111
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107111
@@ -1,6 +1,8 @@
'1798',100,52700,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61000,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
-'2919',100,60800,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,60800,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61000,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
+'3380',100,60800,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
'1798',200,53700,,'',0,2200,,'',0,7000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2900,,'',0,6800,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',200,60200,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2919',200,61900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,61900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60200,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3380',200,61900,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107112 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107112
index 03599ddd..8ce9e045 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107112
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107112
@@ -1,3 +1,4 @@
'1798',100,52800,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61100,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,60900,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,60900,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61100,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,60900,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107113 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107113
index e0dd06c9..9df242e3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107113
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107113
@@ -1,3 +1,4 @@
'1798',100,52900,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61200,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
-'2919',100,61000,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,61000,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61200,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
+'3380',100,61000,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107115 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107115
index daed6802..a62ee266 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107115
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107115
@@ -1,3 +1,4 @@
'1798',100,53000,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61300,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61100,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,61100,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61300,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61100,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107116 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107116
index 8ae1dbeb..d91387db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107116
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107116
@@ -1,3 +1,4 @@
'1798',100,53100,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61400,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61200,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,61200,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61400,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61200,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107117 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107117
index 1157e89a..de0fdeaf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107117
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107117
@@ -1,3 +1,4 @@
'1798',100,53200,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61500,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61300,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,61300,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61500,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61300,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107118 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107118
index 701a1bd9..674404b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107118
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107118
@@ -1,3 +1,4 @@
'1798',100,53300,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61600,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61300,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,61300,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61600,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,2900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61300,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107119 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107119
index a640f652..3318e5fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107119
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107119
@@ -1,3 +1,4 @@
'1798',100,53400,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61700,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61400,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,61400,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61700,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61400,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107120 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107120
index ac196f29..d3bbca7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107120
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107120
@@ -1,3 +1,4 @@
'1798',100,53400,,'',0,8100,,'',0,3000,,'',0,7200,,'',0,2100,,'',0,2100,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61700,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61400,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,9900,,'',0
+'2393',100,61400,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61700,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61400,,'',0,3800,,'',0,8100,,'',0,8100,,'',0,8600,,'',0,4600,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4700,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107121 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107121
index ab811a6e..8b90881b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107121
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107121
@@ -1,6 +1,8 @@
'1798',301,60700,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',301,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',301,63700,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2393',301,63700,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'3379',301,70100,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',301,63700,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
'1798',500,61100,,'',0,9300,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,70600,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
-'2919',500,64200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'2393',500,64200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'3379',500,70600,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'3380',500,64200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107122 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107122
index 366f2bd0..5328ad93 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107122
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107122
@@ -1,15 +1,19 @@
'1798',300,55500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
'1798',301,60000,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1803',301,65400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2919',301,63000,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',301,63000,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3379',301,65400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3380',301,63000,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',601,55600,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'1803',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
'1798',3100,72800,,'',0,3100,,'',0,7000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,1500,,'',0,7200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'1803',3100,91900,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,91900,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64200,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,4500,,'',0,14500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'1803',1003100,84600,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,84600,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,55900,,'',0,7100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107123 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107123
index ae661077..e158ec5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107123
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107123
@@ -1,15 +1,19 @@
'1798',300,55500,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
'1798',301,60000,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'1803',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1803',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2919',301,63000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',301,63000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',300,55900,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3379',301,65400,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',300,64200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3380',301,63000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',601,55600,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
-'1803',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60500,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60100,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
'1798',3100,72800,,'',0,3100,,'',0,7000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,1500,,'',0,7200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'1803',3100,91900,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,91900,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64200,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,4500,,'',0,14500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'1803',1003100,84600,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,84600,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,55900,,'',0,7100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107124 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107124
index 87cdb458..4accc421 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107124
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107124
@@ -1,12 +1,15 @@
'1798',300,55600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60000,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,64300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,64300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60000,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,64300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',601,55700,,'',0,8500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5100,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'1803',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
'1798',3100,72900,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,1500,,'',0,7200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'1803',3100,92000,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92000,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64300,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,84700,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,84700,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,60000,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107125 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107125
index 5a271841..e274faac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107125
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107125
@@ -1,12 +1,15 @@
'1798',300,55700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',601,55700,,'',0,8500,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
-'1803',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60600,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60200,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
'1798',3100,72900,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'1803',3100,92000,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92000,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64300,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'1803',1003100,84700,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,84700,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,60000,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107126 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107126
index 657a263a..ecf64044 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107126
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107126
@@ -1,12 +1,15 @@
'1798',300,55700,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60100,,'',0,10000,,'',0,5800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,64400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',601,55700,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5100,,'',0,8400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'1803',601,60600,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60200,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60200,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60600,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60200,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
'1798',3100,73000,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'1803',3100,92100,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92100,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64400,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,84800,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,84800,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,60100,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107127 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107127
index 485dc2c9..8e6decc9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107127
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107127
@@ -1,9 +1,11 @@
'1798',300,55800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,64500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,64500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,64500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',3100,73000,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'1803',3100,92100,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92100,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64400,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'1803',1003100,84800,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,84800,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,60100,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107128 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107128
index 38b109e5..3532ffe7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107128
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107128
@@ -1,9 +1,11 @@
'1798',300,55900,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60300,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,64600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,64600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60300,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,64600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',3100,73100,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'1803',3100,92200,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92200,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64500,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,84900,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,84900,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,60200,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107129 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107129
index 02fe6436..11720886 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107129
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107129
@@ -1,9 +1,11 @@
'1798',300,60000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60400,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,64700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,64700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60400,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,64700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,5300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',3100,73200,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'1803',3100,92300,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92300,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64600,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,85000,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,85000,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,60300,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107130 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107130
index 4fd0877d..4ec17161 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107130
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107130
@@ -1,6 +1,8 @@
'1798',100,54900,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,63200,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
-'2919',100,62900,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'2393',100,62900,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'3379',100,63200,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'3380',100,62900,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
'1798',300,60400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60800,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,65100,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65100,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60800,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,65100,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107131 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107131
index 2a69f48a..7f196d3d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107131
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107131
@@ -1,6 +1,8 @@
'1798',100,55000,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,63200,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2500,,'',0
-'2919',100,62900,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'2393',100,62900,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'3379',100,63200,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2500,,'',0
+'3380',100,62900,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
'1798',300,60500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60800,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
-'2919',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60800,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
+'3380',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107132 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107132
index 96e3098a..94b68d0a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107132
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107132
@@ -1,6 +1,8 @@
'1798',100,55000,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,63300,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
-'2919',100,63000,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'2393',100,63000,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'3379',100,63300,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'3380',100,63000,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
'1798',300,60500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60900,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60900,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,65200,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107133 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107133
index f1d7dc14..b3c779bf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107133
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107133
@@ -1,3 +1,4 @@
'1798',300,60600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,3600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60900,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
-'2919',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60900,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
+'3380',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107134 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107134
index e0a2c488..2d761967 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107134
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107134
@@ -1,3 +1,4 @@
'1798',300,60600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3600,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,61000,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,61000,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,65300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107135 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107135
index 1a027711..c5b11f5b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107135
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107135
@@ -1,3 +1,4 @@
'1798',300,60700,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,61100,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,65400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,61100,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,65400,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107136 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107136
index 48f4367e..8ed3ab56 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107136
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107136
@@ -1,10 +1,13 @@
'1798',300,60800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,61100,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
-'2919',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,61100,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9300,,'',0
+'3380',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',700,62200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
-'1803',700,70900,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60900,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
+'2393',700,60900,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
+'3379',700,70900,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60900,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
'1798',1600,74000,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
'1798',1000700,73800,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
-'1803',1000700,60900,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,70900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,70900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60900,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,70900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107137 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107137
index 08662c0b..97b758f0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107137
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107137
@@ -1,10 +1,13 @@
'1798',300,60800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,61200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,61200,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,65500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',700,62200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
-'1803',700,70900,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60900,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
+'2393',700,60900,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
+'3379',700,70900,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60900,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
'1798',1600,74000,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
'1798',1000700,73800,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
-'1803',1000700,60900,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,70900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,70900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60900,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,70900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107138 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107138
index 76f3a8c7..e032a6c5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107138
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107138
@@ -1,3 +1,4 @@
'1798',300,61000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,61300,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
-'2919',300,65700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,61300,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,3000,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
+'3380',300,65700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107139 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107139
index acea9c78..0f8bb1d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107139
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107139
@@ -1,3 +1,4 @@
'1798',300,61100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,61400,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
-'2919',300,65800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,61400,,'',0,10000,,'',0,9900,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,5700,,'',0,9700,,'',0,9300,,'',0
+'3380',300,65800,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107140 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107140
index 1ff38eaa..534cd184 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107140
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107140
@@ -1,6 +1,8 @@
'1798',300,62500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7700,4,'',0,3800,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7100,4,'',0,3300,4,'',0,7700,4,'',0,2800,4,'',0,8500,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
'1798',301,54000,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9000,0,'Montrose Exch Only',0
-'1803',300,62800,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,2800,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,9700,4,'',0,9600,4,'',0,9300,4,'',0
-'1803',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8900,0,'Montrose Exch Only',0
-'2919',300,71200,4,'',0,9700,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,5000,4,'',0,9000,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9200,4,'',0,9000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0
-'2919',301,60900,,'',0,10800,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',300,71200,4,'',0,9700,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,5000,4,'',0,9000,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9200,4,'',0,9000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0
+'2393',301,60900,,'',0,10800,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',300,62800,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,7300,4,'',0,2800,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,9700,4,'',0,9600,4,'',0,9300,4,'',0
+'3379',301,63300,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8900,0,'Montrose Exch Only',0
+'3380',300,71200,4,'',0,9700,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,5000,4,'',0,9000,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9200,4,'',0,9000,4,'',0,9900,4,'',0,10000,4,'',0,9900,4,'',0
+'3380',301,60900,,'',0,10800,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107141 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107141
index e53c926b..189611b2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107141
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107141
@@ -1,3 +1,4 @@
'1798',300,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,62700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,9300,,'',0
-'2919',300,71100,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'2393',300,71100,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'3379',300,62700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,9300,,'',0
+'3380',300,71100,,'',0,9700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,5000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107142 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107142
index 80aaa099..664dac44 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107142
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107142
@@ -1,3 +1,4 @@
'1798',300,61500,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
-'2919',300,70200,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'2393',300,70200,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'3379',300,61800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
+'3380',300,70200,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107143 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107143
index 5ec23a94..cca9bdcb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107143
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107143
@@ -1,3 +1,4 @@
'1798',300,61700,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,5500,,'',0
-'1803',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
-'2919',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'2393',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'3379',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
+'3380',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107144 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107144
index b9226020..415e986a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107144
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107144
@@ -1,3 +1,4 @@
'1798',300,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,5500,,'',0
-'1803',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
-'2919',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'2393',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'3379',300,62000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
+'3380',300,70400,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107145 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107145
index 9565aaf0..793bb693 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107145
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107145
@@ -1,3 +1,4 @@
'1798',300,61800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,5500,,'',0
-'1803',300,62100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
-'2919',300,70500,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,5900,,'',0,10000,,'',0,9900,,'',0
+'2393',300,70500,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,5900,,'',0,10000,,'',0,9900,,'',0
+'3379',300,62100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,5300,,'',0
+'3380',300,70500,,'',0,9700,,'',0,5600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,5900,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107146 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107146
index 995d2cfd..d228209e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107146
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107146
@@ -1,3 +1,4 @@
'1798',300,61300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,3700,,'',0,6800,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
-'2919',300,70000,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'2393',300,70000,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'3379',300,61600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,5600,,'',0,9300,,'',0
+'3380',300,70000,,'',0,5700,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9000,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,5000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107147 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107147
index 382dfe64..a6597d5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107147
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107147
@@ -1,3 +1,4 @@
'1798',301,54200,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,63500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'2919',301,61100,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61100,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,63500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'3380',301,61100,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107148 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107148
index f99f3ab6..2c0b925d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107148
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107148
@@ -1,3 +1,4 @@
'1798',301,54300,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,63600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'2919',301,61200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,63600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7300,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'3380',301,61200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107149 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107149
index 66331703..01265543 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107149
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107149
@@ -1,9 +1,12 @@
'1798',301,54400,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,63700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'2919',301,61300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,63700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'3380',301,61300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
'1798',701,64400,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20700,0,'Montrose Exch',0
-'1803',701,73000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,62900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,62900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,80300,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,63100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
-'2919',1000701,73200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'3380',1000701,73200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107150 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107150
index d4aac4d4..ce3ae402 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107150
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107150
@@ -1,9 +1,12 @@
'1798',301,54500,,'',0,9100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,63800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'2919',301,61400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,63800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'3380',301,61400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
'1798',701,64500,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20700,0,'Montrose Exch',0
-'1803',701,73000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,62900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73000,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,62900,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,80300,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,63100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
-'2919',1000701,73200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63100,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'3380',1000701,73200,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107151 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107151
index 2618f56d..2bb158bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107151
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107151
@@ -1,3 +1,4 @@
'1798',301,54500,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3800,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,63900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'2919',301,61500,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61500,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,63900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'3380',301,61500,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107153 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107153
index eda3a884..60f940af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107153
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107153
@@ -1,3 +1,4 @@
'1798',301,54700,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,64100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'2919',301,61700,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61700,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,64100,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'3380',301,61700,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107154 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107154
index 9866ee37..f5cd700b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107154
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107154
@@ -1,6 +1,8 @@
'1798',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'2919',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'3380',101,61500,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
'1798',301,54700,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
-'2919',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
+'3380',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107155 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107155
index 73df9158..0feb0b3c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107155
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107155
@@ -1,6 +1,8 @@
'1798',101,53700,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'2919',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61100,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'3380',101,61600,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
'1798',301,54800,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'2919',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,64200,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'3380',301,61800,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107156 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107156
index 8944c480..8db93fd4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107156
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107156
@@ -1,6 +1,8 @@
'1798',101,53800,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61200,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'2919',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61200,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'3380',101,61600,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
'1798',301,54800,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,64300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
-'2919',301,61900,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61900,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,64300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
+'3380',301,61900,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107157 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107157
index e2dd51a1..e5257a51 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107157
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107157
@@ -1,6 +1,8 @@
'1798',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6400,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
-'2919',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2393',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'3379',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'3380',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
'1798',301,54900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
-'2919',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,0,'Montrose Exch Only',0
+'3380',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107158 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107158
index 75831464..a4671dcc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107158
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107158
@@ -1,8 +1,10 @@
'1798',301,55100,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
-'2919',301,62200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,62200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
+'3380',301,62200,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'1803',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107159 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107159
index 0a212567..91157090 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107159
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107159
@@ -1,8 +1,10 @@
'1798',301,55200,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',301,62200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,62200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,64600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',301,62200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',3101,64500,,'',0,8500,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,2900,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83400,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
+'3379',3101,83400,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
'1798',1003101,71600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10200,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90600,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,90600,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107160 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107160
index 5db79df9..df402567 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107160
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107160
@@ -1,8 +1,10 @@
'1798',301,55200,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
-'2919',301,62300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,62300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
+'3380',301,62300,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',3101,64600,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83500,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'3379',3101,83500,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
'1798',1003101,71700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90700,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,90700,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110500,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107161 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107161
index 5995185d..ebf73e89 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107161
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107161
@@ -1,8 +1,10 @@
'1798',301,55300,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',301,62300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,62300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,64700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',301,62300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',3101,64700,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83600,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'3379',3101,83600,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
'1798',1003101,71800,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90800,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,90800,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107162 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107162
index 293f262e..37eaa0d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107162
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107162
@@ -1,8 +1,10 @@
'1798',301,55300,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
-'2919',301,62400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,62400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
+'3380',301,62400,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',3101,64700,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11600,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83600,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'3379',3101,83600,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
'1798',1003101,71800,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15200,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90800,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,90800,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110600,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107163 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107163
index 9702236d..e4774a88 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107163
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107163
@@ -1,8 +1,10 @@
'1798',301,55400,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',301,62400,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,62400,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,64800,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',301,62400,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',3101,64800,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11600,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6800,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83700,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'3379',3101,83700,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
'1798',1003101,71900,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15200,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90900,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,90900,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107164 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107164
index 9d1d1ce4..56ea7eeb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107164
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107164
@@ -1,8 +1,10 @@
'1798',301,55500,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7700,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,64900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',301,62500,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,62500,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,64900,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',301,62500,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',3101,64800,,'',0,8500,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,4600,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,11600,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6800,,'',0,2900,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83700,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
+'3379',3101,83700,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
'1798',1003101,71900,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15200,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,10200,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90900,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,90900,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110700,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107165 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107165
index 99790d7b..a5d259b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107165
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107165
@@ -1,11 +1,14 @@
'1798',300,55000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
'1798',301,55500,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1803',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
-'2919',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2919',301,62600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',301,62600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3379',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0
+'3380',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3380',301,62600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',3101,64900,,'',0,8500,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,4600,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6900,,'',0,2900,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83800,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
+'3379',3101,83800,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
'1798',1003101,72000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10200,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,91000,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,91000,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107166 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107166
index 6b058739..de2cb08d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107166
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107166
@@ -1,11 +1,14 @@
'1798',300,55000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
'1798',301,55600,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1803',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2919',301,62600,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',301,62600,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',300,55400,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3379',301,65000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',300,63700,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3380',301,62600,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',3101,64900,,'',0,8500,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,4600,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,11600,,'',0,7400,,'',0,1200,,'',0,7000,,'',0,3500,,'',0,6800,,'',0,2900,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83800,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
+'3379',3101,83800,,'',0,10000,,'',0,10500,,'',0,10800,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,10900,,'',0,10900,,'',0
'1798',1003101,72000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15200,,'',0,9300,,'',0,4700,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,10200,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,91000,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,91000,,'',0,10100,,'',0,10700,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,14900,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110800,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107167 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107167
index 1522fc8e..d15cc7ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107167
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107167
@@ -1,3 +1,4 @@
'1798',101,55300,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62600,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,62600,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,63000,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107168 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107168
index 3f189ffb..d992e481 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107168
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107168
@@ -1,3 +1,4 @@
'1798',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107169 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107169
index 3f189ffb..d992e481 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107169
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107169
@@ -1,3 +1,4 @@
'1798',101,55400,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,62700,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,63100,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107170 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107170
index ecb6a294..537860f1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107170
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107170
@@ -1,3 +1,4 @@
'1798',101,55500,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62800,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,62800,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,63200,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107171 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107171
index 7fdaff68..7f2f4689 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107171
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107171
@@ -1,3 +1,4 @@
'1798',101,55600,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,62900,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,62900,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,63300,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4700,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107172 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107172
index f1e20151..067b8114 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107172
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107172
@@ -1,3 +1,4 @@
'1798',101,55700,,'',0,7000,,'',0,3100,,'',0,6000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2100,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,63000,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,63000,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,63400,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107175 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107175
index 6eb0fad7..ac61f24e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107175
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107175
@@ -1,11 +1,14 @@
'1798',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1798',500,61000,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
-'2919',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2393',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'3379',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'3380',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
'1798',1700,64800,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
'1798',2100,65300,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13500,,'',0,20500,,'',0,9300,,'',0,15600,,'',0,11200,,'',0
-'1803',2100,82700,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82700,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,95000,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152600,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107176 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107176
index 3992f0a0..7df95a2d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107176
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107176
@@ -1,11 +1,14 @@
'1798',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1798',500,61000,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
-'2919',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2393',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'3379',500,70500,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'3380',500,64100,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
'1798',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4300,,'',0,7700,,'',0,7600,,'',0
'1798',2100,65400,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13500,,'',0,20500,,'',0,9300,,'',0,15600,,'',0,11100,,'',0
-'1803',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152600,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107177 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107177
index 132ffebf..3b9c3fb3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107177
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107177
@@ -1,11 +1,14 @@
'1798',300,54300,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,54900,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1798',500,61100,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,70500,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
-'2919',500,64100,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',500,64100,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,70500,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'3380',500,64100,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
'1798',1700,64900,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
'1798',2100,65400,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13600,,'',0,20500,,'',0,9200,,'',0,15600,,'',0,11200,,'',0
-'1803',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82800,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,95100,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152700,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107178 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107178
index 8b9e9b32..36451796 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107178
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107178
@@ -1,3 +1,4 @@
'1798',300,54500,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55100,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55100,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107179 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107179
index f429d0de..f307d297 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107179
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107179
@@ -1,3 +1,4 @@
'1798',300,54600,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55100,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55100,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63300,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107180 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107180
index 445aff14..cb87b008 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107180
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107180
@@ -1,3 +1,4 @@
'1798',300,54600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55200,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55200,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107181 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107181
index eb1c7ff3..87c4d3c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107181
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107181
@@ -1,3 +1,4 @@
'1798',300,54700,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3900,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55200,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55200,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107182 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107182
index 9daa1047..dbdf3fa8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107182
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107182
@@ -1,3 +1,4 @@
'1798',300,54800,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55300,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55300,,'',0,9900,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63500,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107183 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107183
index 92d0ab0b..7c282dae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107183
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107183
@@ -1,3 +1,4 @@
'1798',300,54800,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55300,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63600,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63600,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55300,,'',0,10000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63600,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107184 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107184
index 1a893f76..27944e9d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107184
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107184
@@ -1,3 +1,4 @@
'1798',300,54900,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7900,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7800,,'',0,7100,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55300,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55300,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63600,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107185 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107185
index 22792648..9979038a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107185
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107185
@@ -1,3 +1,4 @@
'1798',100,55100,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,63400,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
-'2919',100,63100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'2393',100,63100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'3379',100,63400,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'3380',100,63100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107186 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107186
index 1fdd2d68..07360e5a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107186
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107186
@@ -1,4 +1,5 @@
'1798',100,55300,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,63500,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2500,,'',0
-'2919',100,63200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'2393',100,63200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'3379',100,63500,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2500,,'',0
+'3380',100,63200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
'1798',1201,71900,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107187 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107187
index 6c0d832e..9c28993f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107187
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107187
@@ -1,4 +1,5 @@
'1798',100,55300,,'',0,8200,,'',0,7100,,'',0,3200,,'',0,6200,,'',0,2100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6900,,'',0,2900,,'',0
-'1803',100,63500,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
-'2919',100,63200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'2393',100,63200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'3379',100,63500,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
+'3380',100,63200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
'1798',1201,71900,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107188 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107188
index 8d5c3822..b24e2393 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107188
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107188
@@ -1,4 +1,5 @@
'1798',100,55400,,'',0,8200,,'',0,7100,,'',0,3200,,'',0,6200,,'',0,2100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6900,,'',0,2900,,'',0
-'1803',100,63600,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
-'2919',100,63300,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'2393',100,63300,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'3379',100,63600,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
+'3380',100,63300,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
'1798',1201,72000,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107189 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107189
index 1189d3a1..a4186409 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107189
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107189
@@ -1,4 +1,5 @@
'1798',100,55500,,'',0,8200,,'',0,7100,,'',0,3200,,'',0,6200,,'',0,2100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,2600,,'',0,6700,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1700,,'',0,1800,,'',0,5700,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6900,,'',0,2900,,'',0
-'1803',100,63700,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
-'2919',100,63400,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'2393',100,63400,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
+'3379',100,63700,,'',0,7100,,'',0,4000,,'',0,8700,,'',0,7200,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2400,,'',0
+'3380',100,63400,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8800,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9800,,'',0
'1798',1201,72100,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107190 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107190
index dd39402b..a22f9518 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107190
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107190
@@ -1,8 +1,10 @@
'1798',100,55600,4,'',0,8200,4,'',0,7100,4,'',0,3200,4,'',0,6200,4,'',0,2100,4,'',0,800,4,'',0,2000,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1800,4,'',0,6100,4,'',0,2300,4,'',0,2000,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6600,4,'',0,2600,4,'',0,6700,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2500,4,'',0,2900,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,2800,4,'',0,6900,4,'',0,2900,4,'',0
'1798',101,53000,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',100,63800,4,'',0,7100,4,'',0,4000,4,'',0,8700,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3300,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,3400,4,'',0,7400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,2400,4,'',0
-'1803',101,60500,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
-'2919',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0
-'2919',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2393',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0
+'2393',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'3379',100,63800,4,'',0,7100,4,'',0,4000,4,'',0,8700,4,'',0,7200,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7100,4,'',0,3300,4,'',0,7100,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,3400,4,'',0,7400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,2400,4,'',0
+'3379',101,60500,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'3380',100,63500,4,'',0,7900,4,'',0,4100,4,'',0,8100,4,'',0,8600,4,'',0,8800,4,'',0,4600,4,'',0,9000,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,8800,4,'',0,8700,4,'',0,9000,4,'',0,9800,4,'',0
+'3380',101,61000,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
'1798',1200,72400,,'',0,3500,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
'1798',1201,72200,4,'',0,3500,4,'',0,8000,4,'',0,7800,4,'',0,3800,4,'',0,7300,4,'',0,11700,4,'',0,11600,4,'',0,15600,4,'',0,13900,4,'',0,7200,4,'',0,8000,4,'',0,3200,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107191 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107191
index d1490733..cffd7954 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107191
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107191
@@ -1,7 +1,10 @@
'1798',101,54400,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
-'2919',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'1803',701,73900,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63800,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'1803',1000701,64000,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,25200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,74100,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61700,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'3380',101,62100,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',701,63800,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73900,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63800,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',1000701,74100,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,64000,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,25200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,74100,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107192 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107192
index 2cd164da..5c72e847 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107192
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107192
@@ -1,7 +1,10 @@
'1798',100,54300,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62600,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
-'2919',100,62300,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,5900,,'',0
-'1803',700,70200,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60200,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'1803',1000700,60200,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
-'2919',1000700,70200,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',100,62300,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,5900,,'',0
+'3379',100,62600,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'3380',100,62300,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,5900,,'',0
+'2393',700,60200,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'3379',700,70200,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60200,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'2393',1000700,70200,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60200,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
+'3380',1000700,70200,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107193 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107193
index 355d6496..8200c574 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107193
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107193
@@ -1,7 +1,10 @@
'1798',100,54400,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2700,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62700,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,62400,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'1803',700,70300,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60300,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'1803',1000700,60300,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
-'2919',1000700,70300,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',100,62400,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'3379',100,62700,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,62400,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'2393',700,60300,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'3379',700,70300,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60300,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'2393',1000700,70300,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60300,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
+'3380',1000700,70300,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107194 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107194
index 747b7755..0b83da21 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107194
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107194
@@ -1,7 +1,10 @@
'1798',100,54500,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62800,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
-'2919',100,62500,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
-'1803',700,70400,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60400,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'1803',1000700,60400,,'',0,15500,,'',0,24100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
-'2919',1000700,70400,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',100,62500,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'3379',100,62800,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'3380',100,62500,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'2393',700,60400,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'3379',700,70400,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60400,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'2393',1000700,70400,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60400,,'',0,15500,,'',0,24100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
+'3380',1000700,70400,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107195 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107195
index 9dfe0569..22196ae5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107195
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107195
@@ -1,4 +1,5 @@
'1798',101,53200,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,60600,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
-'2919',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2393',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'3379',101,60600,,'',0,3700,,'',0,8700,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'3380',101,61100,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
'1798',1200,72500,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107196 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107196
index 44b97b93..3ce230ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107196
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107196
@@ -1,4 +1,5 @@
'1798',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,60700,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
-'2919',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2393',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'3379',101,60700,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'3380',101,61200,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
'1798',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11600,,'',0,13900,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107197 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107197
index f20fbddd..5efe6e08 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107197
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107197
@@ -1,4 +1,5 @@
'1798',101,53300,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
-'2919',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2393',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'3379',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'3380',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
'1798',1200,72600,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,13800,,'',0,7200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107198 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107198
index 86e8d827..651593ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107198
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107198
@@ -1,4 +1,5 @@
'1798',101,53600,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6400,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61000,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
-'2919',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2393',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'3379',101,61000,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'3380',101,61400,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
'1798',1200,73400,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11800,,'',0,17700,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107199 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107199
index 63fb3671..3aac38e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107199
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107199
@@ -1,7 +1,10 @@
'1798',100,54200,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62500,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
-'2919',100,62200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
-'1803',700,70100,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60100,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
-'1803',1000700,60100,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
-'2919',1000700,70100,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',100,62200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62500,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'3380',100,62200,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',700,60100,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'3379',700,70100,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60100,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'2393',1000700,70100,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60100,,'',0,15500,,'',0,20100,,'',0,24800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
+'3380',1000700,70100,,'',0,15500,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107200 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107200
index 831f8fbd..be5ab217 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107200
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107200
@@ -1,3 +1,4 @@
'1798',101,54100,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61500,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'2919',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61500,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'3380',101,61900,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107201 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107201
index 2d687614..f7212200 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107201
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107201
@@ -1,7 +1,10 @@
'1798',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61500,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
-'2919',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'1803',701,73700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'1803',1000701,63800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
-'2919',1000701,73900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61500,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'3380',101,61900,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',701,63600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',1000701,73900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
+'3380',1000701,73900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107202 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107202
index 6a243b15..afaa51f0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107202
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107202
@@ -1,7 +1,10 @@
'1798',101,54200,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61600,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'2919',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'1803',701,73700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'1803',1000701,63800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
-'2919',1000701,73900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61600,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'3380',101,62000,,'',0,8100,,'',0,4000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',701,63600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73700,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63600,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',1000701,73900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
+'3380',1000701,73900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107203 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107203
index 118e1369..16e99c3b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107203
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107203
@@ -1,7 +1,10 @@
'1798',101,54300,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61600,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
-'2919',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
-'1803',701,73800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
-'1803',1000701,63900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
-'2919',1000701,74000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61600,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8700,,'',0
+'3380',101,62000,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',701,63700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,25000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',1000701,74000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
+'3380',1000701,74000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107204 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107204
index ba12e273..40fcc742 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107204
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107204
@@ -1,3 +1,4 @@
'1798',301,60100,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,65500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',301,63100,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63100,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65500,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',301,63100,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107205 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107205
index a2657a68..42ac3c29 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107205
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107205
@@ -1,3 +1,4 @@
'1798',301,60200,,'',0,5200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,65600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',301,63200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65600,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',301,63200,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107206 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107206
index a45b5f42..9e6fdeb5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107206
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107206
@@ -1,3 +1,4 @@
'1798',301,60200,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'1803',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',301,63200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65600,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',301,63200,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107207 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107207
index bb3d38bc..743ce4e9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107207
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107207
@@ -1,3 +1,4 @@
'1798',301,60300,,'',0,5200,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,65700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',301,63300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65700,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',301,63300,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107208 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107208
index cc3ebb7d..0a04c7a0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107208
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107208
@@ -1,6 +1,8 @@
'1798',301,60300,,'',0,5300,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'1803',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',301,63300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65700,,'',0,10100,,'',0,10100,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3400,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',301,63300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',601,61100,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8500,,'',0,8700,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2393',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'3379',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107210 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107210
index d34ef73d..20127e17 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107210
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107210
@@ -1,6 +1,8 @@
'1798',301,60500,,'',0,5300,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'1803',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,2800,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65900,,'',0,14100,,'',0,10100,,'',0,3000,,'',0,2800,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',301,63500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',601,61200,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8500,,'',0,8700,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,62000,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61600,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2393',601,61600,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'3379',601,62000,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61600,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9000,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107211 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107211
index e199c00a..8134853e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107211
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107211
@@ -1,3 +1,4 @@
'1798',300,54400,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55000,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,63200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',300,63200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55000,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3400,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,63200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107213 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107213
index bd78e187..2b9cbbda 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107213
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107213
@@ -1,6 +1,8 @@
'1798',301,60800,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',301,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',301,63800,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2393',301,63800,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'3379',301,70200,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',301,63800,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
'1798',501,61100,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107214 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107214
index d79c6dce..ee3d71a5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107214
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107214
@@ -1,12 +1,16 @@
'1798',300,54200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
'1798',301,60900,4,'',0,9300,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7500,4,'',0,7600,4,'',0,3600,4,'',0,7600,4,'',0,3600,4,'',0,7800,4,'',0,7500,4,'',0,3400,4,'',0,7300,4,'',0,2900,4,'',0,7300,4,'',0,3500,4,'',0,6700,4,'',0,8500,4,'',0,4300,4,'',0,9900,4,'',0
-'1803',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'1803',301,70300,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,3500,4,'',0,6900,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,7200,4,'',0,2900,4,'',0,6900,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,9700,4,'',0,9500,4,'',0
-'2919',300,63000,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,5900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2919',301,63900,4,'',0,10900,4,'',0,9800,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,5000,4,'',0,9000,4,'',0,9700,4,'',0,10000,4,'',0
+'2393',300,63000,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,5900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',301,63900,4,'',0,10900,4,'',0,9800,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,5000,4,'',0,9000,4,'',0,9700,4,'',0,10000,4,'',0
+'3379',300,54800,,'',0,9900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3379',301,70300,4,'',0,10100,4,'',0,10100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,3500,4,'',0,6900,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,6800,4,'',0,2900,4,'',0,7200,4,'',0,2900,4,'',0,6900,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,9700,4,'',0,9500,4,'',0
+'3380',300,63000,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,5900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3380',301,63900,4,'',0,10900,4,'',0,9800,4,'',0,9700,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,5000,4,'',0,9000,4,'',0,9700,4,'',0,10000,4,'',0
'1798',500,60900,,'',0,9300,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
'1798',501,61200,4,'',0,2900,4,'',0,6800,4,'',0,2800,4,'',0,7600,4,'',0,3300,4,'',0,7000,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3800,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7800,4,'',0,3100,4,'',0,8500,4,'',0,8400,4,'',0,10000,4,'',0,9500,4,'',0
-'1803',500,70400,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
-'1803',501,64600,4,'',0,9700,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7200,4,'',0,3000,4,'',0,6900,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7400,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,9700,4,'',0,9700,4,'',0,9400,4,'',0
-'2919',500,64000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
-'2919',501,62900,4,'',0,9700,4,'',0,9500,4,'',0,9900,4,'',0,9900,4,'',0,9000,4,'',0,5000,4,'',0,9900,4,'',0,8800,4,'',0,9300,4,'',0,9300,4,'',0,9000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'2393',500,64000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'2393',501,62900,4,'',0,9700,4,'',0,9500,4,'',0,9900,4,'',0,9900,4,'',0,9000,4,'',0,5000,4,'',0,9900,4,'',0,8800,4,'',0,9300,4,'',0,9300,4,'',0,9000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3379',500,70400,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,9700,,'',0
+'3379',501,64600,4,'',0,9700,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7200,4,'',0,3000,4,'',0,6900,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7400,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,9700,4,'',0,9700,4,'',0,9400,4,'',0
+'3380',500,64000,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9700,,'',0,10000,,'',0
+'3380',501,62900,4,'',0,9700,4,'',0,9500,4,'',0,9900,4,'',0,9900,4,'',0,9000,4,'',0,5000,4,'',0,9900,4,'',0,8800,4,'',0,9300,4,'',0,9300,4,'',0,9000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107215 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107215
index dbf5855e..17939902 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107215
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107215
@@ -1,11 +1,13 @@
'1798',401,60700,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60700,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64900,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',1501,61700,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'1803',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
'1798',3100,73200,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'1803',3100,92300,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92300,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64600,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,85000,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,85000,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,60300,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107216 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107216
index f64bbffc..b6d4da55 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107216
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107216
@@ -1,5 +1,6 @@
'1798',401,60700,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,60700,,'',0,5200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60700,,'',0,5200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64900,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',1501,61700,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'1803',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107217 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107217
index afa45a70..8d8f2ec8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107217
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107217
@@ -1,5 +1,6 @@
'1798',401,60800,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',401,60800,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60800,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65000,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',1501,61800,,'',0,8300,,'',0,11800,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'1803',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107218 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107218
index c504c751..af88c5ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107218
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107218
@@ -1,5 +1,6 @@
'1798',401,60800,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,60800,,'',0,9200,,'',0,5800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60800,,'',0,9200,,'',0,5800,,'',0,10100,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65000,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',1501,61800,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'1803',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107219 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107219
index 0670f79b..f84a4ec8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107219
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107219
@@ -1,5 +1,6 @@
'1798',401,60900,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',401,60900,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60900,,'',0,9200,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65100,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',1501,61800,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20200,,'',0,5100,,'',0
-'1803',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107220 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107220
index 169fcd43..572a49a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107220
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107220
@@ -1,5 +1,6 @@
'1798',401,60900,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,60900,,'',0,9200,,'',0,5800,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60900,,'',0,9200,,'',0,5800,,'',0,14100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65100,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',1501,61900,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'1803',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107221 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107221
index a9dec098..1208f612 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107221
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107221
@@ -1,5 +1,6 @@
'1798',401,61000,,'',0,9600,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65200,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',1501,61900,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
-'1803',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90300,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107222 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107222
index 1f6041d1..907a50f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107222
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107222
@@ -1,3 +1,4 @@
'1798',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107223 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107223
index 7664bb48..9425a058 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107223
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107223
@@ -1,3 +1,4 @@
'1798',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107224 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107224
index 7664bb48..9425a058 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107224
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107224
@@ -1,3 +1,4 @@
'1798',401,61100,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65300,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107225 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107225
index 77087ba8..b56747af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107225
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107225
@@ -1,3 +1,4 @@
'1798',401,61200,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65400,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107226 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107226
index 2bbb74ac..6a6c374c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107226
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107226
@@ -1,3 +1,4 @@
'1798',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107227 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107227
index 2bbb74ac..6a6c374c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107227
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107227
@@ -1,3 +1,4 @@
'1798',401,61300,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65500,,'',0,20400,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107228 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107228
index 800e3f7d..49c772cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107228
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107228
@@ -1,3 +1,4 @@
'1798',401,61400,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65600,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107229 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107229
index 71c7e368..f52038be 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107229
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107229
@@ -1,3 +1,4 @@
'1798',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107230 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107230
index 71c7e368..f52038be 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107230
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107230
@@ -1,3 +1,4 @@
'1798',401,61500,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65700,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107231 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107231
index 7276045d..b9bae120 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107231
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107231
@@ -1,3 +1,4 @@
'1798',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107232 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107232
index 7276045d..b9bae120 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107232
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107232
@@ -1,3 +1,4 @@
'1798',401,61600,,'',0,9600,,'',0,2000,,'',0,7300,,'',0,11300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'1803',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,61600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,65800,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107234 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107234
index b0de9b04..eabc2e53 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107234
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107234
@@ -1,3 +1,4 @@
'1798',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107235 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107235
index af2297bc..13ef7713 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107235
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107235
@@ -1,3 +1,4 @@
'1798',400,61800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107236 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107236
index 44302202..f5e2d32f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107236
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107236
@@ -1,3 +1,4 @@
'1798',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,61800,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70000,,'',0,20400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107237 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107237
index 69f0e487..5d89c195 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107237
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107237
@@ -1,3 +1,4 @@
'1798',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107238 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107238
index d7150df6..9ae9a5b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107238
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107238
@@ -1,3 +1,4 @@
'1798',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107239 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107239
index d7150df6..9ae9a5b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107239
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107239
@@ -1,3 +1,4 @@
'1798',400,62200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70300,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107240 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107240
index 3d698005..23d18793 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107240
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107240
@@ -1,3 +1,4 @@
'1798',400,62300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70400,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107241 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107241
index f445730f..9b09520f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107241
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107241
@@ -1,3 +1,4 @@
'1798',400,62400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62300,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70500,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107242 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107242
index 68c9ee5a..10370a63 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107242
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107242
@@ -1,3 +1,4 @@
'1798',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107243 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107243
index 68c9ee5a..10370a63 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107243
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107243
@@ -1,3 +1,4 @@
'1798',400,62500,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70600,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107244 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107244
index 794446bc..31c3d8e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107244
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107244
@@ -1,3 +1,4 @@
'1798',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107245 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107245
index 794446bc..31c3d8e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107245
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107245
@@ -1,3 +1,4 @@
'1798',400,62600,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70700,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107246 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107246
index 75db4c2e..0f3e3855 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107246
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107246
@@ -1,3 +1,4 @@
'1798',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107247 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107247
index 75db4c2e..0f3e3855 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107247
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107247
@@ -1,3 +1,4 @@
'1798',400,62700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62600,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70800,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107248
index c4fc487b..9df5d3ea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107248
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107248
@@ -1,3 +1,4 @@
'1798',400,62800,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70900,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107249 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107249
index a8cc673c..ae14a702 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107249
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107249
@@ -1,5 +1,6 @@
'1798',400,63000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0
+'2393',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0
+'3379',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,16000,,'',0,13500,,'',0
'1798',1500,64600,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,93000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,93000,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107250 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107250
index 89ea6efa..054bb523 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107250
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107250
@@ -1,5 +1,6 @@
'1798',400,63100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
-'1803',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,62900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71100,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1500,64700,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,93000,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'3379',1500,93000,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107251 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107251
index 8c7092b1..5f4e0be4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107251
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107251
@@ -1,5 +1,6 @@
'1798',400,63200,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
-'1803',400,63000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
-'2919',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'3380',400,71200,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1500,64800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'3379',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107252 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107252
index ab68f83e..c44cbaa3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107252
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107252
@@ -1,5 +1,6 @@
'1798',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
-'1803',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
-'2919',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'3380',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1500,64800,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'3379',1500,93100,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107253 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107253
index 76a88f1a..d1fd66ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107253
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107253
@@ -1,5 +1,6 @@
'1798',400,63300,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
-'2919',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63100,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'3380',400,71300,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1500,64900,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'3379',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107254 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107254
index 79ca8c32..fef1347b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107254
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107254
@@ -1,10 +1,12 @@
'1798',400,63400,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7200,0,'Montrose Exch',0,11400,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9800,0,'Montrose Exch',0
-'1803',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
-'2919',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63200,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10400,,'',0,10100,,'',0,14300,,'',0,10000,,'',0
+'3380',400,71400,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1500,64900,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'3379',1500,93200,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
'1798',3101,64500,,'',0,8500,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83400,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'3379',3101,83400,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
'1798',1003101,71600,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90600,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,90600,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110400,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107255 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107255
index d3179ea7..cfd1dc3e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107255
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107255
@@ -1,5 +1,6 @@
'1798',3101,64400,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83300,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'3379',3101,83300,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
'1798',1003101,71500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90500,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,90500,,'',0,10100,,'',0,10600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110300,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107256 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107256
index f63cc1d9..e7aba131 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107256
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107256
@@ -1,5 +1,6 @@
'1798',3101,64300,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,4600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,7400,,'',0,1200,,'',0,3000,,'',0,7500,,'',0,6900,,'',0,3000,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,83200,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'3379',3101,83200,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
'1798',1003101,71400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15100,,'',0,5300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,8500,,'',0,12300,,'',0
-'1803',1003101,90400,,'',0,10100,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003101,90400,,'',0,10100,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,110200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107257 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107257
index c1dbee2e..31bef12e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107257
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107257
@@ -1,7 +1,10 @@
'1798',201,52300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
-'1803',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
-'1803',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'2393',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,61500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,62900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71700,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,71600,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70600,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107258 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107258
index f5028902..382eae26 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107258
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107258
@@ -1,4 +1,5 @@
'1798',501,60400,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'2919',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'3380',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1798',1201,71500,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107259 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107259
index 7536e2d7..0d4f6dc0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107259
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107259
@@ -1,4 +1,5 @@
'1798',501,60400,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'2919',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63800,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'3380',501,62100,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1798',1201,71500,,'',0,3400,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107260 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107260
index c36db470..a9a33132 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107260
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107260
@@ -1,3 +1,4 @@
'1798',501,60500,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63800,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63800,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62100,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107261 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107261
index 04a8ab19..eaa41b36 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107261
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107261
@@ -1,3 +1,4 @@
'1798',501,60500,,'',0,2800,,'',0,6800,,'',0,2600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63900,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'2919',501,62200,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62200,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63900,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'3380',501,62200,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107262 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107262
index 37367b5a..96edbd9d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107262
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107262
@@ -1,3 +1,4 @@
'1798',501,60600,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63900,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62200,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107263 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107263
index ab13aac0..5830a707 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107263
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107263
@@ -1,3 +1,4 @@
'1798',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107264 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107264
index 2736fea9..49e17094 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107264
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107264
@@ -1,3 +1,4 @@
'1798',501,60700,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64000,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62300,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107265 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107265
index 7d69a327..df6c8b22 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107265
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107265
@@ -1,3 +1,4 @@
'1798',501,60800,,'',0,2800,,'',0,6700,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107267 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107267
index 58701113..c33c3f2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107267
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107267
@@ -1,3 +1,4 @@
'1798',501,60800,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107268 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107268
index 68b48148..dba85b36 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107268
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107268
@@ -1,3 +1,4 @@
'1798',501,60900,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3200,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64200,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62500,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107270 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107270
index f6d8b6a2..1fc6dc75 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107270
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107270
@@ -1,3 +1,4 @@
'1798',501,61000,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107271 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107271
index d07cc967..dc453591 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107271
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107271
@@ -1,3 +1,4 @@
'1798',501,61000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3100,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64400,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62700,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107272 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107272
index 1e51bf6d..27194279 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107272
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107272
@@ -1,3 +1,4 @@
'1798',501,61100,,'',0,2900,,'',0,6700,,'',0,2800,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3700,,'',0,7700,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,3100,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64500,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9800,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62800,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,8900,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107273 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107273
index 729e7e15..d0aed170 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107273
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107273
@@ -1,8 +1,10 @@
'1798',601,61400,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62200,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61800,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2393',601,61800,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'3379',601,62200,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61800,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
'1798',1701,63200,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60600,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
-'1803',2101,74300,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90500,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,90500,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74300,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90500,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,72500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107274 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107274
index cbff3d94..b01a61ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107274
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107274
@@ -1,8 +1,10 @@
'1798',601,61500,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
'1798',1701,63300,,'',0,7200,,'',0,4800,,'',0,76500,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60700,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11100,,'',0
-'1803',2101,74300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,90500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,72600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107275 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107275
index dec24efd..32aa3c92 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107275
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107275
@@ -1,5 +1,6 @@
'1798',1701,63300,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60700,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
-'1803',2101,74400,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90600,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,90600,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74400,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90600,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,72600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107276 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107276
index d3e688f1..1be12a30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107276
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107276
@@ -1,5 +1,6 @@
'1798',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7800,,'',0,4400,,'',0,7600,,'',0,7600,,'',0
'1798',2100,65200,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16100,,'',0,13500,,'',0,20500,,'',0,9300,,'',0,15600,,'',0,11200,,'',0
-'1803',2100,82600,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82600,,'',0,20200,,'',0,11900,,'',0,19600,,'',0,15800,,'',0,11400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107277 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107277
index abe5926b..e1af4ea0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107277
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107277
@@ -1,3 +1,4 @@
'1798',601,61500,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2393',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'3379',601,62300,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61900,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107278 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107278
index c9424c85..c9c2c679 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107278
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107278
@@ -1,3 +1,4 @@
'1798',601,61600,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62400,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,62000,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2393',601,62000,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'3379',601,62400,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,62000,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107279 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107279
index 0d20b904..9974b22b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107279
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107279
@@ -1,3 +1,4 @@
'1798',500,61200,,'',0,9300,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3100,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,70700,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
-'2919',500,64300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'2393',500,64300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'3379',500,70700,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
+'3380',500,64300,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107280 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107280
index 1c524adf..f9147319 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107280
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107280
@@ -1,3 +1,4 @@
'1798',500,61300,,'',0,9300,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
-'2919',500,64300,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',500,64300,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,70700,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
+'3380',500,64300,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107282 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107282
index 8c9a6d07..209b4aee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107282
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107282
@@ -1,3 +1,4 @@
'1798',500,61400,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,70900,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
-'2919',500,64500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'2393',500,64500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
+'3379',500,70900,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
+'3380',500,64500,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9700,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107283 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107283
index 00943af6..d078f629 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107283
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107283
@@ -1,3 +1,4 @@
'1798',500,61600,,'',0,9300,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
-'2919',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
+'3380',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107284 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107284
index b516667a..a08e8457 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107284
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107284
@@ -1,3 +1,4 @@
'1798',500,61600,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
-'2919',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,71000,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
+'3380',500,64600,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107285 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107285
index 767e8c1a..ac0096b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107285
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107285
@@ -1,3 +1,4 @@
'1798',500,61700,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,71100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
-'2919',500,64700,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',500,64700,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,71100,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
+'3380',500,64700,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107286 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107286
index db4b9c4d..2d460126 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107286
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107286
@@ -1,4 +1,5 @@
'1798',500,61800,,'',0,9300,,'',0,3400,,'',0,7200,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,71200,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
-'2919',500,64800,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',500,64800,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,71200,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,5700,,'',0
+'3380',500,64800,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
'1798',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,17700,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107287 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107287
index 357ff84c..b8beb220 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107287
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107287
@@ -1,4 +1,5 @@
'1798',500,61900,,'',0,9300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3800,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,2900,,'',0,7300,,'',0,7500,,'',0,2700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
-'2919',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,71300,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,9700,,'',0
+'3380',500,64900,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
'1798',1200,73700,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11800,,'',0,15600,,'',0,11800,,'',0,17700,,'',0,3200,,'',0,8000,,'',0,3100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107288 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107288
index 77752aca..afb08288 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107288
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107288
@@ -1,3 +1,4 @@
'1798',601,55800,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3400,,'',0,8000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'1803',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107289 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107289
index db2c4cb3..9576a8d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107289
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107289
@@ -1,3 +1,4 @@
'1798',601,55800,,'',0,8600,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9000,,'',0,4500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,11500,,'',0,15000,,'',0
-'1803',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60700,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60300,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107290 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107290
index d758fa54..ca2bccbf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107290
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107290
@@ -1,3 +1,4 @@
'1798',601,55900,,'',0,8600,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,15500,,'',0,11000,,'',0
-'1803',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107291 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107291
index 349e0858..6e76cda8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107291
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107291
@@ -1,3 +1,4 @@
'1798',601,55900,,'',0,8600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60800,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60400,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107292 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107292
index 17d8faeb..96438d7e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107292
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107292
@@ -1,3 +1,4 @@
'1798',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107293 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107293
index 17d8faeb..96438d7e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107293
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107293
@@ -1,3 +1,4 @@
'1798',601,60000,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60900,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60500,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107294 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107294
index a9bf1f1d..c7d551b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107294
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107294
@@ -1,3 +1,4 @@
'1798',601,60100,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61000,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60600,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60600,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,61000,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60600,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107295 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107295
index 640845eb..986f6bb2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107295
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107295
@@ -1,3 +1,4 @@
'1798',601,60200,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61100,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60700,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60700,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,61100,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60700,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107296 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107296
index 559c1bae..0294fb8a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107296
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107296
@@ -1,3 +1,4 @@
'1798',601,60300,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61100,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60700,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2393',601,60700,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'3379',601,61100,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60700,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107297 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107297
index 0daaeb41..da75abf3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107297
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107297
@@ -1,3 +1,4 @@
'1798',601,60300,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8000,,'',0,9100,,'',0,4400,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61200,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,5900,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60800,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60800,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,61200,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,5900,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60800,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107298 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107298
index 6136b6ca..af5bf1b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107298
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107298
@@ -1,3 +1,4 @@
'1798',601,60400,,'',0,4600,,'',0,7100,,'',0,3600,,'',0,7500,,'',0,7400,,'',0,4000,,'',0,16000,,'',0,11500,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61200,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60800,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2393',601,60800,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'3379',601,61200,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60800,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107299 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107299
index c0946d7a..2d8f5bd7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107299
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107299
@@ -1,3 +1,4 @@
'1798',601,60400,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61300,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,9000,,'',0
-'2919',601,60900,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60900,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,61300,,'',0,12100,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,9000,,'',0
+'3380',601,60900,,'',0,13100,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107300 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107300
index 959ab649..cfea92e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107300
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107300
@@ -1,3 +1,4 @@
'1798',601,60500,,'',0,4600,,'',0,7100,,'',0,3700,,'',0,7500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61300,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,60900,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2393',601,60900,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'3379',601,61300,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,60900,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107301 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107301
index 22f959bc..535a85ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107301
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107301
@@ -1,3 +1,4 @@
'1798',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2393',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'3379',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107302 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107302
index 22f959bc..535a85ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107302
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107302
@@ -1,3 +1,4 @@
'1798',601,60600,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2393',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'3379',601,61400,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61000,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107303 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107303
index 0c328634..aa0755c7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107303
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107303
@@ -1,3 +1,4 @@
'1798',601,60700,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8100,,'',0,9100,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,3900,,'',0,8000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2393',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'3379',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,5400,,'',0,9300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107304 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107304
index 3c941c82..cb5b2b58 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107304
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107304
@@ -1,3 +1,4 @@
'1798',601,60700,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8200,,'',0,9000,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2393',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'3379',601,61500,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61100,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107305 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107305
index bc039494..535dca02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107305
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107305
@@ -1,3 +1,4 @@
'1798',601,60800,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8300,,'',0,8900,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61600,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61200,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2393',601,61200,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'3379',601,61600,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61200,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107306 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107306
index ab5cc280..39a91299 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107306
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107306
@@ -1,3 +1,4 @@
'1798',601,60900,,'',0,4600,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9900,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'2393',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
+'3379',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,10100,,'',0,15000,,'',0,9900,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107307 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107307
index ac64cdff..51c6b63a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107307
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107307
@@ -1,3 +1,4 @@
'1798',601,60900,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2393',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'3379',601,61700,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61300,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107308 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107308
index e5c5ad6d..8199864c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107308
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107308
@@ -1,3 +1,4 @@
'1798',601,61000,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,4300,,'',0,8000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61800,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61400,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2393',601,61400,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'3379',601,61800,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61400,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107309 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107309
index 6cd31855..c274d877 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107309
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107309
@@ -1,3 +1,4 @@
'1798',601,61100,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8400,,'',0,8800,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,11500,,'',0,9800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2393',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'3379',601,61900,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10100,,'',0,15000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61500,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107310 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107310
index dcbee45c..bc7467fa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107310
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107310
@@ -1,3 +1,4 @@
'1798',601,61700,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107311 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107311
index dcbee45c..bc7467fa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107311
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107311
@@ -1,3 +1,4 @@
'1798',601,61700,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62500,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,62100,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107312 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107312
index 89415031..8e932257 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107312
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107312
@@ -1,3 +1,4 @@
'1798',601,61800,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62600,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,62200,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62200,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62600,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,62200,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107313 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107313
index 37e6c96a..01019175 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107313
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107313
@@ -1,3 +1,4 @@
'1798',601,61900,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107314 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107314
index 7a685dc5..345acf0a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107314
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107314
@@ -1,3 +1,4 @@
'1798',601,61900,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62700,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,62300,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107315 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107315
index 1d1f5ea8..f1f76383 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107315
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107315
@@ -1,3 +1,4 @@
'1798',601,61900,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
-'1803',601,62700,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
-'2919',601,62300,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62300,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62700,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
+'3380',601,62300,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107316 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107316
index 5e75350b..d0d10708 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107316
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107316
@@ -1,3 +1,4 @@
'1798',601,62000,,'',0,8900,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12100,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8600,,'',0,8200,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,10900,,'',0
-'1803',601,62800,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
-'2919',601,62400,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62400,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62800,,'',0,12100,,'',0,10200,,'',0,10000,,'',0,10500,,'',0,10300,,'',0,14600,,'',0,10500,,'',0,10100,,'',0,10900,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,8900,,'',0
+'3380',601,62400,,'',0,13100,,'',0,9700,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107317 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107317
index 2741fc3b..6779baa0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107317
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107317
@@ -1,3 +1,4 @@
'1798',601,62100,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,8000,,'',0,12200,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7800,,'',0,3800,,'',0,15500,,'',0,9800,,'',0,11500,,'',0,11000,,'',0
-'1803',601,62900,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,62500,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'2393',601,62500,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
+'3379',601,62900,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10300,,'',0,14700,,'',0,10500,,'',0,10100,,'',0,10800,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,62500,,'',0,13100,,'',0,9600,,'',0,15100,,'',0,4600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107318 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107318
index 577e6f92..b9dc91a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107318
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107318
@@ -1,7 +1,9 @@
'1798',700,62000,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0,20900,,'',0
-'1803',700,70700,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60700,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'2393',700,60700,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'3379',700,70700,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60700,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
'1798',1600,73800,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
'1798',1000700,73600,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,20000,,'',0,20000,,'',0
-'1803',1000700,60700,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
-'2919',1000700,70700,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,70700,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60700,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
+'3380',1000700,70700,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107319 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107319
index ae791967..38b3512a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107319
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107319
@@ -1,7 +1,9 @@
'1798',700,62100,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0,20900,,'',0
-'1803',700,70800,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60800,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'2393',700,60800,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'3379',700,70800,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60800,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
'1798',1600,73900,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
'1798',1000700,73700,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,20000,,'',0,20000,,'',0
-'1803',1000700,60800,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
-'2919',1000700,70800,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,70800,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60800,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
+'3380',1000700,70800,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107320 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107320
index 737b951e..4f53e4da 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107320
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107320
@@ -1,7 +1,9 @@
'1798',700,62100,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
-'1803',700,70800,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60800,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
+'2393',700,60800,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
+'3379',700,70800,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60800,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,15800,,'',0,16500,,'',0
'1798',1600,73900,,'',0,12000,,'',0,68400,,'',0,8500,,'',0
'1798',1000700,73700,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
-'1803',1000700,60800,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,70800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,15900,,'',0
+'2393',1000700,70800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,15900,,'',0
+'3379',1000700,60800,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,70800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,15900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107321 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107321
index ff73cd44..4503444e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107321
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107321
@@ -1,7 +1,9 @@
'1798',700,62300,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
-'1803',700,71000,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,61000,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61000,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71000,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,61000,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1600,74100,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
'1798',1000700,73900,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
-'1803',1000700,61000,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61000,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107322 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107322
index 57bf5204..b8012a7d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107322
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107322
@@ -1,6 +1,8 @@
'1798',700,62400,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71100,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71100,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74000,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107324 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107324
index ee2f65d9..6772fc86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107324
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107324
@@ -1,6 +1,8 @@
'1798',700,62500,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71200,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71200,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74100,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107325 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107325
index ee2f65d9..6772fc86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107325
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107325
@@ -1,6 +1,8 @@
'1798',700,62500,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71200,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71200,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74100,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107326 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107326
index 4a361cc3..eabe2f29 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107326
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107326
@@ -1,6 +1,8 @@
'1798',700,62600,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71300,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71300,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74200,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107327 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107327
index d8fc3026..dabf24e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107327
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107327
@@ -1,6 +1,8 @@
'1798',700,62600,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71300,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71300,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74200,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107328 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107328
index 1fe8b656..8856f41d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107328
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107328
@@ -1,6 +1,8 @@
'1798',700,62700,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74300,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61300,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71400,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71400,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61300,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71400,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107329 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107329
index ffaf47c4..4431f920 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107329
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107329
@@ -1,6 +1,8 @@
'1798',700,62800,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74400,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61400,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71500,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71500,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61400,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71500,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107330 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107330
index ffaf47c4..4431f920 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107330
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107330
@@ -1,6 +1,8 @@
'1798',700,62800,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74400,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61400,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71500,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71500,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61400,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71500,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107331 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107331
index e3234bee..45987b3a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107331
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107331
@@ -1,7 +1,9 @@
'1798',700,62900,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1600,74700,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
'1798',1000700,74500,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107332 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107332
index 88bc7ff8..4971882e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107332
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107332
@@ -1,7 +1,9 @@
'1798',700,63000,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1600,74800,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
'1798',1000700,74600,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61600,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71700,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71700,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61600,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71700,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107333 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107333
index 6124aa84..97b02600 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107333
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107333
@@ -1,7 +1,9 @@
'1798',700,63000,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,20900,,'',0
-'1803',700,71700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1600,74900,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
'1798',1000700,74600,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61600,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71700,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71700,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61600,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71700,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107334 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107334
index 750c27ba..c1f3e722 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107334
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107334
@@ -1,7 +1,9 @@
'1798',700,63100,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,24900,,'',0
-'1803',700,71800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1600,74900,,'',0,16000,,'',0,64400,,'',0,8500,,'',0
'1798',1000700,74700,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61700,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61700,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107335 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107335
index de5bd245..55fa458a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107335
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107335
@@ -1,7 +1,9 @@
'1798',700,63100,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,24900,,'',0
-'1803',700,71800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1600,75000,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
'1798',1000700,74700,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61700,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61700,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71800,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107336 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107336
index fea7655f..68a9da8c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107336
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107336
@@ -1,6 +1,8 @@
'1798',700,63200,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20600,,'',0,20300,,'',0,19900,,'',0,24900,,'',0
-'1803',700,71900,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61800,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61800,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71900,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61800,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74800,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20600,,'',0,6500,,'',0,13900,,'',0,19900,,'',0,19900,,'',0
-'1803',1000700,61800,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61800,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71900,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107337 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107337
index edb22141..9dc54e6f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107337
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107337
@@ -1,6 +1,8 @@
'1798',700,63300,4,'',0,21100,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20600,4,'',0,20300,4,'',0,19900,4,'',0,24900,4,'',0
'1798',701,63300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',700,72000,4,'',0,18600,4,'',0,21600,4,'',0,21000,4,'',0,21000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,16900,4,'',0
-'1803',701,72000,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
-'2919',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
+'2393',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,72000,4,'',0,18600,4,'',0,21600,4,'',0,21000,4,'',0,21000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,16900,4,'',0
+'3379',701,72000,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',700,61900,4,'',0,20200,4,'',0,19100,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
+'3380',701,61900,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107338 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107338
index 01cdedf3..a4af876a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107338
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107338
@@ -1,6 +1,8 @@
'1798',701,63400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72100,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72100,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75000,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000701,72100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000701,72100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000701,62000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000701,72100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107339 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107339
index 01cdedf3..a4af876a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107339
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107339
@@ -1,6 +1,8 @@
'1798',701,63400,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72100,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72100,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62000,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75000,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000701,72100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000701,72100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000701,62000,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000701,72100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107340 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107340
index f57dd6c5..9b1713ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107340
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107340
@@ -1,6 +1,8 @@
'1798',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75100,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000701,72200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000701,72200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000701,62100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000701,72200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107341 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107341
index f57dd6c5..9b1713ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107341
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107341
@@ -1,6 +1,8 @@
'1798',701,63500,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75100,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000701,72200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000701,72200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000701,62100,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000701,72200,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107342 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107342
index 4348b1d8..a81ac253 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107342
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107342
@@ -1,6 +1,8 @@
'1798',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72200,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62100,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75200,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62100,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,72200,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,72200,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62100,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,72200,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107343 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107343
index 1b9d54ae..41d30968 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107343
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107343
@@ -1,6 +1,8 @@
'1798',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72300,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72300,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75200,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000701,72300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000701,72300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000701,62200,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000701,72300,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107344 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107344
index 55affd30..6a22f24c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107344
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107344
@@ -1,6 +1,8 @@
'1798',701,63600,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72300,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72300,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62200,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75300,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62200,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,72300,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,72300,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62200,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,72300,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107345 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107345
index ed44edd3..2eae5d58 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107345
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107345
@@ -1,6 +1,8 @@
'1798',701,63700,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75300,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62300,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000701,72400,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000701,72400,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000701,62300,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000701,72400,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107346 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107346
index f4bfa8ef..4473951d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107346
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107346
@@ -1,6 +1,8 @@
'1798',701,63800,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
-'2919',701,62300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72400,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,16900,,'',0
+'3380',701,62300,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75400,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62300,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,72400,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,72400,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62300,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,72400,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107347 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107347
index ed7eb669..1d4e1693 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107347
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107347
@@ -1,6 +1,8 @@
'1798',701,63900,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
-'2919',701,62400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72500,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
+'3380',701,62400,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,75500,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62400,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,72500,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,72500,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62400,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,72500,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107348 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107348
index 332de17f..70c1ea05 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107348
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107348
@@ -1,4 +1,5 @@
'1798',1601,75600,,'',0,15900,,'',0,64400,,'',0,8500,,'',0
'1798',1000701,75500,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,15900,0,'Montrose Exch',0
-'1803',1000701,62500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000701,62500,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000701,72600,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107349 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107349
index 8a84f01d..b4a7eea6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107349
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107349
@@ -1,4 +1,5 @@
'1798',1601,75700,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
'1798',1000701,75700,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62600,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62600,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,72700,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107350 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107350
index 76a100ca..26e717f7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107350
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107350
@@ -1,7 +1,9 @@
'1798',201,51400,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5700,,'',0,1700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,60600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'2919',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,60600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'3380',201,62000,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',1601,75800,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
'1798',1000701,75800,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62700,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62700,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,72800,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107351 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107351
index 2338d6a0..1d6c310e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107351
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107351
@@ -1,4 +1,5 @@
'1798',1601,75900,,'',0,15900,,'',0,68400,,'',0,4500,,'',0
'1798',1000701,75900,0,'Montrose Exch',0,5900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62800,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
-'2919',1000701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62800,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,20400,,'',0
+'3380',1000701,72900,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107352 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107352
index 91ecf270..5836c746 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107352
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107352
@@ -1,4 +1,5 @@
'1798',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
'1798',1000701,80000,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
-'2919',1000701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62800,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'3380',1000701,72900,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107353 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107353
index 33078466..97bff6b1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107353
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107353
@@ -1,7 +1,9 @@
'1798',701,64200,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
-'1803',701,72800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
-'2919',701,62700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72800,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
+'3380',701,62700,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
'1798',1000701,80000,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62900,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
-'2919',1000701,73000,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73000,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62900,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'3380',1000701,73000,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107354 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107354
index 1190755c..2b5f0fc0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107354
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107354
@@ -1,7 +1,9 @@
'1798',701,64200,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
-'1803',701,72800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,62700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,62700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1601,80000,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
'1798',1000701,80100,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
-'2919',1000701,73000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'3380',1000701,73000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107355 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107355
index 269916ab..ee927d21 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107355
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107355
@@ -1,7 +1,9 @@
'1798',701,64200,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
-'1803',701,72800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,62700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72800,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,62700,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1601,80100,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
'1798',1000701,80100,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,62900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
-'2919',1000701,73000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,62900,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'3380',1000701,73000,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107356 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107356
index 7a971ba2..020496b6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107356
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107356
@@ -1,7 +1,9 @@
'1798',701,64300,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
-'1803',701,72900,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
-'2919',701,62800,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62800,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72900,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
+'3380',701,62800,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1601,80100,,'',0,11900,,'',0,68400,,'',0,4500,,'',0
'1798',1000701,80100,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,63000,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
-'2919',1000701,73100,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73100,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63000,,'',0,19700,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'3380',1000701,73100,,'',0,19600,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107357 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107357
index 8b9859e8..c00f73b5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107357
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107357
@@ -1,6 +1,8 @@
'1798',701,64300,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20800,0,'Montrose Exch',0
-'1803',701,72900,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,62800,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62800,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72900,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,62800,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,80200,0,'Montrose Exch',0,1900,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,24600,0,'Montrose Exch',0,2500,0,'Montrose Exch',0,17800,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,63000,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
-'2919',1000701,73100,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73100,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63000,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,20800,,'',0,24400,,'',0
+'3380',1000701,73100,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107374 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107374
index 1c0585a6..20562fe9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107374
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107374
@@ -1,2 +1,2 @@
'1798',1501,62000,,'',0,8300,,'',0,11800,,'',0,68400,,'',0,20200,,'',0,5100,,'',0
-'1803',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107375 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107375
index 645f456c..b8a7b0c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107375
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107375
@@ -1,2 +1,2 @@
'1798',1500,64400,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107377 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107377
index c76275d3..341cde4f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107377
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107377
@@ -1,2 +1,2 @@
'1798',1500,64000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92400,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107378 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107378
index 4a91a388..d132f9a5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107378
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107378
@@ -1,2 +1,2 @@
'1798',1501,62400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90900,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107379 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107379
index 8a4da8da..a9e90f7f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107379
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107379
@@ -1,2 +1,2 @@
'1798',1501,62500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,91000,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107380 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107380
index c64555c0..1204a71a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107380
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107380
@@ -1,2 +1,2 @@
'1798',1501,62700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,91200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,91200,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107381 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107381
index 320def46..9f8ac115 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107381
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107381
@@ -1,2 +1,2 @@
'1798',1501,62900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,91400,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107382 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107382
index 0c7447eb..9f5bd520 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107382
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107382
@@ -1,2 +1,2 @@
'1798',1501,63000,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1501,91500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107383 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107383
index c687f50a..a6e22fc0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107383
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107383
@@ -1,2 +1,2 @@
'1798',1501,63100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107384 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107384
index 1f2e9c85..470673b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107384
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107384
@@ -1,2 +1,2 @@
'1798',1501,63200,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1501,91600,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107385 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107385
index d889cf99..9f3244ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107385
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107385
@@ -1,4 +1,4 @@
'1798',1500,63400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
'1798',1501,63400,4,'',0,8300,4,'',0,11900,4,'',0,68400,4,'',0,20300,4,'',0,9000,4,'',0
-'1803',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
-'1803',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
+'3379',1500,91800,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1501,91800,4,'',0,18500,4,'',0,43000,4,'',0,18500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107386 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107386
index f098c0d8..1d3410e5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107386
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107386
@@ -1,2 +1,2 @@
'1798',1500,63500,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,91900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107387 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107387
index fe72bc18..1630d563 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107387
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107387
@@ -1,2 +1,2 @@
'1798',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107388 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107388
index fe72bc18..1630d563 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107388
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107388
@@ -1,2 +1,2 @@
'1798',1500,63700,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92100,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107389 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107389
index c6f61d5a..aebc0dd2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107389
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107389
@@ -1,2 +1,2 @@
'1798',1500,63900,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92300,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107390 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107390
index f9d509f6..5415f17c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107390
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107390
@@ -1,2 +1,2 @@
'1798',1500,64100,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92500,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107391 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107391
index 9ee53e5e..a74e1f5b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107391
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107391
@@ -1,2 +1,2 @@
'1798',1500,64500,,'',0,8300,,'',0,12000,,'',0,68300,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92900,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107392 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107392
index f90cb227..a30565fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107392
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107392
@@ -1,6 +1,8 @@
'1798',701,64900,0,'Montrose Exch',0,25200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20600,0,'Montrose Exch',0
-'1803',701,73400,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63300,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,63300,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73400,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63300,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,80700,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,17500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,63500,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
-'2919',1000701,73600,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73600,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63500,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
+'3380',1000701,73600,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107393 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107393
index 75ef4fed..33e4b89d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107393
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107393
@@ -1,6 +1,8 @@
'1798',701,64700,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20600,0,'Montrose Exch',0
-'1803',701,73200,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63100,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,63100,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73200,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63100,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,80500,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,17500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'1803',1000701,63300,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
-'2919',1000701,73400,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73400,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63300,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
+'3380',1000701,73400,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107408 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107408
index ffbd1326..b31f40e4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107408
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107408
@@ -1,5 +1,6 @@
'1798',1701,63100,,'',0,7200,,'',0,4800,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60500,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15100,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8500,,'',0,4600,,'',0,10100,,'',0,15900,,'',0,11200,,'',0
-'1803',2101,74200,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90400,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,17300,,'',0
+'2393',2101,90400,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,17300,,'',0
+'3379',2101,74200,,'',0,20000,,'',0,11600,,'',0,18800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90400,,'',0,13000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,17300,,'',0
'1798',1002101,72400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107409 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107409
index f4612204..a0524078 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107409
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107409
@@ -1,5 +1,6 @@
'1798',1701,63400,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60800,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
-'1803',2101,74500,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74500,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90700,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,72700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107410 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107410
index 555b9496..0713a79e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107410
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107410
@@ -1,5 +1,6 @@
'1798',1701,63500,,'',0,7200,,'',0,4900,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',2101,60900,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
-'1803',2101,74600,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74600,,'',0,20000,,'',0,15700,,'',0,14800,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90800,,'',0,13000,,'',0,16600,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,72800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107414 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107414
index 00101f8b..b018180b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107414
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107414
@@ -1,5 +1,6 @@
'1798',1700,64400,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
'1798',2100,64900,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13400,,'',0,20400,,'',0,9600,,'',0,11600,,'',0,15200,,'',0
-'1803',2100,82300,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82300,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94600,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152000,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107415 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107415
index f1ff79f9..bedf9a36 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107415
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107415
@@ -1,5 +1,6 @@
'1798',1700,64500,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
'1798',2100,65000,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13400,,'',0,20400,,'',0,9600,,'',0,11600,,'',0,15200,,'',0
-'1803',2100,82400,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82400,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94700,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152100,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107425 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107425
index 5945c834..4d010e92 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107425
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107425
@@ -1,5 +1,6 @@
'1798',1700,64600,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
'1798',2100,65100,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13400,,'',0,20500,,'',0,9500,,'',0,11600,,'',0,15100,,'',0
-'1803',2100,82500,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82500,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152200,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107426 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107426
index 2ab24d40..7d735e68 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107426
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107426
@@ -1,5 +1,6 @@
'1798',1700,64700,,'',0,7200,,'',0,8900,,'',0,72400,,'',0,7700,,'',0,4300,,'',0,7800,,'',0,7600,,'',0
'1798',2100,65200,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13500,,'',0,20400,,'',0,9500,,'',0,15600,,'',0,11100,,'',0
-'1803',2100,82600,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82600,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,15900,,'',0,11400,,'',0,9800,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94900,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,152300,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107427 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107427
index ac3a3740..2ad1142b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107427
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107427
@@ -1,4 +1,5 @@
'1798',2101,61000,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
-'1803',2101,74600,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90800,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,90800,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74600,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90800,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,72900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107428 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107428
index 5ef5e5c5..bdab959b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107428
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107428
@@ -1,3 +1,4 @@
'1798',2101,61200,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
-'1803',2101,74700,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74700,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107429 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107429
index d4535ce8..e2107ca3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107429
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107429
@@ -1,4 +1,5 @@
'1798',2101,61400,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
-'1803',2101,74900,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74900,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,74100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107430 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107430
index d4535ce8..e2107ca3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107430
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107430
@@ -1,4 +1,5 @@
'1798',2101,61400,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
-'1803',2101,74900,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74900,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,91100,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,74100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107431 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107431
index 0c10b865..a501aea6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107431
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107431
@@ -1,4 +1,5 @@
'1798',2101,61500,,'',0,3600,,'',0,18300,,'',0,16600,,'',0,11200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
-'1803',2101,75000,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,91200,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,91200,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,75000,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,91200,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,74200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107432 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107432
index 8dd7d5fa..7ed918a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107432
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107432
@@ -1,4 +1,5 @@
'1798',2101,61600,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11700,,'',0,17000,,'',0,3200,,'',0,8600,,'',0,8600,,'',0,10000,,'',0,11900,,'',0,11100,,'',0
-'1803',2101,75100,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,75100,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,91300,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,74300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107433 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107433
index 843d23d3..70136e04 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107433
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107433
@@ -1,4 +1,5 @@
'1798',2101,61800,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11700,,'',0,17100,,'',0,3200,,'',0,8600,,'',0,8600,,'',0,9900,,'',0,11900,,'',0,11100,,'',0
-'1803',2101,75300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,75300,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,91500,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,74500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107434 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107434
index 681c967a..5dae5d78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107434
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107434
@@ -1,4 +1,5 @@
'1798',2101,62000,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17000,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,10000,,'',0,11800,,'',0,11100,,'',0
-'1803',2101,75500,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
-'2919',2101,91700,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'2393',2101,91700,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'3379',2101,75500,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
+'3380',2101,91700,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
'1798',1002101,74700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107435 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107435
index 43924a28..82823fc5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107435
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107435
@@ -1,4 +1,5 @@
'1798',2101,62100,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
-'1803',2101,75600,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
-'2919',2101,91800,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'2393',2101,91800,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'3379',2101,75600,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
+'3380',2101,91800,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
'1798',1002101,74800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107436 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107436
index 78d14b3f..b34c3d4e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107436
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107436
@@ -1,4 +1,5 @@
'1798',2101,62200,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
-'1803',2101,75700,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
-'2919',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'2393',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'3379',2101,75700,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
+'3380',2101,91900,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
'1798',1002101,74900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107437 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107437
index e72eea01..ada09322 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107437
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107437
@@ -1,4 +1,5 @@
'1798',2101,62300,,'',0,3600,,'',0,18400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
-'1803',2101,75800,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
-'2919',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'2393',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'3379',2101,75800,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
+'3380',2101,92000,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
'1798',1002101,75000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107438 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107438
index b921472f..f1a1b8c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107438
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107438
@@ -1,4 +1,5 @@
'1798',2100,63700,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
-'1803',2100,81300,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
-'2919',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'2393',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'3379',2100,81300,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
+'3380',2100,93500,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
'1798',1002100,150000,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107440 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107440
index 0af82ffb..2efeb3c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107440
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107440
@@ -1,4 +1,5 @@
'1798',2100,63800,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
-'1803',2100,81400,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,10000,,'',0,5500,,'',0,17100,,'',0
-'2919',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'2393',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'3379',2100,81400,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,10000,,'',0,5500,,'',0,17100,,'',0
+'3380',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
'1798',1002100,150100,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107441 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107441
index 00ce3512..82dd0db1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107441
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107441
@@ -1,4 +1,5 @@
'1798',2100,63800,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
-'1803',2100,81400,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
-'2919',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'2393',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'3379',2100,81400,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
+'3380',2100,93600,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
'1798',1002100,150100,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107442 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107442
index 6c2c02a7..b1f3f786 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107442
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107442
@@ -1,4 +1,5 @@
'1798',2100,63900,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
-'1803',2100,81500,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
-'2919',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'2393',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'3379',2100,81500,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
+'3380',2100,93700,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
'1798',1002100,150200,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107443 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107443
index 354b819d..4f67c020 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107443
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107443
@@ -1,4 +1,5 @@
'1798',2100,64000,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,15200,,'',0
-'1803',2100,81500,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
-'2919',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'2393',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'3379',2100,81500,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5500,,'',0,17100,,'',0
+'3380',2100,93800,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
'1798',1002100,150300,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107444 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107444
index ed51b58c..e4887247 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107444
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107444
@@ -1,4 +1,5 @@
'1798',2100,64100,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,15200,,'',0
-'1803',2100,81600,,'',0,20100,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5400,,'',0,17100,,'',0
-'2919',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,81600,,'',0,20100,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,5400,,'',0,17100,,'',0
+'3380',2100,93800,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,150400,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107445 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107445
index c1f803d6..75863b3b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107445
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107445
@@ -1,4 +1,5 @@
'1798',2100,64300,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
-'1803',2100,81800,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9500,,'',0,13100,,'',0
-'2919',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'2393',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
+'3379',2100,81800,,'',0,20200,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9500,,'',0,13100,,'',0
+'3380',2100,94100,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16800,,'',0,13100,,'',0
'1798',1002100,150700,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107446 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107446
index 473def03..713afdf3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107446
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107446
@@ -1,4 +1,5 @@
'1798',2100,64500,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
-'1803',2100,81900,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,81900,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94200,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,150900,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107447 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107447
index d4f05775..efab2611 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107447
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107447
@@ -1,4 +1,5 @@
'1798',2100,64600,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
-'1803',2100,82000,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82000,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94300,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,151000,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107448 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107448
index 10eff354..1af336cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107448
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107448
@@ -1,4 +1,5 @@
'1798',2100,64700,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
-'1803',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,151100,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107449 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107449
index 10eff354..1af336cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107449
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107449
@@ -1,4 +1,5 @@
'1798',2100,64700,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13300,,'',0,20400,,'',0,9700,,'',0,11600,,'',0,15200,,'',0
-'1803',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82100,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94400,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
'1798',1002100,151100,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107450 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107450
index 4d069b5c..495ab95c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107450
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107450
@@ -1,3 +1,4 @@
'1798',2100,64800,,'',0,7600,,'',0,9200,,'',0,9700,,'',0,12100,,'',0,11200,,'',0,16000,,'',0,13400,,'',0,20400,,'',0,9600,,'',0,11600,,'',0,15200,,'',0
-'1803',2100,82200,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
-'2919',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'2393',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
+'3379',2100,82200,,'',0,20200,,'',0,11900,,'',0,19500,,'',0,11900,,'',0,15400,,'',0,9900,,'',0,9400,,'',0,13100,,'',0
+'3380',2100,94500,,'',0,17100,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,16700,,'',0,13100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107481 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107481
index 7ad3c775..493269ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107481
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107481
@@ -1,3 +1,4 @@
'1798',400,61900,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107483 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107483
index fa1b2156..a8646ab1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107483
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107483
@@ -1,3 +1,4 @@
'1798',400,62100,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,62000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,62000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70200,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107485 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107485
index a0fcafe0..51e10951 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107485
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107485
@@ -1,6 +1,7 @@
'1798',3100,73300,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'1803',3100,92400,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92400,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64700,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,85100,,'',0,10200,,'',0,14700,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,85100,,'',0,10200,,'',0,14700,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15200,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101800,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,60400,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107486 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107486
index 3693e66c..97ec9a54 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107486
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107486
@@ -1,6 +1,7 @@
'1798',3100,73400,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,3600,,'',0
-'1803',3100,92500,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92500,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64900,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8800,,'',0,10000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,85200,,'',0,10200,,'',0,14700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003100,85200,,'',0,10200,,'',0,14700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,102000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
'1798',24003100,60500,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107487 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107487
index fdf069cf..ea618bf3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107487
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107487
@@ -1,3 +1,4 @@
'1798',1003101,70600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
-'1803',1003101,85600,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003101,85600,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,105400,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107488 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107488
index dc1ba4f9..788921c7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107488
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107488
@@ -1,3 +1,4 @@
'1798',1003101,70700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
-'1803',1003101,85700,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003101,85700,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,105500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107489 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107489
index 2f58ffb8..357cf3c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107489
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107489
@@ -1,3 +1,4 @@
'1798',1003101,70700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10300,,'',0,4500,,'',0,16300,,'',0
-'1803',1003101,85700,,'',0,10100,,'',0,14600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',1003101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,85700,,'',0,10100,,'',0,14600,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,105500,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107490 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107490
index faae24fe..530c84e5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107490
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107490
@@ -1,3 +1,4 @@
'1798',1003100,65500,,'',0,6900,,'',0,3100,,'',0,7200,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10800,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,10000,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107491 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107491
index a946ed25..cdcaa375 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107491
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107491
@@ -1,3 +1,4 @@
'1798',1003100,65500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003100,85800,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,102600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107492 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107492
index f74f2ff9..f7cfad69 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107492
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107492
@@ -1,3 +1,4 @@
'1798',1003100,65600,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,7700,,'',0,9400,,'',0,3000,,'',0,8700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,10900,,'',0
-'1803',1003100,85900,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003100,85900,,'',0,14200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,15100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,102700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107493 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107493
index 84ba3144..d94c937a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107493
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107493
@@ -1,3 +1,4 @@
'1798',701,63900,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,15900,0,'Montrose Exch',0,24900,0,'Montrose Exch',0
-'1803',701,72600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
-'2919',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72600,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
+'3380',701,62500,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107498 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107498
index f013591e..b0630d59 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107498
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107498
@@ -1,4 +1,5 @@
'1798',2101,61100,,'',0,3600,,'',0,18300,,'',0,12600,,'',0,15200,,'',0,11700,,'',0,13000,,'',0,7200,,'',0,8600,,'',0,4600,,'',0,10000,,'',0,15900,,'',0,11100,,'',0
-'1803',2101,74700,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'2393',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
+'3379',2101,74700,,'',0,20000,,'',0,15700,,'',0,14900,,'',0,16400,,'',0,11400,,'',0,9600,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,90900,,'',0,13000,,'',0,16700,,'',0,12900,,'',0,17000,,'',0,12900,,'',0,17300,,'',0
'1798',1002101,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107499 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107499
index 08afb619..4b6490e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107499
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107499
@@ -1,19 +1,26 @@
'1798',101,54700,,'',0,7000,,'',0,3000,,'',0,6000,,'',0,2800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,2600,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,62000,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
-'2919',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
-'1803',400,63800,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,10600,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,15500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0
-'2919',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0
+'2393',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'3379',101,62000,,'',0,3800,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,2900,,'',0,8700,,'',0
+'3380',101,62400,,'',0,8100,,'',0,4100,,'',0,8500,,'',0,8500,,'',0,8600,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,9000,,'',0,8500,,'',0,4400,,'',0
+'2393',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0
+'3379',400,63800,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,10600,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,15500,4,'',0,10400,4,'',0,10000,4,'',0,10300,4,'',0,10000,4,'',0
+'3380',400,72000,4,'',0,20400,4,'',0,12600,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,15900,4,'',0,13500,4,'',0
'1798',500,62100,4,'',0,9300,4,'',0,3500,4,'',0,7200,4,'',0,3100,4,'',0,6900,4,'',0,3500,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,3500,4,'',0,7700,4,'',0,3600,4,'',0,7600,4,'',0,7500,4,'',0,3800,4,'',0,7500,4,'',0,3300,4,'',0,7100,4,'',0,2900,4,'',0,7300,4,'',0,7400,4,'',0,2700,4,'',0,8500,4,'',0,4300,4,'',0,9900,4,'',0
-'1803',500,71500,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,7500,4,'',0,2900,4,'',0,7000,4,'',0,3300,4,'',0,7200,4,'',0,2800,4,'',0,6900,4,'',0,3200,4,'',0,6900,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0,6800,4,'',0,9700,4,'',0
-'2919',500,65100,4,'',0,14900,4,'',0,5800,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9000,4,'',0,9000,4,'',0,5600,4,'',0,10000,4,'',0
-'1803',701,74100,4,'',0,18700,4,'',0,21600,4,'',0,21000,4,'',0,25000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,12800,4,'',0
-'2919',701,64000,4,'',0,20200,4,'',0,19200,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
-'1803',901,71900,4,'',0,9300,4,'',0,9800,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,9900,4,'',0,10200,4,'',0,9900,4,'',0
-'2919',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0
+'2393',500,65100,4,'',0,14900,4,'',0,5800,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9000,4,'',0,9000,4,'',0,5600,4,'',0,10000,4,'',0
+'3379',500,71500,4,'',0,10100,4,'',0,10100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3400,4,'',0,7100,4,'',0,3000,4,'',0,7600,4,'',0,7500,4,'',0,2900,4,'',0,7000,4,'',0,3300,4,'',0,7200,4,'',0,2800,4,'',0,6900,4,'',0,3200,4,'',0,6900,4,'',0,2900,4,'',0,6900,4,'',0,2900,4,'',0,6800,4,'',0,9700,4,'',0
+'3380',500,65100,4,'',0,14900,4,'',0,5800,4,'',0,9800,4,'',0,10100,4,'',0,10100,4,'',0,9100,4,'',0,9100,4,'',0,10000,4,'',0,8800,4,'',0,9200,4,'',0,9000,4,'',0,9000,4,'',0,5600,4,'',0,10000,4,'',0
+'2393',701,64000,4,'',0,20200,4,'',0,19200,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
+'3379',701,74100,4,'',0,18700,4,'',0,21600,4,'',0,21000,4,'',0,25000,4,'',0,20800,4,'',0,20500,4,'',0,10000,4,'',0,12800,4,'',0
+'3380',701,64000,4,'',0,20200,4,'',0,19200,4,'',0,20000,4,'',0,20000,4,'',0,20000,4,'',0,19800,4,'',0,12500,4,'',0
+'2393',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0
+'3379',901,71900,4,'',0,9300,4,'',0,9800,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,10300,4,'',0,10500,4,'',0,10300,4,'',0,9900,4,'',0,10200,4,'',0,9900,4,'',0
+'3380',901,70900,4,'',0,13100,4,'',0,17200,4,'',0,12300,4,'',0,17100,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,11900,4,'',0,17300,4,'',0
'1798',1200,74000,4,'',0,7500,4,'',0,4000,4,'',0,7800,4,'',0,7800,4,'',0,3300,4,'',0,15800,4,'',0,11600,4,'',0,11900,4,'',0,17600,4,'',0,3200,4,'',0,8000,4,'',0,3100,4,'',0
'1798',2101,60000,,'',0,3600,,'',0,18200,,'',0,12600,,'',0,11100,,'',0,15700,,'',0,12900,,'',0,7100,,'',0,4500,,'',0,8600,,'',0,10200,,'',0,15900,,'',0,11300,,'',0
-'1803',2101,73600,,'',0,20000,,'',0,11600,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
-'2919',2101,85800,,'',0,17000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
-'1803',1000701,64200,4,'',0,19800,4,'',0,20200,4,'',0,20800,4,'',0,25200,4,'',0,20800,4,'',0,20400,4,'',0
-'2919',1000701,74300,4,'',0,19700,4,'',0,19700,4,'',0,20000,4,'',0,19900,4,'',0,19900,4,'',0
+'2393',2101,85800,,'',0,17000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'3379',2101,73600,,'',0,20000,,'',0,11600,,'',0,18700,,'',0,16400,,'',0,11400,,'',0,9700,,'',0,10000,,'',0,12600,,'',0
+'3380',2101,85800,,'',0,17000,,'',0,12500,,'',0,16900,,'',0,13000,,'',0,16900,,'',0,13300,,'',0
+'2393',1000701,74300,4,'',0,19700,4,'',0,19700,4,'',0,20000,4,'',0,19900,4,'',0,19900,4,'',0
+'3379',1000701,64200,4,'',0,19800,4,'',0,20200,4,'',0,20800,4,'',0,25200,4,'',0,20800,4,'',0,20400,4,'',0
+'3380',1000701,74300,4,'',0,19700,4,'',0,19700,4,'',0,20000,4,'',0,19900,4,'',0,19900,4,'',0
'1798',1002101,71800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107500 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107500
index b4720f1b..4b306130 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107500
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107500
@@ -1,9 +1,12 @@
'1798',201,52900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1800,,'',0,6000,,'',0,2300,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6300,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'1803',201,62000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'2393',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
+'3379',201,62000,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,63400,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,8500,,'',0
'1798',301,55900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7000,,'',0,7300,,'',0,3600,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,10000,,'',0
-'1803',301,65300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
-'2919',301,62900,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,62900,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65300,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9600,,'',0
+'3380',301,62900,,'',0,10900,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,5200,,'',0,9100,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',601,55500,,'',0,8500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,12000,,'',0,15500,,'',0,11500,,'',0,8000,,'',0,5000,,'',0,8500,,'',0,8000,,'',0,8500,,'',0,4000,,'',0,8000,,'',0,11500,,'',0,10000,,'',0,11500,,'',0,15000,,'',0
-'1803',601,60400,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
-'2919',601,60000,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'2393',601,60000,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
+'3379',601,60400,,'',0,12000,,'',0,10100,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10500,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,5000,,'',0
+'3380',601,60000,,'',0,13000,,'',0,9500,,'',0,11000,,'',0,8500,,'',0,9000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,9400,,'',0,9300,,'',0,9200,,'',0,9000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107501 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107501
index 1c9d3299..27eb4237 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107501
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107501
@@ -1,7 +1,8 @@
'1798',1701,62600,,'',0,3200,,'',0,8700,,'',0,76400,,'',0,3700,,'',0,8300,,'',0,7800,,'',0,3600,,'',0
'1798',3100,72700,,'',0,3100,,'',0,7000,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10700,,'',0,9200,,'',0,4200,,'',0,1500,,'',0,7200,,'',0,7100,,'',0,1300,,'',0,3700,,'',0
-'1803',3100,91800,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,91800,,'',0,10400,,'',0,10900,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11100,,'',0
'1798',1003100,64100,,'',0,6900,,'',0,3000,,'',0,7300,,'',0,4500,,'',0,14500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,10700,,'',0,7700,,'',0,9300,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,7600,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'1803',1003100,84500,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'2393',1003100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
+'3379',1003100,84500,,'',0,10200,,'',0,10700,,'',0,14900,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11100,,'',0,11200,,'',0,7500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3380',1003100,101200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10100,,'',0
'1798',24003100,55800,,'',0,7100,,'',0,3000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107740 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107740
index b0335fc3..ee79d63a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107740
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107740
@@ -1,8 +1,10 @@
'1798',2100,63400,,'',0,7600,,'',0,9200,,'',0,5700,,'',0,16100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
'1798',2101,62400,,'',0,7600,,'',0,14400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11100,,'',0
-'1803',2100,81000,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9900,,'',0,9500,,'',0,17100,,'',0
-'1803',2101,75900,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
-'2919',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12800,,'',0,17200,,'',0
-'2919',2101,92100,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'2393',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12800,,'',0,17200,,'',0
+'2393',2101,92100,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'3379',2100,81000,,'',0,20100,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,9900,,'',0,9500,,'',0,17100,,'',0
+'3379',2101,75900,,'',0,20000,,'',0,15800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
+'3380',2100,93200,,'',0,17000,,'',0,12800,,'',0,17000,,'',0,13000,,'',0,12800,,'',0,17200,,'',0
+'3380',2101,92100,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
'1798',1002100,145700,,'',0,9100,,'',0
'1798',1002101,75100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107742 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107742
index 8bbb913a..36f4ced2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107742
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107742
@@ -1,4 +1,5 @@
'1798',2101,62600,,'',0,7600,,'',0,14400,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17200,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9800,,'',0,11800,,'',0,11100,,'',0
-'1803',2101,80100,,'',0,20000,,'',0,11900,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16500,,'',0
-'2919',2101,92300,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
+'2393',2101,92300,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
+'3379',2101,80100,,'',0,20000,,'',0,11900,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16500,,'',0
+'3380',2101,92300,,'',0,13000,,'',0,16800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
'1798',1002101,75300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107744 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107744
index 524f18af..4bfd60af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107744
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107744
@@ -1,4 +1,5 @@
'1798',2101,62700,,'',0,7600,,'',0,14500,,'',0,16500,,'',0,11200,,'',0,11800,,'',0,17100,,'',0,3300,,'',0,8600,,'',0,8500,,'',0,9900,,'',0,11800,,'',0,11000,,'',0
-'1803',2101,80300,,'',0,20000,,'',0,11800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
-'2919',2101,92500,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'2393',2101,92500,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
+'3379',2101,80300,,'',0,20000,,'',0,11800,,'',0,18800,,'',0,12500,,'',0,11400,,'',0,9600,,'',0,9900,,'',0,16600,,'',0
+'3380',2101,92500,,'',0,13000,,'',0,16700,,'',0,13000,,'',0,17000,,'',0,12900,,'',0,17200,,'',0
'1798',1002101,75500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107746 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107746
index 00bdeb29..8fa83097 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107746
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107746
@@ -1,8 +1,10 @@
'1798',2100,63200,,'',0,7600,,'',0,9200,,'',0,5700,,'',0,16100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
'1798',2101,62900,4,'',0,7600,4,'',0,14500,4,'',0,16500,4,'',0,11200,4,'',0,11800,4,'',0,17200,4,'',0,3300,4,'',0,8600,4,'',0,8500,4,'',0,9800,4,'',0,11800,4,'',0,11000,4,'',0
-'1803',2100,80800,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
-'1803',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,18800,4,'',0,12500,4,'',0,11400,4,'',0,9600,4,'',0,9900,4,'',0,16500,4,'',0
-'2919',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
-'2919',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12800,4,'',0,17200,4,'',0
+'2393',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
+'2393',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12800,4,'',0,17200,4,'',0
+'3379',2100,80800,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
+'3379',2101,80500,4,'',0,20000,4,'',0,11900,4,'',0,18800,4,'',0,12500,4,'',0,11400,4,'',0,9600,4,'',0,9900,4,'',0,16500,4,'',0
+'3380',2100,93000,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
+'3380',2101,92700,4,'',0,13000,4,'',0,16800,4,'',0,13000,4,'',0,17000,4,'',0,12800,4,'',0,17200,4,'',0
'1798',1002100,145500,,'',0,9100,,'',0
'1798',1002101,75700,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107747 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107747
index e6792458..14d461e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107747
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107747
@@ -1,4 +1,5 @@
'1798',2100,63300,,'',0,7600,,'',0,9200,,'',0,5700,,'',0,16100,,'',0,11200,,'',0,12000,,'',0,17200,,'',0,20400,,'',0,9700,,'',0,11700,,'',0,11200,,'',0
-'1803',2100,80900,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
-'2919',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
+'2393',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
+'3379',2100,80900,,'',0,20000,,'',0,11900,,'',0,19400,,'',0,11900,,'',0,11400,,'',0,10000,,'',0,9500,,'',0,17100,,'',0
+'3380',2100,93100,,'',0,17000,,'',0,12800,,'',0,13000,,'',0,17000,,'',0,12800,,'',0,17200,,'',0
'1798',1002100,145600,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107751 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107751
index 367b9858..0077847e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107751
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107751
@@ -1,22 +1,18 @@
-'1798',3100,95500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
-'1798',3101,171100,,'',0,3000,,'',0,7200,,'',0
-'1803',3100,94000,,'',0,10500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
-'1798',3200,95700,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,11400,,'',0,48500,,'',0
-'1798',3201,171100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
-'1803',3200,81100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0
-'2919',3200,91000,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'1798',3300,61700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,51300,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,10600,,'',0,9900,,'',0
-'1798',3301,170900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
-'1803',3300,195700,,'',0,14500,,'',0
-'2919',3300,190700,,'',0
-'1798',3400,61800,,'',0,3000,,'',0,7000,,'',0,79400,,'',0,59100,,'',0
-'1798',3401,170900,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
-'1798',3500,74300,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33200,,'',0,26800,,'',0
-'1803',3500,84200,,'',0,67200,,'',0,22000,,'',0
-'2919',3500,95100,,'',0,30300,,'',0,59700,,'',0
-'1798',3900,84600,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,8000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,3500,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,7500,,'',0,4900,,'',0
-'1803',3900,84600,,'',0,8800,,'',0,1200,,'',0,8800,,'',0,1200,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9100,,'',0,7900,,'',0,9000,,'',0,1000,,'',0,8900,,'',0,3100,,'',0,8700,,'',0
-'2919',3900,84100,,'',0,8700,,'',0,9800,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,9700,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,8200,,'',0,8700,,'',0,3800,,'',0,8600,,'',0
-'1798',1003100,103000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0
-'1798',1003101,185800,,'',0,8500,,'',0
-'1803',1003100,91000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0
+'1798',3101,62600,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,8700,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7500,,'',0,3000,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
+'3379',3101,81600,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
+'1798',3201,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,9200,,'',0,10800,,'',0
+'2393',3200,91000,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'3379',3201,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',3300,190700,,'',0
+'1798',3500,74400,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33100,,'',0,26900,,'',0
+'2393',3500,95100,,'',0,30300,,'',0,59700,,'',0
+'3379',3500,84300,,'',0,67200,,'',0,22000,,'',0
+'3380',3500,95200,,'',0,30300,,'',0,59700,,'',0
+'1798',3900,93500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'2393',3900,84100,,'',0,8700,,'',0,9800,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,9700,,'',0,8800,,'',0,3200,,'',0,8800,,'',0,8200,,'',0,8700,,'',0,3800,,'',0,8600,,'',0
+'3379',3900,93400,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
+'3380',3900,92800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'1798',1003101,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,14200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,10400,,'',0,8500,,'',0,16300,,'',0
+'3379',1003101,84600,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107752 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107752
index 07b98748..53b99613 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107752
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107752
@@ -1,11 +1,11 @@
-'1798',3101,62600,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,8700,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7200,,'',0,1700,,'',0,38500,,'',0
-'1803',3101,81600,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
-'1798',3201,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6800,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'1798',3900,84600,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'1803',3900,84600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
-'2919',3900,84100,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'1798',1003101,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,14200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,10400,,'',0,8500,,'',0,16300,,'',0
-'1803',1003101,84600,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'1798',3101,62600,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,8700,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7500,,'',0,3000,,'',0,7200,,'',0,1800,,'',0,38400,,'',0
+'3379',3101,81600,,'',0,10000,,'',0,10300,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
+'1798',3201,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6800,,'',0,9200,,'',0,10800,,'',0
+'2393',3201,84500,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',3201,74600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,84500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3900,84100,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'1798',1003101,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,10400,,'',0,8500,,'',0,16300,,'',0
+'2393',1003101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003101,84600,,'',0,10000,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,104300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107754 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107754
index 914d656a..d7b46c86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107754
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107754
@@ -1,10 +1,12 @@
'1798',3100,74400,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9200,,'',0,8200,,'',0,1500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,7500,,'',0
'1798',3101,63200,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,8600,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11400,,'',0,7400,,'',0,1200,,'',0,3100,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,1800,,'',0,38400,,'',0
-'1803',3100,93400,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
-'1803',3101,82200,,'',0,10000,,'',0,10300,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3379',3100,93400,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
+'3379',3101,82200,,'',0,10000,,'',0,10300,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
'1798',1003100,70100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,3700,,'',0,9400,,'',0,7000,,'',0,4700,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
'1798',1003101,70200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
-'1803',1003100,90400,,'',0,10200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,11100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
-'1803',1003101,85200,,'',0,10100,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,10500,,'',0,10500,,'',0
-'2919',1003100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0
-'2919',1003101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0
+'2393',1003101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003100,90400,,'',0,10200,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,11100,,'',0,3500,,'',0,10600,,'',0,10400,,'',0,10000,,'',0
+'3379',1003101,85200,,'',0,10100,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,10500,,'',0,10500,,'',0
+'3380',1003100,103200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0
+'3380',1003101,105000,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107755 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107755
index 780d6c93..338f00db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107755
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107755
@@ -1,12 +1,15 @@
'1798',3100,74700,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,14900,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,9300,,'',0,8200,,'',0,1500,,'',0,3200,,'',0,7000,,'',0,1300,,'',0,7500,,'',0
-'1803',3100,93700,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
+'3379',3100,93700,,'',0,10400,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
'1798',3200,61600,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
-'1803',3200,80700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
-'2919',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2393',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'3379',3200,80700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
+'3380',3200,90600,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
'1798',3300,61400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
+'2393',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
+'3379',3300,83900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,93400,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
'1798',1003100,70400,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,8500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3700,,'',0,9400,,'',0,7000,,'',0,4600,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11500,,'',0,14900,,'',0
-'1803',1003100,90700,,'',0,10200,,'',0,10700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,10600,,'',0,14400,,'',0,10000,,'',0
-'2919',1003100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003100,90700,,'',0,10200,,'',0,10700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,10600,,'',0,14400,,'',0,10000,,'',0
+'3380',1003100,103500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
'1798',24003100,61600,,'',0,3100,,'',0,7100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107756 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107756
index 7d9d7dc0..4d4a2a0c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107756
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107756
@@ -1,24 +1,13 @@
-'1798',3100,74900,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,9300,,'',0,8200,,'',0,1500,,'',0,3200,,'',0,7000,,'',0,1300,,'',0,7500,,'',0
-'1798',3101,171000,,'',0,3000,,'',0,7200,,'',0
-'1803',3100,93900,,'',0,10500,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0
-'1798',3200,61800,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
-'1798',3201,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,16000,,'',0
-'1803',3200,81000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,13000,,'',0
-'2919',3200,90900,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
-'1798',3300,61600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7800,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7800,,'',0,7900,,'',0,2700,,'',0,6900,,'',0,3000,,'',0
-'1798',3301,171000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0
-'1803',3300,84100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10300,,'',0,14500,,'',0
-'2919',3300,93600,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
-'1798',3400,61700,,'',0,3000,,'',0,7000,,'',0,30600,,'',0,48800,,'',0,59100,,'',0,5700,,'',0
-'1798',3401,171000,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0
-'1798',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'1803',3501,82500,,'',0,63100,,'',0,26000,,'',0
-'2919',3501,93300,,'',0,30300,,'',0,59800,,'',0
-'1798',3900,84800,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'1803',3900,84800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
-'2919',3900,84300,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
-'1798',1003100,70600,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,8500,,'',0,10600,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3700,,'',0,9400,,'',0,7000,,'',0,4600,,'',0,9900,,'',0,7600,,'',0,11400,,'',0,11400,,'',0,14900,,'',0
-'1798',1003101,185700,,'',0,8500,,'',0
-'1803',1003100,90900,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,14500,,'',0,10400,,'',0,10000,,'',0
-'2919',1003100,103700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
-'1798',24003100,61700,,'',0,3100,,'',0,7100,,'',0
+'1798',3101,62500,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,8700,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7500,,'',0,3000,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
+'3379',3101,81500,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
+'1798',3201,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,9200,,'',0,10800,,'',0
+'2393',3200,90900,,'',0,9600,,'',0,10200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'3379',3201,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',3300,93600,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,9900,,'',0
+'2393',3501,93300,,'',0,30300,,'',0,59800,,'',0
+'2393',3900,84300,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'1798',1003101,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,14200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,10400,,'',0,8500,,'',0,16300,,'',0
+'2393',1003100,103700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003101,84500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107758 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107758
index 09a440d3..54d27a54 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107758
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107758
@@ -1,3 +1,4 @@
'1798',3201,55900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,84900,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107759 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107759
index e6392b20..ba6a9cbd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107759
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107759
@@ -1,6 +1,8 @@
'1798',3201,60000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85000,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761
index 69f0e5c6..8ee1f4ff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107761
@@ -1,6 +1,8 @@
'1798',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762
index a432f2c3..f907f61a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107762
@@ -1,6 +1,8 @@
'1798',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763
index 009694d5..e843d485 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107763
@@ -1,6 +1,8 @@
'1798',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,91600,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91500,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,91000,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764
index 3aa30269..5e543b0d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107764
@@ -1,6 +1,8 @@
'1798',3201,60200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85200,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,91700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,91100,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765
index f56b3152..de9d14b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107765
@@ -1,6 +1,8 @@
'1798',3201,60300,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85300,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766
index 4930b28d..18021a52 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107766
@@ -1,6 +1,8 @@
'1798',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,91800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,91200,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767
index 41d5e63d..7299bf91 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107767
@@ -1,3 +1,4 @@
'1798',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107768 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107768
index 41d5e63d..7299bf91 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107768
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107768
@@ -1,3 +1,4 @@
'1798',3201,60400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107769 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107769
index ae52ff01..f406b697 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107769
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107769
@@ -1,3 +1,4 @@
'1798',3201,60500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85500,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107770 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107770
index f3d6c523..06cabc2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107770
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107770
@@ -1,3 +1,4 @@
'1798',3201,60600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85600,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107771 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107771
index 0da45ea2..8b1def09 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107771
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107771
@@ -1,3 +1,4 @@
'1798',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107772 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107772
index 0da45ea2..8b1def09 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107772
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107772
@@ -1,3 +1,4 @@
'1798',3201,60700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85700,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107773 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107773
index 78262beb..05edba6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107773
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107773
@@ -1,6 +1,8 @@
'1798',3200,60800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
'1798',3201,60800,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7900,4,'',0,7700,4,'',0,3400,4,'',0,8000,4,'',0,7400,4,'',0,3700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,9200,4,'',0,10800,4,'',0
-'1803',3200,75900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'1803',3201,75900,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,17000,4,'',0
-'2919',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
-'2919',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
+'2393',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
+'3379',3200,75900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3379',3201,75900,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3500,4,'',0,17000,4,'',0
+'3380',3200,85800,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3380',3201,85800,4,'',0,9600,4,'',0,10200,4,'',0,14600,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10400,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107774 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107774
index 911cc3c8..a522c800 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107774
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107774
@@ -1,3 +1,4 @@
'1798',3200,60900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3200,80000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3200,80000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3200,85900,,'',0,9600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107775 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107775
index e82e6449..329aaf84 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107775
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107775
@@ -1,3 +1,4 @@
'1798',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107776 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107776
index c5479bee..e115f451 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107776
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107776
@@ -1,3 +1,4 @@
'1798',3200,61000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3200,80100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3200,90000,,'',0,5600,,'',0,10200,,'',0,14600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107777 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107777
index 4c734f64..a216cc0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107777
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107777
@@ -1,3 +1,4 @@
'1798',3200,61100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3200,80200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2393',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'3379',3200,80200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3200,90100,,'',0,5600,,'',0,10200,,'',0,14700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107778 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107778
index 8002c224..1ead6b0b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107778
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107778
@@ -1,3 +1,4 @@
'1798',3200,61200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
-'1803',3200,80300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3200,80300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3200,90200,,'',0,5600,,'',0,14200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107779 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107779
index fe099597..fa29b4f1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107779
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107779
@@ -1,3 +1,4 @@
'1798',3200,61200,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,8000,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
-'1803',3200,80300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2393',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'3379',3200,80300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3200,90200,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107781 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107781
index b5948462..c0caea3c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107781
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107781
@@ -1,3 +1,4 @@
'1798',3900,91400,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91300,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,90800,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783
index e75863ef..b3e666b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107783
@@ -1,3 +1,4 @@
'1798',3900,90200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'1803',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
-'2919',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'2393',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'3379',3900,90100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
+'3380',3900,85600,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786
index 7ec285e2..ffcaa91f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107786
@@ -1,3 +1,4 @@
-'1798',3301,55600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'1798',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
+'2393',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107787 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107787
index 5fbd4e3f..cf3d8d35 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107787
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107787
@@ -1,6 +1,8 @@
-'1798',3301,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
-'1803',3301,82100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'1798',3400,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'1803',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'1798',3301,55700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
+'2393',3301,91600,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'1798',3400,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3400,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'2393',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'3379',3400,80400,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,10900,,'',0
+'3380',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107788 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107788
index cb3aa089..39874b84 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107788
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107788
@@ -1,6 +1,8 @@
'1798',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
'1798',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2393',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'3379',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789
index cb3aa089..39874b84 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107789
@@ -1,6 +1,8 @@
'1798',3301,55800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,91800,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
'1798',3900,92700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2393',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'3379',3900,92600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,92000,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790
index 250eeeef..2eabc6e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107790
@@ -1,3 +1,4 @@
'1798',3301,55900,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,91900,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107791 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107791
index 78e3ea98..6f0d78b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107791
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107791
@@ -1,3 +1,4 @@
'1798',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107792 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107792
index c8d77e46..27659dc1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107792
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107792
@@ -1,3 +1,4 @@
'1798',3301,60000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,92000,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107793 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107793
index 3e9c345f..fde8face 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107793
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107793
@@ -1,3 +1,4 @@
'1798',3301,60100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,92100,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107794 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107794
index 20cfa66b..81122a37 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107794
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107794
@@ -1,6 +1,8 @@
'1798',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,92200,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
'1798',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,75100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,75100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82400,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107795 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107795
index 3d816761..158b6fd0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107795
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107795
@@ -1,3 +1,4 @@
'1798',3301,60200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3500,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2919',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2393',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'3379',3301,82700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3380',3301,92200,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107796 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107796
index 7bf0b091..3bfaf2b5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107796
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107796
@@ -1,3 +1,4 @@
'1798',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,92300,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107797 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107797
index 5ddd04a2..b50ddef9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107797
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107797
@@ -1,3 +1,4 @@
'1798',3301,60300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2919',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2393',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'3379',3301,82800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3380',3301,92300,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107798 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107798
index 23b9ba06..b82a1f5a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107798
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107798
@@ -1,3 +1,4 @@
'1798',3301,60400,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82900,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2919',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2393',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'3379',3301,82900,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3380',3301,92400,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107800 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107800
index c8eff4b5..d24f80e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107800
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107800
@@ -1,3 +1,4 @@
'1798',3300,60600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2393',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'3379',3300,83100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,92600,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107801 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107801
index ecf20a40..1e44598f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107801
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107801
@@ -1,3 +1,4 @@
'1798',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0
+'2393',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0
+'3379',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107802 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107802
index 04e8d620..a6b5db17 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107802
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107802
@@ -1,3 +1,4 @@
'1798',3300,60700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2393',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'3379',3300,83200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,92700,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107803 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107803
index 9d2e7765..ff67f31a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107803
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107803
@@ -1,3 +1,4 @@
'1798',3300,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'2393',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3379',3300,83300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,92800,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107804 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107804
index a89899ac..d1063c78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107804
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107804
@@ -1,3 +1,4 @@
'1798',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3700,,'',0,8000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7300,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0
+'2393',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0
+'3379',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,92900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14600,,'',0,10000,,'',0,5900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107805 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107805
index dcd5dbbd..a08ed8d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107805
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107805
@@ -1,3 +1,4 @@
'1798',3300,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
+'2393',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
+'3379',3300,83400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,92900,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107806 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107806
index 6de88b10..866271cc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107806
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107806
@@ -1,3 +1,4 @@
'1798',3300,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3100,,'',0,6700,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
+'2393',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
+'3379',3300,83500,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,93000,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107807 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107807
index 517ebdff..e03a91f3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107807
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107807
@@ -1,3 +1,4 @@
'1798',3300,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,3900,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
+'2393',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
+'3379',3300,83600,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,93100,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107817 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107817
index 4ef384db..094711a3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107817
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107817
@@ -1,3 +1,4 @@
'1798',3900,93000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
-'2919',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2393',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'3379',3900,92900,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
+'3380',3900,92300,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107818 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107818
index 9931ccea..10be864b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107818
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107818
@@ -1,3 +1 @@
-'1798',3900,93300,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,93200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
-'2919',3900,92600,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2393',3900,92600,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107819 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107819
index f385cd5a..485a0bc6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107819
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107819
@@ -1,8 +1,2 @@
-'1798',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,4000,,'',0,7100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0
-'1803',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'1798',3400,95300,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0
-'1798',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,80600,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
-'1803',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2919',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107820 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107820
index 7f0ccd9a..7e245dc9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107820
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107820
@@ -1,3 +1,4 @@
-'1798',3401,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2919',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'1798',3401,55600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7500,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
+'2393',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,74600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,81900,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107822 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107822
index fc034c8f..aa2b7b18 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107822
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107822
@@ -1,3 +1,4 @@
-'1798',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'1798',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
+'2393',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107823 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107823
index d5642719..aa2b7b18 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107823
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107823
@@ -1,3 +1,4 @@
'1798',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107824 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107824
index 87fd2cc5..3caac37d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107824
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107824
@@ -1,3 +1,4 @@
'1798',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
-'1803',3401,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2919',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'3380',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107825 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107825
index acc25d90..1d0aedd9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107825
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107825
@@ -1,3 +1,4 @@
'1798',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107826 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107826
index af0e8bf6..3acf8304 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107826
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107826
@@ -1,3 +1,4 @@
'1798',3401,55900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,74900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,74900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82200,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107827 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107827
index a53d80ae..98f5d456 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107827
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107827
@@ -1,3 +1,4 @@
'1798',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107828 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107828
index 923ef832..308e7e5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107828
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107828
@@ -1,3 +1,4 @@
'1798',3401,60000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,75000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82300,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107829 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107829
index 47dcdf5c..8e1d7f74 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107829
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107829
@@ -1,3 +1,4 @@
'1798',3401,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,75000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,75000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82300,,'',0,13500,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107830 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107830
index 21dc21ec..cc1592f0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107830
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107830
@@ -1,3 +1,4 @@
'1798',3401,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,75200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,75200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82500,,'',0,13400,,'',0,16300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107831 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107831
index 50c06704..bc226f15 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107831
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107831
@@ -1,3 +1,4 @@
'1798',3401,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,75200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3401,75200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107832 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107832
index 588e2321..cca9a9f1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107832
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107832
@@ -1,3 +1,4 @@
'1798',3401,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,75300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3401,75300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3401,82600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107833 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107833
index c797cf99..33490c7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107833
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107833
@@ -1,3 +1,4 @@
'1798',3401,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3401,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3401,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3401,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3401,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107835 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107835
index 263900ef..c79edd9e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107835
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107835
@@ -1,3 +1,4 @@
'1798',3400,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,75500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3400,75500,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,82800,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107836 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107836
index e1dcbc33..c627fa6d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107836
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107836
@@ -1,3 +1,4 @@
'1798',3400,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,75600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3400,75600,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,82900,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107838 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107838
index 430710ee..2ba37797 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107838
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107838
@@ -1,3 +1,4 @@
'1798',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107839 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107839
index 159cddfd..38bd36a2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107839
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107839
@@ -1,3 +1,4 @@
'1798',3400,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3400,75800,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,83100,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107840 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107840
index 3f6271b8..19262a3c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107840
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107840
@@ -1,3 +1,4 @@
'1798',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107841 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107841
index dd2124a0..b036f02f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107841
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107841
@@ -1,3 +1,4 @@
'1798',3400,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3400,75900,,'',0,7200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,83200,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107842 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107842
index ba36cc5b..e9174cf9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107842
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107842
@@ -1,3 +1,4 @@
'1798',3400,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,80000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3400,80000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,83300,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107843 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107843
index 9545231d..4ff67be9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107843
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107843
@@ -1,3 +1,4 @@
'1798',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'1803',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2393',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'3379',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107844 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107844
index 3bada6fd..29a8be6f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107844
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107844
@@ -1,3 +1,4 @@
-'1798',3400,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3400,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'1803',3400,80100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'1798',3400,61300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5800,,'',0,9700,,'',0
+'2393',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'3379',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10900,,'',0,10900,,'',0
+'3380',3400,83400,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107845 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107845
index e1aa0d75..4f90c8ef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107845
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107845
@@ -1,3 +1,4 @@
'1798',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'1803',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2393',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'3379',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107846 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107846
index e1aa0d75..fc255f52 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107846
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107846
@@ -1,3 +1,4 @@
-'1798',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
-'1803',3400,80200,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'1798',3400,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3400,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,5700,,'',0,9700,,'',0
+'2393',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'3379',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,10900,,'',0
+'3380',3400,83500,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107847 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107847
index 0daf98f5..ac402880 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107847
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107847
@@ -1,3 +1,4 @@
-'1798',3400,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3300,,'',0,7700,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9700,,'',0,5700,,'',0
-'1803',3400,80400,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'1798',3400,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9700,,'',0,5700,,'',0
+'2393',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'3379',3400,80500,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10900,,'',0,10900,,'',0
+'3380',3400,83700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107849 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107849
index a7c520f6..1888b083 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107849
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107849
@@ -1,3 +1,4 @@
'1798',3900,92500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,92400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,91800,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850
index 49b92540..2c9e975d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107850
@@ -1,3 +1,4 @@
'1798',3900,91900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,91300,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851
index a746ac08..cf1d68a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107851
@@ -1,3 +1,4 @@
'1798',3900,92100,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,92000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,91400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855
index 2c3f217b..c169187f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107855
@@ -1,6 +1,8 @@
'1798',3500,73200,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
'1798',3501,73200,4,'',0,2500,4,'',0,7500,4,'',0,32000,4,'',0,37000,4,'',0,23000,4,'',0
-'1803',3500,83000,,'',0,67200,,'',0,22000,,'',0
-'1803',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
-'2919',3500,93900,,'',0,30300,,'',0,59700,,'',0
-'2919',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
+'2393',3500,93900,,'',0,30300,,'',0,59700,,'',0
+'2393',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
+'3379',3500,83000,,'',0,67200,,'',0,22000,,'',0
+'3379',3501,83000,4,'',0,67200,4,'',0,22000,4,'',0
+'3380',3500,93900,,'',0,30300,,'',0,59700,,'',0
+'3380',3501,93900,4,'',0,30300,4,'',0,59700,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107856 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107856
index 0552f765..5d5358f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107856
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107856
@@ -1,3 +1,4 @@
'1798',3500,73600,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'1803',3500,83400,,'',0,67200,,'',0,22000,,'',0
-'2919',3500,94300,,'',0,30300,,'',0,59700,,'',0
+'2393',3500,94300,,'',0,30300,,'',0,59700,,'',0
+'3379',3500,83400,,'',0,67200,,'',0,22000,,'',0
+'3380',3500,94300,,'',0,30300,,'',0,59700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107857 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107857
index eca466bc..9fb02681 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107857
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107857
@@ -1,3 +1,4 @@
'1798',3500,73800,,'',0,6500,,'',0,3500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'1803',3500,83600,,'',0,67200,,'',0,22000,,'',0
-'2919',3500,94500,,'',0,30300,,'',0,59700,,'',0
+'2393',3500,94500,,'',0,30300,,'',0,59700,,'',0
+'3379',3500,83600,,'',0,67200,,'',0,22000,,'',0
+'3380',3500,94500,,'',0,30300,,'',0,59700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107861 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107861
index 9b8e77b6..15985e1e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107861
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107861
@@ -1,3 +1,4 @@
'1798',3900,93200,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
-'2919',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2393',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'3379',3900,93100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
+'3380',3900,92500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870
index 29743c11..83c34733 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107870
@@ -1,6 +1,8 @@
'1798',3200,61300,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,9200,,'',0,10800,,'',0
-'1803',3200,80400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'2393',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
+'3379',3200,80400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3200,90300,,'',0,5600,,'',0,14200,,'',0,10700,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10300,,'',0,10000,,'',0
'1798',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
-'2919',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
+'3380',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871
index e04c305c..05aaeb1e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107871
@@ -1,6 +1,8 @@
'1798',3200,61400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7600,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,3400,,'',0,7900,,'',0,7400,,'',0,3700,,'',0,7900,,'',0,8000,,'',0,2700,,'',0,9200,,'',0,10700,,'',0
-'1803',3200,80500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
-'2919',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3200,80500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,13000,,'',0
+'3380',3200,90400,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,10600,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,90900,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
-'2919',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,90800,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11800,,'',0
+'3380',3900,90300,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877
index 774f9ee9..34d8bb45 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107877
@@ -1,3 +1,4 @@
'1798',3900,93100,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
-'2919',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2393',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'3379',3900,93000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11800,,'',0
+'3380',3900,92400,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880
index 69f0e5c6..8ee1f4ff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107880
@@ -1,6 +1,8 @@
'1798',3201,60100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'2393',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
+'3379',3201,75200,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,85100,,'',0,9600,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10000,,'',0
'1798',3900,91500,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,90900,,'',0,14600,,'',0,16000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883
index 4958b192..18d6e5ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107883
@@ -1,6 +1,8 @@
'1798',3301,55700,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7900,,'',0,8000,,'',0,3100,,'',0,8200,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
-'1803',3301,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'2919',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'1798',3400,61500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8200,,'',0,3300,,'',0,7600,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9800,,'',0,5700,,'',0
-'1803',3400,80300,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'2393',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'3379',3301,82200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'3380',3301,91700,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'1798',3400,61500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,3400,,'',0,7500,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,7900,,'',0,9800,,'',0,5700,,'',0
+'2393',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
+'3379',3400,80500,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10800,,'',0,10900,,'',0
+'3380',3400,83600,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,16300,,'',0,13000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107884 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107884
index 74563af0..7cd0bebd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107884
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_107884
@@ -1,3 +1,4 @@
-'1798',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9800,,'',0,9700,,'',0
-'1803',3401,74700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2919',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'1798',3401,55700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7500,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9700,,'',0,9700,,'',0
+'2393',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,74700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82000,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_108262 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_108262
index efc27d0d..6bd320ee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_108262
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_108262
@@ -1,21 +1,29 @@
'1798',100,54100,,'',0,8200,,'',0,3000,,'',0,7200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,2600,,'',0,6200,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6600,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,62400,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
-'2919',100,62100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'2393',100,62100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
+'3379',100,62400,,'',0,3100,,'',0,7900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7300,,'',0,3100,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6700,,'',0,2600,,'',0
+'3380',100,62100,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,4700,,'',0,8600,,'',0,8900,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,8900,,'',0,8700,,'',0,5000,,'',0,9900,,'',0
'1798',200,55600,,'',0,6300,,'',0,3100,,'',0,7200,,'',0,2800,,'',0,6200,,'',0,2200,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,7300,,'',0,2400,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62100,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63900,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63900,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62100,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63900,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
'1798',300,55300,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3800,,'',0,7000,,'',0,4500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,55700,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,64000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'1803',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',300,64000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,55700,,'',0,10000,,'',0,9800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,64000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,4800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60000,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64200,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',501,60200,,'',0,2800,,'',0,2800,,'',0,6600,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8500,,'',0,10000,,'',0,9500,,'',0
-'1803',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
-'2919',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',700,70000,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
-'1803',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,63600,,'',0,9600,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9800,,'',0,9700,,'',0,9500,,'',0
+'3380',501,61900,,'',0,9600,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,4900,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
+'3379',700,70000,,'',0,14500,,'',0,25500,,'',0,21000,,'',0,21000,,'',0,21000,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60000,,'',0,20000,,'',0,15000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,16500,,'',0
+'2393',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64000,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,14500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63000,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1201,71300,,'',0,3300,,'',0,8000,,'',0,7800,,'',0,3800,,'',0,7300,,'',0,11700,,'',0,11600,,'',0,15600,,'',0,13900,,'',0,7200,,'',0,4000,,'',0,7200,,'',0
-'1803',1000700,60000,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
-'2919',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'2393',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
+'3379',1000700,60000,,'',0,15500,,'',0,20000,,'',0,24800,,'',0,21200,,'',0,21000,,'',0,20500,,'',0
+'3380',1000700,70000,,'',0,15500,,'',0,19500,,'',0,20000,,'',0,20000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120002
index 5f43be68..b200e8d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120002
@@ -1,12 +1,16 @@
'1798',100,52400,,'',0,8000,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
'1798',101,60200,4,'',0,3000,4,'',0,7100,4,'',0,2100,4,'',0,2800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5800,4,'',0,2000,4,'',0,2200,4,'',0,6000,4,'',0,2500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2100,4,'',0,6000,4,'',0,2100,4,'',0,2100,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,2600,4,'',0,6900,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0
-'1803',100,60700,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
-'1803',101,63500,4,'',0,7800,4,'',0,8700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7200,4,'',0,3300,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2700,4,'',0,6700,4,'',0,4700,4,'',0
-'2919',100,60500,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,9900,,'',0
-'2919',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0
+'2393',100,60500,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,9900,,'',0
+'2393',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0
+'3379',100,60700,,'',0,3000,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0
+'3379',101,63500,4,'',0,7800,4,'',0,8700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7300,4,'',0,3300,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,7500,4,'',0,3400,4,'',0,7200,4,'',0,3300,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2700,4,'',0,6700,4,'',0,4700,4,'',0
+'3380',100,60500,,'',0,3600,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,9900,,'',0
+'3380',101,63900,4,'',0,8100,4,'',0,8100,4,'',0,4600,4,'',0,8500,4,'',0,8600,4,'',0,8700,4,'',0,5000,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,8800,4,'',0,9000,4,'',0,8400,4,'',0,8300,4,'',0
'1798',200,53500,,'',0,2200,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,1800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
'1798',201,55300,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2100,4,'',0,5800,4,'',0,2000,4,'',0,1800,4,'',0,6200,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,1800,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2700,4,'',0,7000,4,'',0,1800,4,'',0,1800,4,'',0,1900,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6100,4,'',0,2300,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,3000,4,'',0
-'1803',200,60000,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'1803',201,64300,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7300,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3100,4,'',0,7300,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7300,4,'',0,4700,4,'',0
-'2919',200,61700,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
-'2919',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0
+'2393',200,61700,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
+'2393',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0
+'3379',200,60000,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3379',201,64300,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7300,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,3100,4,'',0,7300,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7300,4,'',0,4700,4,'',0
+'3380',200,61700,,'',0,8300,,'',0,4200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0
+'3380',201,65800,4,'',0,8200,4,'',0,8500,4,'',0,8500,4,'',0,4600,4,'',0,8500,4,'',0,9200,4,'',0,9100,4,'',0,9100,4,'',0,9100,4,'',0,5100,4,'',0,9100,4,'',0,8900,4,'',0,9000,4,'',0,8700,4,'',0,8900,4,'',0,4300,4,'',0,8500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120006
index ec14a8c6..b96de297 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120006
@@ -1,2 +1,2 @@
'1798',1501,62100,,'',0,8300,,'',0,11900,,'',0,68300,,'',0,20300,,'',0,5000,,'',0
-'1803',1501,90500,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,90500,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120007
index ee8f7522..2122c9b6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120007
@@ -1,11 +1,14 @@
-'1798',3101,62800,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,8600,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7600,,'',0,3000,,'',0,7100,,'',0,1700,,'',0,38500,,'',0
-'1803',3101,81800,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,11000,,'',0,11000,,'',0
+'1798',3101,62900,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,8600,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7500,,'',0,3000,,'',0,7100,,'',0,1800,,'',0,38500,,'',0
+'3379',3101,81900,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
'1798',3201,55800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,7700,,'',0,3500,,'',0,8000,,'',0,3400,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6700,,'',0,9200,,'',0,10800,,'',0
-'1803',3201,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',3201,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
+'3380',3201,84800,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
'1798',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'1803',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
-'2919',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
-'1798',1003101,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,2900,,'',0,14500,,'',0,4500,,'',0,16200,,'',0
-'1803',1003101,84800,,'',0,10000,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,104500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'3379',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
+'3380',3900,85700,,'',0,18600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'1798',1003101,65800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7300,,'',0,10200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,14400,,'',0,4500,,'',0,16300,,'',0
+'2393',1003101,104500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003101,84800,,'',0,10100,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,14900,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,104600,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120013
index 42efdb32..a1fa70d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120013
@@ -1,3 +1,3 @@
'1798',3100,73900,,'',0,7100,,'',0,3000,,'',0,10400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,9200,,'',0,4200,,'',0,5500,,'',0,3200,,'',0,7100,,'',0,1300,,'',0,7500,,'',0
-'1803',3100,92900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
+'3379',3100,92900,,'',0,10400,,'',0,11000,,'',0,10900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11100,,'',0
'1798',24003100,61000,,'',0,3100,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120014
index 4b90d1e6..43d7dbeb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120014
@@ -1,5 +1,6 @@
'1798',3101,63800,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,8600,,'',0,10500,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11400,,'',0,7400,,'',0,1200,,'',0,3100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,1800,,'',0,38400,,'',0
-'1803',3101,82700,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
+'3379',3101,82700,,'',0,10000,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,10900,,'',0
'1798',1003101,70800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7400,,'',0,10100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11100,,'',0,9300,,'',0,8700,,'',0,7100,,'',0,3200,,'',0,6800,,'',0,10400,,'',0,4500,,'',0,16300,,'',0
-'1803',1003101,85800,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
-'2919',1003101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',1003101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'3379',1003101,85800,,'',0,10100,,'',0,14500,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,10900,,'',0,11000,,'',0,15000,,'',0,10900,,'',0,10500,,'',0,10500,,'',0
+'3380',1003101,105600,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120016
index 1d556050..2659d40c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120016
@@ -1,2 +1,2 @@
'1798',1500,64400,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92700,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
+'3379',1500,92700,,'',0,18600,,'',0,43000,,'',0,18400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120022 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120022
index d284b54d..03d7df39 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120022
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120022
@@ -1,6 +1,8 @@
'1798',701,64600,0,'Montrose Exch',0,21200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20700,0,'Montrose Exch',0
-'1803',701,73100,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63000,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,63000,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73100,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63000,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000701,80400,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,24100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,2400,0,'Montrose Exch',0,17900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000701,63200,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
-'2919',1000701,73300,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73300,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63200,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
+'3380',1000701,73300,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120023
index fd96e9f8..e91022d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120023
@@ -1,9 +1,12 @@
'1798',200,54800,,'',0,6300,,'',0,3100,,'',0,7100,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3300,,'',0,6400,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0
-'1803',200,61400,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,63100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'2393',200,63100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
+'3379',200,61400,,'',0,4500,,'',0,7500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,63100,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,4500,,'',0,9300,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4800,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,8200,,'',0
'1798',301,60600,,'',0,5300,,'',0,7200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,7600,,'',0,3600,,'',0,7600,,'',0,3600,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'1803',301,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',301,63600,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63600,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,70000,,'',0,10100,,'',0,10100,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',301,63600,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',601,61300,,'',0,8800,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8700,,'',0,8500,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,3900,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'2393',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
+'3379',601,62100,,'',0,12100,,'',0,10200,,'',0,9900,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,14500,,'',0,10100,,'',0,11000,,'',0,9700,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61700,,'',0,13100,,'',0,9600,,'',0,11100,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,16000,,'',0,11800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120024
index 1415ce1d..669363a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120024
@@ -1,4 +1,5 @@
'1798',101,53400,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2400,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
-'2919',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'2393',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
+'3379',101,60800,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,8800,,'',0
+'3380',101,61300,,'',0,4000,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8500,,'',0
'1798',1200,73300,,'',0,7500,,'',0,4000,,'',0,7800,,'',0,7800,,'',0,3300,,'',0,11700,,'',0,15600,,'',0,11700,,'',0,17800,,'',0,3200,,'',0,8000,,'',0,3200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120026 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120026
index 24211bc7..c8599c78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120026
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120026
@@ -1,2 +1,2 @@
'1798',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120027 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120027
index 24211bc7..c8599c78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120027
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120027
@@ -1,2 +1,2 @@
'1798',1501,62600,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
+'3379',1501,91100,,'',0,14500,,'',0,47000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120028 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120028
index c77c0cec..57b64755 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120028
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120028
@@ -1,2 +1,2 @@
'1798',1500,63800,,'',0,8300,,'',0,11900,,'',0,68400,,'',0,20300,,'',0,9000,,'',0
-'1803',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
+'3379',1500,92200,,'',0,18500,,'',0,43000,,'',0,18500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120031 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120031
index c103432d..69648100 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120031
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120031
@@ -1,3 +1,4 @@
'1798',3900,85000,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'1803',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
-'2919',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'2393',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
+'3379',3900,85000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,10000,,'',0,11900,,'',0
+'3380',3900,84500,,'',0,18500,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,17000,,'',0,12500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033
index 8ea4d1b3..c25c3e82 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120033
@@ -1,3 +1,4 @@
'1798',201,54800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
-'2919',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2393',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3379',201,63900,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
+'3380',201,65300,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120034
index e96f5efc..ed994af1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120034
@@ -1,3 +1,4 @@
'1798',201,54900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,64000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
-'2919',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2393',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3379',201,64000,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
+'3380',201,65400,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120035
index 6c58c853..7d001bdc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120035
@@ -1,3 +1,4 @@
'1798',201,55100,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,64100,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4700,,'',0
-'2919',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
+'2393',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
+'3379',201,64100,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4700,,'',0
+'3380',201,65600,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120037
index 2e9ba622..2019a54b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120037
@@ -1,3 +1,4 @@
'1798',201,54300,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2393',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3379',201,63400,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64800,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120038
index 8880e320..ae4db39b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120038
@@ -1,3 +1,4 @@
'1798',200,54200,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2800,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3200,,'',0,6500,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',200,60700,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2919',200,62400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60700,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3380',200,62400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120039
index 3d5a4d30..55fac327 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120039
@@ -1,3 +1,4 @@
'1798',200,54200,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'1803',200,60800,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,62500,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62500,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60800,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,62500,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120040
index c5e0e144..86f854d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120040
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120040
@@ -1,3 +1,4 @@
'1798',200,54300,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'1803',200,60900,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,62600,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62600,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60900,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,62600,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,4900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120041
index d3ba15af..7db5a11f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120041
@@ -1,3 +1,4 @@
'1798',201,54000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,2000,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'2393',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
+'3379',201,63100,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,64500,,'',0,8200,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,8900,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120042
index f8fe0c01..8bf1c7e5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120042
@@ -1,3 +1,4 @@
'1798',200,54100,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',200,60600,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2919',200,62300,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62300,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60600,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3380',200,62300,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120043
index 519122fb..a897f93f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120043
@@ -1,6 +1,8 @@
'1798',200,60700,4,'',0,2300,4,'',0,7100,4,'',0,3400,4,'',0,6800,4,'',0,2200,4,'',0,2100,4,'',0,5700,4,'',0,1800,4,'',0,2100,4,'',0,5900,4,'',0,2000,4,'',0,2200,4,'',0,5800,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6700,4,'',0,2700,4,'',0,7200,4,'',0,2300,4,'',0,5800,4,'',0,1800,4,'',0,2000,4,'',0,1500,4,'',0,6000,4,'',0,1800,4,'',0,1800,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,2100,4,'',0,6300,4,'',0,3000,4,'',0,6900,4,'',0,2800,4,'',0,6800,4,'',0,2900,4,'',0
'1798',201,51300,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5800,,'',0,1600,,'',0,1500,,'',0,2000,,'',0,6600,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2400,,'',0,6500,,'',0,2400,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,1600,,'',0,2300,,'',0,5700,,'',0,1700,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,2300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',200,63200,4,'',0,8500,4,'',0,3600,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,7300,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,7400,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6600,4,'',0,3200,4,'',0
-'1803',201,60500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
-'2919',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0
-'2919',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0
+'2393',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',200,63200,4,'',0,8500,4,'',0,3600,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,7100,4,'',0,7300,4,'',0,3400,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,7500,4,'',0,7400,4,'',0,3300,4,'',0,7400,4,'',0,3000,4,'',0,7200,4,'',0,3300,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,6600,4,'',0,3200,4,'',0
+'3379',201,60500,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7400,,'',0,3300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3200,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2700,,'',0,7300,,'',0,8800,,'',0
+'3380',200,65000,4,'',0,8300,4,'',0,8200,4,'',0,8700,4,'',0,4600,4,'',0,8700,4,'',0,8600,4,'',0,9300,4,'',0,9100,4,'',0,5200,4,'',0,9100,4,'',0,9100,4,'',0,9000,4,'',0,8700,4,'',0,9000,4,'',0,4600,4,'',0,8900,4,'',0,8100,4,'',0
+'3380',201,61900,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120044
index b7023644..d13e1f98 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120044
@@ -1,3 +1,4 @@
'1798',201,54500,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,1700,,'',0,6000,,'',0,1800,,'',0,2200,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,63600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
-'2919',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'2393',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
+'3379',201,63600,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3300,,'',0,8800,,'',0
+'3380',201,65000,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,4900,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120045
index 7c5b2f61..c201b56a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120045
@@ -1,3 +1,4 @@
'1798',200,54100,,'',0,6300,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,2900,,'',0,7000,,'',0
-'1803',200,60700,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
-'2919',200,62400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60700,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7200,,'',0
+'3380',200,62400,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120046
index 4d531ffd..b3763c1a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120046
@@ -1,6 +1,8 @@
'1798',101,60100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,63400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0,4700,,'',0
-'2919',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0
+'2393',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0
+'3379',101,63400,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6700,,'',0,4700,,'',0
+'3380',101,63800,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8400,,'',0,8300,,'',0
'1798',201,55200,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2100,,'',0,5800,,'',0,2000,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,3000,,'',0,5800,,'',0,1800,,'',0,1900,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0
-'1803',201,64300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
-'2919',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0
+'2393',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0
+'3379',201,64300,,'',0,7500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3100,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0,4800,,'',0
+'3380',201,65700,,'',0,8200,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,9100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120047
index 5f43389f..cecf3436 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120047
@@ -1,3 +1,4 @@
'1798',100,53000,,'',0,8100,,'',0,3000,,'',0,7100,,'',0,2100,,'',0,2000,,'',0,4800,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2200,,'',0,6000,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2600,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',100,61300,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
-'2919',100,61100,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'2393',100,61100,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
+'3379',100,61300,,'',0,3100,,'',0,7800,,'',0,8700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7300,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6600,,'',0
+'3380',100,61100,,'',0,3700,,'',0,8100,,'',0,8100,,'',0,4600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4800,,'',0,9000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120048
index 6e477369..66df653b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120048
@@ -1,3 +1,4 @@
'1798',101,55900,,'',0,7000,,'',0,7100,,'',0,2000,,'',0,2800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2600,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,3000,,'',0
-'1803',101,63200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
-'2919',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'2393',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
+'3379',101,63200,,'',0,7800,,'',0,4700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3400,,'',0,7200,,'',0,3300,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,6800,,'',0,4700,,'',0
+'3380',101,63600,,'',0,8100,,'',0,4100,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,8800,,'',0,9000,,'',0,8500,,'',0,4300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120049
index 873eb8ec..8dc92759 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120049
@@ -1,3 +1,4 @@
'1798',200,54000,,'',0,6200,,'',0,3000,,'',0,7100,,'',0,2700,,'',0,2100,,'',0,6100,,'',0,1700,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3100,,'',0,6600,,'',0,1800,,'',0,1800,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
-'1803',200,60500,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
-'2919',200,62200,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'2393',200,62200,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
+'3379',200,60500,,'',0,4500,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7300,,'',0,3500,,'',0,7100,,'',0,3200,,'',0,7400,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2600,,'',0,7300,,'',0
+'3380',200,62200,,'',0,8300,,'',0,4200,,'',0,8600,,'',0,8500,,'',0,8600,,'',0,4500,,'',0,9200,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,5100,,'',0,8900,,'',0,9000,,'',0,8700,,'',0,8900,,'',0,4200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120050
index deec1c9d..5bf5c9e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120050
@@ -1,6 +1,8 @@
'1798',3300,60500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,6800,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3400,,'',0,7600,,'',0,3600,,'',0,8000,,'',0,7900,,'',0,3100,,'',0,8200,,'',0,3300,,'',0,7700,,'',0,7900,,'',0,4000,,'',0,6700,,'',0,2900,,'',0,7000,,'',0
'1798',3301,60500,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3100,4,'',0,6800,4,'',0,3500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3400,4,'',0,7600,4,'',0,3600,4,'',0,8000,4,'',0,7900,4,'',0,3100,4,'',0,8200,4,'',0,3300,4,'',0,7700,4,'',0,7900,4,'',0,4000,4,'',0,6700,4,'',0,2900,4,'',0,7000,4,'',0
-'1803',3300,83000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
-'1803',3301,83000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,10400,4,'',0,10500,4,'',0
-'2919',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
-'2919',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0
+'2393',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'2393',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0
+'3379',3300,83000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,10400,,'',0,10500,,'',0
+'3379',3301,83000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,10400,4,'',0,10500,4,'',0
+'3380',3300,92500,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10000,,'',0,10000,,'',0
+'3380',3301,92500,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10600,4,'',0,10000,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120055
index acc25d90..1d0aedd9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120055
@@ -1,3 +1,4 @@
'1798',3401,55800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,7900,,'',0,3800,,'',0,7600,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
-'2919',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'3379',3401,74800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,10900,,'',0
+'3380',3401,82100,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120056
index 9ae6afba..aeecaef2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120056
@@ -1,3 +1,4 @@
'1798',3900,91300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,91200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,90700,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057
index 34b58ab7..b03c1c52 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120057
@@ -1,3 +1,4 @@
'1798',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2393',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'3379',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058
index cdb1584c..4330b307 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120058
@@ -1,3 +1,4 @@
'1798',3400,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8100,,'',0,3300,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
-'1803',3400,75700,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'2919',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3379',3400,75700,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3380',3400,83000,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120059
index 2c4d96a4..00d486b2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120059
@@ -1,3 +1,4 @@
'1798',3501,73100,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'1803',3501,82900,,'',0,67200,,'',0,22000,,'',0
-'2919',3501,93800,,'',0,30300,,'',0,59700,,'',0
+'2393',3501,93800,,'',0,30300,,'',0,59700,,'',0
+'3379',3501,82900,,'',0,67200,,'',0,22000,,'',0
+'3380',3501,93800,,'',0,30300,,'',0,59700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120061
index 37cff9f8..39488442 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120061
@@ -1,6 +1,8 @@
'1798',1000700,74900,4,'',0,6000,4,'',0,13500,4,'',0,20000,4,'',0,20100,4,'',0,20600,4,'',0,6500,4,'',0,13900,4,'',0,19900,4,'',0,19900,4,'',0
'1798',1000701,74900,0,'Montrose Exch',0,6000,0,'Montrose Exch',0,13500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,6500,0,'Montrose Exch',0,13900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19900,0,'Montrose Exch',0
-'1803',1000700,61900,4,'',0,19700,4,'',0,20100,4,'',0,20800,4,'',0,21200,4,'',0,20900,4,'',0,20400,4,'',0
-'1803',1000701,61900,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0
-'2919',1000701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0
+'2393',1000701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61900,4,'',0,19700,4,'',0,20100,4,'',0,20800,4,'',0,21200,4,'',0,20900,4,'',0,20400,4,'',0
+'3379',1000701,61900,,'',0,19700,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,72000,4,'',0,19600,4,'',0,19600,4,'',0,20000,4,'',0,20000,4,'',0,19900,4,'',0
+'3380',1000701,72000,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120062
index f51945b9..9906f74e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120062
@@ -1,3 +1,4 @@
'1798',3900,85500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'1803',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
-'2919',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
+'2393',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
+'3379',3900,85400,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,11900,,'',0
+'3380',3900,84900,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,16000,,'',0,12900,,'',0,12500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120063
index e8cda5ab..ce74e2ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120063
@@ -1,28 +1,8 @@
-'1798',3100,95700,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0
-'1803',3100,94200,4,'',0,10500,4,'',0,11000,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0
-'1798',3200,95900,4,'',0,7000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3700,4,'',0,11400,4,'',0,48500,4,'',0
-'1803',3200,81300,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0
-'2919',3200,91200,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0
-'1798',3300,61900,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3100,4,'',0,6600,4,'',0,51300,4,'',0,7700,4,'',0,4000,4,'',0,7800,4,'',0,3100,4,'',0,8200,4,'',0,7200,4,'',0,3700,4,'',0,7800,4,'',0,10600,4,'',0,9900,4,'',0
-'1798',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,7100,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',3300,195900,4,'',0,14500,4,'',0
-'1803',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
-'2919',3300,190900,4,'',0
-'2919',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
-'1798',3400,62000,4,'',0,3000,4,'',0,7000,4,'',0,2600,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,10500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8500,4,'',0,3000,4,'',0,7600,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,7900,4,'',0,10100,4,'',0
-'1798',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7300,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,10000,,'',0,9700,,'',0
-'1803',3400,80500,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
-'1803',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2919',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0
-'2919',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
-'1798',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
-'1798',3501,72500,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'1803',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
-'1803',3501,82400,,'',0,63100,,'',0,26000,,'',0
-'2919',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
-'2919',3501,93200,,'',0,30300,,'',0,59800,,'',0
-'1798',3900,84500,,'',0,9100,4,'',0,900,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,3300,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7300,,'',0,5100,4,'',0
-'1803',3900,84500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9100,4,'',0,900,,'',0,9300,4,'',0,700,,'',0,9300,4,'',0,700,,'',0,9400,4,'',0,7600,,'',0,9200,4,'',0,800,,'',0,9100,4,'',0,2900,,'',0,8900,4,'',0
-'2919',3900,84000,,'',0,8900,4,'',0,9600,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,9500,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,8000,,'',0,8900,4,'',0,3600,,'',0,8800,4,'',0
-'1798',1003100,103200,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0
-'1803',1003100,91200,4,'',0,10200,4,'',0,10800,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11000,4,'',0
+'2393',3200,91200,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0
+'2393',3300,190900,4,'',0
+'2393',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'2393',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0
+'2393',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'2393',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
+'2393',3501,93200,,'',0,30300,,'',0,59800,,'',0
+'2393',3900,84000,,'',0,8900,4,'',0,9600,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,9500,,'',0,9000,4,'',0,3000,,'',0,9000,4,'',0,8000,,'',0,8900,4,'',0,3600,,'',0,8800,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120064
index f16f21b0..c78fbaea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120064
@@ -1,20 +1,4 @@
-'1798',3100,75100,4,'',0,7100,4,'',0,3000,4,'',0,58300,4,'',0,9300,4,'',0,8200,4,'',0,1500,4,'',0,3200,4,'',0,7000,4,'',0,1300,4,'',0,7500,4,'',0
-'1798',3101,62500,,'',0,8500,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,8700,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11300,,'',0,3400,,'',0,5200,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,2000,,'',0,38500,,'',0
-'1803',3101,81500,,'',0,10000,,'',0,10200,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0
-'1798',3200,62000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,58800,4,'',0,11600,4,'',0,7400,4,'',0,3900,4,'',0,7400,4,'',0,3700,4,'',0,7800,4,'',0,7900,4,'',0,11900,4,'',0,10700,4,'',0
-'1798',3201,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3700,,'',0,7500,,'',0,7800,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,7000,,'',0,9000,,'',0,11000,,'',0
-'1803',3200,192700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,13000,4,'',0
-'1803',3201,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,17000,,'',0
-'2919',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'1798',3300,95400,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3400,4,'',0,65200,4,'',0,9600,4,'',0
-'1803',3300,84300,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0
-'2919',3300,93800,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
-'1798',3400,95400,4,'',0,7100,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,11500,4,'',0,65500,4,'',0
-'1803',3400,80700,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0
-'1798',1003100,70800,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,8500,4,'',0,58600,4,'',0,3700,4,'',0,9400,4,'',0,7000,4,'',0,4600,4,'',0,9900,4,'',0,7600,4,'',0,11400,4,'',0,15400,4,'',0,10900,4,'',0
-'1798',1003101,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,14200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,9200,,'',0,8700,,'',0,3100,,'',0,7300,,'',0,3000,,'',0,10200,,'',0,8500,,'',0,16500,,'',0
-'1803',1003100,182200,4,'',0,3500,4,'',0,14500,4,'',0,10400,4,'',0,10000,4,'',0
-'1803',1003101,84500,,'',0,10000,,'',0,10500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,10500,,'',0,10500,,'',0
-'2919',1003100,103900,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
-'2919',1003101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
-'1798',24003100,61900,4,'',0,3100,4,'',0,7100,4,'',0
+'2393',3201,84400,,'',0,9600,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
+'2393',3300,93800,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
+'2393',1003100,103900,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
+'2393',1003101,104200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10500,,'',0,10500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120067
index c1b8cb57..8bbd7549 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120067
@@ -1,3 +1,4 @@
'1798',3900,90700,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12500,,'',0
-'1803',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
-'2919',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'2393',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
+'3379',3900,90600,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
+'3380',3900,90100,,'',0,14600,,'',0,16000,,'',0,14500,,'',0,16000,,'',0,12900,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068
index a99cb048..992114a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120068
@@ -1,3 +1,4 @@
'1798',500,61400,,'',0,9300,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,6900,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,7100,,'',0,3500,,'',0,7700,,'',0,3600,,'',0,7600,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6700,,'',0,8500,,'',0,4300,,'',0,9900,,'',0
-'1803',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
-'2919',500,64400,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'2393',500,64400,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
+'3379',500,70800,,'',0,10100,,'',0,10100,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,3000,,'',0,7400,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2800,,'',0,9700,,'',0
+'3380',500,64400,,'',0,10900,,'',0,9800,,'',0,9800,,'',0,10100,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9000,,'',0,5000,,'',0,9600,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120069
index c62d0c53..af703992 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120069
@@ -1,3 +1,4 @@
'1798',501,60800,,'',0,2800,,'',0,6800,,'',0,2700,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3100,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3500,,'',0,7300,,'',0,7500,,'',0,3600,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3200,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,9500,,'',0
-'1803',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2393',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3379',501,64100,,'',0,9700,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,6900,,'',0,3300,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',501,62400,,'',0,9700,,'',0,9500,,'',0,9900,,'',0,9900,,'',0,9000,,'',0,5000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,9300,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120070
index 4bd48546..4cbd9937 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120070
@@ -1,6 +1,8 @@
'1798',700,62400,,'',0,21100,,'',0,20000,,'',0,20100,,'',0,20000,,'',0,20500,,'',0,20400,,'',0,20000,,'',0,20900,,'',0
-'1803',700,71100,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,61100,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',700,61100,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',700,71100,,'',0,14600,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,61100,,'',0,20100,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',1000700,74000,,'',0,6000,,'',0,13500,,'',0,20000,,'',0,20100,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,19900,,'',0,20000,,'',0
-'1803',1000700,61100,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
-'2919',1000700,71100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,71100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,61100,,'',0,19600,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20400,,'',0
+'3380',1000700,71100,,'',0,19600,,'',0,19600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120071
index 3517cb8e..acb259db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120071
@@ -1,6 +1,8 @@
'1798',400,61700,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
'1798',401,61700,4,'',0,9600,4,'',0,2000,4,'',0,7300,4,'',0,11300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0
-'1803',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'1803',401,61700,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,11500,4,'',0,10500,4,'',0,10100,4,'',0,10300,4,'',0,10000,4,'',0
-'2919',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
-'2919',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0
+'2393',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0
+'3379',400,61700,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3379',401,61700,4,'',0,9200,4,'',0,9800,4,'',0,10100,4,'',0,10000,4,'',0,10500,4,'',0,10500,4,'',0,10000,4,'',0,10500,4,'',0,10700,4,'',0,9300,4,'',0,11500,4,'',0,10500,4,'',0,10100,4,'',0,10300,4,'',0,10000,4,'',0
+'3380',400,65900,,'',0,24400,,'',0,12500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3380',401,65900,4,'',0,24400,4,'',0,12500,4,'',0,13000,4,'',0,17000,4,'',0,13000,4,'',0,17000,4,'',0,12000,4,'',0,17500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120072
index 304260a7..a101999d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120072
@@ -1,27 +1,34 @@
'1798',101,53900,,'',0,7000,,'',0,3000,,'',0,2000,,'',0,6800,,'',0,1800,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6600,,'',0,2900,,'',0,7000,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
-'2919',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'2393',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
+'3379',101,61300,,'',0,3700,,'',0,8700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,3500,,'',0,7600,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3200,,'',0,7300,,'',0,3300,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,8800,,'',0
+'3380',101,61700,,'',0,4100,,'',0,8000,,'',0,8500,,'',0,8500,,'',0,4600,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,4500,,'',0,8400,,'',0
'1798',200,60100,,'',0,2300,,'',0,3100,,'',0,7300,,'',0,2800,,'',0,6200,,'',0,2100,,'',0,1700,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,1800,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2700,,'',0,7200,,'',0,2300,,'',0,1800,,'',0,5800,,'',0,1900,,'',0,1500,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6300,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,6900,,'',0
-'1803',200,62600,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
-'2919',200,64400,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'2393',200,64400,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
+'3379',200,62600,,'',0,8500,,'',0,3600,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3300,,'',0,7400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,7400,,'',0,3100,,'',0,7200,,'',0,3300,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3200,,'',0
+'3380',200,64400,,'',0,8300,,'',0,8200,,'',0,4700,,'',0,8600,,'',0,8600,,'',0,8600,,'',0,9300,,'',0,5100,,'',0,9100,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,8800,,'',0,5000,,'',0,8600,,'',0,8900,,'',0,8200,,'',0
'1798',301,54900,,'',0,9200,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8300,,'',0,10000,,'',0,8900,4,'',0
-'1803',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,4,'',0
-'2919',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,4,'',0
+'2393',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,4,'',0
+'3379',301,64400,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8700,4,'',0
+'3380',301,62000,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,9100,,'',0,10000,,'',0,4800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,4,'',0
'1798',400,63700,4,'',0,9600,4,'',0,2000,4,'',0,18600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10600,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
'1798',401,60500,,'',0,9500,,'',0,2000,,'',0,3300,,'',0,15300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1803',401,60500,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'2393',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
+'3379',401,60500,,'',0,5200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,14500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',401,64700,,'',0,20300,,'',0,16500,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,12000,,'',0,17500,,'',0
'1798',700,61900,,'',0,21100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,20500,,'',0,20000,,'',0,20900,,'',0
'1798',701,65200,4,'',0,25200,4,'',0,20000,4,'',0,20100,4,'',0,20000,4,'',0,20500,4,'',0,20300,4,'',0,19900,4,'',0
-'1803',700,70600,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
-'2919',700,60600,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'2393',700,60600,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
+'3379',700,70600,,'',0,14500,,'',0,25600,,'',0,21000,,'',0,21000,,'',0,20900,,'',0,20500,,'',0,10000,,'',0,17000,,'',0
+'3380',700,60600,,'',0,20000,,'',0,15100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19900,,'',0,16500,,'',0
'1798',900,54500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1798',901,61700,4,'',0,10100,4,'',0,10400,4,'',0,9800,4,'',0,9600,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10100,4,'',0,10100,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'1803',900,64500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
-'2919',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',900,64500,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10400,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,14700,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,10300,,'',0,10000,,'',0
+'3380',900,63500,,'',0,17000,,'',0,13000,,'',0,12200,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',1500,73700,4,'',0,12000,4,'',0,68300,4,'',0
'1798',1600,73700,,'',0,12000,,'',0,68300,,'',0,8500,,'',0
'1798',1000700,73500,,'',0,2000,,'',0,17500,,'',0,20000,,'',0,20000,,'',0,20500,,'',0,6500,,'',0,14000,,'',0,20000,,'',0,20000,,'',0
'1798',1000701,83000,4,'',0,17500,4,'',0,20000,4,'',0,20100,4,'',0,20600,4,'',0,20300,4,'',0,19900,4,'',0,19800,4,'',0
-'1803',1000700,60600,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
-'2919',1000700,70600,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'2393',1000700,70600,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
+'3379',1000700,60600,,'',0,19500,,'',0,20100,,'',0,20800,,'',0,21200,,'',0,20900,,'',0,20500,,'',0
+'3380',1000700,70600,,'',0,19500,,'',0,15600,,'',0,20000,,'',0,20000,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120073 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120073
index 47c63ef4..5985f108 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120073
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120073
@@ -1,26 +1,33 @@
'1798',100,54800,,'',0,8200,,'',0,7000,,'',0,3200,,'',0,2200,,'',0,6100,,'',0,800,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,6300,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6600,,'',0,2500,,'',0,6700,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,1700,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,7000,,'',0,2900,,'',0
-'1803',100,63100,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
-'2919',100,62800,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'2393',100,62800,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
+'3379',100,63100,,'',0,7100,,'',0,3900,,'',0,8700,,'',0,3100,,'',0,7000,,'',0,7200,,'',0,3100,,'',0,7100,,'',0,3300,,'',0,7100,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6600,,'',0,2600,,'',0
+'3380',100,62800,,'',0,7900,,'',0,4100,,'',0,8100,,'',0,8600,,'',0,8700,,'',0,4600,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,8800,,'',0,8700,,'',0,9000,,'',0,9900,,'',0
'1798',201,52200,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6000,,'',0,2400,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6600,,'',0,1600,,'',0,2300,,'',0,5900,,'',0,1500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2300,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'1803',201,61400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
-'2919',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'2393',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
+'3379',201,61400,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7300,,'',0,3400,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,7300,,'',0,3300,,'',0,7400,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,6700,,'',0,3300,,'',0,8800,,'',0
+'3380',201,62800,,'',0,8100,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,8700,,'',0,9000,,'',0,8500,,'',0,4500,,'',0
'1798',300,60300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,2700,,'',0,7600,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,3800,,'',0,6900,,'',0,8500,,'',0,4400,,'',0,10000,,'',0,9500,,'',0
-'1803',300,60700,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
-'2919',300,65000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2393',300,65000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3379',300,60700,,'',0,10000,,'',0,9800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3300,,'',0,6900,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9700,,'',0,9400,,'',0
+'3380',300,65000,,'',0,9700,,'',0,9500,,'',0,10000,,'',0,9900,,'',0,9000,,'',0,9000,,'',0,9900,,'',0,8800,,'',0,9300,,'',0,5300,,'',0,9000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
'1798',400,82400,4,'',0
-'1803',400,63400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'2393',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
+'3379',400,63400,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10600,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,14400,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,71600,,'',0,20400,,'',0,12500,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,15900,,'',0,13500,,'',0
'1798',701,65000,0,'Montrose Exch',0,25200,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,20300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20500,4,'',0
-'1803',701,73400,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
-'2919',701,63300,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,63300,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,73400,,'',0,18700,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,24800,,'',0,20500,,'',0,10000,,'',0,12800,,'',0
+'3380',701,63300,,'',0,20200,,'',0,19200,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
'1798',901,222200,4,'',0
-'1803',901,71500,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
-'2919',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'2393',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
+'3379',901,71500,,'',0,9300,,'',0,9800,,'',0,10200,,'',0,10500,,'',0,10300,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,10300,,'',0,10500,,'',0,10300,,'',0,10000,,'',0,10200,,'',0,9900,,'',0
+'3380',901,70500,,'',0,13100,,'',0,17100,,'',0,12300,,'',0,17100,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,11900,,'',0,17400,,'',0
'1798',1500,65200,4,'',0,108900,4,'',0,9000,4,'',0
'1798',1501,61400,,'',0,4300,,'',0,15800,,'',0,64300,,'',0,24200,,'',0,5100,,'',0
-'1803',1500,93500,4,'',0,18600,4,'',0,43000,4,'',0,18400,4,'',0
-'1803',1501,85700,,'',0,18500,,'',0,47000,,'',0,14500,,'',0
+'3379',1500,93500,4,'',0,18600,4,'',0,43000,4,'',0,18400,4,'',0
+'3379',1501,85700,,'',0,18500,,'',0,47000,,'',0,14500,,'',0
'1798',1601,80800,4,'',0,11900,4,'',0,68500,4,'',0,4600,4,'',0
'1798',1000701,80700,4,'',0,2100,0,'Montrose Exch',0,17500,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20600,0,'Montrose Exch',0,2300,4,'',0,18000,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,19800,0,'Montrose Exch',0
-'1803',1000701,63500,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
-'2919',1000701,73600,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'2393',1000701,73600,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
+'3379',1000701,63500,,'',0,19800,,'',0,20200,,'',0,20800,,'',0,21200,,'',0,24800,,'',0,20400,,'',0
+'3380',1000701,73600,,'',0,19700,,'',0,19700,,'',0,20000,,'',0,19900,,'',0,19900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120074 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120074
index 7c46c545..7def8fe8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120074
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120074
@@ -1,3 +1,4 @@
'1798',400,62000,0,'Montrose Exch',0,9600,0,'Montrose Exch',0,2000,0,'Montrose Exch',0,7300,0,'Montrose Exch',0,11300,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10600,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10100,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,10000,0,'Montrose Exch',0,9900,0,'Montrose Exch',0
-'1803',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
-'2919',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'2393',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
+'3379',400,61900,,'',0,9200,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,10500,,'',0,10500,,'',0,10000,,'',0,10500,,'',0,10700,,'',0,9300,,'',0,11500,,'',0,10500,,'',0,10100,,'',0,10300,,'',0,10000,,'',0
+'3380',400,70100,,'',0,20400,,'',0,12500,,'',0,17000,,'',0,13000,,'',0,17000,,'',0,13000,,'',0,12000,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120075 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120075
index b64c32ec..f326d4f8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120075
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120075
@@ -1,3 +1,4 @@
'1798',301,54600,,'',0,9200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,7100,,'',0,3300,,'',0,7700,,'',0,2800,,'',0,8500,,'',0,8400,,'',0,10000,,'',0,8900,0,'Montrose Exch Only',0
-'1803',301,64000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
-'2919',301,61600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'2393',301,61600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
+'3379',301,64000,,'',0,10100,,'',0,10000,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,7200,,'',0,2800,,'',0,7000,,'',0,7200,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,9700,,'',0,9600,,'',0,8800,0,'Montrose Exch Only',0
+'3380',301,61600,,'',0,10800,,'',0,9700,,'',0,9700,,'',0,10000,,'',0,10000,,'',0,9000,,'',0,5100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,9200,,'',0,9000,,'',0,9800,,'',0,10000,,'',0,9500,0,'Montrose Exch Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120077
index 53a4a7f1..9900db6e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120077
@@ -1,3 +1,4 @@
'1798',3300,61300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3100,,'',0,6600,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3400,,'',0,7700,,'',0,7700,,'',0,4000,,'',0,7800,,'',0,3100,,'',0,8200,,'',0,7200,,'',0,3700,,'',0,7900,,'',0,7900,,'',0,2700,,'',0,2900,,'',0,7000,,'',0
-'1803',3300,83800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
-'2919',3300,93300,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
+'2393',3300,93300,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
+'3379',3300,83800,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3200,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3300,,'',0,10400,,'',0,10500,,'',0
+'3380',3300,93300,,'',0,10100,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,14500,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120078
index 50118be0..85ea9376 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120078
@@ -1,6 +1,8 @@
'1798',301,60400,,'',0,5300,,'',0,7200,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3500,,'',0,7300,,'',0,3000,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7600,,'',0,3700,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,4500,,'',0,8300,,'',0,9900,,'',0
-'1803',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,2900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
-'2919',301,63400,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'2393',301,63400,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
+'3379',301,65800,,'',0,10100,,'',0,14100,,'',0,3000,,'',0,2900,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,7100,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,9700,,'',0,9500,,'',0
+'3380',301,63400,,'',0,10900,,'',0,9800,,'',0,9700,,'',0,10000,,'',0,10100,,'',0,9100,,'',0,9100,,'',0,10000,,'',0,8800,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9800,,'',0,10000,,'',0
'1798',601,61200,,'',0,4700,,'',0,7100,,'',0,7700,,'',0,3500,,'',0,7300,,'',0,4000,,'',0,16000,,'',0,11600,,'',0,11500,,'',0,8600,,'',0,8600,,'',0,8300,,'',0,4000,,'',0,8500,,'',0,7900,,'',0,4000,,'',0,15500,,'',0,5800,,'',0,15500,,'',0,11000,,'',0
-'1803',601,62000,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14100,,'',0,11000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
-'2919',601,61600,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'2393',601,61600,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
+'3379',601,62000,,'',0,12100,,'',0,10200,,'',0,9800,,'',0,10500,,'',0,10200,,'',0,10600,,'',0,10500,,'',0,14100,,'',0,11000,,'',0,9800,,'',0,10500,,'',0,10400,,'',0,10000,,'',0,9000,,'',0
+'3380',601,61600,,'',0,13100,,'',0,9600,,'',0,11000,,'',0,8600,,'',0,9000,,'',0,10100,,'',0,9000,,'',0,9100,,'',0,9400,,'',0,5300,,'',0,9100,,'',0,9000,,'',0,12000,,'',0,15800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120079
index 5ada779b..b1a133fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120079
@@ -1,6 +1,8 @@
'1798',3400,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,4000,,'',0,7400,,'',0,7800,,'',0,3800,,'',0,7600,,'',0,7800,,'',0,3400,,'',0,7900,,'',0,3900,,'',0,9700,,'',0,9700,,'',0
'1798',3401,60500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,4000,4,'',0,7400,4,'',0,7800,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,3900,4,'',0,9700,4,'',0,9700,4,'',0
-'1803',3400,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
-'1803',3401,75400,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
-'2919',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
-'2919',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0
+'2393',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'2393',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0
+'3379',3400,75400,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,10900,,'',0
+'3379',3401,75400,4,'',0,7200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,10900,4,'',0
+'3380',3400,82700,,'',0,17500,,'',0,12300,,'',0,18000,,'',0,12500,,'',0,12300,,'',0,17000,,'',0,17900,,'',0
+'3380',3401,82700,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,12300,4,'',0,17000,4,'',0,17900,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120080 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120080
index 81d4b5bb..f77c90a2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120080
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120080
@@ -1,3 +1,4 @@
'1798',3900,92200,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'2393',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
+'3379',3900,92100,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,91500,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,12900,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081
index 8dc74c4c..1b03b46d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120081
@@ -1,3 +1,4 @@
'1798',701,64100,0,'Montrose Exch',0,21100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20100,0,'Montrose Exch',0,20000,0,'Montrose Exch',0,20500,0,'Montrose Exch',0,24300,0,'Montrose Exch',0,19900,0,'Montrose Exch',0,20900,0,'Montrose Exch',0
-'1803',701,72700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
-'2919',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'2393',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
+'3379',701,72700,,'',0,18600,,'',0,21600,,'',0,21000,,'',0,21000,,'',0,20800,,'',0,24500,,'',0,10000,,'',0,12900,,'',0
+'3380',701,62600,,'',0,20200,,'',0,19100,,'',0,20000,,'',0,20000,,'',0,20000,,'',0,19800,,'',0,12500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120082
index 34b58ab7..b03c1c52 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120082
@@ -1,3 +1,4 @@
'1798',3900,92800,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,16500,,'',0,10000,,'',0,12400,,'',0
-'1803',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
-'2919',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'2393',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
+'3379',3900,92700,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,15800,,'',0
+'3380',3900,92100,,'',0,18600,,'',0,12000,,'',0,18500,,'',0,12000,,'',0,16900,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120092
new file mode 100644
index 00000000..3e4bbe1a
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120092
@@ -0,0 +1,21 @@
+'1798',3100,74900,4,'',0,7100,4,'',0,3000,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,10900,4,'',0,9300,4,'',0,8200,4,'',0,1500,4,'',0,3200,4,'',0,7000,4,'',0,1300,4,'',0,7500,4,'',0
+'3379',3100,93900,4,'',0,10500,4,'',0,11000,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0
+'1798',3200,61800,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7700,4,'',0,7500,4,'',0,3900,4,'',0,7700,4,'',0,3400,4,'',0,7900,4,'',0,7400,4,'',0,3700,4,'',0,7800,4,'',0,7900,4,'',0,2700,4,'',0,9200,4,'',0,10700,4,'',0
+'3379',3200,81000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,13000,4,'',0
+'3380',3200,90900,4,'',0,9600,4,'',0,10200,4,'',0,10700,4,'',0,10500,4,'',0,10600,4,'',0,10400,4,'',0,10500,4,'',0,10300,4,'',0,10000,4,'',0
+'1798',3300,61600,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3100,4,'',0,6600,4,'',0,3500,4,'',0,7200,4,'',0,3300,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3400,4,'',0,7800,4,'',0,7700,4,'',0,4000,4,'',0,7800,4,'',0,3100,4,'',0,8200,4,'',0,7200,4,'',0,3700,4,'',0,7800,4,'',0,7900,4,'',0,2700,4,'',0,6900,4,'',0,3000,4,'',0
+'1798',3301,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,4000,,'',0,7100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0
+'3379',3300,84100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3200,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3300,4,'',0,10300,4,'',0,14500,4,'',0
+'3379',3301,81900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7200,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,10500,,'',0,10500,,'',0
+'3380',3300,93600,4,'',0,10100,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0,9900,4,'',0
+'3380',3301,91400,,'',0,10000,,'',0,10500,,'',0,10400,,'',0,10500,,'',0,10500,,'',0,10500,,'',0,10600,,'',0,10100,,'',0,10000,,'',0
+'1798',3400,61700,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7400,4,'',0,3100,4,'',0,7100,4,'',0,3200,4,'',0,6900,4,'',0,3600,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8000,4,'',0,3500,4,'',0,7400,4,'',0,3800,4,'',0,7600,4,'',0,7800,4,'',0,3400,4,'',0,7900,4,'',0,7900,4,'',0,9800,4,'',0,5700,4,'',0
+'1798',3401,55500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7300,,'',0,3900,,'',0,7800,,'',0,7500,,'',0,3800,,'',0,7400,,'',0,8000,,'',0,4000,,'',0,9800,,'',0,9700,,'',0
+'3379',3400,80700,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7300,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,10800,4,'',0,10900,4,'',0
+'3379',3401,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'3380',3400,83800,4,'',0,17500,4,'',0,12300,4,'',0,18000,4,'',0,12500,4,'',0,16300,4,'',0,13000,4,'',0,17900,4,'',0
+'3380',3401,81800,,'',0,13400,,'',0,16300,,'',0,14000,,'',0,16500,,'',0,12300,,'',0,17000,,'',0,13900,,'',0
+'1798',1003100,70600,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,8500,4,'',0,10600,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,3700,4,'',0,9400,4,'',0,7000,4,'',0,4600,4,'',0,9900,4,'',0,7600,4,'',0,11400,4,'',0,11400,4,'',0,14900,4,'',0
+'3379',1003100,90900,4,'',0,10200,4,'',0,10800,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11100,4,'',0,3500,4,'',0,14500,4,'',0,10400,4,'',0,10000,4,'',0
+'3380',1003100,103700,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0,14500,4,'',0,10500,4,'',0,10000,4,'',0
+'1798',24003100,61700,4,'',0,3100,4,'',0,7100,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120093
new file mode 100644
index 00000000..ac0363e7
--- /dev/null
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_120093
@@ -0,0 +1,9 @@
+'1798',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
+'1798',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3379',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
+'3379',3501,82500,,'',0,63100,,'',0,26000,,'',0
+'3380',3500,95200,4,'',0,30300,4,'',0,59700,4,'',0
+'3380',3501,93300,,'',0,30300,,'',0,59800,,'',0
+'1798',3900,84600,,'',0,9000,4,'',0,1100,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,8000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,3500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,7500,,'',0,4900,4,'',0
+'3379',3900,84600,,'',0,8900,4,'',0,1100,,'',0,8900,4,'',0,1100,,'',0,9000,4,'',0,1100,,'',0,9100,4,'',0,900,,'',0,9100,4,'',0,1000,,'',0,9100,4,'',0,7800,,'',0,9000,4,'',0,1000,,'',0,8900,4,'',0,3000,,'',0,8800,4,'',0
+'3380',3900,84100,,'',0,8800,4,'',0,9700,,'',0,8900,4,'',0,3100,,'',0,8900,4,'',0,9600,,'',0,8900,4,'',0,3100,,'',0,8900,4,'',0,8100,,'',0,8800,4,'',0,3700,,'',0,8700,4,'',0
diff --git a/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
index 941c33bc..dfe6b9ce 100644
--- a/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
+++ b/app-android/src/main/res-current/values/current_gtfs_rts_values_gen.xml
@@ -6,6 +6,6 @@
49.1583
-122.47064
-122.21454
- 1723986000
+ 1724590800
1725334260
diff --git a/app-android/src/main/res-next/raw/next_gtfs_rts_stops b/app-android/src/main/res-next/raw/next_gtfs_rts_stops
index b91c0bec..d0dfb911 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_rts_stops
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_stops
@@ -474,7 +474,7 @@
107752,'107752','1st Ave @ James St',49.13445,-122.30825,0,1448850460
107754,'107754','Junction Mall',49.13014,-122.31907,0,1448850462
107755,'107755','Lougheed Hwy @ Haig St',49.13289,-122.32110,0,1448850463
-107756,'107756','Mission City Stn',49.13391,-122.30415,0,1448850464
+107756,'107756','Mission City Stn B:2',49.13389,-122.30416,0,1448850464
107758,'107758','Hurd St @ Lougheed Hwy',49.13347,-122.32942,0,1448850466
107759,'107759','Hurd St @ Scott Ave',49.13533,-122.33268,0,1448850467
107761,'107761','Hurd St @ Pleasantview Cres',49.13882,-122.33270,0,1448850490
@@ -520,8 +520,6 @@
107806,'107806','Cedar St @ 10th Ave',49.14188,-122.31640,0,1448851270
107807,'107807','32700 Blk Cedar Vly Connector',49.13862,-122.31909,0,1448851271
107817,'107817','7th Ave @ Horne St',49.13976,-122.30207,0,1448851302
-107818,'107818','3rd Ave @ Horne St',49.13625,-122.30202,0,1448851303
-107819,'107819','3rd Ave @ Horne St',49.13621,-122.30181,0,1448851304
107820,'107820','3rd Ave @ Columbia St',49.13618,-122.29674,0,1448851326
107822,'107822','Stave Lk St @ 5A Ave',49.13857,-122.29277,0,1448851328
107823,'107823','Stave Lk St @ 7th Ave',49.14009,-122.29275,0,1448851329
@@ -603,8 +601,6 @@
120059,'120059','Dewdney Trunk Rd @ Lougheed Hwy',49.15002,-122.25518,0,1450482245
120061,'120061','Lower Sumas Mtn Rd @ Marshall Rd',49.04901,-122.22350,0,1450482268
120062,'120062','Junction Mall',49.13091,-122.31975,0,1450482269
-120063,'120063','Mission Exch B:B',49.13530,-122.30299,0,1450482270
-120064,'120064','Mission Exch B:A',49.13535,-122.30290,0,1450482271
120067,'120067','Mission Walmart',49.13198,-122.34088,0,1450482274
120068,'120068','Marshall Rd @ Mdws St',49.03823,-122.33353,0,1450482275
120069,'120069','Marshall Rd @ Majestic Cres',49.03826,-122.32663,0,1450482276
@@ -620,3 +616,5 @@
120080,'120080','Cedar St @ 3rd Ave',49.13660,-122.31656,0,1450482329
120081,'120081','Marshall Rd @ Everett St',49.03850,-122.25475,0,1450482330
120082,'120082','11th Ave @ Taulbut St',49.14388,-122.30661,0,1450482331
+120092,'120092','Mission City Stn B:1',49.13393,-122.30507,0,1450482362
+120093,'120093','Mission City Stn B:3',49.13385,-122.30336,0,1450482363
diff --git a/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops b/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops
index 4e2404dd..4c3e268d 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops
@@ -951,29 +951,25 @@
3100,120013,13,0
3100,107754,14,0
3100,107755,15,0
-3100,107756,16,0
-3100,107751,17,0
-3100,120063,18,1
-3100,120064,19,1
-3101,120064,1,0
-3101,107756,2,0
-3101,107751,3,0
-3101,107752,4,0
-3101,120007,5,0
-3101,107754,6,0
-3101,120014,7,0
-3101,107256,8,0
-3101,107255,9,0
-3101,107254,10,0
-3101,107159,11,0
-3101,107160,12,0
-3101,107161,13,0
-3101,107162,14,0
-3101,107163,15,0
-3101,107164,16,0
-3101,107165,17,0
-3101,107166,18,0
-3101,107020,19,1
+3100,120092,16,1
+3101,107756,1,0
+3101,107751,2,0
+3101,107752,3,0
+3101,120007,4,0
+3101,107754,5,0
+3101,120014,6,0
+3101,107256,7,0
+3101,107255,8,0
+3101,107254,9,0
+3101,107159,10,0
+3101,107160,11,0
+3101,107161,12,0
+3101,107162,13,0
+3101,107163,14,0
+3101,107164,15,0
+3101,107165,16,0
+3101,107166,17,0
+3101,107020,18,1
3200,107773,1,0
3200,107774,2,0
3200,107775,3,0
@@ -984,31 +980,27 @@
3200,107870,8,0
3200,107871,9,0
3200,107755,10,0
-3200,107756,11,0
-3200,107751,12,0
-3200,120063,13,1
-3200,120064,14,1
-3201,120064,1,0
-3201,107756,2,0
-3201,107751,3,0
-3201,107752,4,0
-3201,120007,5,0
-3201,107758,6,0
-3201,107759,7,0
-3201,107880,8,0
-3201,107761,9,0
-3201,107762,10,0
-3201,107763,11,0
-3201,107764,12,0
-3201,107765,13,0
-3201,107766,14,0
-3201,107767,15,0
-3201,107768,16,0
-3201,107769,17,0
-3201,107770,18,0
-3201,107771,19,0
-3201,107772,20,0
-3201,107773,21,1
+3200,120092,11,1
+3201,107756,1,0
+3201,107751,2,0
+3201,107752,3,0
+3201,120007,4,0
+3201,107758,5,0
+3201,107759,6,0
+3201,107880,7,0
+3201,107761,8,0
+3201,107762,9,0
+3201,107763,10,0
+3201,107764,11,0
+3201,107765,12,0
+3201,107766,13,0
+3201,107767,14,0
+3201,107768,15,0
+3201,107769,16,0
+3201,107770,17,0
+3201,107771,18,0
+3201,107772,19,0
+3201,107773,20,1
3300,120050,1,0
3300,107800,2,0
3300,107801,3,0
@@ -1020,29 +1012,23 @@
3300,107807,9,0
3300,120077,10,0
3300,107755,11,0
-3300,107756,12,0
-3300,107751,13,0
-3300,120063,14,1
-3300,120064,15,1
-3301,120063,1,0
-3301,107751,2,0
-3301,107756,3,0
-3301,107819,4,0
-3301,107786,5,0
-3301,107787,6,0
-3301,107883,7,0
-3301,107788,8,0
-3301,107789,9,0
-3301,107790,10,0
-3301,107791,11,0
-3301,107792,12,0
-3301,107793,13,0
-3301,107794,14,0
-3301,107795,15,0
-3301,107796,16,0
-3301,107797,17,0
-3301,107798,18,0
-3301,120050,19,1
+3300,120092,12,1
+3301,120092,1,0
+3301,107786,2,0
+3301,107787,3,0
+3301,107883,4,0
+3301,107788,5,0
+3301,107789,6,0
+3301,107790,7,0
+3301,107791,8,0
+3301,107792,9,0
+3301,107793,10,0
+3301,107794,11,0
+3301,107795,12,0
+3301,107796,13,0
+3301,107797,14,0
+3301,107798,15,0
+3301,120050,16,1
3400,120079,1,0
3400,107835,2,0
3400,107836,3,0
@@ -1059,74 +1045,64 @@
3400,107787,14,0
3400,107883,15,0
3400,107847,16,0
-3400,107756,17,0
-3400,107751,18,0
-3400,120063,19,1
-3400,107819,20,1
-3400,120064,21,1
-3401,120063,1,0
-3401,107751,2,0
-3401,107756,3,0
-3401,107819,4,0
-3401,107820,5,0
-3401,107884,6,0
-3401,107822,7,0
-3401,107823,8,0
-3401,107824,9,0
-3401,107825,10,0
-3401,120055,11,0
-3401,107826,12,0
-3401,107827,13,0
-3401,107828,14,0
-3401,107829,15,0
-3401,107794,16,0
-3401,107830,17,0
-3401,107831,18,0
-3401,107832,19,0
-3401,107833,20,0
-3401,120079,21,1
+3400,120092,17,1
+3401,120092,1,0
+3401,107820,2,0
+3401,107884,3,0
+3401,107822,4,0
+3401,107823,5,0
+3401,107824,6,0
+3401,107825,7,0
+3401,120055,8,0
+3401,107826,9,0
+3401,107827,10,0
+3401,107828,11,0
+3401,107829,12,0
+3401,107794,13,0
+3401,107830,14,0
+3401,107831,15,0
+3401,107832,16,0
+3401,107833,17,0
+3401,120079,18,1
3500,107855,1,0
3500,107856,2,0
3500,107857,3,0
3500,107751,4,0
-3500,120063,5,1
-3501,120063,1,0
-3501,107756,2,0
+3500,120093,5,1
+3501,107756,1,0
+3501,120093,2,0
3501,120059,3,0
3501,107855,4,1
-3900,120063,1,0
-3900,107751,2,0
-3900,107752,3,0
-3900,107756,4,0
-3900,120031,5,0
-3900,120062,6,0
-3900,107783,7,0
-3900,120007,8,0
-3900,120067,9,0
-3900,107870,10,0
-3900,107871,11,0
-3900,120056,12,0
-3900,107781,13,0
-3900,107759,14,0
-3900,107880,15,0
-3900,107761,16,0
-3900,107762,17,0
-3900,107763,18,0
-3900,107764,19,0
-3900,107765,20,0
-3900,107766,21,0
-3900,107850,22,0
-3900,107851,23,0
-3900,120080,24,0
-3900,107849,25,0
-3900,107788,26,0
-3900,107789,27,0
-3900,120082,28,0
-3900,120057,29,0
-3900,107817,30,0
-3900,107877,31,0
-3900,107861,32,0
-3900,107818,33,0
+3900,120093,1,0
+3900,120031,2,0
+3900,120062,3,0
+3900,107783,4,0
+3900,120007,5,0
+3900,120067,6,0
+3900,107870,7,0
+3900,107871,8,0
+3900,120056,9,0
+3900,107781,10,0
+3900,107759,11,0
+3900,107880,12,0
+3900,107761,13,0
+3900,107762,14,0
+3900,107763,15,0
+3900,107764,16,0
+3900,107765,17,0
+3900,107766,18,0
+3900,107850,19,0
+3900,107851,20,0
+3900,120080,21,0
+3900,107849,22,0
+3900,107788,23,0
+3900,107789,24,0
+3900,120082,25,0
+3900,120057,26,0
+3900,107817,27,0
+3900,107877,28,0
+3900,107861,29,0
+3900,107751,30,0
1000700,108262,1,0
1000700,107021,2,0
1000700,107022,3,0
@@ -1278,32 +1254,28 @@
1003100,107492,15,0
1003100,107754,16,0
1003100,107755,17,0
-1003100,107756,18,0
-1003100,107751,19,0
-1003100,120063,20,1
-1003100,120064,21,1
-1003101,120064,1,0
-1003101,107756,2,0
-1003101,107751,3,0
-1003101,107752,4,0
-1003101,120007,5,0
-1003101,107754,6,0
-1003101,107487,7,0
-1003101,107488,8,0
-1003101,107489,9,0
-1003101,120014,10,0
-1003101,107256,11,0
-1003101,107255,12,0
-1003101,107254,13,0
-1003101,107159,14,0
-1003101,107160,15,0
-1003101,107161,16,0
-1003101,107162,17,0
-1003101,107163,18,0
-1003101,107164,19,0
-1003101,107165,20,0
-1003101,107166,21,0
-1003101,107020,22,1
+1003100,120092,18,1
+1003101,107756,1,0
+1003101,107751,2,0
+1003101,107752,3,0
+1003101,120007,4,0
+1003101,107754,5,0
+1003101,107487,6,0
+1003101,107488,7,0
+1003101,107489,8,0
+1003101,120014,9,0
+1003101,107256,10,0
+1003101,107255,11,0
+1003101,107254,12,0
+1003101,107159,13,0
+1003101,107160,14,0
+1003101,107161,15,0
+1003101,107162,16,0
+1003101,107163,17,0
+1003101,107164,18,0
+1003101,107165,19,0
+1003101,107166,20,0
+1003101,107020,21,1
24003100,107501,1,0
24003100,107122,2,0
24003100,107123,3,0
@@ -1318,5 +1290,4 @@
24003100,107486,12,0
24003100,120013,13,0
24003100,107755,14,0
-24003100,107756,15,0
-24003100,120064,16,1
+24003100,120092,15,1
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107751 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107751
index 9091e7c1..5ad7b235 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107751
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107751
@@ -1,22 +1,19 @@
-'3277',3100,95500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,19400,,'',0,7600,,'',0,3500,,'',0,7500,,'',0
-'3277',3101,171300,,'',0,2800,,'',0,7200,,'',0
-'3281',3100,92500,,'',0,10000,,'',0,11500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0
-'3282',3100,114000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,10300,,'',0
-'3277',3200,203300,,'',0
-'3277',3201,171300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0
-'3282',3200,81900,,'',0,10400,,'',0,88700,,'',0,11000,,'',0,11500,,'',0
-'3277',3300,61300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,65900,,'',0,52000,,'',0,9500,,'',0
-'3277',3301,171100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0
-'3281',3300,200400,,'',0,9900,,'',0
-'3277',3400,61300,,'',0,3000,,'',0,7100,,'',0,31200,,'',0,48800,,'',0
-'3277',3401,171100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0
-'3277',3500,74300,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33200,,'',0,26800,,'',0
-'3281',3500,84200,,'',0,67200,,'',0,22000,,'',0
-'3282',3500,95900,,'',0,25500,,'',0,63400,,'',0
-'3277',3900,84600,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,8000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,3500,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,7500,,'',0,4900,,'',0
-'3281',3900,84600,,'',0,8800,,'',0,1200,,'',0,8800,,'',0,1200,,'',0,8900,,'',0,1100,,'',0,9000,,'',0,1000,,'',0,9000,,'',0,1000,,'',0,9100,,'',0,7900,,'',0,9000,,'',0,1000,,'',0,8900,,'',0,3100,,'',0,8700,,'',0
-'3282',3900,84600,,'',0,8700,,'',0,6800,,'',0,4800,,'',0,5700,,'',0,4800,,'',0,6700,,'',0,8800,,'',0,2200,,'',0,8800,,'',0,2700,,'',0,8800,,'',0,6700,,'',0,4700,,'',0,9300,,'',0,8600,,'',0
-'3277',1003100,92500,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,15000,,'',0,15400,,'',0,29600,,'',0,8100,,'',0
-'3277',1003101,185800,,'',0,8500,,'',0
-'3281',1003100,85100,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,15000,,'',0,11000,,'',0,3500,,'',0
-'3282',1003100,110500,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,14800,,'',0
+'3277',3101,62100,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
+'3281',3101,75600,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
+'3282',3101,100300,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
+'3277',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3278',3201,62100,,'',0
+'3281',3201,75600,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3282',3201,75600,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3283',3201,62100,,'',0
+'3277',3500,74400,,'',0,6500,,'',0,3600,,'',0,35900,,'',0,33100,,'',0,26900,,'',0
+'3281',3500,84300,,'',0,67200,,'',0,22000,,'',0
+'3282',3500,100000,,'',0,21500,,'',0,63400,,'',0
+'3277',3900,93500,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
+'3281',3900,93400,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
+'3282',3900,93300,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
+'3277',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3278',1003101,65100,,'',0
+'3281',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3282',1003101,85900,,'',0,25200,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3283',1003101,65100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107752 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107752
index b9e0673c..272e34d0 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107752
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107752
@@ -1,16 +1,13 @@
-'3277',3101,62100,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,2800,,'',0,7200,,'',0,1700,,'',0,38500,,'',0
-'3281',3101,75600,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
-'3282',3101,100300,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
-'3277',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3277',3101,62100,,'',0,8500,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38400,,'',0
+'3281',3101,75600,,'',0,10300,,'',0,14500,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
+'3282',3101,100400,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
+'3277',3201,55100,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
'3278',3201,62100,,'',0
-'3281',3201,75600,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
-'3282',3201,75600,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3281',3201,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3282',3201,75600,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
'3283',3201,62100,,'',0
-'3277',3900,84600,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3281',3900,84600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
-'3282',3900,84600,,'',0,15500,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'3277',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3277',1003101,72100,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2400,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
'3278',1003101,65100,,'',0
-'3281',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
-'3282',1003101,85900,,'',0,25200,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3281',1003101,82600,,'',0,10500,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3282',1003101,85900,,'',0,25300,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
'3283',1003101,65100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107756 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107756
index 32bb77b6..b912ec4a 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107756
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107756
@@ -1,29 +1,14 @@
-'3277',3100,74400,,'',0,7100,,'',0,3500,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,9900,,'',0,7800,,'',0,1700,,'',0,7600,,'',0,2700,,'',0,800,,'',0,7500,,'',0
-'3277',3101,171200,,'',0,2800,,'',0,7200,,'',0
-'3281',3100,92400,,'',0,10000,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,11000,,'',0
-'3282',3100,113900,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,11500,,'',0,10300,,'',0
-'3277',3200,61200,,'',0,10200,,'',0,3000,,'',0,7100,,'',0,3600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8200,,'',0,3800,,'',0,7700,,'',0,7500,,'',0,3800,,'',0,7100,,'',0,3500,,'',0,7300,,'',0,8400,,'',0,2700,,'',0,9500,,'',0,10400,,'',0
-'3277',3201,171200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0
-'3278',3200,64300,,'',0
-'3281',3200,81700,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3200,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,8500,,'',0,2900,,'',0,7000,,'',0,13000,,'',0
-'3282',3200,81800,,'',0,10400,,'',0,10300,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,7500,,'',0,3400,,'',0,7400,,'',0,11000,,'',0,11500,,'',0
-'3283',3200,64300,,'',0
-'3277',3300,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7300,,'',0,3600,,'',0,6900,,'',0,3200,,'',0,7000,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,7600,,'',0,4300,,'',0,7200,,'',0,7500,,'',0,3800,,'',0,7400,,'',0,3300,,'',0,7500,,'',0,8300,,'',0,2700,,'',0,7000,,'',0,2500,,'',0
-'3277',3301,171200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0
-'3281',3300,81600,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,7100,,'',0,8000,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,15900,,'',0,9900,,'',0
-'3282',3300,84600,,'',0,10700,,'',0,15000,,'',0,3600,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,10800,,'',0,16000,,'',0,10000,,'',0
-'3277',3400,61200,,'',0,3000,,'',0,7100,,'',0,31200,,'',0,48800,,'',0
-'3277',3401,171200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0
-'3277',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3277',3101,62000,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1800,,'',0,38500,,'',0
+'3281',3101,75500,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
+'3282',3101,100200,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
+'3277',3201,55000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,9500,,'',0,10500,,'',0
+'3278',3201,62000,,'',0
+'3281',3201,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
+'3282',3201,75500,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3283',3201,62000,,'',0
'3281',3501,82500,,'',0,63100,,'',0,26000,,'',0
-'3282',3501,94100,,'',0,21500,,'',0,67500,,'',0
-'3277',3900,84800,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
-'3281',3900,84800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,11900,,'',0
-'3282',3900,84800,,'',0,15500,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,14000,,'',0
-'3277',1003100,70100,,'',0,3000,,'',0,7200,,'',0,3400,,'',0,8700,,'',0,10100,,'',0,11400,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,3900,,'',0,9400,,'',0,7300,,'',0,8000,,'',0,4900,,'',0,8100,,'',0,12700,,'',0,14300,,'',0,10800,,'',0
-'3277',1003101,185700,,'',0,8500,,'',0
-'3281',1003100,85000,,'',0,10400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,15600,,'',0,10100,,'',0,9800,,'',0
-'3282',1003100,85000,,'',0,10500,,'',0,14900,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,11500,,'',0,14800,,'',0,14300,,'',0,16000,,'',0,10400,,'',0
-'3277',24003100,64300,,'',0,7000,,'',0
-'3278',24003100,61300,,'',0
-'3283',24003100,61300,,'',0
+'3277',1003101,72000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10700,,'',0,8500,,'',0,16300,,'',0
+'3278',1003101,65000,,'',0
+'3281',1003101,82500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3282',1003101,85800,,'',0,25200,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3283',1003101,65000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107786 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107786
index b43e9838..7c344937 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107786
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107786
@@ -1,3 +1,3 @@
-'3277',3301,55200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
+'3277',3301,55200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
'3281',3301,75700,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
'3282',3301,82700,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107787 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107787
index 5d34d0f7..f323776c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107787
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107787
@@ -1,6 +1,6 @@
-'3277',3301,55200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,75700,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
-'3282',3301,82700,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
+'3277',3301,55300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,4500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
+'3281',3301,75800,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3282',3301,82800,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
'3277',3400,60900,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7500,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
'3281',3400,81400,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,84100,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107818 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107818
deleted file mode 100644
index 8c16bb53..00000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107818
+++ /dev/null
@@ -1,3 +0,0 @@
-'3277',3900,93300,,'',0,10100,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,12400,,'',0
-'3281',3900,93200,,'',0,10000,,'',0,10100,,'',0,10200,,'',0,10000,,'',0,10100,,'',0,16800,,'',0,9900,,'',0,11800,,'',0
-'3282',3900,93100,,'',0,11600,,'',0,10500,,'',0,15500,,'',0,11000,,'',0,11500,,'',0,11400,,'',0,17900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107819 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107819
deleted file mode 100644
index 3a6c5db1..00000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107819
+++ /dev/null
@@ -1,7 +0,0 @@
-'3277',3301,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8100,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6700,,'',0,3000,,'',0,6500,,'',0
-'3281',3301,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
-'3282',3301,82500,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3277',3400,220200,4,'',0
-'3277',3401,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
-'3282',3401,82300,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107820 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107820
index c7d4da09..ce075c9c 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107820
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107820
@@ -1,3 +1,3 @@
-'3277',3401,55100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,3200,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9700,,'',0,10000,,'',0
-'3281',3401,75600,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3277',3401,55100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9700,,'',0,10000,,'',0
+'3281',3401,75600,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82400,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107822 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107822
index 0ed67c35..94eaea87 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107822
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107822
@@ -1,3 +1,3 @@
-'3277',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3277',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
'3281',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82500,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107844 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107844
index 8d4a3569..b96cbad6 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107844
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107844
@@ -1,3 +1,3 @@
-'3277',3400,60700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
+'3277',3400,60800,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7400,,'',0,3400,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,8100,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7800,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8400,,'',0,5700,,'',0,9900,,'',0
'3281',3400,81300,,'',0,3000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11400,,'',0
'3282',3400,83900,,'',0,17800,,'',0,11100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,18400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107884 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107884
index 51ac7929..96ee67e4 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107884
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_107884
@@ -1,3 +1,3 @@
-'3277',3401,55200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7500,,'',0,7200,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7900,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,9800,,'',0,10000,,'',0
-'3281',3401,75700,,'',0,7000,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3277',3401,55200,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,9700,,'',0,10000,,'',0
+'3281',3401,75700,,'',0,7000,,'',0,7400,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15400,,'',0
'3282',3401,82500,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120007 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120007
index 94a7d30f..39a33b04 100644
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120007
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120007
@@ -1,7 +1,7 @@
-'3277',3101,62300,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,2800,,'',0,7200,,'',0,1600,,'',0,38500,,'',0
-'3281',3101,75800,,'',0,14300,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
-'3282',3101,100500,,'',0,21900,,'',0,11000,,'',0,11400,,'',0,15500,,'',0,11000,,'',0
-'3277',3201,55300,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
+'3277',3101,62400,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11600,,'',0,7900,,'',0,3500,,'',0,7700,,'',0,2800,,'',0,7200,,'',0,1700,,'',0,38500,,'',0
+'3281',3101,75900,,'',0,14300,,'',0,10400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,10900,,'',0,11000,,'',0
+'3282',3101,100600,,'',0,21900,,'',0,11000,,'',0,11400,,'',0,15500,,'',0,11000,,'',0
+'3277',3201,55300,,'',0,10100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7600,,'',0,7900,,'',0,3500,,'',0,7800,,'',0,3300,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,6700,,'',0,9500,,'',0,10500,,'',0
'3278',3201,62400,,'',0
'3281',3201,75800,,'',0,7100,,'',0,7300,,'',0,3200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
'3282',3201,75800,,'',0,14300,,'',0,10300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4100,,'',0,7500,,'',0,7900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
@@ -9,8 +9,8 @@
'3277',3900,90300,,'',0,10100,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,10000,,'',0,12500,,'',0,10000,,'',0,16500,,'',0
'3281',3900,90200,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10100,,'',0,12900,,'',0,9900,,'',0,11900,,'',0
'3282',3900,90200,,'',0,11600,,'',0,10500,,'',0,11500,,'',0,11000,,'',0,15500,,'',0,11400,,'',0,14000,,'',0
-'3277',1003101,72300,,'',0,3000,,'',0,7500,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11100,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2400,,'',0,14800,,'',0,4500,,'',0,16200,,'',0
+'3277',1003101,72300,,'',0,3000,,'',0,7600,,'',0,7300,,'',0,10400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,14700,,'',0,4500,,'',0,16200,,'',0
'3278',1003101,65300,,'',0
-'3281',1003101,82800,,'',0,10500,,'',0,10500,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,10900,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
-'3282',1003101,90100,,'',0,21300,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11400,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
+'3281',1003101,82800,,'',0,10600,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,9900,,'',0
+'3282',1003101,90100,,'',0,21300,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,10900,,'',0,15500,,'',0,10000,,'',0
'3283',1003101,65300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120063 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120063
deleted file mode 100644
index bfdf50a1..00000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120063
+++ /dev/null
@@ -1,28 +0,0 @@
-'3277',3100,95700,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,19400,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0
-'3281',3100,92700,4,'',0,10000,4,'',0,11500,4,'',0,11000,4,'',0,15000,4,'',0,11500,4,'',0,11500,4,'',0,11000,4,'',0
-'3282',3100,114200,4,'',0,11000,4,'',0,15000,4,'',0,11500,4,'',0,11500,4,'',0,10300,4,'',0
-'3277',3200,203500,4,'',0
-'3282',3200,82100,4,'',0,10400,4,'',0,88700,4,'',0,11000,4,'',0,11500,4,'',0
-'3277',3300,61500,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3600,4,'',0,65900,4,'',0,52000,4,'',0,9500,4,'',0
-'3277',3301,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,6500,,'',0
-'3281',3300,200600,4,'',0,9900,4,'',0
-'3281',3301,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
-'3282',3301,82500,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
-'3277',3400,61500,4,'',0,3000,4,'',0,7100,4,'',0,2700,4,'',0,7500,4,'',0,3400,4,'',0,7000,4,'',0,3200,4,'',0,7400,4,'',0,7200,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8400,4,'',0,3200,4,'',0,7800,4,'',0,7400,4,'',0,3800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,8400,4,'',0,9700,4,'',0,9900,4,'',0
-'3277',3401,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,10000,,'',0,10000,,'',0
-'3281',3400,81700,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,11400,4,'',0
-'3281',3401,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
-'3282',3400,84300,4,'',0,17800,4,'',0,11100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,18400,4,'',0
-'3282',3401,82300,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
-'3277',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
-'3277',3501,72500,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
-'3281',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
-'3281',3501,82400,,'',0,63100,,'',0,26000,,'',0
-'3282',3500,100000,4,'',0,21500,4,'',0,63400,4,'',0
-'3282',3501,94000,,'',0,21500,,'',0,67500,,'',0
-'3277',3900,84500,,'',0,9100,4,'',0,900,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,3300,,'',0,9200,4,'',0,800,,'',0,9200,4,'',0,7300,,'',0,5100,4,'',0
-'3281',3900,84500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9100,4,'',0,900,,'',0,9300,4,'',0,700,,'',0,9300,4,'',0,700,,'',0,9400,4,'',0,7600,,'',0,9200,4,'',0,800,,'',0,9100,4,'',0,2900,,'',0,8900,4,'',0
-'3282',3900,84500,,'',0,8900,4,'',0,6600,,'',0,5000,4,'',0,5500,,'',0,5000,4,'',0,6500,,'',0,9000,4,'',0,2000,,'',0,9000,4,'',0,2500,,'',0,9000,4,'',0,6500,,'',0,4900,4,'',0,9100,,'',0,8800,4,'',0
-'3277',1003100,92700,4,'',0,10100,4,'',0,11400,4,'',0,11000,4,'',0,15000,4,'',0,15400,4,'',0,29600,4,'',0,8100,4,'',0
-'3281',1003100,85300,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,15000,4,'',0,11000,4,'',0,3500,4,'',0
-'3282',1003100,110700,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,14800,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120064 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120064
deleted file mode 100644
index 2daa4cb9..00000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120064
+++ /dev/null
@@ -1,29 +0,0 @@
-'3277',3100,74600,4,'',0,7100,4,'',0,3500,4,'',0,68300,4,'',0,7800,4,'',0,12000,4,'',0
-'3277',3101,62000,,'',0,8500,,'',0,3000,,'',0,7300,,'',0,3400,,'',0,8800,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,2800,,'',0,7200,,'',0,2000,,'',0,38500,,'',0
-'3281',3101,75500,,'',0,10300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0,11000,,'',0
-'3282',3101,100200,,'',0,21800,,'',0,11000,,'',0,11500,,'',0,15500,,'',0,11000,,'',0
-'3277',3200,61400,4,'',0,10200,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8200,4,'',0,3800,4,'',0,7700,4,'',0,7500,4,'',0,3800,4,'',0,7100,4,'',0,3500,4,'',0,7300,4,'',0,8400,4,'',0,12200,4,'',0,10400,4,'',0
-'3277',3201,55000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,9500,,'',0,10500,,'',0
-'3278',3200,64500,4,'',0
-'3278',3201,62000,,'',0
-'3281',3200,81900,4,'',0,3100,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,7500,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,8500,4,'',0,2900,4,'',0,7000,4,'',0,13000,4,'',0
-'3281',3201,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,7000,,'',0,3000,,'',0,17000,,'',0
-'3282',3200,102700,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7500,4,'',0,3400,4,'',0
-'3282',3201,75500,,'',0,10300,,'',0,14200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
-'3283',3200,64500,4,'',0
-'3283',3201,62000,,'',0
-'3277',3300,92300,4,'',0,3200,4,'',0,7000,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,11900,4,'',0,7200,4,'',0,7500,4,'',0,3800,4,'',0,7400,4,'',0,3300,4,'',0,7500,4,'',0,8300,4,'',0,9700,4,'',0
-'3281',3300,81800,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7100,4,'',0,8000,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,7400,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0
-'3282',3300,84800,4,'',0,10700,4,'',0,15000,4,'',0,3600,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,7400,4,'',0,3500,4,'',0,10800,4,'',0,16000,4,'',0,10000,4,'',0
-'3277',3400,220300,4,'',0
-'3277',1003100,70300,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,67700,4,'',0,13300,4,'',0,7300,4,'',0,8000,4,'',0,25700,4,'',0,14300,4,'',0,10800,4,'',0
-'3277',1003101,72000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,14400,,'',0,10800,,'',0,11000,,'',0,11000,,'',0,11500,,'',0,9400,,'',0,7800,,'',0,3600,,'',0,7200,,'',0,2500,,'',0,10500,,'',0,8500,,'',0,16500,,'',0
-'3278',1003101,65000,,'',0
-'3281',1003100,200700,4,'',0,10100,4,'',0,9800,4,'',0
-'3281',1003101,82500,,'',0,10500,,'',0,10500,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
-'3282',1003100,85200,4,'',0,10500,4,'',0,89000,4,'',0,16000,4,'',0,10400,4,'',0
-'3282',1003101,85800,,'',0,25200,,'',0,3500,,'',0,11000,,'',0,15000,,'',0,11500,,'',0,11500,,'',0,11000,,'',0,11000,,'',0,15500,,'',0,10000,,'',0
-'3283',1003101,65000,,'',0
-'3277',24003100,64500,4,'',0,7000,4,'',0
-'3278',24003100,61500,4,'',0
-'3283',24003100,61500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120092 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120092
new file mode 100644
index 00000000..a95bc442
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120092
@@ -0,0 +1,26 @@
+'3277',3100,74400,4,'',0,7100,4,'',0,3500,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,9900,4,'',0,7800,4,'',0,1700,4,'',0,7600,4,'',0,2700,4,'',0,800,4,'',0,7500,4,'',0
+'3281',3100,92400,4,'',0,10000,4,'',0,11500,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,11500,4,'',0,11000,4,'',0
+'3282',3100,113900,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,11500,4,'',0,10300,4,'',0
+'3277',3200,61200,4,'',0,10200,4,'',0,3000,4,'',0,7100,4,'',0,3600,4,'',0,7200,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8200,4,'',0,3800,4,'',0,7700,4,'',0,7500,4,'',0,3800,4,'',0,7100,4,'',0,3500,4,'',0,7300,4,'',0,8400,4,'',0,2700,4,'',0,9500,4,'',0,10400,4,'',0
+'3278',3200,64300,4,'',0
+'3281',3200,81700,4,'',0,3100,4,'',0,7500,4,'',0,3200,4,'',0,7000,4,'',0,7600,4,'',0,3500,4,'',0,7700,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,7500,4,'',0,3200,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,8500,4,'',0,2900,4,'',0,7000,4,'',0,13000,4,'',0
+'3282',3200,81800,4,'',0,10400,4,'',0,10300,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7500,4,'',0,3400,4,'',0,7400,4,'',0,11000,4,'',0,11500,4,'',0
+'3283',3200,64300,4,'',0
+'3277',3300,61200,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7300,4,'',0,3600,4,'',0,6900,4,'',0,3200,4,'',0,7000,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,7600,4,'',0,4300,4,'',0,7200,4,'',0,7500,4,'',0,3800,4,'',0,7400,4,'',0,3300,4,'',0,7500,4,'',0,8300,4,'',0,2700,4,'',0,7000,4,'',0,2500,4,'',0
+'3277',3301,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8000,,'',0,7500,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,6800,,'',0,3000,,'',0,6500,,'',0
+'3281',3300,81600,4,'',0,3000,4,'',0,7300,4,'',0,3300,4,'',0,7100,4,'',0,8000,4,'',0,3600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,15900,4,'',0,9900,4,'',0
+'3281',3301,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,4000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,12000,,'',0,10000,,'',0
+'3282',3300,84600,4,'',0,10700,4,'',0,15000,4,'',0,3600,4,'',0,7500,4,'',0,3600,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,10800,4,'',0,16000,4,'',0,10000,4,'',0
+'3282',3301,82500,,'',0,10500,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,12000,,'',0,10000,,'',0
+'3277',3400,61200,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7500,4,'',0,3400,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7700,4,'',0,8100,4,'',0,3500,4,'',0,7800,4,'',0,7400,4,'',0,3800,4,'',0,7400,4,'',0,3500,4,'',0,7400,4,'',0,8400,4,'',0,9700,4,'',0,9900,4,'',0
+'3277',3401,55000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,9800,,'',0,10000,,'',0
+'3281',3400,81700,4,'',0,3000,4,'',0,7400,4,'',0,3200,4,'',0,7000,4,'',0,3500,4,'',0,7600,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,11000,4,'',0,11400,4,'',0
+'3281',3401,75500,,'',0,7000,,'',0,3300,,'',0,7200,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15500,,'',0
+'3282',3400,84300,4,'',0,17800,4,'',0,11100,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,8000,4,'',0,3500,4,'',0,8000,4,'',0,3500,4,'',0,7500,4,'',0,18400,4,'',0
+'3282',3401,82300,,'',0,17700,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4000,,'',0,7500,,'',0,8000,,'',0,3500,,'',0,7500,,'',0,14500,,'',0
+'3277',1003100,70100,4,'',0,3000,4,'',0,7200,4,'',0,3400,4,'',0,8700,4,'',0,10100,4,'',0,11400,4,'',0,11000,4,'',0,11000,4,'',0,15500,4,'',0,3900,4,'',0,9400,4,'',0,7300,4,'',0,8000,4,'',0,4900,4,'',0,8100,4,'',0,12700,4,'',0,14300,4,'',0,10800,4,'',0
+'3281',1003100,85000,4,'',0,10400,4,'',0,15000,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,15000,4,'',0,11000,4,'',0,3500,4,'',0,15600,4,'',0,10100,4,'',0,9800,4,'',0
+'3282',1003100,85000,4,'',0,10500,4,'',0,14900,4,'',0,11000,4,'',0,11000,4,'',0,11500,4,'',0,11500,4,'',0,14800,4,'',0,14300,4,'',0,16000,4,'',0,10400,4,'',0
+'3277',24003100,64300,4,'',0,7000,4,'',0
+'3278',24003100,61300,4,'',0
+'3283',24003100,61300,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120093 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120093
new file mode 100644
index 00000000..2673ea59
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_120093
@@ -0,0 +1,8 @@
+'3277',3500,74400,4,'',0,6500,4,'',0,3600,4,'',0,35900,4,'',0,33200,4,'',0,26800,4,'',0
+'3277',3501,72700,,'',0,2500,,'',0,7500,,'',0,32000,,'',0,37000,,'',0,23000,,'',0
+'3281',3500,84300,4,'',0,67200,4,'',0,22000,4,'',0
+'3282',3500,100000,4,'',0,21500,4,'',0,63400,4,'',0
+'3282',3501,94100,,'',0,21500,,'',0,67500,,'',0
+'3277',3900,84600,,'',0,9000,4,'',0,1100,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,8000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,3500,,'',0,9000,4,'',0,1000,,'',0,9000,4,'',0,7500,,'',0,4900,4,'',0
+'3281',3900,84600,,'',0,8900,4,'',0,1100,,'',0,8900,4,'',0,1100,,'',0,9000,4,'',0,1100,,'',0,9100,4,'',0,900,,'',0,9100,4,'',0,1000,,'',0,9100,4,'',0,7800,,'',0,9000,4,'',0,1000,,'',0,8900,4,'',0,3000,,'',0,8800,4,'',0
+'3282',3900,84600,,'',0,8800,4,'',0,6700,,'',0,4900,4,'',0,5600,,'',0,4900,4,'',0,6600,,'',0,8900,4,'',0,2100,,'',0,8900,4,'',0,2600,,'',0,8900,4,'',0,6600,,'',0,4800,4,'',0,9200,,'',0,8700,4,'',0
diff --git a/app-android/src/main/res/values/gtfs_rts_values.xml b/app-android/src/main/res/values/gtfs_rts_values.xml
index d42ec092..089cb60d 100755
--- a/app-android/src/main/res/values/gtfs_rts_values.xml
+++ b/app-android/src/main/res/values/gtfs_rts_values.xml
@@ -1,6 +1,6 @@
- 20240820
+ 20240827
org.mtransit.android.ca_central_fraser_valley_transit_system_bus.gtfs
@string/gtfs_rts_authority
https://www.bctransit.com/contact