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 98964a61e..73b28b7b9 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 June 23, 2024 to August 31, 2024.
+Schedule from June 30, 2024 to August 31, 2024.
diff --git a/app-android/src/main/res-current/raw/current_gtfs_rts_routes b/app-android/src/main/res-current/raw/current_gtfs_rts_routes
index 0bbee4880..36b6d1622 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_rts_routes
+++ b/app-android/src/main/res-current/raw/current_gtfs_rts_routes
@@ -1,7 +1,6 @@
 1,'1','Lakeshore','004B8D',49,3
 2,'2','North End Shuttle','8CC63F',50,3
 3,'3','Dilworth Mt','F37421',51,3
-4,'4','Pandosy / UBCO Express','00AEEF',52,3
 5,'5','Gordon','FCAFF7',53,3
 6,'6','Glenmore / UBCO Express','00AA47',54,3
 8,'8','University / College','ED1D8F',56,3
@@ -26,5 +25,4 @@
 28,'28','Shannon Lk','875D9F',1606,3
 29,'29','Bear Crk','7C3F25',1607,3
 32,'32','The Lks','FFC20E',1631,3
-88,'88','Special','004B8D',1792,3
 97,'97','Okanagan','8CC63F',1822,3
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 4efe4b7ed..0880c9cf9 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
@@ -1,973 +1,950 @@
-102728,'102728','Spall @ Bernard',49.88798,-119.45463,0,1448701418
-102853,'102853','Queensway Exch',49.88742,-119.4959,0,1448702467
-102854,'102854','Queensway Exch',49.88738,-119.49474,0,1448702468
-102855,'102855','Queensway Exch',49.88738,-119.49449,0,1448702469
-102856,'102856','Queensway Exch',49.88739,-119.49419,0,1448702470
-102857,'102857','Queensway Exch',49.88736,-119.49393,0,1448702471
-102859,'102859','Queensway Exch',49.88726,-119.49432,0,1448702473
-102860,'102860','Queensway Exch',49.88726,-119.4946,0,1448702495
-102861,'102861','Queensway Exch',49.88726,-119.49483,0,1448702496
-102862,'102862','Queensway Exch',49.88742,-119.49615,0,1448702497
-102863,'102863','Rutland @ Sumac',49.90388,-119.38677,0,1448702498
-102865,'102865','Water @ Doyle',49.88923,-119.49651,0,1448702500
-102866,'102866','Doyle @ St Paul',49.88895,-119.4915,0,1448702501
-102867,'102867','Doyle @ Bertram',49.88904,-119.49058,0,1448702502
-102868,'102868','Water @ Leon',49.88467,-119.49665,0,1448702503
-102869,'102869','Water @ Leon',49.8842,-119.49635,0,1448702504
-102870,'102870','Water @ Cawston',49.89209,-119.49652,0,1448702526
-102874,'102874','Bernard @ Bertram',49.88637,-119.48987,0,1448702530
-102875,'102875','Richter @ Lawrence',49.88563,-119.48856,0,1448702531
-102877,'102877','Bernard @ Richter',49.88628,-119.48818,0,1448702533
-102879,'102879','Richter @ Wilson',49.89102,-119.48855,0,1448702535
-102880,'102880','Richter @ Fuller',49.89061,-119.48841,0,1448702557
-102881,'102881','Pandosy @ Buckland',49.88166,-119.4951,0,1448702558
-102882,'102882','Leon @ Richter',49.88454,-119.4869,0,1448702559
-102883,'102883','Pandosy @ Buckland',49.88135,-119.49494,0,1448702560
-102884,'102884','Leon @ Richter',49.88445,-119.48666,0,1448702561
-102885,'102885','Richter @ Clement',49.89321,-119.48854,0,1448702562
-102886,'102886','Richter @ Dehart',49.88192,-119.48865,0,1448702563
-102887,'102887','Richter @ Dehart',49.8822,-119.48838,0,1448702564
-102888,'102888','Ellis @ Ind',49.89581,-119.49349,0,1448702565
-102889,'102889','Bernard @ Ethel',49.88636,-119.48312,0,1448702566
-102890,'102890','Leon @ Ethel',49.88453,-119.48369,0,1448702588
-102891,'102891','Leon @ Ethel',49.88444,-119.48386,0,1448702589
-102892,'102892','Pandosy @ Sutherland',49.8797,-119.49357,0,1448702590
-102893,'102893','Bernard @ Ethel',49.88627,-119.48235,0,1448702591
-102894,'102894','Cawston @ Ethel',49.89168,-119.48331,0,1448702592
-102895,'102895','Richter @ Gaston',49.89568,-119.48854,0,1448702593
-102896,'102896','Pandosy @ Sutherland',49.87905,-119.49294,0,1448702594
-102897,'102897','Richter @ Sutherland',49.88004,-119.48842,0,1448702595
-102898,'102898','Cawston @ Ethel',49.89159,-119.48234,0,1448702596
-102899,'102899','Sutherland @ Richter',49.87981,-119.48813,0,1448702597
-102900,'102900','Bernard @ Graham',49.88638,-119.48019,0,1448703270
-102901,'102901','Ellis @ Recreation',49.89799,-119.49346,0,1448703271
-102902,'102902','Bernard @ Graham',49.88631,-119.47974,0,1448703272
-102903,'102903','Cawston @ Graham',49.89167,-119.48059,0,1448703273
-102905,'102905','Graham @ Clement',49.89328,-119.47995,0,1448703275
-102906,'102906','Sutherland @ Ethel',49.87987,-119.4831,0,1448703276
-102907,'102907','Bernard @ Gordon',49.88626,-119.47807,0,1448703277
-102908,'102908','Graham @ Clement',49.89322,-119.47981,0,1448703278
-102909,'102909','Bernard @ Gordon',49.88643,-119.478,0,1448703279
-102910,'102910','Pandosy @ Cadder',49.87673,-119.49122,0,1448703301
-102911,'102911','Ellis @ Roanoke',49.89957,-119.49347,0,1448703302
-102912,'102912','Sutherland @ Ethel',49.87979,-119.48227,0,1448703303
-102913,'102913','Richter @ Bay',49.89928,-119.48853,0,1448703304
-102914,'102914','Pandosy @ Cadder',49.87589,-119.4913,0,1448703305
-102915,'102915','Bernard @ Gordon',49.88625,-119.47605,0,1448703306
-102916,'102916','Lawrence @ Gordon',49.88526,-119.47631,0,1448703307
-102917,'102917','Sutherland @ Bowes',49.87987,-119.48026,0,1448703308
-102918,'102918','Lawrence @ Gordon',49.88534,-119.47589,0,1448703309
-102919,'102919','Ellis @ Okanagan',49.90105,-119.49342,0,1448703310
-102920,'102920','Sutherland @ Lequime',49.87978,-119.47865,0,1448703332
-102921,'102921','Bernard @ Danjou',49.88636,-119.47432,0,1448703333
-102922,'102922','Richter @ Okanagan',49.90119,-119.48853,0,1448703334
-102923,'102923','Bernard @ Danjou',49.88631,-119.47413,0,1448703335
-102924,'102924','Ellis @ Oxford',49.90187,-119.49319,0,1448703336
-102925,'102925','Lawrence @ Kelglen',49.88523,-119.47319,0,1448703337
-102926,'102926','Lawrence @ Kelglen',49.88532,-119.47289,0,1448703338
-102927,'102927','Sutherland @ Gordon',49.88026,-119.47594,0,1448703339
-102928,'102928','Kelowna General Hosp',49.87391,-119.49134,0,1448703340
-102929,'102929','Springfield @ Ethel',49.87645,-119.48061,0,1448703341
-102930,'102930','Kelowna General Hosp',49.87353,-119.49118,0,1448703363
-102931,'102931','Sutherland @ Gordon',49.88017,-119.47525,0,1448703364
-102932,'102932','Cambridge @ Ellis',49.9035,-119.4924,0,1448703365
-102933,'102933','Bernard @ Richmond',49.88637,-119.47123,0,1448703366
-102934,'102934','Cambridge @ Kingsway',49.90348,-119.49063,0,1448703367
-102935,'102935','Richter @ Cambridge',49.90303,-119.48852,0,1448703368
-102936,'102936','Bernard @ Richmond',49.88628,-119.47099,0,1448703369
-102937,'102937','Lawrence @ Richmond',49.88523,-119.47072,0,1448703370
-102938,'102938','Sutherland @ Capri',49.88017,-119.47325,0,1448703371
-102939,'102939','Gordon @ Springfield',49.87646,-119.47723,0,1448703372
-102941,'102941','Springfield @ Gordon',49.87679,-119.47658,0,1448703395
-102942,'102942','Lawrence @ Richmond',49.8853,-119.47019,0,1448703396
-102944,'102944','Sutherland @ Pacific',49.88025,-119.47239,0,1448703398
-102945,'102945','Sutherland @ Pacific',49.88017,-119.4713,0,1448703399
-102948,'102948','Lawrence @ Lakeview',49.88532,-119.46744,0,1448703402
-102950,'102950','Springfield @ Wilkinson',49.8771,-119.47202,0,1448703425
-102951,'102951','Lawrence @ Alta Vista',49.88522,-119.46664,0,1448703426
-102952,'102952','Pandosy @ Morrison',49.86934,-119.49134,0,1448703427
-102953,'102953','Bernard @ Highland',49.88635,-119.46602,0,1448703428
-102954,'102954','Springfield @ Wilkinson',49.8769,-119.47106,0,1448703429
-102955,'102955','Sutherland @ Chandler',49.88033,-119.46761,0,1448703430
-102956,'102956','Pandosy @ Patterson',49.8686,-119.49115,0,1448703431
-102957,'102957','Sutherland @ Chandler',49.88024,-119.46766,0,1448703432
-102958,'102958','Gordon @ Guisachan',49.87245,-119.47608,0,1448703433
-102959,'102959','Clifton @ Hartwick',49.89387,-119.46595,0,1448703434
-102960,'102960','Clifton @ Hartwick',49.89365,-119.4657,0,1448703456
-102961,'102961','Pandosy @ Patterson',49.86803,-119.49133,0,1448703457
-102962,'102962','Burtch @ Kelglen',49.88298,-119.46507,0,1448703458
-102963,'102963','Burtch @ Kelglen',49.88286,-119.46508,0,1448703459
-102964,'102964','Bernard @ Noble',49.88634,-119.46366,0,1448703460
-102965,'102965','Clifton @ Lambert',49.8959,-119.4659,0,1448703461
-102966,'102966','Clifton @ Lambert',49.89544,-119.46565,0,1448703462
-102968,'102968','Clifton @ Lynwood',49.89726,-119.46588,0,1448703464
-102969,'102969','Lawrence @ Burtch',49.88455,-119.46294,0,1448703465
-102970,'102970','Burtch @ Dickson',49.87844,-119.46587,0,1448703487
-102971,'102971','Lawrence @ Burtch',49.8844,-119.46287,0,1448703488
-102972,'102972','Burtch @ Dickson',49.8782,-119.46574,0,1448703489
-102973,'102973','Springfield @ Burtch',49.87707,-119.46632,0,1448703490
-102974,'102974','Bernard @ Burtch',49.88654,-119.46173,0,1448703491
-102975,'102975','Bernard @ Cherry Cresent',49.887,-119.46121,0,1448703492
-102976,'102976','Pandosy @ Raymer',49.86571,-119.49129,0,1448703493
-102977,'102977','High @ Glengarry',49.89773,-119.46413,0,1448703494
-102978,'102978','Gordon @ Cameron',49.86989,-119.47471,0,1448703495
-102979,'102979','Springfield @ Burtch',49.87673,-119.46501,0,1448703496
-102982,'102982','Pandosy @ Groves',49.86339,-119.49129,0,1448703520
-102984,'102984','Pandosy @ Groves',49.86394,-119.49115,0,1448703522
-102985,'102985','Harvey @ Kirschner - Parkinson Sta',49.88182,-119.45904,0,1448703523
-102986,'102986','Springfield @ Dayton',49.87693,-119.46171,0,1448703524
-102987,'102987','High @ Tronson',49.89847,-119.46225,0,1448703525
-102988,'102988','High @ Tronson',49.89915,-119.46132,0,1448703526
-102989,'102989','Harvey @ Kirschner - Parkinson Sta',49.88204,-119.45807,0,1448703527
-102990,'102990','Springfield @ Dayton',49.87672,-119.46062,0,1448703549
-102991,'102991','Bernard @ Dilworth Cresent',49.8884,-119.45621,0,1448703550
-102993,'102993','Parkinson @ Ufton',49.88315,-119.45636,0,1448703552
-102994,'102994','Parkinson @ Ufton',49.8831,-119.45592,0,1448703553
-102995,'102995','Pandosy @ KLO',49.86229,-119.49117,0,1448703554
-102996,'102996','Springfield @ Kirschner',49.87694,-119.45876,0,1448703555
-102997,'102997','KLO @ Lakeshore',49.86196,-119.49084,0,1448703556
-102998,'102998','Rutland @ Klassen',49.90721,-119.38669,0,1448703557
-102999,'102999','Lakeshore @ Cedar',49.86167,-119.49131,0,1448703558
-103000,'103000','Glenmore @ Dilworth',49.88976,-119.45456,0,1448724412
-103002,'103002','Hwy 33 @ Enterprise',49.8907,-119.42352,0,1448724414
-103003,'103003','Glenmore @ Bernard',49.88905,-119.45421,0,1448724415
-103004,'103004','Springfield @ Kirschner',49.87677,-119.45797,0,1448724416
-103005,'103005','High @ Kennedy',49.90041,-119.45849,0,1448724417
-103006,'103006','Gordon @ Raymer',49.86456,-119.47437,0,1448724418
-103007,'103007','Glenmore @ Highland Dr',49.89402,-119.45454,0,1448724419
-103008,'103008','Glenmore @ Highland Dr',49.89407,-119.45415,0,1448724420
-103009,'103009','Enterprise @ Spall',49.88407,-119.45354,0,1448724421
-103010,'103010','High @ Kennedy',49.90041,-119.45754,0,1448724443
-103011,'103011','Spall @ Windsor',49.88042,-119.4547,0,1448724444
-103012,'103012','Spall @ Windsor',49.88087,-119.45438,0,1448724445
-103013,'103013','Glenmore @ Mtn',49.89592,-119.45449,0,1448724446
-103014,'103014','Springfield @ Spall',49.8772,-119.45597,0,1448724447
-103015,'103015','Enterprise @ Spall',49.88415,-119.4529,0,1448724448
-103016,'103016','Pandosy Exch',49.8604,-119.49115,0,1448724449
-103018,'103018','Spall @ Kent',49.87864,-119.45469,0,1448724451
-103020,'103020','KLO @ Casorso',49.86093,-119.48492,0,1448724474
-103021,'103021','Mission Rec Exch',49.83712,-119.48059,0,1448724475
-103022,'103022','Mission Rec Exch',49.83693,-119.48062,0,1448724476
-103023,'103023','Mission Rec Exch',49.8366,-119.48062,0,1448724477
-103024,'103024','Spall @ Kent',49.87888,-119.45447,0,1448724478
-103025,'103025','Lakeshore @ Pandosy Exch',49.86026,-119.49128,0,1448724479
-103026,'103026','Glenmore @ Mtn',49.89679,-119.45408,0,1448724480
-103027,'103027','Westside @ Nancee Way',49.88307,-119.53813,0,1448724481
-103028,'103028','Okanagan College Exch',49.86127,-119.47932,0,1448724482
-103029,'103029','Clement @ Cerise',49.89239,-119.47059,0,1448724483
-103030,'103030','Okanagan College Exch',49.86105,-119.47988,0,1448724505
-103031,'103031','Clement @ Cerise',49.89277,-119.47138,0,1448724506
-103033,'103033','Springfield @ Spall',49.87716,-119.45386,0,1448724508
-103035,'103035','Glenmore @ High',49.89996,-119.45438,0,1448724510
-103036,'103036','Enterprise @ Enterprise Court',49.88316,-119.45031,0,1448724511
-103038,'103038','KLO @ Gordon',49.86091,-119.47554,0,1448724513
-103039,'103039','Lanfranco @ Lakeshore',49.85815,-119.4903,0,1448724514
-103040,'103040','Casorso @ Lanfranco',49.85831,-119.48549,0,1448724536
-103041,'103041','Glenmore @ Summit',49.90187,-119.45352,0,1448724537
-103042,'103042','KLO @ Holland',49.86109,-119.47275,0,1448724538
-103043,'103043','Westside @ Bear Crk',49.89228,-119.54262,0,1448724539
-103044,'103044','Lakeshore @ Lanfranco',49.85714,-119.49113,0,1448724540
-103045,'103045','KLO @ Holland',49.86091,-119.47253,0,1448724541
-103046,'103046','Enterprise @ Hardy',49.88332,-119.44811,0,1448724542
-103047,'103047','Westside @ Westpoint Pk',49.88551,-119.54411,0,1448724543
-103048,'103048','Glenmore @ Glenmeadows',49.90405,-119.45336,0,1448724544
-103049,'103049','Hwy 97 @ Banks - Banks Sta',49.88563,-119.42664,0,1448724545
-103050,'103050','Enterprise @ Hardy',49.88325,-119.44694,0,1448724567
-103051,'103051','Glenmore @ Glenmeadows',49.904,-119.45297,0,1448724568
-103052,'103052','Summit @ Vly',49.9012,-119.45024,0,1448724569
-103053,'103053','Summit @ Vly',49.90111,-119.45021,0,1448724570
-103054,'103054','KLO @ Saint Amand',49.86108,-119.4663,0,1448724571
-103056,'103056','Springfield @ Barlee',49.87716,-119.44781,0,1448724573
-103057,'103057','Springfield @ Barlee',49.87738,-119.44737,0,1448724574
-103058,'103058','Enterprise @ Cooper',49.88324,-119.44458,0,1448724575
-103059,'103059','KLO @ Saint Amand',49.8609,-119.46676,0,1448724576
-103060,'103060','Enterprise @ Cooper',49.88333,-119.44438,0,1448724598
-103061,'103061','Harvey @ Cooper - Cooper Sta',49.88202,-119.44467,0,1448724599
-103062,'103062','Lakeshore @ Swordy',49.85481,-119.49002,0,1448724600
-103063,'103063','Bear Crk @ McNaughton',49.89299,-119.54761,0,1448724601
-103065,'103065','Boucherie @ Carrall',49.82514,-119.60949,0,1448724603
-103066,'103066','Parkinson @ Bear Crk',49.89893,-119.54703,0,1448724604
-103067,'103067','Harvey @ Cooper - Cooper Sta',49.88176,-119.44216,0,1448724605
-103069,'103069','Orchard Pk Exch',49.88025,-119.44247,0,1448724607
-103070,'103070','Orchard Pk Exch',49.88041,-119.44248,0,1448724629
-103071,'103071','Orchard Pk Exch',49.88056,-119.44248,0,1448724630
-103072,'103072','Orchard Pk Exch',49.88065,-119.44234,0,1448724631
-103073,'103073','Orchard Pk Exch',49.8805,-119.44234,0,1448724632
-103075,'103075','Orchard Pk Exch',49.88037,-119.44234,0,1448724634
-103076,'103076','Enterprise @ Cooper',49.88322,-119.44167,0,1448724635
-103077,'103077','Orchard Pk Exch',49.87962,-119.44228,0,1448724636
-103078,'103078','Boucherie @ Hayman',49.87266,-119.5447,0,1448724637
-103079,'103079','Orchard Pk Exch',49.88008,-119.44231,0,1448724638
-103080,'103080','Glenmore @ Yates',49.90911,-119.4509,0,1448724660
-103081,'103081','McCurdy @ Alsgard',49.90125,-119.40612,0,1448724661
-103082,'103082','Summit @ Denali',49.89883,-119.44257,0,1448724662
-103083,'103083','Summit @ Denali',49.89841,-119.44231,0,1448724663
-103084,'103084','KLO @ Benvoulin',49.86104,-119.45854,0,1448724664
-103086,'103086','Springfield @ Cooper',49.8771,-119.44164,0,1448724666
-103087,'103087','Glenmore @ Yates',49.90967,-119.45011,0,1448724667
-103088,'103088','KLO @ Benvoulin',49.86088,-119.45995,0,1448724668
-103089,'103089','Summit @ Lillooet',49.89569,-119.43997,0,1448724669
-103090,'103090','Yates @ Glenmore',49.90895,-119.44894,0,1448724691
-103091,'103091','Lakeshore @ Bechard',49.85151,-119.48683,0,1448724692
-103092,'103092','Enterprise @ Dilworth',49.88331,-119.43862,0,1448724693
-103093,'103093','Lakeshore @ Bechard',49.85151,-119.48697,0,1448724694
-103094,'103094','Parkinson @ Westlake',49.89125,-119.55277,0,1448724695
-103095,'103095','Summit @ Chilcotin',49.89592,-119.43912,0,1448724696
-103096,'103096','Dilworth @ Leckie',49.88699,-119.43781,0,1448724697
-103097,'103097','Springfield @ Benvoulin',49.87734,-119.44014,0,1448724698
-103098,'103098','Yates @ Vly',49.90866,-119.44724,0,1448724699
-103099,'103099','Dilworth @ Leckie',49.887,-119.43767,0,1448724700
-103101,'103101','Dilworth @ Enterprise',49.88438,-119.43778,0,1448725374
-103102,'103102','Dilworth @ Enterprise',49.88451,-119.43764,0,1448725375
-103103,'103103','Glenmore @ Watson',49.91122,-119.44942,0,1448725376
-103104,'103104','Glenmore @ Cross',49.9224,-119.43994,0,1448725377
-103105,'103105','Enterprise @ Dilworth',49.88322,-119.43689,0,1448725378
-103107,'103107','Glenmore @ Watson',49.91165,-119.44873,0,1448725380
-103108,'103108','Dilworth @ Baron',49.8789,-119.43703,0,1448725381
-103110,'103110','Westlake @ Keloka',49.88711,-119.55568,0,1448725404
-103111,'103111','Summit @ Skeena',49.8986,-119.43643,0,1448725405
-103113,'103113','Lakeshore @ Barrera',49.84894,-119.48617,0,1448725407
-103114,'103114','KLO @ Como',49.86091,-119.45055,0,1448725408
-103115,'103115','Westlake @ Horizon',49.88503,-119.55698,0,1448725409
-103116,'103116','KLO @ Como',49.86104,-119.44997,0,1448725410
-103117,'103117','Summit @ Skeena',49.89885,-119.43561,0,1448725411
-103118,'103118','Dilworth @ Omineca',49.8912,-119.43322,0,1448725412
-103119,'103119','Lakeshore @ Barrera',49.84868,-119.48634,0,1448725413
-103121,'103121','Baron @ Underhill',49.87958,-119.43414,0,1448725436
-103122,'103122','Enterprise @ Leckie',49.88404,-119.43275,0,1448725437
-103123,'103123','Dilworth @ Omineca',49.89152,-119.43264,0,1448725438
-103125,'103125','Baron @ Underhill',49.87964,-119.43327,0,1448725440
-103126,'103126','Enterprise @ Leckie',49.88561,-119.43186,0,1448725441
-103127,'103127','Enterprise @ Hunter',49.88592,-119.43166,0,1448725442
-103128,'103128','Summit @ Lillooet',49.89927,-119.43362,0,1448725443
-103129,'103129','Summit @ Lillooet',49.89936,-119.43308,0,1448725444
-103130,'103130','Springfield @ Durnin',49.87779,-119.43249,0,1448725466
-103131,'103131','Glenmore @ Ballou',49.91564,-119.44633,0,1448725467
-103132,'103132','Cross @ Glenmore',49.92343,-119.44008,0,1448725468
-103133,'103133','Lakeshore @ Cook',49.84624,-119.48736,0,1448725469
-103134,'103134','Anders @ Thacker',49.85992,-119.54544,0,1448725470
-103135,'103135','Anders @ Thacker',49.86003,-119.54574,0,1448725471
-103136,'103136','Glenmore @ Kane',49.91616,-119.44563,0,1448725472
-103138,'103138','Springfield @ Durnin',49.87814,-119.43089,0,1448725474
-103139,'103139','Lakeshore @ Cook',49.84517,-119.48784,0,1448725475
-103140,'103140','Kane @ Drysdale',49.91535,-119.44385,0,1448725497
-103141,'103141','Enterprise @ Banks',49.88868,-119.42863,0,1448725498
-103142,'103142','Baron @ Leckie',49.88249,-119.42873,0,1448725499
-103143,'103143','Summit @ Purcell',49.89963,-119.43066,0,1448725500
-103144,'103144','Baron @ Leckie',49.88246,-119.42857,0,1448725501
-103145,'103145','Dilworth @ Cascade',49.89286,-119.42815,0,1448725502
-103146,'103146','KLO @ Spiers',49.86056,-119.44227,0,1448725503
-103147,'103147','Dilworth @ Cascade',49.89277,-119.42812,0,1448725504
-103148,'103148','Summit @ Nahanni',49.89991,-119.4301,0,1448725505
-103149,'103149','KLO @ Spiers',49.8605,-119.44237,0,1448725506
-103151,'103151','Lakeshore @ Truswell',49.84396,-119.48769,0,1448725529
-103152,'103152','Lakeshore @ Truswell',49.84381,-119.48795,0,1448725530
-103153,'103153','Black Mtn @ Large',49.87201,-119.34848,0,1448725531
-103154,'103154','Glenmore @ Dallas',49.91798,-119.44468,0,1448725532
-103156,'103156','Springfield @ Leckie',49.87964,-119.42761,0,1448725534
-103159,'103159','Glenmore @ Dallas',49.91841,-119.44403,0,1448725537
-103160,'103160','Thacker @ Douglas',49.8564,-119.54544,0,1448725559
-103161,'103161','Westlake @ Starlight',49.87915,-119.56426,0,1448725560
-103162,'103162','Boucherie @ Stuart',49.86412,-119.5551,0,1448725561
-103163,'103163','Anders @ Olalla',49.86016,-119.55063,0,1448725562
-103164,'103164','Anders @ Olalla',49.86031,-119.55198,0,1448725563
-103165,'103165','Enterprise @ Powick',49.89028,-119.42541,0,1448725564
-103166,'103166','960 Block Dilworth',49.89692,-119.42629,0,1448725565
-103167,'103167','Thacker @ Douglas',49.85579,-119.5457,0,1448725566
-103168,'103168','Summit @ Dilworth',49.89871,-119.4268,0,1448725567
-103169,'103169','1900 Block Baron',49.8837,-119.42518,0,1448725568
-103170,'103170','Summit @ Dilworth',49.8988,-119.4268,0,1448725590
-103171,'103171','Baron @ Banks',49.88431,-119.42479,0,1448725591
-103172,'103172','970 Block Dilworth',49.89653,-119.426,0,1448725592
-103173,'103173','Westlake @ Caledonia',49.87347,-119.56304,0,1448725593
-103174,'103174','Hwy 97 @ Banks - Banks Sta',49.88688,-119.42413,0,1448725594
-103176,'103176','Gordon @ Steele',49.80585,-119.47308,0,1448725596
-103177,'103177','Gordon @ Powerline Pk',49.80533,-119.47633,0,1448725597
-103178,'103178','Westlake @ Rosewood',49.8777,-119.5663,0,1448725598
-103180,'103180','Hudson @ Boucherie',49.86235,-119.5565,0,1448725621
-103181,'103181','Thacker @ Collens Hl',49.85383,-119.54566,0,1448725622
-103182,'103182','Thacker @ Collens Hl',49.85383,-119.54591,0,1448725623
-103183,'103183','Hudson @ Boucherie',49.86245,-119.55688,0,1448725624
-103184,'103184','Baron @ Spedding',49.88631,-119.42205,0,1448725625
-103185,'103185','Lakeshore @ Bluebird',49.84032,-119.48865,0,1448725626
-103186,'103186','Baron @ Spedding',49.88635,-119.42179,0,1448725627
-103187,'103187','Gordon @ Frost',49.80374,-119.47688,0,1448725628
-103188,'103188','Lakeshore @ Lexington',49.84046,-119.48847,0,1448725629
-103189,'103189','Springfield @ Parkview',49.88042,-119.42189,0,1448725630
-103190,'103190','Springfield @ Parkview',49.88061,-119.4216,0,1448725652
-103191,'103191','S Rdg @ Frost',49.80337,-119.48271,0,1448725653
-103192,'103192','Hwy 33 @ Rutland',49.8891,-119.38773,0,1448725654
-103193,'103193','Rutland Exch',49.89064,-119.39239,0,1448725655
-103195,'103195','Thacker @ Beverly',49.85252,-119.54781,0,1448725657
-103197,'103197','Thacker @ Beverly',49.85268,-119.54852,0,1448725659
-103198,'103198','Lynrick @ Loseth',49.86761,-119.35336,0,1448725660
-103201,'103201','Ziprick @ Terai',49.88831,-119.41764,0,1448726335
-103202,'103202','Springfield @ Ziprick',49.88061,-119.41854,0,1448726336
-103203,'103203','Vly @ Longhill',49.91991,-119.43415,0,1448726337
-103204,'103204','Ziprick @ Terai',49.88805,-119.4175,0,1448726338
-103205,'103205','Springfield @ Ziprick',49.88036,-119.41841,0,1448726339
-103206,'103206','Snowsell @ Cross',49.92446,-119.44177,0,1448726340
-103214,'103214','Lakeshore @ Lequime',49.83651,-119.48721,0,1448726369
-103215,'103215','Enterprise @ Hwy 97',49.8955,-119.41605,0,1448726370
-103216,'103216','Ogden @ Boucherie',49.853,-119.55566,0,1448726371
-103217,'103217','Ogden @ Boucherie',49.85288,-119.55563,0,1448726372
-103219,'103219','Alhambra @ Brentwood',49.86201,-119.56683,0,1448726374
-103220,'103220','Alhambra @ Brentwood',49.86203,-119.56697,0,1448726396
-103221,'103221','Hwy 33 @ Nickel',49.88912,-119.4134,0,1448726397
-103222,'103222','Hwy 33 @ Taylor',49.88903,-119.41316,0,1448726398
-103224,'103224','Vly @ Drysdale',49.9232,-119.43309,0,1448726400
-103226,'103226','Snowsell @ Porthill',49.92719,-119.43902,0,1448726402
-103227,'103227','Springfield @ Graham',49.87976,-119.41336,0,1448726403
-103230,'103230','1380 Block Stevens',49.86627,-119.57189,0,1448726427
-103231,'103231','KLO @ McCulloch',49.85971,-119.42417,0,1448726428
-103232,'103232','KLO @ McCulloch',49.85955,-119.42419,0,1448726429
-103233,'103233','Brentwood @ Denny',49.86118,-119.5693,0,1448726430
-103234,'103234','Brentwood @ Denny',49.86127,-119.56926,0,1448726431
-103235,'103235','Springfield @ Gerstmar',49.87881,-119.41188,0,1448726432
-103236,'103236','Union @ Wyndham',49.92785,-119.43703,0,1448726433
-103239,'103239','Boucherie @ Montigny',49.84895,-119.55707,0,1448726436
-103240,'103240','Hwy 33 @ Gerstmar',49.88913,-119.41001,0,1448726458
-103243,'103243','Union @ Vly',49.9254,-119.43203,0,1448726461
-103244,'103244','Boucherie @ Montigny',49.84871,-119.55757,0,1448726462
-103245,'103245','Hwy 33 @ Gerstmar',49.88904,-119.40886,0,1448726463
-103246,'103246','Gerstmar @ Thompson',49.87904,-119.40955,0,1448726464
-103248,'103248','Lakeshore @ Old Mdws',49.83198,-119.48779,0,1448726466
-103249,'103249','Brentwood @ Applewood',49.86146,-119.57255,0,1448726467
-103250,'103250','Gerstmar @ Thompson',49.87903,-119.40941,0,1448726489
-103251,'103251','Ross @ Stevens',49.86582,-119.57582,0,1448726490
-103252,'103252','Graham @ Gerstmar',49.88176,-119.40874,0,1448726491
-103253,'103253','Graham @ Irma',49.88185,-119.40857,0,1448726492
-103254,'103254','Brentwood @ Applewood',49.86137,-119.57259,0,1448726493
-103256,'103256','Hwy 97 @ McCurdy - McCurdy Sta',49.90021,-119.41008,0,1448726495
-103257,'103257','Gordon @ Welke',49.83149,-119.48334,0,1448726496
-103258,'103258','Ross @ Western',49.86368,-119.57583,0,1448726497
-103260,'103260','Hwy 33 @ Bryden',49.88912,-119.40635,0,1448726520
-103261,'103261','Brentwood @ Vista',49.8614,-119.57523,0,1448726521
-103262,'103262','Ross @ Brentwood',49.86189,-119.57587,0,1448726522
-103263,'103263','Hwy 97 @ McCurdy - McCurdy Sta',49.90245,-119.40752,0,1448726523
-103264,'103264','Hwy 33 @ Davie',49.88903,-119.40539,0,1448726524
-103265,'103265','Ross @ Brentwood',49.86081,-119.5774,0,1448726525
-103266,'103266','Boucherie @ Gregory',49.84694,-119.55991,0,1448726526
-103268,'103268','Boucherie @ Gregory',49.84647,-119.56099,0,1448726528
-103271,'103271','Graham @ Matt',49.88186,-119.40343,0,1448726552
-103272,'103272','Lakeshore @ Simeon',49.82828,-119.48869,0,1448726553
-103274,'103274','Hwy 33 @ Franklyn',49.88911,-119.40301,0,1448726555
-103277,'103277','Graham @ Matt',49.88177,-119.40282,0,1448726558
-103278,'103278','Hwy 33 @ Barber',49.88902,-119.4018,0,1448726559
-103279,'103279','Ross @ Applegreen',49.86082,-119.58009,0,1448726560
-103282,'103282','Ross @ Applegreen',49.86076,-119.58012,0,1448726584
-103283,'103283','McCurdy @ Mayfair',49.90129,-119.40309,0,1448726585
-103285,'103285','McCulloch @ Hart',49.85346,-119.41668,0,1448726587
-103286,'103286','McCulloch @ Hart',49.85344,-119.41593,0,1448726588
-103287,'103287','Leathead @ Franklyn',49.89543,-119.40033,0,1448726589
-103288,'103288','Franklyn @ Pearson',49.89809,-119.40092,0,1448726590
-103289,'103289','Hollydell @ Stirling',49.88276,-119.39981,0,1448726591
-103290,'103290','Lakeshore @ Willms',49.82597,-119.4887,0,1448726613
-103291,'103291','Hollydell @ Stirling',49.88282,-119.39969,0,1448726614
-103292,'103292','Franklyn @ McCurdy',49.90087,-119.40091,0,1448726615
-103293,'103293','Dehart @ Bartholomew',49.82657,-119.47627,0,1448726616
-103294,'103294','Crawford @ Dehart',49.82868,-119.46415,0,1448726617
-103295,'103295','Crawford @ Dehart',49.82873,-119.46431,0,1448726618
-103296,'103296','Hwy 33 @ Hollywood',49.88896,-119.39876,0,1448726619
-103297,'103297','Hwy 33 @ Hollywood',49.88914,-119.39897,0,1448726620
-103298,'103298','Dehart @ Bartholomew',49.82648,-119.47621,0,1448726621
-103299,'103299','Ross @ Cameron',49.86073,-119.58302,0,1448726622
-103300,'103300','Finns @ Fitzpatrick',49.90654,-119.40249,0,1448727295
-103301,'103301','Ross @ Riffington',49.86086,-119.58389,0,1448727296
-103302,'103302','Boucherie @ Sunnyside',49.84387,-119.56543,0,1448727297
-103303,'103303','Hollywood @ Perry',49.88084,-119.3983,0,1448727298
-103304,'103304','Hollywood @ Perry',49.88117,-119.39815,0,1448727299
-103305,'103305','Gordon @ Balsam',49.82502,-119.48329,0,1448727300
-103306,'103306','Boucherie @ Sunnyside',49.84366,-119.56609,0,1448727301
-103307,'103307','Hollywood @ Quigley',49.87754,-119.39834,0,1448727302
-103308,'103308','Hollywood @ Juniper',49.87776,-119.3982,0,1448727303
-103309,'103309','Hollywood @ Springfield',49.87562,-119.39835,0,1448727304
-103310,'103310','Hollywood @ Springfield',49.87517,-119.39822,0,1448727326
-103312,'103312','Hwy 33 @ Aurora',49.88894,-119.39593,0,1448727328
-103313,'103313','Springfield @ Monterey',49.87438,-119.39757,0,1448727329
-103316,'103316','Dehart @ Gordon',49.823,-119.48252,0,1448727332
-103317,'103317','Lakeshore @ Dehart',49.82219,-119.48899,0,1448727333
-103319,'103319','Lakeshore @ Dehart',49.82253,-119.48892,0,1448727335
-103321,'103321','Hwy 33 @ Dougall',49.88912,-119.39428,0,1448727358
-103322,'103322','Leathead @ Tartan',49.89539,-119.39396,0,1448727359
-103323,'103323','McCulloch @ Reekie',49.85199,-119.40978,0,1448727360
-103324,'103324','McCulloch @ Reekie',49.85166,-119.4099,0,1448727361
-103325,'103325','Gordon @ Dehart',49.82218,-119.48322,0,1448727362
-103326,'103326','Dougall Rd @ McIntosh',49.89262,-119.39273,0,1448727363
-103327,'103327','Fitzpatrick @ Findlay',49.90721,-119.39684,0,1448727364
-103328,'103328','Ross @ Bartley',49.8602,-119.58971,0,1448727365
-103329,'103329','Ross @ Bartley',49.86011,-119.58953,0,1448727366
-103331,'103331','Springfield @ Hollywood',49.87446,-119.3941,0,1448727389
-103334,'103334','Springfield @ Hollywood',49.87437,-119.39381,0,1448727392
-103335,'103335','Leathead @ Asher',49.8953,-119.39157,0,1448727393
-103337,'103337','Lakeshore @ Eldorado',49.82061,-119.49098,0,1448727395
-103340,'103340','Lakeshore @ Eldorado',49.82059,-119.49122,0,1448727419
-103342,'103342','4069 Block Lakeshore',49.83785,-119.48796,0,1448727421
-103343,'103343','Fitzpatrick @ Chichester',49.9072,-119.39401,0,1448727422
-103344,'103344','Leathead @ Pinetree',49.89539,-119.39024,0,1448727423
-103346,'103346','Springfield @ Neptune',49.87758,-119.39045,0,1448727425
-103347,'103347','Lakeshore @ Keith',49.81881,-119.49314,0,1448727426
-103348,'103348','3280 Block McCulloch',49.84643,-119.40986,0,1448727427
-103349,'103349','3280 Block McCulloch',49.84644,-119.40976,0,1448727428
-103351,'103351','Boucherie @ Mission Hl',49.84013,-119.57359,0,1448727451
-103354,'103354','Leathead @ Ford',49.8956,-119.38807,0,1448727454
-103355,'103355','Lakeshore @ Keith',49.81814,-119.49415,0,1448727455
-103357,'103357','Springfield @ Neptune',49.87771,-119.38854,0,1448727457
-103359,'103359','Boucherie @ Mission Hl',49.83973,-119.57402,0,1448727459
-103360,'103360','Fitzpatrick @ Stafford',49.9072,-119.39121,0,1448727481
-103361,'103361','Rutland @ Robson',49.88676,-119.38697,0,1448727482
-103362,'103362','Sexsmith @ Cambro',49.91897,-119.39783,0,1448727483
-103363,'103363','Rutland @ Gray',49.88848,-119.38698,0,1448727484
-103364,'103364','Rutland @ Holbrook',49.88519,-119.38699,0,1448727485
-103365,'103365','Rutland @ Shepherd',49.8909,-119.38698,0,1448727486
-103366,'103366','Rutland @ Jupiter',49.87934,-119.38775,0,1448727487
-103367,'103367','Rutland @ Jupiter',49.88005,-119.38759,0,1448727488
-103368,'103368','1230 Block Crawford',49.82022,-119.4669,0,1448727489
-103369,'103369','Rutland @ Benchview',49.8829,-119.38703,0,1448727490
-103370,'103370','Rutland @ McIntosh',49.89274,-119.38697,0,1448727512
-103372,'103372','Rutland @ Belgo',49.88213,-119.38689,0,1448727514
-103373,'103373','Rutland @ Mugford',49.89296,-119.3868,0,1448727515
-103374,'103374','Hollywood @ Sexsmith',49.9188,-119.39774,0,1448727516
-103375,'103375','Rutland @ Hardie',49.89512,-119.38697,0,1448727517
-103376,'103376','Rutland @ Briarwood',49.89433,-119.38683,0,1448727518
-103377,'103377','Rutland @ Leathead',49.89668,-119.38696,0,1448727519
-103378,'103378','Hwy 33 @ Sadler',49.88894,-119.38603,0,1448727520
-103379,'103379','Ross @ Daimler',49.85624,-119.59386,0,1448727521
-103380,'103380','Rutland @ Hartman',49.89945,-119.38689,0,1448727543
-103381,'103381','Ross @ Daimler',49.85618,-119.594,0,1448727544
-103382,'103382','Rutland @ McCurdy',49.90065,-119.38688,0,1448727545
-103383,'103383','Husch @ Scarboro',49.88365,-119.38526,0,1448727546
-103384,'103384','Rutland @ McCurdy',49.90151,-119.38674,0,1448727547
-103385,'103385','Rutland @ Sumac',49.90334,-119.38691,0,1448727548
-103387,'103387','Fitzpatrick @ Aldon',49.90719,-119.38815,0,1448727550
-103388,'103388','3120 Block E Boundary',49.8486,-119.58899,0,1448727551
-103389,'103389','3130 Block E Boundary',49.84856,-119.58912,0,1448727552
-103392,'103392','Rutland @ Fitzpatrick',49.90671,-119.38689,0,1448727576
-103393,'103393','Old Okanagan @ Daimler',49.85604,-119.59657,0,1448727577
-103395,'103395','Old Okanagan @ Daimler',49.85604,-119.59671,0,1448727579
-103396,'103396','McCurdy @ Keyes',49.90123,-119.38454,0,1448727580
-103399,'103399','McCulloch @ June Spgs',49.84102,-119.4083,0,1448727583
-103401,'103401','Westridge @ Crawford',49.81736,-119.46382,0,1448728257
-103403,'103403','E Boundary @ Vineyard',49.84568,-119.589,0,1448728259
-103405,'103405','Husch @ Molnar',49.88365,-119.38152,0,1448728261
-103406,'103406','McCulloch @ June Spgs',49.8408,-119.40699,0,1448728262
-103407,'103407','E Boundary @ Eagle',49.84488,-119.58914,0,1448728263
-103408,'103408','Gordon @ Buck',49.81364,-119.48294,0,1448728264
-103410,'103410','Molnar @ Milton',49.88754,-119.37968,0,1448728287
-103411,'103411','Molnar @ Husch',49.88419,-119.37963,0,1448728288
-103412,'103412','Molnar @ Holbrook',49.88578,-119.37969,0,1448728289
-103414,'103414','Hwy 33 @ Molnar',49.88894,-119.37879,0,1448728291
-103416,'103416','McCurdy @ Friesen',49.90163,-119.38037,0,1448728293
-103417,'103417','Boucherie @ Grn Bay',49.835,-119.5793,0,1448728294
-103418,'103418','Boucherie @ Grn Bay',49.83474,-119.57944,0,1448728295
-103419,'103419','3520 Block McCulloch',49.84053,-119.40368,0,1448728296
-103420,'103420','3530 Block McCulloch',49.84037,-119.40298,0,1448728318
-103421,'103421','Muir @ McKenzie',49.88973,-119.37732,0,1448728319
-103422,'103422','E Boundary @ Elk',49.84047,-119.58896,0,1448728320
-103423,'103423','Westridge @ Blueridge',49.81368,-119.46525,0,1448728321
-103424,'103424','Parkridge @ Mission Rdg',49.81499,-119.45803,0,1448728322
-103425,'103425','Old Vernon @ Acland',49.91813,-119.38287,0,1448728323
-103426,'103426','Hardie @ Hemlock',49.8949,-119.37682,0,1448728324
-103427,'103427','E Boundary @ Elk',49.84023,-119.5891,0,1448728325
-103428,'103428','Merrifield @ Mugford',49.89233,-119.37614,0,1448728326
-103429,'103429','Craig @ Hartman',49.89947,-119.37696,0,1448728327
-103430,'103430','McCurdy @ Craig',49.90185,-119.37751,0,1448728349
-103432,'103432','Chute Lk @ Barnaby',49.8097,-119.49825,0,1448728351
-103433,'103433','McCulloch @ Spaarpak',49.8401,-119.39967,0,1448728352
-103434,'103434','Old Okanagan @ Shamrock',49.84915,-119.60106,0,1448728353
-103435,'103435','Old Okanagan @ Shamrock',49.84924,-119.60116,0,1448728354
-103436,'103436','McCulloch @ Spaarpak',49.84003,-119.40003,0,1448728355
-103439,'103439','870 Block Gordon',49.80993,-119.47199,0,1448728358
-103440,'103440','Parkridge @ Appleridge',49.81226,-119.45691,0,1448728380
-103441,'103441','Westridge @ Appleridge',49.81085,-119.46306,0,1448728381
-103444,'103444','Westridge @ Westridge Court',49.80905,-119.46136,0,1448728384
-103445,'103445','Chute Lk @ Winery',49.80597,-119.49958,0,1448728385
-103446,'103446','Hwy 33 @ Toovey',49.8779,-119.36902,0,1448728386
-103447,'103447','Rdg Ests @ Elk',49.8362,-119.59467,0,1448728387
-103448,'103448','Hwy 33 @ Toovey',49.87883,-119.36932,0,1448728388
-103450,'103450','Elk @ Rdg Ests',49.83628,-119.59588,0,1448728411
-103451,'103451','Arbor Vw @ Windsong',49.80578,-119.48125,0,1448728412
-103452,'103452','Boucherie @ Pritchard',49.83094,-119.58828,0,1448728413
-103457,'103457','Okanagan College Exch',49.86095,-119.4812,0,1448728418
-103458,'103458','McCulloch @ McClain',49.83795,-119.39291,0,1448728419
-103459,'103459','Old Okanagan @ Louie',49.84551,-119.6064,0,1448728420
-103460,'103460','Pritchard @ Boucherie',49.83058,-119.58902,0,1448728442
-103461,'103461','McCulloch @ Lakevale',49.83774,-119.39156,0,1448728443
-103462,'103462','Old Okanagan @ Louie',49.84547,-119.60728,0,1448728444
-103463,'103463','Elk @ Cougar',49.839,-119.60133,0,1448728445
-103464,'103464','Parkridge @ Westridge',49.80764,-119.45594,0,1448728446
-103465,'103465','Elk @ Cougar',49.83914,-119.60246,0,1448728447
-103467,'103467','Old Boucherie @ Pritchard',49.82781,-119.58937,0,1448728449
-103469,'103469','Woodstock @ Sandstone',49.84963,-119.6137,0,1448728451
-103470,'103470','Parkridge @ Woodridge',49.80949,-119.45623,0,1448728473
-103471,'103471','Woodstock @ Shannon Court',49.85085,-119.6149,0,1448728474
-103472,'103472','Main @ Grant',50.0273,-119.40354,0,1448728475
-103473,'103473','Old Okanagan @ Old Raven',49.84478,-119.60989,0,1448728476
-103474,'103474','Old Boucherie @ Pritchard',49.82791,-119.58995,0,1448728477
-103477,'103477','Hwy 33 @ Langford',49.88913,-119.37944,0,1448728480
-103478,'103478','Old Vernon @ Morrison',49.91821,-119.37012,0,1448728481
-103480,'103480','Old Vernon @ Morrison',49.91807,-119.36946,0,1448728504
-103481,'103481','Shannon Way @ Westville',49.84902,-119.6156,0,1448728505
-103482,'103482','Hwy 33 @ Sadler',49.8891,-119.38583,0,1448728506
-103483,'103483','Carrington @ Elk',49.83844,-119.60908,0,1448728507
-103484,'103484','Old Boucherie @ Hitchner',49.82774,-119.59299,0,1448728508
-103485,'103485','Carrington @ Elk',49.83866,-119.60907,0,1448728509
-103486,'103486','Old Boucherie @ Hitchner',49.82783,-119.59359,0,1448728510
-103489,'103489','McCulloch @ Gallaghers Blvd',49.83796,-119.38226,0,1448728513
-103490,'103490','Hwy 33 @ Hume',49.86878,-119.36109,0,1448728535
-103491,'103491','1950 Block Old Boucherie',49.82781,-119.59699,0,1448728536
-103492,'103492','1950 Block Old Boucherie',49.8277,-119.59702,0,1448728537
-103493,'103493','Shannon Lk @ Shannon Way',49.84953,-119.61979,0,1448728538
-103495,'103495','Shannon Lk @ Shannon Way',49.84942,-119.6201,0,1448728540
-103497,'103497','Louie @ Elk',49.84029,-119.61252,0,1448728542
-103500,'103500','Old Boucherie @ Boucherie',49.82767,-119.59875,0,1448729217
-103501,'103501','Hwy 33 @ Traut',49.86906,-119.36299,0,1448729218
-103502,'103502','Old Okanagan @ Bayview',49.84351,-119.61736,0,1448729219
-103503,'103503','Old Vernon @ McKenzie',49.91962,-119.36428,0,1448729220
-103505,'103505','Old Okanagan @ Bayview',49.8436,-119.61734,0,1448729222
-103506,'103506','Old Vernon @ McKenzie',49.91962,-119.36414,0,1448729223
-103507,'103507','Cooper @ Harvey',49.87956,-119.44306,0,1448729224
-103508,'103508','3530 Block Carrington',49.83681,-119.61117,0,1448729225
-103509,'103509','3530 Block Carrington',49.83686,-119.6113,0,1448729226
-103510,'103510','2070 Block Boucherie',49.82765,-119.60019,0,1448729248
-103511,'103511','Louie @ Butt',49.8385,-119.61494,0,1448729249
-103512,'103512','Cooper @ Harvey',49.87953,-119.44339,0,1448729250
-103513,'103513','Shannon Lk @ Old Okanagan Hwy',49.8466,-119.6224,0,1448729251
-103515,'103515','Loseth @ Autumn',49.86608,-119.35416,0,1448729253
-103516,'103516','Shannon Lk @ Old Okanagan Hwy',49.84616,-119.62221,0,1448729254
-103518,'103518','2030 Block Boucherie',49.82678,-119.60213,0,1448729256
-103519,'103519','2030 Block Boucherie',49.82671,-119.60205,0,1448729257
-103520,'103520','Quilchena @ Providence',49.79664,-119.51164,0,1448729279
-103521,'103521','Loseth @ Feedham',49.86921,-119.3554,0,1448729280
-103522,'103522','5150 Block Chute Lk',49.79561,-119.50219,0,1448729281
-103523,'103523','Quilchena @ Thalia',49.79623,-119.51483,0,1448729282
-103524,'103524','Sunrise @ Loseth',49.86218,-119.35772,0,1448729283
-103525,'103525','Butt @ Carrington',49.83557,-119.61434,0,1448729284
-103526,'103526','Large @ St Clare',49.87188,-119.35377,0,1448729285
-103527,'103527','Butt @ Carrington',49.83535,-119.61439,0,1448729286
-103528,'103528','Old Okanagan @ Shannon Lk',49.84479,-119.62391,0,1448729287
-103529,'103529','2040 Block Boucherie',49.82626,-119.60476,0,1448729288
-103531,'103531','Loseth @ Lynrick',49.8675,-119.35471,0,1448729311
-103532,'103532','2040 Block Boucherie',49.82617,-119.60524,0,1448729312
-103533,'103533','370 Block Quilchena',49.79505,-119.51869,0,1448729313
-103535,'103535','Butt @ Louie',49.837,-119.61936,0,1448729315
-103537,'103537','Butt @ Louie',49.83691,-119.61937,0,1448729317
-103538,'103538','Hwy 33 @ Oswell',49.86825,-119.35058,0,1448729318
-103539,'103539','Sunrise @ Lynrick',49.86315,-119.35367,0,1448729319
-103540,'103540','Quilchena @ Raven',49.79397,-119.52096,0,1448729341
-103541,'103541','3330 Block Old Okanagan',49.84244,-119.62545,0,1448729342
-103542,'103542','3340 Block Old Okanagan',49.84236,-119.62557,0,1448729343
-103547,'103547','Old Vernon @ Scotty Crk',49.93322,-119.36423,0,1448729348
-103548,'103548','Old Vernon @ Scotty Crk',49.93301,-119.36409,0,1448729349
-103550,'103550','Lynrick @ Autumn',49.86528,-119.35062,0,1448729372
-103551,'103551','Old Okanagan @ Chieftain',49.8403,-119.62544,0,1448729373
-103552,'103552','Old Okanagan @ Chieftain',49.84021,-119.62556,0,1448729374
-103553,'103553','Boucherie @ Carrall',49.82524,-119.60947,0,1448729375
-103554,'103554','Black Mtn @ Linda',49.8708,-119.34797,0,1448729376
-103556,'103556','Old Okanagan @ Quince',49.8383,-119.62555,0,1448729378
-103557,'103557','Black Mtn @ Begley',49.86937,-119.34723,0,1448729379
-103561,'103561','3600 Block Old Vernon',49.93716,-119.36407,0,1448729404
-103562,'103562','Quilchena @ Providence',49.79129,-119.52185,0,1448729405
-103563,'103563','Old Okanagan @ Butt',49.8371,-119.6254,0,1448729406
-103564,'103564','3660 Block Old Vernon',49.93754,-119.36421,0,1448729407
-103565,'103565','Old Okanagan @ Butt',49.83656,-119.62553,0,1448729408
-103566,'103566','Boucherie @ Carrall',49.82474,-119.61267,0,1448729409
-103569,'103569','5600 Block Airport Way',49.95585,-119.38145,0,1448729412
-103573,'103573','Elliott @ Reece',49.84423,-119.63405,0,1448729437
-103574,'103574','5600 Block Airport Way',49.95571,-119.38163,0,1448729438
-103575,'103575','Old Okanagan @ Bering',49.83419,-119.62551,0,1448729439
-103576,'103576','Old Vernon @ Bulman',49.94041,-119.36411,0,1448729440
-103577,'103577','Old Vernon @ Bulman',49.94079,-119.36455,0,1448729441
-103579,'103579','Gellatly @ Carrington',49.82888,-119.62044,0,1448729443
-103580,'103580','Gellatly @ Witt',49.82736,-119.61874,0,1448729465
-103581,'103581','Gellatly @ Carrington',49.82941,-119.62109,0,1448729466
-103582,'103582','Gellatly @ Witt',49.82757,-119.619,0,1448729467
-103584,'103584','3590 Block Old Okanagan',49.83343,-119.62537,0,1448729469
-103585,'103585','Elliott @ Neufeld',49.84199,-119.63402,0,1448729470
-103586,'103586','Boucherie @ Gellatly',49.82381,-119.61586,0,1448729471
-103589,'103589','Smith Crk @ Elliott',49.84782,-119.63926,0,1448729474
-103590,'103590','Boucherie @ Gellatly',49.82377,-119.61659,0,1448729496
-103593,'103593','Old Okanagan @ Drought',49.83067,-119.62549,0,1448729499
-103594,'103594','Elliott @ Butt',49.83642,-119.63117,0,1448729500
-103595,'103595','Old Okanagan @ Drought',49.83014,-119.62535,0,1448729501
-103596,'103596','Dobbin @ Old Okanagan',49.82867,-119.62476,0,1448729502
-103597,'103597','Main @ Hoskins',49.82964,-119.62627,0,1448729503
-103598,'103598','3580 Block Elliott',49.83354,-119.63114,0,1448729504
-103599,'103599','Old Vernon @ Black',49.95112,-119.36886,0,1448729505
-103600,'103600','Old Vernon @ Black',49.95113,-119.36867,0,1448730178
-103602,'103602','Elliott @ Delray',49.83015,-119.63108,0,1448730180
-103604,'103604','Airport Way @ Lapointe',49.96414,-119.38173,0,1448730182
-103607,'103607','Airport Way @ Lapointe',49.96419,-119.38187,0,1448730185
-103608,'103608','Lower Glenrosa @ Paynter',49.82971,-119.63564,0,1448730186
-103609,'103609','Airport Way @ Old Vernon',49.96977,-119.38373,0,1448730187
-103610,'103610','Airport Way @ Old Vernon',49.9695,-119.38341,0,1448730209
-103611,'103611','Hwy 97 @ Old Vernon',49.97077,-119.38572,0,1448730210
-103613,'103613','Old Vernon @ Teather',49.96097,-119.36898,0,1448730212
-103614,'103614','Webber @ Dunbarton',49.83901,-119.65335,0,1448730213
-103615,'103615','Webber @ McAllister',49.84093,-119.65547,0,1448730214
-103616,'103616','Webber @ Gorman',49.83695,-119.65332,0,1448730215
-103617,'103617','Webber @ Aberdeen',49.8354,-119.65331,0,1448730216
-103618,'103618','Webber @ McRae',49.84307,-119.65903,0,1448730217
-103619,'103619','Old Vernon @ Spencer',49.97036,-119.3707,0,1448730218
-103620,'103620','Old Vernon @ Spencer',49.97048,-119.3707,0,1448730240
-103621,'103621','Lower Glenrosa @ Glenway',49.82656,-119.64675,0,1448730241
-103622,'103622','Webber @ McGregor',49.84535,-119.66172,0,1448730242
-103623,'103623','Webber @ Scotstown',49.83283,-119.65316,0,1448730243
-103624,'103624','McNair @ Webber',49.84718,-119.66355,0,1448730244
-103625,'103625','McIver @ McRae',49.84196,-119.662,0,1448730245
-103626,'103626','McIver @ McBain',49.84375,-119.66364,0,1448730246
-103627,'103627','Webber @ Salloum',49.83,-119.6532,0,1448730247
-103628,'103628','McIver @ McTaggart',49.83965,-119.66108,0,1448730248
-103629,'103629','McIver @ McRobbie',49.8467,-119.66575,0,1448730249
-103630,'103630','Lower Glenrosa @ Glenford',49.82818,-119.65282,0,1448730271
-103631,'103631','McLeod @ McGinnis',49.844,-119.66541,0,1448730272
-103632,'103632','Lower Glenrosa @ Gln',49.82501,-119.65077,0,1448730273
-103633,'103633','McGinnis @ McGee',49.84223,-119.66491,0,1448730274
-103634,'103634','McIver @ Glenrosa',49.83432,-119.65978,0,1448730275
-103636,'103636','McLeod @ McCoy',49.84589,-119.66771,0,1448730277
-103637,'103637','Glenrosa @ Gln Abbey',49.83202,-119.65859,0,1448730278
-103638,'103638','McLeod @ Blue Jay',49.84748,-119.66933,0,1448730279
-103639,'103639','Glenrosa @ McIver',49.83463,-119.66181,0,1448730280
-103640,'103640','Glenrosa @ Parkhurst',49.83652,-119.66334,0,1448730302
-103641,'103641','Canary @ Blue Jay',49.8487,-119.67165,0,1448730303
-103642,'103642','McGinnis @ Liard',49.83894,-119.66637,0,1448730304
-103643,'103643','Glenrosa @ Dunfield',49.8242,-119.65376,0,1448730305
-103644,'103644','Gts @ McMurchie',49.84472,-119.67019,0,1448730306
-103645,'103645','Glenrosa @ Rosedale',49.83822,-119.66739,0,1448730307
-103646,'103646','Oriole @ Canary',49.84766,-119.67301,0,1448730308
-103647,'103647','Gts @ McPherson',49.842,-119.67023,0,1448730309
-103648,'103648','Salmon @ Oriole',49.84566,-119.67284,0,1448730310
-103649,'103649','Gts @ Glenrosa',49.8409,-119.67024,0,1448730311
-103650,'103650','Hwy 97 @ Parkinson',50.00075,-119.40285,0,1448730333
-103652,'103652','Hwy 97 @ Commonwealth',50.00711,-119.40312,0,1448730335
-103653,'103653','Hwy 97 @ Commonwealth',50.00833,-119.4028,0,1448730336
-103654,'103654','Hwy 97 @ Beaver Lk',50.02081,-119.40618,0,1448730337
-103655,'103655','Hwy 97 @ Okanagan Ctr',50.02177,-119.40668,0,1448730338
+102728,'102728','Spall Rd @ Bernard Ave',49.88798,-119.45463,0,1448701418
+102853,'102853','Queensway Exch B:B',49.88742,-119.4959,0,1448702467
+102854,'102854','Queensway Exch B:J',49.88738,-119.49474,0,1448702468
+102855,'102855','Queensway Exch B:I',49.88738,-119.49449,0,1448702469
+102856,'102856','Queensway Exch B:H',49.88739,-119.49419,0,1448702470
+102857,'102857','Queensway Exch B:G',49.88736,-119.49393,0,1448702471
+102859,'102859','Queensway Exch B:E',49.88726,-119.49432,0,1448702473
+102860,'102860','Queensway Exch B:D',49.88726,-119.4946,0,1448702495
+102861,'102861','Queensway Exch B:C',49.88726,-119.49483,0,1448702496
+102862,'102862','Queensway Exch B:A',49.88742,-119.49615,0,1448702497
+102863,'102863','Rutland Rd N @ Sumac Rd E',49.90388,-119.38677,0,1448702498
+102865,'102865','Water St @ Doyle Ave',49.88923,-119.49651,0,1448702500
+102866,'102866','Doyle Ave @ Saint Paul St',49.88895,-119.4915,0,1448702501
+102867,'102867','Doyle Ave @ Bertram St',49.88904,-119.49058,0,1448702502
+102868,'102868','Water St @ Leon Ave',49.88467,-119.49665,0,1448702503
+102869,'102869','Water St @ Leon Ave',49.8842,-119.49635,0,1448702504
+102870,'102870','Water St @ Cawston Ave',49.89209,-119.49652,0,1448702526
+102874,'102874','Bernard Ave @ Bertram St',49.88637,-119.48987,0,1448702530
+102875,'102875','Richter St @ Lawrence Ave',49.88563,-119.48856,0,1448702531
+102877,'102877','Bernard Ave @ Richter St',49.88628,-119.48818,0,1448702533
+102879,'102879','Richter St @ Wilson Ave',49.89102,-119.48855,0,1448702535
+102880,'102880','Richter St @ Fuller Ave',49.89061,-119.48841,0,1448702557
+102881,'102881','Pandosy St @ Buckland Ave',49.88166,-119.4951,0,1448702558
+102882,'102882','Leon Ave @ Richter St',49.88454,-119.4869,0,1448702559
+102883,'102883','Pandosy St @ Buckland Ave',49.88135,-119.49494,0,1448702560
+102884,'102884','Leon Ave @ Richter St',49.88445,-119.48666,0,1448702561
+102885,'102885','Richter St @ Clement Ave',49.89321,-119.48854,0,1448702562
+102886,'102886','Richter St @ DeHart Ave',49.88192,-119.48865,0,1448702563
+102887,'102887','Richter St @ DeHart Ave',49.8822,-119.48838,0,1448702564
+102888,'102888','Ellis St @ Ind Ave',49.89581,-119.49349,0,1448702565
+102889,'102889','Bernard Ave @ Ethel St',49.88636,-119.48312,0,1448702566
+102890,'102890','Leon Ave @ Ethel St',49.88453,-119.48369,0,1448702588
+102891,'102891','Leon Ave @ Ethel St',49.88444,-119.48386,0,1448702589
+102892,'102892','Pandosy St @ Sutherland Ave',49.8797,-119.49357,0,1448702590
+102893,'102893','Bernard Ave @ Ethel St',49.88627,-119.48235,0,1448702591
+102894,'102894','Cawston Ave @ Ethel St',49.89168,-119.48331,0,1448702592
+102895,'102895','Richter St @ Gaston Ave',49.89568,-119.48854,0,1448702593
+102896,'102896','Pandosy St @ Sutherland Ave',49.87905,-119.49294,0,1448702594
+102897,'102897','Richter St @ Sutherland Ave',49.88004,-119.48842,0,1448702595
+102898,'102898','Cawston Ave @ Ethel St',49.89159,-119.48234,0,1448702596
+102899,'102899','Sutherland Ave @ Richter St',49.87981,-119.48813,0,1448702597
+102900,'102900','Bernard Ave @ Graham St',49.88638,-119.48019,0,1448703270
+102901,'102901','Ellis St @ Recreation Ave',49.89799,-119.49346,0,1448703271
+102902,'102902','Bernard Ave @ Graham St',49.88631,-119.47974,0,1448703272
+102903,'102903','Cawston Ave @ Graham St',49.89167,-119.48059,0,1448703273
+102905,'102905','Graham St @ Clement Ave',49.89328,-119.47995,0,1448703275
+102906,'102906','Sutherland Ave @ Ethel St',49.87987,-119.4831,0,1448703276
+102907,'102907','Bernard Ave @ Gordon Dr',49.88626,-119.47807,0,1448703277
+102908,'102908','Graham St @ Clement Ave',49.89322,-119.47981,0,1448703278
+102909,'102909','Bernard Ave @ Gordon Dr',49.88643,-119.478,0,1448703279
+102910,'102910','Pandosy St @ Cadder Ave',49.87673,-119.49122,0,1448703301
+102911,'102911','Ellis St @ Roanoke Ave',49.89957,-119.49347,0,1448703302
+102912,'102912','Sutherland Ave @ Ethel St',49.87979,-119.48227,0,1448703303
+102913,'102913','Richter St @ Bay Ave',49.89928,-119.48853,0,1448703304
+102914,'102914','Pandosy St @ Cadder Ave',49.87589,-119.4913,0,1448703305
+102915,'102915','Bernard Ave @ Gordon Dr',49.88625,-119.47605,0,1448703306
+102916,'102916','Lawrence Ave @ Gordon Dr',49.88526,-119.47631,0,1448703307
+102917,'102917','Sutherland Ave @ Bowes St',49.87987,-119.48026,0,1448703308
+102918,'102918','Lawrence Ave @ Gordon Dr',49.88534,-119.47589,0,1448703309
+102919,'102919','Ellis St @ Okanagan Blvd',49.90105,-119.49342,0,1448703310
+102920,'102920','Sutherland Ave @ Lequime St',49.87978,-119.47865,0,1448703332
+102921,'102921','Bernard Ave @ D''Anjou St',49.88636,-119.47432,0,1448703333
+102922,'102922','Richter St @ Okanagan Blvd',49.90119,-119.48853,0,1448703334
+102923,'102923','Bernard Ave @ D''Anjou St',49.88631,-119.47413,0,1448703335
+102924,'102924','Ellis St @ Oxford Ave',49.90187,-119.49319,0,1448703336
+102925,'102925','Lawrence Ave @ Kelglen Cres',49.88523,-119.47319,0,1448703337
+102926,'102926','Lawrence Ave @ Kelglen Cres',49.88532,-119.47289,0,1448703338
+102927,'102927','Sutherland Ave @ Gordon Dr',49.88026,-119.47594,0,1448703339
+102928,'102928','Kelowna General Hosp B:A',49.87391,-119.49134,0,1448703340
+102929,'102929','Springfield Rd @ Ethel St',49.87645,-119.48061,0,1448703341
+102930,'102930','Kelowna General Hosp B:C',49.87353,-119.49118,0,1448703363
+102931,'102931','Sutherland Ave @ Gordon Dr',49.88017,-119.47525,0,1448703364
+102932,'102932','Cambridge Ave @ Ellis St',49.9035,-119.4924,0,1448703365
+102933,'102933','Bernard Ave @ Richmond St',49.88637,-119.47123,0,1448703366
+102934,'102934','Cambridge Ave @ Kingsway',49.90348,-119.49063,0,1448703367
+102935,'102935','Richter St @ Cambridge Ave',49.90303,-119.48852,0,1448703368
+102936,'102936','Bernard Ave @ Richmond St',49.88628,-119.47099,0,1448703369
+102937,'102937','Lawrence Ave @ Richmond St',49.88523,-119.47072,0,1448703370
+102938,'102938','Sutherland Ave @ Capri St',49.88017,-119.47325,0,1448703371
+102939,'102939','Gordon Dr @ Springfield Rd',49.87646,-119.47723,0,1448703372
+102941,'102941','Springfield Rd @ Gordon Dr',49.87679,-119.47658,0,1448703395
+102942,'102942','Lawrence Ave @ Richmond St',49.8853,-119.47019,0,1448703396
+102944,'102944','Sutherland Ave @ Pacific Crt',49.88025,-119.47239,0,1448703398
+102945,'102945','Sutherland Ave @ Pacific Crt',49.88017,-119.4713,0,1448703399
+102948,'102948','Lawrence Ave @ Lakeview St',49.88532,-119.46744,0,1448703402
+102950,'102950','Springfield Rd @ Wilkinson St',49.8771,-119.47202,0,1448703425
+102951,'102951','Lawrence Ave @ Alta Vista Rd',49.88522,-119.46664,0,1448703426
+102952,'102952','Pandosy St @ Morrison Ave',49.86934,-119.49134,0,1448703427
+102953,'102953','Bernard Ave @ Highland Dr S',49.88635,-119.46602,0,1448703428
+102954,'102954','Springfield Rd @ Wilkinson St',49.8769,-119.47106,0,1448703429
+102956,'102956','Pandosy St @ Patterson Ave',49.8686,-119.49115,0,1448703431
+102957,'102957','Sutherland Ave @ Chandler St',49.88024,-119.46766,0,1448703432
+102958,'102958','Gordon Dr @ Guisachan Rd',49.87245,-119.47608,0,1448703433
+102959,'102959','Clifton Rd @ Hartwick St',49.89387,-119.46595,0,1448703434
+102960,'102960','Clifton Rd @ Hartwick St',49.89365,-119.4657,0,1448703456
+102961,'102961','Pandosy St @ Patterson Ave',49.86803,-119.49133,0,1448703457
+102962,'102962','Burtch Rd @ Kelglen Cres',49.88298,-119.46507,0,1448703458
+102963,'102963','Burtch Rd @ Kelglen Cres',49.88286,-119.46508,0,1448703459
+102964,'102964','Bernard Ave @ Noble Crt',49.88634,-119.46366,0,1448703460
+102965,'102965','Clifton Rd @ Lambert Ave',49.8959,-119.4659,0,1448703461
+102966,'102966','Clifton Rd @ Lambert Ave',49.89544,-119.46565,0,1448703462
+102968,'102968','Clifton Rd @ Lynwood Cres',49.89726,-119.46588,0,1448703464
+102969,'102969','Lawrence Ave @ Burtch Rd',49.88455,-119.46294,0,1448703465
+102970,'102970','Burtch Rd @ Dickson Ave',49.87844,-119.46587,0,1448703487
+102971,'102971','Lawrence Ave @ Burtch Rd',49.8844,-119.46287,0,1448703488
+102972,'102972','Burtch Rd @ Dickson Ave',49.8782,-119.46574,0,1448703489
+102973,'102973','Springfield Rd @ Burtch Rd',49.87707,-119.46632,0,1448703490
+102974,'102974','Bernard Ave @ Burtch Rd',49.88654,-119.46173,0,1448703491
+102975,'102975','Bernard Ave @ Cherry Cres W',49.887,-119.46121,0,1448703492
+102976,'102976','Pandosy St @ Raymer Ave',49.86571,-119.49129,0,1448703493
+102977,'102977','High Rd @ Glengarry St',49.89773,-119.46413,0,1448703494
+102978,'102978','Gordon Dr @ Cameron Ave',49.86989,-119.47471,0,1448703495
+102979,'102979','Springfield Rd @ Burtch Rd',49.87673,-119.46501,0,1448703496
+102982,'102982','Pandosy St @ Groves Ave',49.86339,-119.49129,0,1448703520
+102984,'102984','Pandosy St @ Groves Ave',49.86394,-119.49115,0,1448703522
+102985,'102985','Harvey Ave @ Parkinson Stn',49.88182,-119.45904,0,1448703523
+102986,'102986','Springfield Rd @ Dayton St',49.87693,-119.46171,0,1448703524
+102987,'102987','High Rd @ Tronson Dr',49.89847,-119.46225,0,1448703525
+102988,'102988','High Rd @ Tronson Dr',49.89915,-119.46132,0,1448703526
+102989,'102989','Harvey Ave @ Parkinson Stn',49.88204,-119.45807,0,1448703527
+102990,'102990','Springfield Rd @ Dayton St',49.87672,-119.46062,0,1448703549
+102991,'102991','Bernard Ave @ Dilworth Cres',49.8884,-119.45621,0,1448703550
+102993,'102993','Parkinson Way @ Ufton Crt',49.88315,-119.45636,0,1448703552
+102994,'102994','Parkinson Way @ Ufton Crt',49.8831,-119.45592,0,1448703553
+102995,'102995','Pandosy St @ KLO Rd',49.86229,-119.49117,0,1448703554
+102996,'102996','Springfield Rd @ Kirschner Rd',49.87694,-119.45876,0,1448703555
+102998,'102998','Rutland Rd N @ Klassen Rd',49.90721,-119.38669,0,1448703557
+102999,'102999','Lakeshore Rd @ Cedar Ave',49.86167,-119.49131,0,1448703558
+103000,'103000','Glenmore Rd @ Dilworth Cres',49.88976,-119.45456,0,1448724412
+103002,'103002','Hwy 33 @ Enterprise Way',49.8907,-119.42352,0,1448724414
+103003,'103003','Glenmore Dr @ Bernard Ave',49.88905,-119.45421,0,1448724415
+103004,'103004','Springfield Rd @ Kirschner Rd',49.87677,-119.45797,0,1448724416
+103005,'103005','High Rd @ Kennedy St',49.90041,-119.45849,0,1448724417
+103006,'103006','Gordon Dr @ Raymer Ave',49.86456,-119.47437,0,1448724418
+103007,'103007','Glenmore Rd @ Highland Dr N',49.89402,-119.45454,0,1448724419
+103008,'103008','Glenmore Dr @ Highland Dr N',49.89407,-119.45415,0,1448724420
+103009,'103009','Enterprise Way @ Spall Rd',49.88407,-119.45354,0,1448724421
+103010,'103010','High Rd @ Kennedy St',49.90041,-119.45754,0,1448724443
+103011,'103011','Spall Rd @ Windsor Rd',49.88042,-119.4547,0,1448724444
+103012,'103012','Spall Rd @ Windsor Rd',49.88087,-119.45438,0,1448724445
+103013,'103013','Glenmore Rd @ Mtn Ave',49.89592,-119.45449,0,1448724446
+103014,'103014','Springfield Rd @ Spall Rd',49.8772,-119.45597,0,1448724447
+103015,'103015','Enterprise Way @ Spall Rd',49.88415,-119.4529,0,1448724448
+103016,'103016','S Pandosy Exch B:A',49.8604,-119.49115,0,1448724449
+103018,'103018','Spall Rd @ Kent Rd',49.87864,-119.45469,0,1448724451
+103020,'103020','KLO Rd @ Casorso Rd',49.86093,-119.48492,0,1448724474
+103021,'103021','Mission Rec Exch B:A',49.83712,-119.48059,0,1448724475
+103022,'103022','Mission Rec Exch B:B',49.83693,-119.48062,0,1448724476
+103023,'103023','Mission Rec Exch B:C',49.8366,-119.48062,0,1448724477
+103024,'103024','Spall Rd @ Kent Rd',49.87888,-119.45447,0,1448724478
+103025,'103025','S Pandosy Exch B:B',49.86026,-119.49128,0,1448724479
+103026,'103026','Glenmore Dr @ Mtn Ave',49.89679,-119.45408,0,1448724480
+103027,'103027','Westside Rd @ Nancee Way',49.88307,-119.53813,0,1448724481
+103028,'103028','Okanagan College Exch B:A',49.86127,-119.47932,0,1448724482
+103029,'103029','Clement Ave @ Cerise Dr',49.89239,-119.47059,0,1448724483
+103030,'103030','Okanagan College Exch B:B',49.86105,-119.47988,0,1448724505
+103031,'103031','Clement Ave @ Cerise Dr',49.89277,-119.47138,0,1448724506
+103033,'103033','Springfield Rd @ Spall Rd',49.87716,-119.45386,0,1448724508
+103035,'103035','Glenmore Rd @ High Rd',49.89996,-119.45438,0,1448724510
+103036,'103036','Enterprise Way @ Enterprise Crt',49.88316,-119.45031,0,1448724511
+103038,'103038','KLO Rd @ Gordon Dr',49.86091,-119.47554,0,1448724513
+103039,'103039','Lanfranco Rd @ Lakeshore Rd',49.85815,-119.4903,0,1448724514
+103041,'103041','Glenmore Rd @ Summit Dr',49.90187,-119.45352,0,1448724537
+103042,'103042','KLO Rd @ Holland Rd',49.86109,-119.47275,0,1448724538
+103043,'103043','Westside Rd @ Bear Crk Rd',49.89228,-119.54262,0,1448724539
+103044,'103044','Lakeshore Rd @ Lanfranco Rd',49.85714,-119.49113,0,1448724540
+103045,'103045','KLO Rd @ Holland Rd',49.86091,-119.47253,0,1448724541
+103046,'103046','Enterprise Way @ Hardy St',49.88332,-119.44811,0,1448724542
+103047,'103047','Westside Rd @ Westpoint Pk',49.88551,-119.54411,0,1448724543
+103048,'103048','Glenmore Rd @ Glenmeadows Rd',49.90405,-119.45336,0,1448724544
+103049,'103049','Hwy 97 N @ Banks Stn',49.88563,-119.42664,0,1448724545
+103050,'103050','Enterprise Way @ Hardy St',49.88325,-119.44694,0,1448724567
+103051,'103051','Glenmore Rd @ Glenmeadows Rd',49.904,-119.45297,0,1448724568
+103052,'103052','Summit Dr @ Vly Rd',49.9012,-119.45024,0,1448724569
+103053,'103053','Summit Dr @ Vly Rd',49.90111,-119.45021,0,1448724570
+103054,'103054','KLO Rd @ St Amand Rd',49.86108,-119.4663,0,1448724571
+103056,'103056','Springfield Rd @ Barlee Rd',49.87716,-119.44781,0,1448724573
+103057,'103057','Springfield Rd @ Barlee Rd',49.87738,-119.44737,0,1448724574
+103058,'103058','Enterprise Way @ Cooper Rd',49.88324,-119.44458,0,1448724575
+103059,'103059','KLO Rd @ St Amand Rd',49.8609,-119.46676,0,1448724576
+103060,'103060','Enterprise Way @ Cooper Rd',49.88333,-119.44438,0,1448724598
+103061,'103061','Harvey Ave @ Cooper Stn - Orchard Pk',49.88202,-119.44467,0,1448724599
+103062,'103062','Lakeshore Rd @ Richter St',49.85481,-119.49002,0,1448724600
+103063,'103063','Bear Crk Rd @ McNaughton Rd',49.89299,-119.54761,0,1448724601
+103065,'103065','Boucherie Rd @ Carrall Rd',49.82514,-119.60949,0,1448724603
+103066,'103066','Parkinson Rd @ Bear Crk Rd',49.89893,-119.54703,0,1448724604
+103067,'103067','Harvey Ave @ Cooper Stn - Orchard Pk',49.88176,-119.44216,0,1448724605
+103069,'103069','Orchard Pk Exch B:A',49.88025,-119.44247,0,1448724607
+103070,'103070','Orchard Pk Exch B:B',49.88041,-119.44248,0,1448724629
+103071,'103071','Orchard Pk Exch B:C',49.88056,-119.44248,0,1448724630
+103072,'103072','Orchard Pk Exch B:D',49.88065,-119.44234,0,1448724631
+103073,'103073','Orchard Pk Exch B:E',49.8805,-119.44234,0,1448724632
+103075,'103075','Orchard Pk Exch B:F',49.88037,-119.44234,0,1448724634
+103076,'103076','Enterprise Way @ Cooper Rd',49.88322,-119.44167,0,1448724635
+103077,'103077','Orchard Pk Exch B:H',49.87962,-119.44228,0,1448724636
+103078,'103078','Boucherie Rd @ Hayman Rd',49.87266,-119.5447,0,1448724637
+103079,'103079','Orchard Pk Exch B:G',49.88008,-119.44231,0,1448724638
+103080,'103080','Glenmore Rd @ Yates Rd',49.90911,-119.4509,0,1448724660
+103081,'103081','McCurdy Rd @ Alsgard St',49.90125,-119.40612,0,1448724661
+103082,'103082','Summit Dr @ Denali Dr',49.89883,-119.44257,0,1448724662
+103083,'103083','Summit Dr @ Denali Dr',49.89841,-119.44231,0,1448724663
+103084,'103084','KLO Rd @ Benvoulin Rd W Side',49.86104,-119.45854,0,1448724664
+103086,'103086','Springfield Rd @ Cooper Rd',49.8771,-119.44164,0,1448724666
+103087,'103087','Glenmore Rd @ Yates Rd',49.90967,-119.45011,0,1448724667
+103088,'103088','KLO Rd @ Benvoulin Rd W Side',49.86088,-119.45995,0,1448724668
+103089,'103089','Summit Dr @ Lillooet Cres W',49.89569,-119.43997,0,1448724669
+103090,'103090','Yates Rd @ Glenmore Rd',49.90895,-119.44894,0,1448724691
+103091,'103091','Lakeshore Rd @ Bechard Rd',49.85151,-119.48683,0,1448724692
+103092,'103092','Enterprise Way @ Dilworth Dr',49.88331,-119.43862,0,1448724693
+103093,'103093','Lakeshore Rd @ Bechard Rd',49.85151,-119.48697,0,1448724694
+103094,'103094','Parkinson Rd @ Westlake Rd',49.89125,-119.55277,0,1448724695
+103095,'103095','Summit Dr @ Chilcotin Cres',49.89592,-119.43912,0,1448724696
+103096,'103096','Dilworth Dr @ Leckie Pl',49.88699,-119.43781,0,1448724697
+103097,'103097','Springfield Rd @ Benvoulin Crt',49.87734,-119.44014,0,1448724698
+103098,'103098','Yates Rd @ Vly Rd',49.90866,-119.44724,0,1448724699
+103099,'103099','Dilworth Dr @ Leckie Rd',49.887,-119.43767,0,1448724700
+103101,'103101','Dilworth Dr @ Enterprise Way',49.88438,-119.43778,0,1448725374
+103102,'103102','Dilworth Dr @ Enterprise Way',49.88451,-119.43764,0,1448725375
+103103,'103103','Glenmore Rd @ Watson Rd',49.91122,-119.44942,0,1448725376
+103104,'103104','Glenmore Rd @ Cross Rd',49.9224,-119.43994,0,1448725377
+103105,'103105','Enterprise Way @ Dilworth Dr',49.88322,-119.43689,0,1448725378
+103107,'103107','Glenmore Rd @ Watson Rd',49.91165,-119.44873,0,1448725380
+103108,'103108','Dilworth Dr @ Baron Rd',49.8789,-119.43703,0,1448725381
+103110,'103110','Westlake Rd @ Keloka Way',49.88711,-119.55568,0,1448725404
+103111,'103111','Summit Dr @ Skeena Dr',49.8986,-119.43643,0,1448725405
+103113,'103113','Lakeshore Rd @ Barrera Rd',49.84894,-119.48617,0,1448725407
+103114,'103114','KLO Rd @ Como Rd',49.86091,-119.45055,0,1448725408
+103115,'103115','Westlake Rd @ Horizon Dr',49.88503,-119.55698,0,1448725409
+103116,'103116','KLO Rd @ Como Rd',49.86104,-119.44997,0,1448725410
+103117,'103117','Summit Dr @ Skeena Dr',49.89885,-119.43561,0,1448725411
+103118,'103118','Dilworth Dr @ Omineca Pl',49.8912,-119.43322,0,1448725412
+103119,'103119','Lakeshore Rd @ Barrera Rd',49.84868,-119.48634,0,1448725413
+103121,'103121','Baron Rd @ Underhill St',49.87958,-119.43414,0,1448725436
+103122,'103122','Enterprise Way @ Leckie Rd',49.88404,-119.43275,0,1448725437
+103123,'103123','Dilworth Dr @ Omineca Pl',49.89152,-119.43264,0,1448725438
+103125,'103125','Baron Rd @ Underhill St',49.87964,-119.43327,0,1448725440
+103126,'103126','Enterprise Way @ Leckie Rd',49.88561,-119.43186,0,1448725441
+103127,'103127','Enterprise Way @ Hunter Rd',49.88592,-119.43166,0,1448725442
+103128,'103128','Summit Dr @ Lillooet Cres',49.89927,-119.43362,0,1448725443
+103129,'103129','Summit Dr @ Lillooet Cres E',49.89936,-119.43308,0,1448725444
+103130,'103130','Springfield Rd @ Durnin Rd',49.87779,-119.43249,0,1448725466
+103131,'103131','Glenmore Rd @ Ballou Rd',49.91564,-119.44633,0,1448725467
+103132,'103132','Cross Rd @ Glenmore Rd',49.92343,-119.44008,0,1448725468
+103133,'103133','Lakeshore Rd @ Cook Rd',49.84624,-119.48736,0,1448725469
+103134,'103134','Anders Rd @ Thacker Dr',49.85992,-119.54544,0,1448725470
+103135,'103135','Anders Rd @ Thacker Dr',49.86003,-119.54574,0,1448725471
+103136,'103136','Glenmore Rd @ Kane Rd',49.91616,-119.44563,0,1448725472
+103138,'103138','Springfield Rd @ Durnin Rd',49.87814,-119.43089,0,1448725474
+103139,'103139','Lakeshore Rd @ Cook Rd',49.84517,-119.48784,0,1448725475
+103140,'103140','Kane Rd @ Drysdale Blvd',49.91535,-119.44385,0,1448725497
+103141,'103141','Enterprise Way @ Banks Rd',49.88868,-119.42863,0,1448725498
+103142,'103142','Baron Rd @ Leckie Rd',49.88249,-119.42873,0,1448725499
+103143,'103143','Summit Dr @ Purcell Dr',49.89963,-119.43066,0,1448725500
+103144,'103144','Baron Rd @ Leckie Rd',49.88246,-119.42857,0,1448725501
+103145,'103145','Dilworth Dr @ Cascade Pl',49.89286,-119.42815,0,1448725502
+103146,'103146','KLO Rd @ Spiers Rd',49.86056,-119.44227,0,1448725503
+103147,'103147','Dilworth Dr @ Cascade Pl',49.89277,-119.42812,0,1448725504
+103148,'103148','Summit Dr @ Nahanni Pl',49.89991,-119.4301,0,1448725505
+103149,'103149','KLO Rd @ Spiers Rd',49.8605,-119.44237,0,1448725506
+103151,'103151','Lakeshore Rd @ Truswell Rd',49.84396,-119.48769,0,1448725529
+103152,'103152','Lakeshore Rd @ Truswell Rd',49.84381,-119.48795,0,1448725530
+103153,'103153','Black Mtn Dr @ Large Ave',49.87201,-119.34848,0,1448725531
+103154,'103154','Glenmore Rd @ Dallas Rd',49.91798,-119.44468,0,1448725532
+103156,'103156','Springfield Rd @ Leckie Rd',49.87964,-119.42761,0,1448725534
+103159,'103159','Glenmore Rd @ Dallas Rd',49.91841,-119.44403,0,1448725537
+103160,'103160','Thacker Dr @ Douglas Rd',49.8564,-119.54544,0,1448725559
+103161,'103161','Westlake Rd @ Starlight Cres',49.87915,-119.56426,0,1448725560
+103162,'103162','Boucherie Rd @ Stuart Rd',49.86412,-119.5551,0,1448725561
+103163,'103163','Anders Rd @ Olalla Rd',49.86016,-119.55063,0,1448725562
+103164,'103164','Anders Rd @ Olalla Rd',49.86031,-119.55198,0,1448725563
+103165,'103165','Enterprise Way @ Powick Rd',49.89028,-119.42541,0,1448725564
+103166,'103166','1000 Blk Dilworth Dr',49.89692,-119.42629,0,1448725565
+103167,'103167','Thacker Dr @ Douglas Rd',49.85579,-119.5457,0,1448725566
+103168,'103168','Summit Dr @ Dilworth Dr',49.89871,-119.4268,0,1448725567
+103169,'103169','1900 Blk Baron Rd',49.8837,-119.42518,0,1448725568
+103170,'103170','Summit Dr @ Dilworth Dr',49.8988,-119.4268,0,1448725590
+103171,'103171','Baron Rd @ Banks Rd',49.88431,-119.42479,0,1448725591
+103172,'103172','1000 Blk Dilworth Dr',49.89653,-119.426,0,1448725592
+103173,'103173','Westlake Rd @ Caledonia Way',49.87347,-119.56304,0,1448725593
+103174,'103174','Hwy 97 N @ Banks Stn',49.88688,-119.42413,0,1448725594
+103176,'103176','Gordon Dr @ Steele Rd',49.80585,-119.47308,0,1448725596
+103177,'103177','Gordon Dr @ Powerline Pk',49.80533,-119.47633,0,1448725597
+103178,'103178','Westlake Rd @ Rosewood Dr',49.8777,-119.5663,0,1448725598
+103180,'103180','Hudson Rd @ Boucherie Rd',49.86235,-119.5565,0,1448725621
+103181,'103181','Thacker Dr @ Collens Hl Rd',49.85383,-119.54566,0,1448725622
+103182,'103182','Thacker Dr @ Collens Hl Rd',49.85383,-119.54591,0,1448725623
+103183,'103183','Hudson Rd @ Boucherie Rd',49.86245,-119.55688,0,1448725624
+103184,'103184','Baron Rd @ Spedding Crt',49.88631,-119.42205,0,1448725625
+103185,'103185','Lakeshore Rd @ Bluebird Rd',49.84032,-119.48865,0,1448725626
+103186,'103186','Baron Rd @ Spedding Crt',49.88635,-119.42179,0,1448725627
+103187,'103187','Gordon Dr @ Frost Rd',49.80374,-119.47688,0,1448725628
+103188,'103188','Lakeshore Rd @ Lexington Dr',49.84046,-119.48847,0,1448725629
+103189,'103189','Springfield Rd @ Parkview Cres',49.88042,-119.42189,0,1448725630
+103190,'103190','Springfield Rd @ Parkview Cres',49.88061,-119.4216,0,1448725652
+103191,'103191','S Rdg Dr @ Frost Rd',49.80337,-119.48271,0,1448725653
+103192,'103192','Hwy 33 E @ Rutland Rd N',49.8891,-119.38773,0,1448725654
+103193,'103193','Rutland Exch B:A',49.89064,-119.39239,0,1448725655
+103195,'103195','Thacker Dr @ Beverly Pl',49.85252,-119.54781,0,1448725657
+103197,'103197','Thacker Dr @ Beverly Pl',49.85268,-119.54852,0,1448725659
+103198,'103198','Lynrick Rd @ Loseth Rd',49.86761,-119.35336,0,1448725660
+103201,'103201','Ziprick Rd @ Terai Rd',49.88831,-119.41764,0,1448726335
+103202,'103202','Springfield Rd @ Ziprick Rd',49.88061,-119.41854,0,1448726336
+103203,'103203','Vly @ Longhill',49.91993,-119.43419,0,1448726337
+103204,'103204','Ziprick Rd @ Terai Rd',49.88805,-119.4175,0,1448726338
+103205,'103205','Springfield Rd @ Ziprick Rd',49.88036,-119.41841,0,1448726339
+103206,'103206','Snowsell St @ Cross Rd',49.92446,-119.44177,0,1448726340
+103214,'103214','Lakeshore Rd @ Lequime Rd',49.83651,-119.48721,0,1448726369
+103216,'103216','Ogden Rd @ Boucherie Rd',49.853,-119.55566,0,1448726371
+103217,'103217','Ogden Rd @ Boucherie Rd',49.85288,-119.55563,0,1448726372
+103219,'103219','Alhambra Dr @ Brentwood Rd',49.86201,-119.56683,0,1448726374
+103220,'103220','Alhambra Dr @ Brentwood Rd',49.86203,-119.56697,0,1448726396
+103221,'103221','Hwy 33 W @ Nickel Rd',49.88912,-119.4134,0,1448726397
+103222,'103222','Hwy 33 W @ Taylor Rd',49.88903,-119.41316,0,1448726398
+103226,'103226','Snowsell St @ Porthill Dr',49.92719,-119.43902,0,1448726402
+103227,'103227','Springfield Rd @ Graham Rd',49.87976,-119.41336,0,1448726403
+103230,'103230','1400 Blk Stevens Rd',49.86627,-119.57189,0,1448726427
+103231,'103231','KLO Rd @ McCulloch Rd',49.85971,-119.42417,0,1448726428
+103232,'103232','KLO Rd @ McCulloch Rd',49.85955,-119.42419,0,1448726429
+103233,'103233','Brentwood Rd @ Denny Crt',49.86118,-119.5693,0,1448726430
+103234,'103234','Brentwood Rd @ Denny Crt',49.86127,-119.56926,0,1448726431
+103235,'103235','Springfield Rd @ Gerstmar Rd',49.87881,-119.41188,0,1448726432
+103236,'103236','Union Rd @ Wyndham Cres',49.92785,-119.43703,0,1448726433
+103239,'103239','Boucherie Rd @ Montigny Rd',49.84895,-119.55707,0,1448726436
+103240,'103240','Hwy 33 W @ Kneller Rd',49.88913,-119.41001,0,1448726458
+103243,'103243','Union Rd @ Vly Rd N',49.9254,-119.43203,0,1448726461
+103244,'103244','Boucherie Rd @ Montigny Rd',49.84871,-119.55757,0,1448726462
+103245,'103245','Hwy 33 W @ Gerstmar Rd',49.88904,-119.40886,0,1448726463
+103246,'103246','Gerstmar Rd @ Thompson Rd',49.87904,-119.40955,0,1448726464
+103248,'103248','Lakeshore Rd @ Old Mdws Rd',49.83198,-119.48779,0,1448726466
+103249,'103249','Brentwood Rd @ Applewood Rd',49.86146,-119.57255,0,1448726467
+103250,'103250','Gerstmar Rd @ Thompson Rd',49.87903,-119.40941,0,1448726489
+103251,'103251','Ross Rd @ Stevens Rd',49.86582,-119.57582,0,1448726490
+103252,'103252','Graham Rd @ Gerstmar Rd',49.88176,-119.40874,0,1448726491
+103253,'103253','Graham Rd @ Irma Rd',49.88185,-119.40857,0,1448726492
+103254,'103254','Brentwood Rd @ Applewood Rd',49.86137,-119.57259,0,1448726493
+103256,'103256','Hwy 97 N @ McCurdy Stn',49.90021,-119.41008,0,1448726495
+103257,'103257','Gordon Dr @ Welke Rd',49.83149,-119.48334,0,1448726496
+103258,'103258','Ross Rd @ Western Rd',49.86368,-119.57583,0,1448726497
+103260,'103260','Hwy 33 W @ Bryden Rd',49.88912,-119.40635,0,1448726520
+103261,'103261','Brentwood Rd @ Vista Way',49.8614,-119.57523,0,1448726521
+103262,'103262','Ross Rd @ Brentwood Rd',49.86189,-119.57587,0,1448726522
+103263,'103263','Hwy 97 N @ McCurdy Stn',49.90245,-119.40752,0,1448726523
+103264,'103264','Hwy 33 W @ Davie Rd',49.88903,-119.40539,0,1448726524
+103265,'103265','Ross Rd @ Brentwood Rd',49.86081,-119.5774,0,1448726525
+103266,'103266','Boucherie Rd @ Gregory Rd',49.84694,-119.55991,0,1448726526
+103268,'103268','Boucherie Rd @ Gregory Rd',49.84647,-119.56099,0,1448726528
+103271,'103271','Graham Rd @ Matt Rd',49.88186,-119.40343,0,1448726552
+103272,'103272','Lakeshore Rd @ Simeon Crt',49.82828,-119.48869,0,1448726553
+103274,'103274','Hwy 33 W @ Franklyn Rd',49.88911,-119.40301,0,1448726555
+103277,'103277','Graham Rd @ Matt Rd',49.88177,-119.40282,0,1448726558
+103278,'103278','Hwy 33 W @ Barber Rd',49.88902,-119.4018,0,1448726559
+103279,'103279','Ross Rd @ Applegreen Crt',49.86082,-119.58009,0,1448726560
+103282,'103282','Ross Rd @ Applegreen Crt',49.86076,-119.58012,0,1448726584
+103283,'103283','McCurdy Rd @ Mayfair Rd',49.90129,-119.40309,0,1448726585
+103285,'103285','McCulloch Rd @ Hart Rd',49.85346,-119.41668,0,1448726587
+103286,'103286','McCulloch Rd @ Hart Rd',49.85344,-119.41593,0,1448726588
+103287,'103287','Leathead Rd @ Franklyn Rd',49.89543,-119.40033,0,1448726589
+103288,'103288','Franklyn Rd @ Pearson Rd',49.89809,-119.40092,0,1448726590
+103289,'103289','Hollydell Rd @ Stirling Rd',49.88276,-119.39981,0,1448726591
+103290,'103290','Lakeshore Rd @ Willms Rd',49.82597,-119.4887,0,1448726613
+103291,'103291','Hollydell Rd @ Stirling Rd',49.88282,-119.39969,0,1448726614
+103292,'103292','Franklyn Rd @ McCurdy Rd',49.90087,-119.40091,0,1448726615
+103293,'103293','DeHart Rd @ Bartholomew Crt',49.82657,-119.47627,0,1448726616
+103294,'103294','Crawford Rd @ DeHart Rd',49.82868,-119.46415,0,1448726617
+103295,'103295','Crawford Rd @ DeHart Rd',49.82873,-119.46431,0,1448726618
+103296,'103296','Hwy 33 W @ Hollywood Rd S',49.88896,-119.39876,0,1448726619
+103297,'103297','Hwy 33 W @ Hollywood Rd N',49.88914,-119.39897,0,1448726620
+103298,'103298','DeHart Rd @ Bartholomew Crt',49.82648,-119.47621,0,1448726621
+103299,'103299','Ross Rd @ Cameron Rd',49.86073,-119.58302,0,1448726622
+103300,'103300','Finns Rd @ Fitzpatrick Rd',49.90654,-119.40249,0,1448727295
+103301,'103301','Ross Rd @ Riffington Pl',49.86086,-119.58389,0,1448727296
+103302,'103302','Boucherie Rd @ Sunnyside Rd',49.84387,-119.56543,0,1448727297
+103303,'103303','Hollywood Rd S @ Perry Rd',49.88084,-119.3983,0,1448727298
+103304,'103304','Hollywood Rd S @ Perry Rd',49.88117,-119.39815,0,1448727299
+103305,'103305','Gordon Dr @ Balsam Rd',49.82502,-119.48329,0,1448727300
+103306,'103306','Boucherie Rd @ Sunnyside Rd',49.84366,-119.56609,0,1448727301
+103307,'103307','Hollywood Rd S @ Quigley Rd',49.87754,-119.39834,0,1448727302
+103308,'103308','Hollywood Rd S @ Juniper Rd',49.87776,-119.3982,0,1448727303
+103309,'103309','Hollywood Rd S @ Springfield Rd',49.87562,-119.39835,0,1448727304
+103310,'103310','Hollywood Rd S @ Springfield Rd',49.87517,-119.39822,0,1448727326
+103312,'103312','Hwy 33 W @ Aurora Cres',49.88894,-119.39593,0,1448727328
+103313,'103313','Springfield Rd @ Monterey Rd',49.87438,-119.39757,0,1448727329
+103316,'103316','DeHart Rd @ Gordon Dr',49.823,-119.48252,0,1448727332
+103317,'103317','Lakeshore Rd @ DeHart Rd',49.82219,-119.48899,0,1448727333
+103319,'103319','Lakeshore Rd @ DeHart Rd',49.82253,-119.48892,0,1448727335
+103321,'103321','Hwy 33 W @ Dougall Rd N',49.88912,-119.39428,0,1448727358
+103322,'103322','Leathead Rd @ Tartan Rd',49.89539,-119.39396,0,1448727359
+103323,'103323','McCulloch Rd @ Reekie Rd',49.85199,-119.40978,0,1448727360
+103324,'103324','McCulloch Rd @ Reekie Rd',49.85166,-119.4099,0,1448727361
+103325,'103325','Gordon Dr @ DeHart Rd',49.82218,-119.48322,0,1448727362
+103326,'103326','Dougall Rd N @ McIntosh Rd',49.89262,-119.39273,0,1448727363
+103327,'103327','Fitzpatrick Rd @ Findlay Rd',49.90721,-119.39684,0,1448727364
+103328,'103328','Ross Rd @ Bartley Rd',49.8602,-119.58971,0,1448727365
+103329,'103329','Ross Rd @ Bartley Rd',49.86011,-119.58953,0,1448727366
+103331,'103331','Springfield Rd @ Hollywood Rd S',49.87446,-119.3941,0,1448727389
+103334,'103334','Springfield Rd @ Hollywood Rd S',49.87437,-119.39381,0,1448727392
+103335,'103335','Leathead Rd @ Asher Rd',49.8953,-119.39157,0,1448727393
+103337,'103337','Lakeshore Rd @ Eldorado Rd',49.82061,-119.49098,0,1448727395
+103340,'103340','Lakeshore Rd @ Eldorado Rd',49.82059,-119.49122,0,1448727419
+103342,'103342','4100 Blk Lakeshore Rd',49.83785,-119.48796,0,1448727421
+103343,'103343','Fitzpatrick Rd @ Chichester Crt',49.9072,-119.39401,0,1448727422
+103344,'103344','Leathead Rd @ Pinetree Rd',49.89539,-119.39024,0,1448727423
+103346,'103346','Springfield Rd @ Neptune Rd',49.87758,-119.39045,0,1448727425
+103347,'103347','Lakeshore Rd @ Keith Rd',49.81881,-119.49314,0,1448727426
+103348,'103348','3300 Blk McCulloch Rd',49.84643,-119.40986,0,1448727427
+103349,'103349','3300 Blk McCulloch Rd',49.84644,-119.40976,0,1448727428
+103351,'103351','Boucherie Rd @ Mission Hl Rd',49.84013,-119.57359,0,1448727451
+103354,'103354','Leathead Rd @ Ford Rd',49.8956,-119.38807,0,1448727454
+103355,'103355','Lakeshore Rd @ Keith Rd',49.81814,-119.49415,0,1448727455
+103357,'103357','Springfield Rd @ Neptune Rd',49.87771,-119.38854,0,1448727457
+103359,'103359','Boucherie Rd @ Mission Hl Rd',49.83973,-119.57402,0,1448727459
+103360,'103360','Fitzpatrick Rd @ Stafford Rd',49.9072,-119.39121,0,1448727481
+103361,'103361','Rutland Rd S @ Robson Rd W',49.88676,-119.38697,0,1448727482
+103363,'103363','Rutland Rd S @ Gray Rd',49.88848,-119.38698,0,1448727484
+103364,'103364','Rutland Rd S @ Holbrook Rd W',49.88519,-119.38699,0,1448727485
+103365,'103365','Rutland Rd N @ Shepherd Rd',49.8909,-119.38698,0,1448727486
+103366,'103366','Rutland Rd S @ Jupiter Rd',49.87934,-119.38775,0,1448727487
+103367,'103367','Rutland Rd S @ Jupiter Crt',49.88005,-119.38759,0,1448727488
+103368,'103368','1200 Blk Crawford Rd',49.82022,-119.4669,0,1448727489
+103369,'103369','Rutland Rd S @ Benchview Rd',49.8829,-119.38703,0,1448727490
+103372,'103372','Rutland Rd S @ Belgo Rd',49.88213,-119.38689,0,1448727514
+103373,'103373','Rutland Rd N @ Mugford Rd',49.89296,-119.3868,0,1448727515
+103375,'103375','Rutland Rd N @ Hardie Rd',49.89512,-119.38697,0,1448727517
+103376,'103376','Rutland Rd N @ Briarwood Rd',49.89433,-119.38683,0,1448727518
+103377,'103377','Rutland Rd N @ Leathead Rd',49.89668,-119.38696,0,1448727519
+103378,'103378','Hwy 33 E @ Sadler Rd',49.88894,-119.38603,0,1448727520
+103379,'103379','Ross Rd @ Daimler Dr',49.85624,-119.59386,0,1448727521
+103380,'103380','Rutland Rd N @ Hartman Rd',49.89945,-119.38689,0,1448727543
+103381,'103381','Ross Rd @ Daimler Dr',49.85618,-119.594,0,1448727544
+103382,'103382','Rutland Rd N @ McCurdy Rd',49.90065,-119.38688,0,1448727545
+103383,'103383','Husch Rd @ Scarboro Rd',49.88365,-119.38526,0,1448727546
+103384,'103384','Rutland Rd N @ McCurdy Rd E',49.90151,-119.38674,0,1448727547
+103385,'103385','Rutland Rd N @ Sumac Rd E',49.90334,-119.38691,0,1448727548
+103387,'103387','Fitzpatrick Rd @ Aldon Rd',49.90719,-119.38815,0,1448727550
+103388,'103388','3100 Blk E Boundary Rd',49.8486,-119.58899,0,1448727551
+103389,'103389','3100 Blk E Boundary Rd',49.84856,-119.58912,0,1448727552
+103392,'103392','Rutland Rd N @ Fitzpatrick Rd',49.90671,-119.38689,0,1448727576
+103393,'103393','Old Okanagan Hwy @ Daimler Dr',49.85604,-119.59657,0,1448727577
+103395,'103395','Old Okanagan Hwy @ Daimler Dr',49.85604,-119.59671,0,1448727579
+103396,'103396','McCurdy Rd E @ Keyes Rd',49.90123,-119.38454,0,1448727580
+103399,'103399','McCulloch Rd @ June Spgs Rd',49.84102,-119.4083,0,1448727583
+103401,'103401','Westridge Dr @ Crawford Rd',49.81736,-119.46382,0,1448728257
+103403,'103403','E Boundary Rd @ Vineyard Dr',49.84568,-119.589,0,1448728259
+103405,'103405','Husch Rd @ Molnar Rd',49.88365,-119.38152,0,1448728261
+103406,'103406','McCulloch Rd @ June Spgs Rd',49.8408,-119.40699,0,1448728262
+103407,'103407','E Boundary Rd @ Eagle Crt',49.84488,-119.58914,0,1448728263
+103408,'103408','Gordon Dr @ Buck Rd',49.81364,-119.48294,0,1448728264
+103410,'103410','Molnar Rd @ Milton Rd',49.88754,-119.37968,0,1448728287
+103411,'103411','Molnar Rd @ Husch Rd',49.88419,-119.37963,0,1448728288
+103412,'103412','Molnar Rd @ Holbrook Rd E',49.88578,-119.37969,0,1448728289
+103414,'103414','Hwy 33 E @ Molnar Rd',49.88894,-119.37879,0,1448728291
+103416,'103416','McCurdy Rd E @ Friesen Rd',49.90163,-119.38037,0,1448728293
+103417,'103417','Boucherie Rd @ Grn Bay Rd',49.835,-119.5793,0,1448728294
+103418,'103418','Boucherie Rd @ Grn Bay Rd',49.83474,-119.57944,0,1448728295
+103419,'103419','3500 Blk McCulloch Rd',49.84053,-119.40368,0,1448728296
+103420,'103420','3500 Blk McCulloch Rd',49.84037,-119.40298,0,1448728318
+103421,'103421','Muir Rd @ McKenzie Rd',49.88973,-119.37732,0,1448728319
+103422,'103422','E Boundary Rd @ Elk Rd',49.84047,-119.58896,0,1448728320
+103423,'103423','Westridge Dr @ Blueridge Rd',49.81368,-119.46525,0,1448728321
+103424,'103424','Parkridge Dr @ Mission Rdg Dr',49.81499,-119.45803,0,1448728322
+103425,'103425','Old Vernon Rd @ Acland Rd',49.91813,-119.38287,0,1448728323
+103426,'103426','Hardie Rd @ Hemlock Rd',49.8949,-119.37682,0,1448728324
+103427,'103427','E Boundary Rd @ Elk Rd',49.84023,-119.5891,0,1448728325
+103428,'103428','Merrifield Rd @ Mugford Rd',49.89233,-119.37614,0,1448728326
+103429,'103429','Craig Rd @ Hartman Rd',49.89947,-119.37696,0,1448728327
+103430,'103430','McCurdy Rd E @ Craig Rd',49.90185,-119.37751,0,1448728349
+103432,'103432','Chute Lk Rd @ Barnaby Rd',49.8097,-119.49825,0,1448728351
+103433,'103433','McCulloch Rd @ Spaarpak Rd',49.8401,-119.39967,0,1448728352
+103434,'103434','Old Okanagan Hwy @ Shamrock Dr',49.84915,-119.60106,0,1448728353
+103435,'103435','Old Okanagan Hwy @ Shamrock Dr',49.84924,-119.60116,0,1448728354
+103436,'103436','McCulloch Rd @ Spaarpak Rd',49.84003,-119.40003,0,1448728355
+103439,'103439','900 Blk Gordon Dr',49.80993,-119.47199,0,1448728358
+103440,'103440','Parkridge Dr @ Appleridge Rd',49.81226,-119.45691,0,1448728380
+103441,'103441','Westridge Dr @ Appleridge Rd',49.81085,-119.46306,0,1448728381
+103444,'103444','Westridge Dr @ Westridge Crt',49.80905,-119.46136,0,1448728384
+103445,'103445','Chute Lk Rd @ Winery',49.80597,-119.49958,0,1448728385
+103446,'103446','Hwy 33 E @ Toovey Rd',49.8779,-119.36902,0,1448728386
+103447,'103447','Rdg Ests Dr @ Elk Rd',49.8362,-119.59467,0,1448728387
+103448,'103448','Hwy 33 E @ Toovey Rd',49.87883,-119.36932,0,1448728388
+103450,'103450','Elk Rd @ Rdg Ests Dr',49.83628,-119.59588,0,1448728411
+103451,'103451','Arbor Vw Dr @ Windsong Cres W',49.80578,-119.48125,0,1448728412
+103452,'103452','Boucherie Rd @ Pritchard Dr',49.83094,-119.58828,0,1448728413
+103457,'103457','Okanagan College Exch B:C',49.86095,-119.4812,0,1448728418
+103458,'103458','McCulloch Rd @ McClain Rd',49.83795,-119.39291,0,1448728419
+103459,'103459','Old Okanagan Hwy @ Louie Dr',49.84551,-119.6064,0,1448728420
+103460,'103460','Pritchard Dr @ Boucherie Rd',49.83058,-119.58902,0,1448728442
+103461,'103461','McCulloch Rd @ Eastwood Dr',49.83774,-119.39156,0,1448728443
+103462,'103462','Old Okanagan Hwy @ Louie Dr',49.84547,-119.60728,0,1448728444
+103463,'103463','Elk Rd @ Cougar Rd',49.839,-119.60133,0,1448728445
+103464,'103464','Parkridge Dr @ Westridge Dr',49.80764,-119.45594,0,1448728446
+103465,'103465','Elk Rd @ Cougar Rd',49.83914,-119.60246,0,1448728447
+103467,'103467','Old Boucherie Rd @ Pritchard Dr',49.82781,-119.58937,0,1448728449
+103469,'103469','Woodstock Dr @ Sandstone Dr',49.84963,-119.6137,0,1448728451
+103470,'103470','Parkridge Dr @ Woodridge Rd',49.80949,-119.45623,0,1448728473
+103471,'103471','Woodstock Dr @ Shannon Crt',49.85085,-119.6149,0,1448728474
+103472,'103472','Main St @ Grant Cres',50.0273,-119.40354,0,1448728475
+103473,'103473','Old Okanagan Hwy @ Skyview Ln',49.84478,-119.60989,0,1448728476
+103474,'103474','Old Boucherie Rd @ Pritchard Dr',49.82791,-119.58995,0,1448728477
+103477,'103477','Hwy 33 E @ Langford Rd',49.88913,-119.37944,0,1448728480
+103478,'103478','Old Vernon Rd @ Morrison Rd',49.91821,-119.37012,0,1448728481
+103480,'103480','Old Vernon Rd @ Morrison Rd',49.91807,-119.36946,0,1448728504
+103481,'103481','Shannon Way @ Westville Way',49.84902,-119.6156,0,1448728505
+103482,'103482','Hwy 33 E @ Sadler Rd',49.8891,-119.38583,0,1448728506
+103483,'103483','Carrington Rd @ Elk Rd',49.83844,-119.60908,0,1448728507
+103484,'103484','Old Boucherie Rd @ Hitchner Rd',49.82774,-119.59299,0,1448728508
+103485,'103485','Carrington Rd @ Elk Rd',49.83866,-119.60907,0,1448728509
+103486,'103486','Old Boucherie Rd @ Hitchner Rd',49.82783,-119.59359,0,1448728510
+103489,'103489','McCulloch Rd @ Gallagher''s Canyon Blvd',49.83796,-119.38226,0,1448728513
+103490,'103490','Hwy 33 E @ Hume Ave',49.86878,-119.36109,0,1448728535
+103491,'103491','1900 Blk Old Boucherie Rd',49.82781,-119.59699,0,1448728536
+103492,'103492','1900 Blk Old Boucherie Rd',49.8277,-119.59702,0,1448728537
+103493,'103493','Shannon Lk Rd @ Shannon Way',49.84953,-119.61979,0,1448728538
+103495,'103495','Shannon Lk Rd @ Shannon Way',49.84942,-119.6201,0,1448728540
+103497,'103497','Louie Dr @ Elk Rd',49.84029,-119.61252,0,1448728542
+103500,'103500','Old Boucherie Rd @ Boucherie Rd',49.82767,-119.59875,0,1448729217
+103501,'103501','Hwy 33 E @ Hume Ave',49.86906,-119.36299,0,1448729218
+103502,'103502','Old Okanagan Hwy @ Bayview Dr',49.84351,-119.61736,0,1448729219
+103503,'103503','Old Vernon Rd @ McKenzie Rd',49.91962,-119.36428,0,1448729220
+103505,'103505','Old Okanagan Hwy @ Bayview Dr',49.8436,-119.61734,0,1448729222
+103506,'103506','Old Vernon Rd @ McKenzie Rd',49.91962,-119.36414,0,1448729223
+103508,'103508','3500 Blk Carrington Rd',49.83681,-119.61117,0,1448729225
+103509,'103509','3500 Blk Carrington Rd',49.83686,-119.6113,0,1448729226
+103510,'103510','Boucherie Rd @ Sonoma Pines Dr',49.82765,-119.60019,0,1448729248
+103511,'103511','Louie Dr @ Butt Rd',49.8385,-119.61494,0,1448729249
+103513,'103513','Shannon Lk Rd @ Old Okanagan Hwy',49.8466,-119.6224,0,1448729251
+103515,'103515','Loseth Rd @ Autumn Rd',49.86608,-119.35416,0,1448729253
+103516,'103516','Shannon Lk Rd @ Old Okanagan Hwy',49.84616,-119.62221,0,1448729254
+103518,'103518','2030 Blk Boucherie Rd',49.82678,-119.60213,0,1448729256
+103519,'103519','2030 Blk Boucherie Rd',49.82671,-119.60205,0,1448729257
+103520,'103520','Quilchena Dr @ Providence Ave',49.79664,-119.51164,0,1448729279
+103521,'103521','Loseth Dr @ Feedham Ave',49.86921,-119.3554,0,1448729280
+103522,'103522','5200 Blk Chute Lk Rd',49.79561,-119.50219,0,1448729281
+103523,'103523','Quilchena Dr @ Thalia St',49.79623,-119.51483,0,1448729282
+103524,'103524','Sunrise Rd @ Loseth Rd',49.86218,-119.35772,0,1448729283
+103525,'103525','Butt Rd @ Carrington Rd',49.83557,-119.61434,0,1448729284
+103526,'103526','Large Ave @ St Clare Crt',49.87188,-119.35377,0,1448729285
+103527,'103527','Butt Rd @ Carrington Rd',49.83535,-119.61439,0,1448729286
+103528,'103528','Old Okanagan Hwy @ Shannon Lk Rd',49.84479,-119.62391,0,1448729287
+103529,'103529','2040 Blk Boucherie Rd',49.82626,-119.60476,0,1448729288
+103531,'103531','Loseth Rd @ Lynrick Rd',49.8675,-119.35471,0,1448729311
+103532,'103532','2040 Blk Boucherie Rd',49.82617,-119.60524,0,1448729312
+103533,'103533','400 Blk Quilchena Dr',49.79505,-119.51869,0,1448729313
+103535,'103535','Butt Rd @ Louie Dr',49.837,-119.61936,0,1448729315
+103537,'103537','Butt Rd @ Louie Dr',49.83691,-119.61937,0,1448729317
+103538,'103538','Hwy 33 E @ Oswell Dr',49.86825,-119.35058,0,1448729318
+103539,'103539','Sunrise Rd @ Lynrick Rd',49.86315,-119.35367,0,1448729319
+103540,'103540','Quilchena Dr @ Raven Dr',49.79397,-119.52096,0,1448729341
+103541,'103541','3300 Blk Old Okanagan Hwy',49.84244,-119.62545,0,1448729342
+103542,'103542','3300 Blk Old Okanagan Hwy',49.84236,-119.62557,0,1448729343
+103547,'103547','Old Vernon Rd @ Scotty Crk Rd',49.93322,-119.36423,0,1448729348
+103548,'103548','Old Vernon Rd @ Scotty Crk Rd',49.93301,-119.36409,0,1448729349
+103550,'103550','Lynrick Rd @ Autumn Rd',49.86528,-119.35062,0,1448729372
+103551,'103551','Old Okanagan Hwy @ Chieftain Rd',49.8403,-119.62544,0,1448729373
+103552,'103552','Old Okanagan Hwy @ Chieftain Rd',49.84021,-119.62556,0,1448729374
+103553,'103553','Boucherie Rd @ Carrall Rd E Side',49.82524,-119.60947,0,1448729375
+103554,'103554','Black Mtn Dr @ Linda Ave',49.8708,-119.34797,0,1448729376
+103556,'103556','Old Okanagan Hwy @ Quince Rd',49.8383,-119.62555,0,1448729378
+103557,'103557','Black Mtn Dr @ Begley Rd',49.86937,-119.34723,0,1448729379
+103561,'103561','3600 Blk Old Vernon Rd',49.93716,-119.36407,0,1448729404
+103562,'103562','Quilchena Dr @ Providence Ave',49.79129,-119.52185,0,1448729405
+103563,'103563','Old Okanagan Hwy @ Butt Rd',49.8371,-119.6254,0,1448729406
+103564,'103564','3700 Blk Old Vernon Rd',49.93754,-119.36421,0,1448729407
+103565,'103565','Old Okanagan Hwy @ Butt Rd',49.83656,-119.62553,0,1448729408
+103566,'103566','Boucherie Rd @ Carrall Rd W Side',49.82474,-119.61267,0,1448729409
+103569,'103569','5600 Blk Airport Way',49.95585,-119.38145,0,1448729412
+103573,'103573','Elliott Rd @ Reece Rd',49.84423,-119.63405,0,1448729437
+103574,'103574','5600 Blk Airport Way',49.95571,-119.38163,0,1448729438
+103575,'103575','Old Okanagan Hwy @ Bering Rd',49.83419,-119.62551,0,1448729439
+103576,'103576','Old Vernon Rd @ Bulman Rd',49.94041,-119.36411,0,1448729440
+103577,'103577','Old Vernon Rd @ Bulman Rd',49.94079,-119.36455,0,1448729441
+103579,'103579','Gellatly Rd @ Carrington Rd',49.82888,-119.62044,0,1448729443
+103580,'103580','Gellatly Rd @ Witt Rd',49.82736,-119.61874,0,1448729465
+103581,'103581','Gellatly Rd @ Carrington Rd',49.82941,-119.62109,0,1448729466
+103582,'103582','Gellatly Rd @ Witt Rd',49.82757,-119.619,0,1448729467
+103584,'103584','3600 Blk Old Okanagan Hwy',49.83343,-119.62537,0,1448729469
+103585,'103585','Elliott Rd @ Nuefeld Cres',49.84199,-119.63402,0,1448729470
+103586,'103586','Boucherie Rd @ Gellatly Rd',49.82381,-119.61586,0,1448729471
+103589,'103589','Smith Crk Rd @ Elliott Rd',49.84782,-119.63926,0,1448729474
+103590,'103590','Boucherie Rd @ Gellatly Rd',49.82377,-119.61659,0,1448729496
+103593,'103593','Old Okanagan Hwy @ Drought Rd',49.83067,-119.62549,0,1448729499
+103594,'103594','Elliott Rd @ Butt Rd',49.83642,-119.63117,0,1448729500
+103595,'103595','Old Okanagan Hwy @ Drought Rd',49.83014,-119.62535,0,1448729501
+103596,'103596','Dobbin Rd @ Old Okanagan Hwy',49.82867,-119.62476,0,1448729502
+103597,'103597','Main St @ Hoskins Rd',49.82964,-119.62627,0,1448729503
+103598,'103598','3600 Blk Elliott Rd',49.83354,-119.63114,0,1448729504
+103599,'103599','Old Vernon Rd @ Black Rd',49.95112,-119.36886,0,1448729505
+103600,'103600','Old Vernon Rd @ Black Rd',49.95113,-119.36867,0,1448730178
+103602,'103602','Elliott Rd @ Delray Rd',49.83015,-119.63108,0,1448730180
+103604,'103604','Airport Way @ Lapointe Dr',49.96414,-119.38173,0,1448730182
+103607,'103607','Airport Way @ Lapointe Dr',49.96419,-119.38187,0,1448730185
+103608,'103608','Lower Glenrosa Rd @ Paynter Rd',49.82971,-119.63564,0,1448730186
+103609,'103609','Airport Way @ Old Vernon Rd',49.96977,-119.38373,0,1448730187
+103610,'103610','Airport Way @ Old Vernon Rd',49.9695,-119.38341,0,1448730209
+103611,'103611','Hwy 97 @ Old Vernon Rd',49.97077,-119.38572,0,1448730210
+103613,'103613','Old Vernon Rd @ Teather Rd',49.96097,-119.36898,0,1448730212
+103614,'103614','Webber Rd @ Dunbarton Rd',49.83901,-119.65335,0,1448730213
+103615,'103615','Webber Rd @ McAllister Rd',49.84093,-119.65547,0,1448730214
+103616,'103616','Webber Rd @ Gorman Rd',49.83695,-119.65332,0,1448730215
+103617,'103617','Webber Rd @ Aberdeen Rd',49.8354,-119.65331,0,1448730216
+103618,'103618','Webber Rd @ McRae Rd',49.84307,-119.65903,0,1448730217
+103619,'103619','Old Vernon Rd @ Spencer Rd',49.97036,-119.3707,0,1448730218
+103620,'103620','Old Vernon Rd @ Spencer Rd',49.97048,-119.3707,0,1448730240
+103621,'103621','Lower Glenrosa Rd @ Glenway Rd',49.82656,-119.64675,0,1448730241
+103622,'103622','Webber Rd @ McGregor Rd',49.84535,-119.66172,0,1448730242
+103623,'103623','Webber Rd @ Scottstown Rd',49.83283,-119.65316,0,1448730243
+103624,'103624','McNair Rd @ Webber Rd',49.84718,-119.66355,0,1448730244
+103625,'103625','McIver Rd @ McRae Rd',49.84196,-119.662,0,1448730245
+103626,'103626','McIver Rd @ McBain Rd',49.84375,-119.66364,0,1448730246
+103627,'103627','Webber Rd @ Salloum Rd',49.83,-119.6532,0,1448730247
+103628,'103628','McIver Rd @ McTaggart Rd',49.83965,-119.66108,0,1448730248
+103629,'103629','McIver Rd @ McRobbie Rd',49.8467,-119.66575,0,1448730249
+103630,'103630','Lower Glenrosa Rd @ Glenford Rd',49.82818,-119.65282,0,1448730271
+103631,'103631','McLeod Rd @ McGinnis Rd',49.844,-119.66541,0,1448730272
+103632,'103632','Lower Glenrosa Rd @ Gln Crt',49.82501,-119.65077,0,1448730273
+103633,'103633','McGinnis Rd @ McGee Crt',49.84223,-119.66491,0,1448730274
+103634,'103634','McIver Rd @ Glenrosa Rd',49.83432,-119.65978,0,1448730275
+103636,'103636','McLeod Rd @ McCoy Rd',49.84589,-119.66771,0,1448730277
+103637,'103637','Glenrosa Rd @ Gln Abbey Pl',49.83202,-119.65859,0,1448730278
+103638,'103638','McLeod Rd @ Blue Jay Dr',49.84748,-119.66933,0,1448730279
+103639,'103639','Glenrosa Rd @ McIver Rd W',49.83463,-119.66181,0,1448730280
+103640,'103640','Glenrosa Rd @ Parkhurst Rd',49.83652,-119.66334,0,1448730302
+103641,'103641','Canary Dr @ Blue Jay Dr',49.8487,-119.67165,0,1448730303
+103642,'103642','McGinnis Rd @ Liard Crt',49.83894,-119.66637,0,1448730304
+103643,'103643','Glenrosa Rd @ Dunfield Rd',49.8242,-119.65376,0,1448730305
+103644,'103644','Gts Rd @ McMurchie Rd',49.84472,-119.67019,0,1448730306
+103645,'103645','Glenrosa Rd @ Rosedale Crt',49.83822,-119.66739,0,1448730307
+103646,'103646','Oriole Dr @ Canary Dr',49.84766,-119.67301,0,1448730308
+103647,'103647','Gts Rd @ McPherson Rd',49.842,-119.67023,0,1448730309
+103648,'103648','Salmon Rd @ Oriole Dr',49.84566,-119.67284,0,1448730310
+103649,'103649','Gts Rd @ Glenrosa Rd',49.8409,-119.67024,0,1448730311
+103650,'103650','Hwy 97 @ Parkinson Dr',50.00075,-119.40285,0,1448730333
+103652,'103652','Hwy 97 @ Commonwealth Rd',50.00711,-119.40312,0,1448730335
+103653,'103653','Hwy 97 @ Commonwealth Rd',50.00833,-119.4028,0,1448730336
+103654,'103654','Hwy 97 @ Beaver Lk Rd',50.02081,-119.40618,0,1448730337
+103655,'103655','Hwy 97 @ Okanagan Ctr Rd',50.02177,-119.40668,0,1448730338
 103656,'103656','Kelowna Airport',49.95206,-119.3833,0,1448730339
-103657,'103657','Hwy 97 @ Pollard',50.02626,-119.40528,0,1448730340
-103658,'103658','Main @ Winfield',50.02352,-119.40417,0,1448730341
-103659,'103659','Okanagan Ctr @ Berry',50.03079,-119.41034,0,1448730342
-103660,'103660','Berry @ Bottom Wood Lk',50.02947,-119.40276,0,1448730364
-103661,'103661','Bottom Wood Lk @ George Elliott',50.03105,-119.40199,0,1448730365
-103662,'103662','Okanagan Ctr @ Camp',50.03587,-119.41149,0,1448730366
-103663,'103663','Lodge @ Bottom Wood Lk',50.0347,-119.40096,0,1448730367
-103664,'103664','Lodge @ Mdw',50.03467,-119.39688,0,1448730368
-103665,'103665','Huston @ Huston',49.79564,-119.69837,0,1448730369
-103666,'103666','10300 Block Lodge',50.03466,-119.39335,0,1448730370
-103667,'103667','Buchanan @ Burden',49.79458,-119.69935,0,1448730371
-103668,'103668','Okanagan Ctr @ Seaton',50.04127,-119.41452,0,1448730372
-103669,'103669','Huston @ Shaw',49.79477,-119.70139,0,1448730373
-103670,'103670','Okanagan Ctr @ Williams',50.04408,-119.41669,0,1448730395
-103671,'103671','Buchanan @ Beach Ave',49.79245,-119.70261,0,1448730396
-103672,'103672','Huston @ Lang',49.79247,-119.70544,0,1448730397
-103673,'103673','Lodge @ Quail',50.04069,-119.39199,0,1448730398
-103674,'103674','11330 Block Okanagan Ctr',50.04746,-119.41834,0,1448730399
-103675,'103675','Buchanan @ Hwy 97 S',49.78912,-119.70749,0,1448730400
-103676,'103676','Lodge @ Sherman',50.04299,-119.39142,0,1448730401
-103677,'103677','Okanagan Ctr @ Davidson',50.05003,-119.41913,0,1448730402
-103678,'103678','11200 Block Lodge',50.04514,-119.39088,0,1448730403
-103679,'103679','Woodsdale @ Turtle Bay',50.04934,-119.40772,0,1448730404
+103657,'103657','Hwy 97 @ Pollard Rd',50.02626,-119.40528,0,1448730340
+103658,'103658','Main St @ Winfield Rd',50.02352,-119.40417,0,1448730341
+103659,'103659','Okanagan Ctr Rd @ Berry Rd',50.03079,-119.41034,0,1448730342
+103660,'103660','Berry Rd @ Bottom Wood Lk Rd',50.02947,-119.40276,0,1448730364
+103661,'103661','Bottom Wood Lk Rd @ G Elliot Secondar',50.03105,-119.40199,0,1448730365
+103662,'103662','Okanagan Ctr Rd @ Camp Rd',50.03587,-119.41149,0,1448730366
+103663,'103663','Lodge Rd @ Bottom Wood Lk Rd',50.0347,-119.40096,0,1448730367
+103664,'103664','Lodge Rd @ Mdw Rd',50.03467,-119.39688,0,1448730368
+103665,'103665','Huston Rd @ Walker Rd',49.79564,-119.69837,0,1448730369
+103666,'103666','10300 Blk Lodge Rd',50.03466,-119.39335,0,1448730370
+103667,'103667','Buchanan Rd @ Burdekin Ln',49.79458,-119.69935,0,1448730371
+103668,'103668','Okanagan Ctr Rd @ Seaton Rd',50.04127,-119.41452,0,1448730372
+103669,'103669','Huston Rd @ Shaw Rd',49.79477,-119.70139,0,1448730373
+103670,'103670','Okanagan Ctr Rd @ Williams Rd',50.04408,-119.41669,0,1448730395
+103671,'103671','Buchanan Rd @ Beach Ave',49.79245,-119.70261,0,1448730396
+103672,'103672','Huston Rd @ Lang Rd',49.79247,-119.70544,0,1448730397
+103673,'103673','Lodge Rd @ Quail Rd',50.04069,-119.39199,0,1448730398
+103674,'103674','11300 Blk Okanagan Ctr Rd',50.04746,-119.41834,0,1448730399
+103675,'103675','Buchanan Rd @ Hwy 97',49.78912,-119.70749,0,1448730400
+103676,'103676','Lodge Rd @ Sherman Dr',50.04299,-119.39142,0,1448730401
+103677,'103677','Okanagan Ctr Rd @ Davidson Rd',50.05003,-119.41913,0,1448730402
+103678,'103678','11200 Blk Lodge Rd',50.04514,-119.39088,0,1448730403
+103679,'103679','Woodsdale Rd @ Turtle Bay Crt',50.04934,-119.40772,0,1448730404
 103680,'103680','Kelowna Airport',49.95212,-119.38314,0,1448730426
-103681,'103681','Woodsdale @ Bottom Wood Lk',50.04934,-119.40267,0,1448730427
-103682,'103682','Trepanier Bench @ Desert Pines',49.78635,-119.71073,0,1448730428
-103683,'103683','Woodsdale @ Reiswig',50.04933,-119.39768,0,1448730429
-103684,'103684','Woodsdale @ Lodge',50.04938,-119.39092,0,1448730430
-103685,'103685','Oceola @ Pretty',50.05535,-119.41125,0,1448730431
+103681,'103681','Woodsdale Rd @ Bottom Wood Lk Rd',50.04934,-119.40267,0,1448730427
+103682,'103682','Trepanier Bench Rd @ Desert Pines Ave',49.78635,-119.71073,0,1448730428
+103683,'103683','Woodsdale Rd @ Reiswig Rd',50.04933,-119.39768,0,1448730429
+103684,'103684','Woodsdale Rd @ Lodge Rd',50.04938,-119.39092,0,1448730430
+103685,'103685','Oceola Rd @ Pretty Rd',50.05535,-119.41125,0,1448730431
 103686,'103686','Peachland Vlg Ctr',49.78471,-119.71764,0,1448730432
-103688,'103688','Okanagan Ctr @ Oceola',50.06003,-119.41859,0,1448730434
-103689,'103689','13th St @ Lk',49.78264,-119.72329,0,1448730435
-103690,'103690','13th St @ Lk',49.7827,-119.72315,0,1448730457
-103691,'103691','Beach @ 11th St',49.78188,-119.7291,0,1448730458
-103692,'103692','Beach @ 11th St',49.78121,-119.73113,0,1448730459
-103693,'103693','Beach @ 8th St',49.7805,-119.73201,0,1448730460
-103694,'103694','Beach @ 6th St',49.77759,-119.73379,0,1448730461
-103695,'103695','Beach @ 6th St',49.77638,-119.73427,0,1448730462
-103700,'103700','Beach @ Hwy 97',49.77085,-119.73908,0,1448731139
-103701,'103701','Beach @ Hwy 97',49.77045,-119.73964,0,1448731140
-103702,'103702','Princeton @ Lakeview',49.76999,-119.7425,0,1448731141
-103703,'103703','Princeton @ Princess',49.76884,-119.74467,0,1448731142
-103704,'103704','Princeton @ Columbia',49.76867,-119.74559,0,1448731143
-103705,'103705','Princeton @ Somerset',49.76668,-119.74825,0,1448731144
-103706,'103706','Princeton @ Somerset',49.76624,-119.74866,0,1448731145
-103707,'103707','Princeton @ Lipsett',49.76471,-119.75143,0,1448731146
-103708,'103708','Princeton @ Lipsett',49.76466,-119.75171,0,1448731147
-103709,'103709','Princeton @ Gummow',49.76258,-119.75472,0,1448731148
-103710,'103710','Princeton @ Ellison',49.7623,-119.75708,0,1448731170
-103711,'103711','Princeton @ Turner',49.75947,-119.76076,0,1448731171
-103712,'103712','Princeton @ Turner',49.75959,-119.76161,0,1448731172
-103713,'103713','Princeton @ Whinton',49.757,-119.76356,0,1448731173
-103714,'103714','Princeton @ Whinton',49.75688,-119.76399,0,1448731174
-103715,'103715','Princeton @ Vernon',49.75512,-119.76637,0,1448731175
-103716,'103716','Princeton @ Vernon',49.75505,-119.76698,0,1448731176
-103717,'103717','5000 Block Princeton',49.75376,-119.77165,0,1448731177
-103718,'103718','5000 Block Princeton',49.75369,-119.77149,0,1448731178
-103719,'103719','Princeton @ Forest Hl',49.75239,-119.77841,0,1448731179
-103720,'103720','Princeton @ Keyes',49.75229,-119.77856,0,1448731201
-103721,'103721','Princeton @ Pineridge',49.7521,-119.78355,0,1448731202
-103722,'103722','Princeton @ Pineridge',49.752,-119.78354,0,1448731203
-103723,'103723','Princeton @ Bradbury',49.75194,-119.78764,0,1448731204
-103744,'103744','Hwy 97 @ Westside Rd - Westside Rd Stn',49.88178,-119.53628,0,1448731267
-103745,'103745','Hwy 97 @ Sneena - Westside Rd Stn',49.88084,-119.535,0,1448731268
-103800,'103800','Lequime Rd',49.83559,-119.48483,0,1448732100
-103801,'103801','Lequime Rd',49.8356,-119.48437,0,1448732101
-103802,'103802','Lakeshore @ Old Mdws',49.83254,-119.4873,0,1448732102
-103803,'103803','Lakeshore @ Simeon',49.8284,-119.48883,0,1448732103
-103804,'103804','Lakeshore @ Willms',49.82605,-119.48884,0,1448732104
-103805,'103805','Chute Lk @ Barnaby',49.80994,-119.49782,0,1448732105
-103806,'103806','Chute Lk @ Chute Lk Cresent',49.80179,-119.49816,0,1448732106
-103807,'103807','Chute Lk @ Chute Lk Cresent',49.80189,-119.49785,0,1448732107
-103808,'103808','Chute Lk @ S Crest',49.79838,-119.4991,0,1448732108
-103809,'103809','Chute Lk @ S Crest',49.79886,-119.49889,0,1448732109
-103810,'103810','5160 Block Chute Lk',49.7957,-119.5026,0,1448732131
-103811,'103811','Chute Lk @ Lark',49.79539,-119.50863,0,1448732132
-103812,'103812','Chute Lk @ Hedeman',49.79458,-119.51064,0,1448732133
-103813,'103813','Chute Lk @ Lakepointe',49.79132,-119.51333,0,1448732134
-103814,'103814','Chute Lk @ Farron',49.78948,-119.51741,0,1448732135
-103815,'103815','Gordon @ Old Mdws',49.8324,-119.48308,0,1448732136
-103816,'103816','Gordon @ Young',49.82893,-119.48313,0,1448732137
-103817,'103817','Gordon @ Young',49.82844,-119.48326,0,1448732138
-103818,'103818','Gordon @ Tozer',49.82426,-119.48314,0,1448732139
-103820,'103820','Gordon @ Raymer',49.81971,-119.48299,0,1448732162
-103821,'103821','Gordon @ Raymer',49.81886,-119.48325,0,1448732163
-103824,'103824','Gordon @ McClure',49.81612,-119.48299,0,1448732166
-103825,'103825','Gordon @ McClure',49.81536,-119.48323,0,1448732167
-103826,'103826','Gordon @ Buck',49.81367,-119.48318,0,1448732168
-103827,'103827','Gordon @ Paret',49.81094,-119.47795,0,1448732169
-103828,'103828','Gordon @ Paret',49.81106,-119.47778,0,1448732170
-103829,'103829','870 Block Gordon',49.80969,-119.47163,0,1448732171
-103833,'103833','Arbor Vw @ Windsong',49.80614,-119.4774,0,1448732196
-103844,'103844','Princeton @ Pierce',49.75315,-119.7902,0,1448732228
-103845,'103845','Country Club @ Via Centrale',49.95498,-119.39983,0,1448732229
-103848,'103848','Country Club @ Quail Rdg',49.96292,-119.39911,0,1448732232
-103849,'103849','Country Club @ Via Centrale',49.95503,-119.39992,0,1448732233
-103851,'103851','Quail Rdg @ Country Club',49.96253,-119.39818,0,1448732256
-103852,'103852','1840 Block Country Club Dr',49.95311,-119.39954,0,1448732257
-103853,'103853','1840 Block Country Club Dr',49.953,-119.39964,0,1448732258
-103858,'103858','1740 Block Country Club Dr',49.95116,-119.39982,0,1448732263
-104911,'104911','Old Okanagan @ Skyview',49.84488,-119.60947,0,1448762884
-104912,'104912','Beach @ 12th St',49.78188,-119.72608,0,1448762885
-104913,'104913','Old Vernon @ Teather',49.96147,-119.36886,0,1448762886
-104914,'104914','1240 Block Crawford',49.82041,-119.4668,0,1448762887
-104916,'104916','Innovation @ Airport Way',49.95166,-119.38964,0,1448762889
-140000,'140000','Harvey @ Bertram - Richter Sta',49.88379,-119.49144,0,1452329123
-140001,'140001','Woodsdale @ Rogers',50.04933,-119.40399,0,1452329124
-140002,'140002','Harvey @ Gordon - Gordon Sta',49.88373,-119.4787,0,1452329125
-140003,'140003','Harvey @ Gordon - Gordon Sta',49.88333,-119.47533,0,1452329126
-140004,'140004','Westbank Exch',49.82865,-119.63102,0,1452329127
-140005,'140005','Westbank Exch',49.82934,-119.63103,0,1452329128
-140006,'140006','Westbank Exch',49.82876,-119.63088,0,1452329129
-140007,'140007','Boucherie Mtn Exch',49.86207,-119.58528,0,1452329130
-140008,'140008','Boucherie Mtn Exch',49.86209,-119.58489,0,1452329131
-140009,'140009','Boucherie Mtn Exch',49.86198,-119.58509,0,1452329132
-140010,'140010','Boucherie Mtn Exch',49.86154,-119.58522,0,1452329154
-140011,'140011','Boucherie Mtn Exch',49.86139,-119.58522,0,1452329155
-140012,'140012','Gordon @ Lexington',49.83934,-119.48239,0,1452329156
-140013,'140013','Sneena @ Westside',49.88071,-119.5341,0,1452329157
-140014,'140014','Bottom Wood Lk @ Konschuh',50.02872,-119.40067,0,1452329158
-140015,'140015','Bottom Wood Lk @ Seniors Ctr',50.02447,-119.39926,0,1452329159
-140016,'140016','Beaver Lk @ Jensen',50.02018,-119.40119,0,1452329160
-140017,'140017','Main @ Hl',50.02083,-119.40426,0,1452329161
-140018,'140018','Ellis @ Clement',49.89318,-119.49347,0,1452329162
-140019,'140019','Clement @ Richter',49.89353,-119.48794,0,1452329163
-140020,'140020','Clement @ Ethel',49.89351,-119.4823,0,1452329185
-140021,'140021','Gordon @ Coronation',49.89238,-119.47706,0,1452329186
-140022,'140022','Gordon @ Bernard',49.88678,-119.47713,0,1452329187
-140023,'140023','Gordon @ Laurier',49.88237,-119.47716,0,1452329188
-140024,'140024','Gordon @ KLO',49.86022,-119.47447,0,1452329189
-140025,'140025','Gordon @ Lanfranco',49.85706,-119.47451,0,1452329190
-140026,'140026','Gordon @ Casorso',49.85055,-119.47694,0,1452329191
-140027,'140027','Gordon @ Cook',49.84517,-119.48059,0,1452329192
-140028,'140028','Gordon @ Lexington',49.83991,-119.48209,0,1452329193
-140029,'140029','Gordon @ Cook',49.84572,-119.47987,0,1452329194
-140030,'140030','Gordon @ Casorso',49.85125,-119.47618,0,1452329216
-140031,'140031','Gordon @ Bothe',49.85768,-119.4742,0,1452329217
-140032,'140032','Gordon @ KLO',49.86018,-119.47416,0,1452329218
-140033,'140033','Gordon @ Raymer',49.86533,-119.47407,0,1452329219
-140034,'140034','Gordon @ Cameron',49.87056,-119.47472,0,1452329220
-140035,'140035','Gordon @ Guisachan',49.87318,-119.47612,0,1452329221
-140036,'140036','Gordon @ Springfield',49.87724,-119.47694,0,1452329222
-140037,'140037','Gordon @ Harvey',49.88259,-119.47687,0,1452329223
-140038,'140038','Gordon @ Bernard',49.88689,-119.47684,0,1452329224
-140039,'140039','Gordon @ Cawston',49.89185,-119.47692,0,1452329225
-140040,'140040','Clement @ Ethel',49.89359,-119.4833,0,1452329247
-140041,'140041','Clement @ Richter',49.89365,-119.48933,0,1452329248
-140042,'140042','Ellis @ Clement',49.89315,-119.49361,0,1452329249
-140043,'140043','Cadder @ Richter',49.87633,-119.48765,0,1452329250
-140044,'140044','Ellis @ Doyle',49.89038,-119.49347,0,1452329251
-140045,'140045','Cadder @ Ethel',49.8764,-119.48314,0,1452329252
-140046,'140046','Cadder @ Richter',49.87642,-119.48892,0,1452329253
-140047,'140047','Cadder @ Pandosy',49.87632,-119.49074,0,1452329254
-140048,'140048','Springfield @ Gordon',49.87687,-119.47815,0,1452329255
-140049,'140049','Harvey @ Richter - Richter Sta',49.88354,-119.49035,0,1452329256
-140050,'140050','Clement @ Gordon',49.89372,-119.47777,0,1452329278
-140051,'140051','Clement @ Gordon',49.8934,-119.47588,0,1452329279
-140053,'140053','Pandosy @ Osprey',49.86579,-119.49115,0,1452329281
-140054,'140054','Woodsdale @ Bottom Wood Lk',50.04924,-119.404,0,1452329282
-140055,'140055','KLO @ Benvoulin',49.86088,-119.45507,0,1452329283
-140056,'140056','Bernard @ Elm',49.88626,-119.4658,0,1452329284
-140057,'140057','1300 Block Ellis',49.88954,-119.49363,0,1452329285
-140058,'140058','Asquith @ Saddleback',49.8507,-119.62354,0,1452329286
-140059,'140059','Ironridge @ Ironridge Pl',49.8545,-119.62783,0,1452329287
-140060,'140060','WildHorse @ Bridlehill',49.85388,-119.63302,0,1452329309
-140061,'140061','WildHorse @ Bridlehill',49.85346,-119.63555,0,1452329310
-140062,'140062','Whispering Hls @ Wild Horse',49.85228,-119.64166,0,1452329311
-140063,'140063','CopperRidge @ Smith',49.85389,-119.64384,0,1452329312
-140064,'140064','Smith Crk @ Sugosa',49.85176,-119.6431,0,1452329313
-140065,'140065','Hudson @ Concord',49.86268,-119.56288,0,1452329314
-140066,'140066','Hudson @ Westlake',49.86265,-119.56391,0,1452329315
-140067,'140067','Louie @ Butt',49.83779,-119.61573,0,1452329316
-140068,'140068','Louie @ Elk',49.84031,-119.61231,0,1452329317
-140069,'140069','Stevens @ Mcdougall',49.86598,-119.5675,0,1452329318
-140071,'140071','Hwy 97 @ Butt - Butt Rd Sta',49.83717,-119.6142,0,1452329341
-140072,'140072','Hwy 97 @ Butt - Butt Rd Sta',49.83532,-119.61713,0,1452329342
-140073,'140073','Hwy 97 @ Westlake - Hudson Sta',49.86426,-119.56286,0,1452329343
-140074,'140074','Hwy 97 @ Westlake - Hudson Sta',49.86317,-119.56654,0,1452329344
-140077,'140077','Bottom Wood Lk @ Powley',50.03782,-119.40308,0,1452329347
-140078,'140078','Bottom Wood Lk @ Mayrus',50.04311,-119.4031,0,1452329348
-140079,'140079','Bottom Wood Lk @ Wageman',50.04597,-119.40312,0,1452329349
-140080,'140080','Lk Hl @ Lk Breeze',50.06598,-119.41901,0,1452329371
-140081,'140081','Shoreline @ Stillwater',50.06856,-119.42013,0,1452329372
-140082,'140082','Shoreline Way @ Lk Hl',50.07352,-119.41726,0,1452329373
-140083,'140083','Lk Hl @ Shoreline Way',50.07171,-119.41646,0,1452329374
-140084,'140084','Stillwater @ Lk Hl',50.06954,-119.41854,0,1452329375
-140085,'140085','Stillwater @ Driftwood',50.06784,-119.41929,0,1452329376
-140086,'140086','Lk Hl @ Lk Breeze',50.06626,-119.41895,0,1452329377
-140087,'140087','Lk Hl @ Oceola',50.06129,-119.41834,0,1452329378
-140088,'140088','Oceola @ Pretty',50.0547,-119.41142,0,1452329379
-140089,'140089','Woodsdale @ Turtle Bay',50.04925,-119.40761,0,1452329380
-140090,'140090','Bottom Wood Lk @ Wageman',50.04629,-119.40299,0,1452329402
-140091,'140091','Bottom Wood Lk @ Mayrus',50.04335,-119.40297,0,1452329403
-140092,'140092','Bottom Wood Lk @ Powley',50.0383,-119.40293,0,1452329404
-140093,'140093','Bottom Wood Lk @ Berry',50.03032,-119.40192,0,1452329405
-140094,'140094','E Boundary @ Wolfe',49.8393,-119.5918,0,1452329406
-140095,'140095','E Boundary @ Wolfe',49.83921,-119.59181,0,1452329407
-140096,'140096','Lk Hl @ Oceola',50.06138,-119.41821,0,1452329408
+103688,'103688','Okanagan Ctr Rd @ Oceola Rd',50.06003,-119.41859,0,1448730434
+103689,'103689','13th St @ Lk Ave',49.78264,-119.72329,0,1448730435
+103690,'103690','13th St @ Lk Ave',49.7827,-119.72315,0,1448730457
+103691,'103691','Beach Ave @ 11th St',49.78188,-119.7291,0,1448730458
+103692,'103692','Beach Ave @ 11th St',49.78121,-119.73113,0,1448730459
+103693,'103693','Beach Ave @ 8th St',49.7805,-119.73201,0,1448730460
+103694,'103694','Beach Ave @ 6th St',49.77759,-119.73379,0,1448730461
+103695,'103695','Beach Ave @ 6th St',49.77638,-119.73427,0,1448730462
+103700,'103700','Beach Ave @ Hwy 97',49.77085,-119.73908,0,1448731139
+103701,'103701','Beach Ave @ Hwy 97',49.77045,-119.73964,0,1448731140
+103702,'103702','Princeton Ave @ Lakeview Ave',49.76999,-119.7425,0,1448731141
+103703,'103703','Princeton Ave @ Princess St',49.76884,-119.74467,0,1448731142
+103704,'103704','Princeton Ave @ Columbia Ave',49.76867,-119.74559,0,1448731143
+103705,'103705','Princeton Ave @ Somerset Ave',49.76668,-119.74825,0,1448731144
+103706,'103706','Princeton Ave @ Somerset Ave',49.76624,-119.74866,0,1448731145
+103707,'103707','Princeton Ave @ Lipsett Ave',49.76471,-119.75143,0,1448731146
+103708,'103708','Princeton Ave @ Lipsett Ave',49.76466,-119.75171,0,1448731147
+103709,'103709','Princeton Ave @ Gummow Rd',49.76258,-119.75472,0,1448731148
+103710,'103710','Princeton Ave @ Ellison Ave',49.7623,-119.75708,0,1448731170
+103711,'103711','Princeton Ave @ Turner Ave',49.75947,-119.76076,0,1448731171
+103712,'103712','Princeton Ave @ Turner Ave',49.75959,-119.76161,0,1448731172
+103713,'103713','Princeton Ave @ Whinton Cres',49.757,-119.76356,0,1448731173
+103714,'103714','Princeton Ave @ Whinton Cres',49.75688,-119.76399,0,1448731174
+103715,'103715','Princeton Ave @ Vernon Ave',49.75512,-119.76637,0,1448731175
+103716,'103716','Princeton Ave @ Vernon Ave',49.75505,-119.76698,0,1448731176
+103717,'103717','5000 Blk Princeton Ave',49.75376,-119.77165,0,1448731177
+103718,'103718','5000 Blk Princeton Ave',49.75369,-119.77149,0,1448731178
+103719,'103719','Princeton Ave @ Forest Hl Dr',49.75239,-119.77841,0,1448731179
+103720,'103720','Princeton Ave @ Keyes Ave',49.75229,-119.77856,0,1448731201
+103721,'103721','Princeton Ave @ Pineridge Rd',49.7521,-119.78355,0,1448731202
+103722,'103722','Princeton Ave @ Pineridge Rd',49.752,-119.78354,0,1448731203
+103723,'103723','Princeton Ave @ Bradbury St',49.75194,-119.78764,0,1448731204
+103744,'103744','Hwy 97 @ Westside Rd Stn',49.88178,-119.53628,0,1448731267
+103745,'103745','Hwy 97 @ Westside Rd Stn',49.88084,-119.535,0,1448731268
+103800,'103800','Lequime Rd @ Gordon Dr',49.83559,-119.48483,0,1448732100
+103801,'103801','Lequime Rd @ Gordon Dr',49.8356,-119.48437,0,1448732101
+103802,'103802','Lakeshore Rd @ Old Mdws Rd',49.83254,-119.4873,0,1448732102
+103803,'103803','Lakeshore Rd @ Simeon Crt',49.8284,-119.48883,0,1448732103
+103804,'103804','Lakeshore Rd @ Willms Rd',49.82605,-119.48884,0,1448732104
+103805,'103805','Chute Lk Rd @ Barnaby Rd',49.80994,-119.49782,0,1448732105
+103806,'103806','Chute Lk Rd @ Chute Lk Cres',49.80179,-119.49816,0,1448732106
+103807,'103807','Chute Lk Rd @ Chute Lk Cres',49.80189,-119.49785,0,1448732107
+103808,'103808','Chute Lk Rd @ S Crest Dr',49.79838,-119.4991,0,1448732108
+103809,'103809','Chute Lk Rd @ S Crest Dr',49.79886,-119.49889,0,1448732109
+103810,'103810','5200 Blk Chute Lk Rd',49.7957,-119.5026,0,1448732131
+103811,'103811','Chute Lk Rd @ Lark St',49.79539,-119.50863,0,1448732132
+103812,'103812','Chute Lk Rd @ Hedeman Crt',49.79458,-119.51064,0,1448732133
+103813,'103813','Chute Lk Rd @ Lakepointe Dr',49.79132,-119.51333,0,1448732134
+103814,'103814','S Perimeter Way @ Farron Pl',49.78948,-119.51741,0,1448732135
+103815,'103815','Gordon Dr @ Old Mdws Rd',49.8324,-119.48308,0,1448732136
+103816,'103816','Gordon Dr @ Young Rd',49.82893,-119.48313,0,1448732137
+103817,'103817','Gordon Dr @ Young Rd',49.82844,-119.48326,0,1448732138
+103818,'103818','Gordon Dr @ Tozer Crt',49.82426,-119.48314,0,1448732139
+103820,'103820','Gordon Dr @ Raymer Rd',49.81971,-119.48299,0,1448732162
+103821,'103821','Gordon Dr @ Raymer Rd',49.81886,-119.48325,0,1448732163
+103824,'103824','Gordon Dr @ McClure Rd',49.81612,-119.48299,0,1448732166
+103825,'103825','Gordon Dr @ McClure Rd',49.81536,-119.48323,0,1448732167
+103826,'103826','Gordon Dr @ Buck Rd',49.81367,-119.48318,0,1448732168
+103827,'103827','Gordon Dr @ Paret Rd',49.81094,-119.47795,0,1448732169
+103828,'103828','Gordon Dr @ Paret Rd',49.81106,-119.47778,0,1448732170
+103829,'103829','900 Blk Gordon Dr',49.80969,-119.47163,0,1448732171
+103833,'103833','Arbor Vw Dr @ Windsong Cres E',49.80614,-119.4774,0,1448732196
+103844,'103844','Princeton Ave @ Pierce St',49.75315,-119.7902,0,1448732228
+103845,'103845','Country Club Dr @ Via Centrale',49.95498,-119.39983,0,1448732229
+103848,'103848','Country Club Dr @ Quail Rdg Blvd',49.96292,-119.39911,0,1448732232
+103849,'103849','Country Club Dr @ Via Centrale',49.95503,-119.39992,0,1448732233
+103851,'103851','Quail Rdg Blvd @ Country Club Dr',49.96253,-119.39818,0,1448732256
+103852,'103852','1800 Blk Country Club Dr',49.95311,-119.39954,0,1448732257
+103853,'103853','1800 Blk Country Club Dr',49.953,-119.39964,0,1448732258
+103858,'103858','1700 Blk Country Club Dr',49.95116,-119.39982,0,1448732263
+104911,'104911','Old Okanagan Hwy @ Skyview Ln',49.84488,-119.60947,0,1448762884
+104912,'104912','Beach Ave @ 12th St',49.78188,-119.72608,0,1448762885
+104913,'104913','Old Vernon Rd @ Teather Rd',49.96147,-119.36886,0,1448762886
+104914,'104914','1200 Blk Crawford Rd',49.82041,-119.4668,0,1448762887
+104916,'104916','Innovation Dr @ Airport Way',49.95166,-119.38964,0,1448762889
+140000,'140000','Harvey Ave @ Richter Stn',49.88379,-119.49144,0,1452329123
+140001,'140001','Woodsdale Rd @ Rogers Rd',50.04933,-119.40399,0,1452329124
+140002,'140002','Harvey Ave @ Gordon Stn',49.88373,-119.4787,0,1452329125
+140003,'140003','Harvey Ave @ Gordon Stn',49.88333,-119.47533,0,1452329126
+140004,'140004','Westbank Exch B:A',49.82865,-119.63102,0,1452329127
+140005,'140005','Westbank Exch B:B',49.82934,-119.63103,0,1452329128
+140006,'140006','Westbank Exch B:C',49.82876,-119.63088,0,1452329129
+140007,'140007','Boucherie Mtn Exch B:A',49.86207,-119.58528,0,1452329130
+140008,'140008','Boucherie Mtn Exch B:B',49.86209,-119.58489,0,1452329131
+140009,'140009','Boucherie Mtn Exch B:C',49.86198,-119.58509,0,1452329132
+140010,'140010','Boucherie Mtn Exch B:D',49.86154,-119.58522,0,1452329154
+140011,'140011','Boucherie Mtn Exch B:E',49.86139,-119.58522,0,1452329155
+140012,'140012','Gordon Dr @ Lexington Dr',49.83934,-119.48239,0,1452329156
+140013,'140013','Sneena Rd @ Westside Rd',49.88071,-119.5341,0,1452329157
+140014,'140014','Bottom Wood Lk Rd @ Konschuh Rd',50.02872,-119.40067,0,1452329158
+140015,'140015','Bottom Wood Lk Rd @ Seniors Ctr',50.02447,-119.39926,0,1452329159
+140016,'140016','Beaver Lk Rd @ Jensen Rd',50.02018,-119.40119,0,1452329160
+140017,'140017','Main St @ Hl Rd',50.02083,-119.40426,0,1452329161
+140018,'140018','Ellis St @ Clement Ave',49.89318,-119.49347,0,1452329162
+140019,'140019','Clement Ave @ Richter St',49.89353,-119.48794,0,1452329163
+140020,'140020','Clement Ave @ Ethel St',49.89351,-119.4823,0,1452329185
+140021,'140021','Gordon Dr @ Coronation Ave',49.89238,-119.47706,0,1452329186
+140022,'140022','Gordon Dr @ Bernard Ave',49.88678,-119.47713,0,1452329187
+140023,'140023','Gordon Dr @ Laurier Ave',49.88237,-119.47716,0,1452329188
+140024,'140024','Gordon Dr @ KLO Rd',49.86022,-119.47447,0,1452329189
+140025,'140025','Gordon Dr @ Lanfranco Rd',49.85706,-119.47451,0,1452329190
+140026,'140026','Gordon Dr @ Casorso Rd',49.85055,-119.47694,0,1452329191
+140027,'140027','Gordon Dr @ Cook Rd',49.84517,-119.48059,0,1452329192
+140028,'140028','Gordon Dr @ Lexington Dr',49.83991,-119.48209,0,1452329193
+140029,'140029','Gordon Dr @ Cook Rd',49.84572,-119.47987,0,1452329194
+140030,'140030','Gordon Dr @ Casorso Rd',49.85125,-119.47618,0,1452329216
+140031,'140031','Gordon Dr @ Bothe Rd',49.85768,-119.4742,0,1452329217
+140032,'140032','Gordon Dr @ KLO Rd',49.86018,-119.47416,0,1452329218
+140033,'140033','Gordon Dr @ Raymer Ave',49.86533,-119.47407,0,1452329219
+140034,'140034','Gordon Dr @ Cameron Ave',49.87056,-119.47472,0,1452329220
+140035,'140035','Gordon Dr @ Guisachan Rd',49.87318,-119.47612,0,1452329221
+140036,'140036','Gordon Dr @ Springfield Rd',49.87724,-119.47694,0,1452329222
+140037,'140037','Gordon Dr @ Harvey Ave',49.88259,-119.47687,0,1452329223
+140038,'140038','Gordon Dr @ Bernard Ave',49.88689,-119.47684,0,1452329224
+140039,'140039','Gordon Dr @ Cawston Ave',49.89185,-119.47692,0,1452329225
+140040,'140040','Clement Ave @ Ethel St',49.89359,-119.4833,0,1452329247
+140041,'140041','Clement Ave @ Richter St',49.89365,-119.48933,0,1452329248
+140042,'140042','Ellis St @ Clement Ave',49.89315,-119.49361,0,1452329249
+140043,'140043','Cadder Ave @ Richter St',49.87633,-119.48765,0,1452329250
+140044,'140044','Ellis St @ Doyle Ave',49.89038,-119.49347,0,1452329251
+140045,'140045','Cadder Ave @ Ethel St',49.8764,-119.48314,0,1452329252
+140046,'140046','Cadder Ave @ Richter St',49.87642,-119.48892,0,1452329253
+140047,'140047','Cadder Ave @ Pandosy St',49.87632,-119.49074,0,1452329254
+140048,'140048','Springfirld Rd @ Gordon Dr',49.87687,-119.47815,0,1452329255
+140049,'140049','Harvey Ave @ Richter Stn',49.88354,-119.49035,0,1452329256
+140050,'140050','Clement Ave @ Gordon Dr',49.89372,-119.47777,0,1452329278
+140051,'140051','Clement Ave @ Gordon Dr',49.8934,-119.47588,0,1452329279
+140053,'140053','Pandosy St @ Osprey Ave',49.86579,-119.49115,0,1452329281
+140054,'140054','Woodsdale Rd @ Bottom Wood Lk Rd',50.04924,-119.404,0,1452329282
+140055,'140055','KLO Rd @ Benvoulin Rd E Side',49.86088,-119.45507,0,1452329283
+140056,'140056','Bernard Ave @ Elm St',49.88626,-119.4658,0,1452329284
+140057,'140057','Ellis St @ Doyle Ave',49.88954,-119.49363,0,1452329285
+140058,'140058','Asquith Rd @ Saddleback Way',49.8507,-119.62354,0,1452329286
+140059,'140059','Ironridge Rd @ Ironridge Pl',49.8545,-119.62783,0,1452329287
+140060,'140060','Wild Horse Dr @ Bridlehill Dr E Side',49.85388,-119.63302,0,1452329309
+140061,'140061','Wild Horse Dr @ Bridlehill Dr W Side',49.85346,-119.63555,0,1452329310
+140062,'140062','Whispering Hls Dr @ Wild Horse Dr',49.85228,-119.64166,0,1452329311
+140063,'140063','Copper Rdg Dr @ Smith Crk Rd',49.85389,-119.64384,0,1452329312
+140064,'140064','Smith Crk Rd @ Sugosa Pl',49.85176,-119.6431,0,1452329313
+140065,'140065','Hudson Rd @ Concord Rd',49.86268,-119.56288,0,1452329314
+140066,'140066','Hudson Rd @ Westlake Rd',49.86265,-119.56391,0,1452329315
+140067,'140067','Louie Dr @ Butt Rd',49.83779,-119.61573,0,1452329316
+140068,'140068','Louie Dr @ Elk Rd',49.84031,-119.61231,0,1452329317
+140069,'140069','Stevens Rd @ Mcdougall Rd',49.86598,-119.5675,0,1452329318
+140071,'140071','Hwy 97 @ Butt Rd Stn',49.83717,-119.6142,0,1452329341
+140072,'140072','Hwy 97 @ Butt Rd Stn',49.83532,-119.61713,0,1452329342
+140073,'140073','Hwy 97 @ Westlake-Hudson Stn',49.86426,-119.56286,0,1452329343
+140074,'140074','Hwy 97 @ Westlake-Hudson Stn',49.86317,-119.56654,0,1452329344
+140077,'140077','Bottom Wood Lk Rd @ Powley Crt',50.03782,-119.40308,0,1452329347
+140078,'140078','Bottom Wood Lk Rd @ Mayrus Rd',50.04311,-119.4031,0,1452329348
+140079,'140079','Bottom Wood Lk Rd @ Wageman Rd',50.04597,-119.40312,0,1452329349
+140080,'140080','Lk Hl Dr @ Lk Breeze Crt',50.06598,-119.41901,0,1452329371
+140081,'140081','Shoreline Dr @ Stillwater Way',50.06856,-119.42013,0,1452329372
+140082,'140082','Shoreline Way @ Lk Hl Dr',50.07352,-119.41726,0,1452329373
+140083,'140083','Lk Hl Dr @ Shoreline Way',50.07171,-119.41646,0,1452329374
+140084,'140084','Stillwater Way @ Lk Hl Dr',50.06954,-119.41854,0,1452329375
+140085,'140085','Shoreline Dr @ Driftwood Crt',50.06784,-119.41929,0,1452329376
+140086,'140086','Lk Hl Dr @ Lk Breeze Crt',50.06626,-119.41895,0,1452329377
+140087,'140087','Lk Hl Dr @ Oceola Rd',50.06129,-119.41834,0,1452329378
+140088,'140088','Oceola Rd @ Pretty Rd',50.0547,-119.41142,0,1452329379
+140089,'140089','Woodsdale Rd @ Turtle Bay Crt',50.04925,-119.40761,0,1452329380
+140090,'140090','Bottom Wood Lk Rd @ Wageman Rd',50.04629,-119.40299,0,1452329402
+140091,'140091','Bottom Wood Lk Rd @ Mayrus Rd',50.04335,-119.40297,0,1452329403
+140092,'140092','Bottom Wood Lk Rd @ Powley Crt',50.0383,-119.40293,0,1452329404
+140093,'140093','Bottom Wood Lk Rd @ Berry Rd',50.03032,-119.40192,0,1452329405
+140094,'140094','E Boundary Rd @ Wolfe Rd',49.8393,-119.5918,0,1452329406
+140095,'140095','E Boundary Rd @ Wolfe Rd',49.83921,-119.59181,0,1452329407
+140096,'140096','Lk Hl Dr @ Oceola Rd',50.06138,-119.41821,0,1452329408
 140098,'140098','UBCO Exch',49.93991,-119.39456,0,1452329410
-140099,'140099','UBCO Exch',49.93929,-119.39492,0,1452329411
+140099,'140099','UBCO Exch B:A',49.93929,-119.39492,0,1452329411
 140100,'140100','UBCO Exch',49.93948,-119.39427,0,1452330084
-140101,'140101','UBCO Exch',49.93943,-119.39406,0,1452330085
-140102,'140102','UBCO Exch',49.93938,-119.39387,0,1452330086
-140103,'140103','UBCO Exch',49.93935,-119.39373,0,1452330087
-140104,'140104','UBCO Exch',49.93999,-119.39437,0,1452330088
-140105,'140105','Edwards @ Hwy 97',49.92429,-119.38502,0,1452330089
-140106,'140106','Edwards @ Hwy 97',49.92447,-119.3858,0,1452330090
-140107,'140107','Acland @ Penno',49.92214,-119.38407,0,1452330091
-140108,'140108','Acland @ Penno',49.92159,-119.38393,0,1452330092
-140109,'140109','Acland @ Old Vernon',49.91886,-119.38392,0,1452330093
-140111,'140111','Rutland @ Commercial',49.91505,-119.38664,0,1452330116
-140112,'140112','Rutland @ Commercial',49.91558,-119.3859,0,1452330117
-140113,'140113','Hwy 97 @ Sexsmith - Sexsmith Sta',49.91696,-119.38904,0,1452330118
-140114,'140114','Hwy 97 @ Old Vernon - Sexsmith Stn',49.91939,-119.38664,0,1452330119
-140116,'140116','Elk @ Acorn',49.83922,-119.60591,0,1452330121
-140117,'140117','Elk @ Acorn',49.83913,-119.60606,0,1452330122
-140131,'140131','Glenmore @ Cross',49.92337,-119.43833,0,1452330178
-140132,'140132','Glenmore @ Union',49.92765,-119.43474,0,1452330179
-140133,'140133','Glenmore @ Union',49.9263,-119.43606,0,1452330180
-140134,'140134','Glenmore @ Scenic',49.93297,-119.43329,0,1452330181
-140135,'140135','Glenmore @ Scenic',49.93288,-119.43344,0,1452330182
-140136,'140136','John Hindle @ Glenmore',49.94691,-119.42356,0,1452330183
-140137,'140137','John Hindle @ Glenmore',49.94758,-119.42474,0,1452330184
-140138,'140138','John Hindle @ Academy Way',49.93838,-119.40154,0,1452330185
-140139,'140139','John Hindle @ Upper Campus Way',49.93867,-119.40171,0,1452330186
-140140,'140140','Academy @ Shetland',49.92234,-119.39804,0,1452330208
-140141,'140141','Academy Way @ Arab',49.92285,-119.39965,0,1452330209
-140142,'140142','Academy Way @ Vint',49.92831,-119.39994,0,1452330210
-140143,'140143','Academy Way @ Vint',49.92817,-119.40007,0,1452330211
-140144,'140144','Academy Way @ Acadia',49.93228,-119.40138,0,1452330212
-140145,'140145','Academy Way @ Acadia',49.93211,-119.4014,0,1452330213
-140146,'140146','Academy Way @ Aberdeen Hall',49.93471,-119.40111,0,1452330214
-140147,'140147','Academy Way @ Aberdeen Hall',49.93462,-119.40135,0,1452330215
-140148,'140148','Rutland Exch',49.89065,-119.39187,0,1452330216
-140149,'140149','Rutland Exch',49.89065,-119.39082,0,1452330217
-140150,'140150','Rutland Exch',49.89055,-119.39235,0,1452330239
-140151,'140151','Rutland Exch',49.89056,-119.3918,0,1452330240
-140152,'140152','Dougall @ Hwy 33',49.88942,-119.39279,0,1452330241
-140153,'140153','Westlake @ Peak Pt',49.88398,-119.56054,0,1452330242
-140154,'140154','Parkinson @ Pettman',49.89593,-119.54971,0,1452330243
-140155,'140155','Bear Crk @ Vancouver',49.89527,-119.54744,0,1452330244
-140156,'140156','Sexsmith @ Adams',49.91822,-119.38993,0,1452330245
-140157,'140157','Sexsmith @ Adams',49.9181,-119.38901,0,1452330246
-140158,'140158','KLO @ Benvoulin Rd',49.86109,-119.45483,0,1452330247
-140159,'140159','Innovation @ University Way',49.94257,-119.39061,0,1452330248
-140160,'140160','Innovation @ University Way',49.94336,-119.39014,0,1452330270
-140161,'140161','Arborview @ Steele',49.80656,-119.47267,0,1452330271
-140162,'140162','John Hindle @ Landfill',49.94409,-119.4123,0,1452330272
-140163,'140163','John Hindle @ Landfill',49.94415,-119.41218,0,1452330273
-140164,'140164','Shepherd @ Roxby',49.89054,-119.38836,0,1452330274
-140165,'140165','Boucherie Exch',49.86222,-119.58388,0,1452330275
-140166,'140166','Asquith @ Saddleback',49.8512,-119.62468,0,1452330276
-140167,'140167','Copper Rdg @ Smith Crk',49.85379,-119.64351,0,1452330277
-140168,'140168','Daimler @ Auburn',49.85732,-119.59814,0,1452330278
-140169,'140169','Shannon Lk @ Crystal',49.86732,-119.59091,0,1452330279
-140170,'140170','Shannon Way @ Westville',49.84892,-119.6154,0,1452330301
-140171,'140171','Wildhorse @ Bridlehill',49.85374,-119.63274,0,1452330302
-140172,'140172','Elliott @ Butt',49.83711,-119.63103,0,1452330303
-140173,'140173','Elliott @ Reece',49.8443,-119.63392,0,1452330304
-140174,'140174','Elliott @ Springer Ln',49.83371,-119.63103,0,1452330305
-140175,'140175','Elliott @ Neufeld',49.84168,-119.63387,0,1452330306
-140176,'140176','Elliott @ Solar',49.8312,-119.63098,0,1452330307
-140177,'140177','2179 Block Shannon Rdg',49.85579,-119.60559,0,1452330308
-140178,'140178','2569 Block Wildhorse',49.85309,-119.63649,0,1452330309
-140179,'140179','2886 Block Auburn',49.85562,-119.60073,0,1452330310
-140180,'140180','Bartley @ Byland',49.86302,-119.58757,0,1452330332
-140181,'140181','Byland @ Kyle',49.85908,-119.5919,0,1452330333
-140182,'140182','Byland @ Compass',49.86075,-119.58947,0,1452330334
-140183,'140183','Ironridge @ Ironridge Court',49.85452,-119.62768,0,1452330335
-140184,'140184','Shannon Lk @ Golf Course Dr',49.86354,-119.6094,0,1452330336
-140185,'140185','Shannon Lk @ Shannon Vw Dr',49.86596,-119.6049,0,1452330337
-140186,'140186','Shannon Lk @ Shannon Lk Dr',49.86691,-119.59986,0,1452330338
-140187,'140187','Shannon Lk @ Shannon Rdg',49.85308,-119.61752,0,1452330339
-140188,'140188','Shannon Lk @ Stonegrove',49.85823,-119.6168,0,1452330340
-140189,'140189','Shannon Lk @ Swite',49.85531,-119.61792,0,1452330341
-140190,'140190','Shannon Lk @ Tallus Rdg Dr',49.86248,-119.61289,0,1452330363
-140191,'140191','Shannon Lk @ Tallus Rdg',49.86323,-119.612,0,1452330364
-140192,'140192','Whispering Hls @ Copper Rdg',49.8531,-119.64055,0,1452330365
-140193,'140193','Woodstock @ Sandstone',49.85024,-119.61384,0,1452330366
-140194,'140194','Shannon Rdg @ Rdg Pl',49.85339,-119.61379,0,1452330367
-140195,'140195','Shannon Rdg @ Shannon Grn Court',49.85472,-119.61117,0,1452330368
-140196,'140196','Smith Crk @ Elliott',49.84772,-119.63908,0,1452330369
-140197,'140197','Smith Crk @ Wild Horse',49.85124,-119.64235,0,1452330370
-140198,'140198','2176 Block Shannon Rdg Dr',49.85589,-119.6056,0,1452330371
-140199,'140199','Auburn @ Shelby',49.85639,-119.60087,0,1452330372
-140200,'140200','Auburn @ Shannon Rdg',49.85377,-119.60086,0,1452331045
-140201,'140201','Bartley @ Shannon Lk',49.86403,-119.58783,0,1452331046
-140202,'140202','Byland @ Compass',49.86083,-119.58954,0,1452331047
-140203,'140203','Byland @ Kyle',49.85816,-119.59337,0,1452331048
-140204,'140204','Shannon Lk @ Alexandria',49.85515,-119.61803,0,1452331049
-140205,'140205','Shannon Lk @ Stonegrove',49.85825,-119.61694,0,1452331050
-140206,'140206','Shannon Lk @ Asquith',49.85159,-119.61851,0,1452331051
-140207,'140207','Shannon Rdg @ Lakeside Court',49.85361,-119.61363,0,1452331052
-140208,'140208','Shannon Rdg @ Shannon Grn',49.85453,-119.61203,0,1452331053
-140209,'140209','Daimler @ Auburn',49.85751,-119.5984,0,1452331054
-140210,'140210','Shannon Lk @ Crystal Dr',49.86869,-119.59306,0,1452331076
-140211,'140211','Shannon Lk @ Shannon Lk',49.86682,-119.60065,0,1452331077
-140212,'140212','Shannon Lk @ Shannon Woods Dr',49.86578,-119.60611,0,1452331078
+140101,'140101','UBCO Exch B:B',49.93943,-119.39406,0,1452330085
+140102,'140102','UBCO Exch B:C',49.93938,-119.39387,0,1452330086
+140103,'140103','UBCO Exch B:D',49.93935,-119.39373,0,1452330087
+140104,'140104','UBCO Exch B:E',49.93999,-119.39437,0,1452330088
+140105,'140105','Edwards Rd @ Hwy 97',49.92429,-119.38502,0,1452330089
+140106,'140106','Edwards Rd @ Hwy 97',49.92447,-119.3858,0,1452330090
+140107,'140107','Acland Rd @ Penno Rd',49.92214,-119.38407,0,1452330091
+140108,'140108','Acland Rd @ Penno Rd',49.92159,-119.38393,0,1452330092
+140109,'140109','Acland Rd @ Old Vernon Rd',49.91886,-119.38392,0,1452330093
+140111,'140111','Rutland Rd N @ Commercial Dr',49.91505,-119.38664,0,1452330116
+140112,'140112','Rutland Rd N @ Commercial Dr',49.91558,-119.3859,0,1452330117
+140113,'140113','Hwy 97 N @ Sexsmith Stn',49.91696,-119.38904,0,1452330118
+140114,'140114','Hwy 97 N @ Sexsmith Stn',49.91939,-119.38664,0,1452330119
+140116,'140116','Elk Rd @ Acorn Dr',49.83922,-119.60591,0,1452330121
+140117,'140117','Elk Rd @ Acorn Dr',49.83913,-119.60606,0,1452330122
+140131,'140131','Glenmore Rd @ Cross Rd',49.92337,-119.43833,0,1452330178
+140132,'140132','Glenmore Rd @ Union Rd',49.92765,-119.43474,0,1452330179
+140133,'140133','Glenmore Rd @ Union Rd',49.9263,-119.43606,0,1452330180
+140134,'140134','Glenmore Rd N @ Scenic Rd',49.93297,-119.43329,0,1452330181
+140135,'140135','Glenmore Rd N @ Scenic Rd',49.93288,-119.43344,0,1452330182
+140136,'140136','John Hindle Dr @ Glenmore Rd N',49.94691,-119.42356,0,1452330183
+140137,'140137','John Hindle Dr @ Glenmore Rd N',49.94758,-119.42474,0,1452330184
+140138,'140138','John Hindle Dr @ Academy Way',49.93838,-119.40154,0,1452330185
+140139,'140139','John Hindle Dr @ Upper Campus Way',49.93867,-119.40171,0,1452330186
+140148,'140148','Rutland Exch B:B',49.89065,-119.39187,0,1452330216
+140149,'140149','Rutland Exch B:C',49.89065,-119.39082,0,1452330217
+140150,'140150','Rutland Exch B:D',49.89055,-119.39235,0,1452330239
+140151,'140151','Rutland Exch B:E',49.89056,-119.3918,0,1452330240
+140152,'140152','Dougall Rd @ Hwy 33 W',49.88942,-119.39279,0,1452330241
+140153,'140153','Westlake Rd @ Peak Pt Rd',49.88398,-119.56054,0,1452330242
+140154,'140154','Parkinson Rd @ Pettman Rd',49.89593,-119.54971,0,1452330243
+140155,'140155','Bear Crk Rd @ Vancouver Rd',49.89527,-119.54744,0,1452330244
+140158,'140158','KLO Rd @ Benvoulin Rd E Side',49.86109,-119.45483,0,1452330247
+140159,'140159','Innovation Dr @ University Way',49.94257,-119.39061,0,1452330248
+140160,'140160','Innovation Dr @ University Way',49.94336,-119.39014,0,1452330270
+140162,'140162','John Hindle Dr @ Glenmore Landfill',49.94409,-119.4123,0,1452330272
+140163,'140163','John Hindle Dr @ Glenmore Landfill',49.94415,-119.41218,0,1452330273
+140164,'140164','Shepherd Rd @ Roxby Rd',49.89054,-119.38836,0,1452330274
+140165,'140165','Boucherie Mtn Exch B:F',49.86222,-119.58388,0,1452330275
+140166,'140166','Asquith Rd @ Saddleback Way',49.8512,-119.62468,0,1452330276
+140167,'140167','Copper Rdg Dr @ Smith Crk Rd',49.85379,-119.64351,0,1452330277
+140168,'140168','Daimler Dr @ Auburn Rd',49.85732,-119.59814,0,1452330278
+140169,'140169','Shannon Lk Rd @ Crystal Dr',49.86732,-119.59091,0,1452330279
+140170,'140170','Shannon Way @ Westville Way',49.84892,-119.6154,0,1452330301
+140171,'140171','Wild Horse Dr @ Bridlehill Dr',49.85374,-119.63274,0,1452330302
+140172,'140172','Elliott Rd @ Butt Rd',49.83711,-119.63103,0,1452330303
+140173,'140173','Elliott Rd @ Reece Rd',49.8443,-119.63392,0,1452330304
+140174,'140174','Elliott Rd @ Springer Ln',49.83371,-119.63103,0,1452330305
+140175,'140175','Elliott Rd @ Nuefeld Cres',49.84168,-119.63387,0,1452330306
+140176,'140176','Elliott Rd @ Solar Rd',49.8312,-119.63098,0,1452330307
+140177,'140177','2200 Blk Shannon Rdg Dr',49.85579,-119.60559,0,1452330308
+140178,'140178','2600 Blk Wild Horse Dr',49.85309,-119.63649,0,1452330309
+140179,'140179','2900 Blk Auburn Rd',49.85562,-119.60073,0,1452330310
+140180,'140180','Bartley Rd @ Byland Rd',49.86302,-119.58757,0,1452330332
+140181,'140181','Byland Rd @ Kyle Rd',49.85908,-119.5919,0,1452330333
+140182,'140182','Byland Rd @ Compass Crt',49.86075,-119.58947,0,1452330334
+140183,'140183','Ironridge Rd @ Ironridge Crt',49.85452,-119.62768,0,1452330335
+140184,'140184','Shannon Lk Rd @ Golf Course Dr',49.86354,-119.6094,0,1452330336
+140185,'140185','Shannon Lk Rd @ Shannon Vw Dr',49.86596,-119.6049,0,1452330337
+140186,'140186','Shannon Lk Rd @ Shannon Lk Dr',49.86691,-119.59986,0,1452330338
+140187,'140187','Shannon Lk Rd @ Shannon Rdg Dr',49.85308,-119.61752,0,1452330339
+140188,'140188','Shannon Lk Rd @ Canyon Crest Dr',49.85823,-119.6168,0,1452330340
+140189,'140189','Shannon Lk Rd @ Alexandria Way',49.85531,-119.61792,0,1452330341
+140190,'140190','Shannon Lk Rd @ Tallus Rdg Dr',49.86248,-119.61289,0,1452330363
+140191,'140191','Shannon Lk Rd @ Tallus Rdg Dr',49.86323,-119.612,0,1452330364
+140192,'140192','Whispering Hls Dr @ Copper Rdg Dr',49.8531,-119.64055,0,1452330365
+140193,'140193','Woodstock Dr @ Sandstone Dr',49.85024,-119.61384,0,1452330366
+140194,'140194','Shannon Rdg Dr @ Rdg Pl',49.85339,-119.61379,0,1452330367
+140195,'140195','Shannon Rdg Dr @ Shannon Grn Crt',49.85472,-119.61117,0,1452330368
+140196,'140196','Smith Crk Rd @ Elliott Rd',49.84772,-119.63908,0,1452330369
+140197,'140197','Smith Crk Rd @ Wild Horse Dr',49.85124,-119.64235,0,1452330370
+140198,'140198','2200 Blk Shannon Rdg Dr',49.85589,-119.6056,0,1452330371
+140199,'140199','Auburn Rd @ Shelby Cres',49.85639,-119.60087,0,1452330372
+140200,'140200','Auburn Rd @ Shannon Rdg Dr',49.85377,-119.60086,0,1452331045
+140201,'140201','Bartley Rd @ Shannon Lk Rd',49.86403,-119.58783,0,1452331046
+140202,'140202','Byland Rd @ Compass Crt',49.86083,-119.58954,0,1452331047
+140203,'140203','Byland Rd @ Kyle Rd',49.85816,-119.59337,0,1452331048
+140204,'140204','Shannon Lk Rd @ Alexandria Way',49.85515,-119.61803,0,1452331049
+140205,'140205','Shannon Lk Rd @ Canyon Crest Dr',49.85825,-119.61694,0,1452331050
+140206,'140206','Shannon Lk Rd @ Asquith Rd',49.85159,-119.61851,0,1452331051
+140207,'140207','Shannon Rdg Dr @ Lakeside Crt',49.85361,-119.61363,0,1452331052
+140208,'140208','Shannon Rdg Dr @ Shannon Grn Crt',49.85453,-119.61203,0,1452331053
+140209,'140209','Daimler Dr @ Auburn Rd',49.85751,-119.5984,0,1452331054
+140210,'140210','Shannon Lk Rd @ Crystal Dr',49.86869,-119.59306,0,1452331076
+140211,'140211','Shannon Lk Rd @ Shannon Woods Dr',49.86682,-119.60065,0,1452331077
+140212,'140212','Shannon Lk Rd @ Shannon Woods Dr',49.86578,-119.60611,0,1452331078
 140214,'140214','Westbank Exch B:E',49.82962,-119.63043,0,1452331080
-140216,'140216','Rutland @ Bach',49.89656,-119.3868,0,1452331082
-140221,'140221','Beach @ 4th',49.77477,-119.73514,0,1452331108
-140222,'140222','Beach @ 4th',49.7747,-119.73506,0,1452331109
-140233,'140233','Ellis @ Clement',49.89404,-119.49347,0,1452331141
-140234,'140234','Enterprise Way @ Commerce',49.89376,-119.4206,0,1452331142
-140235,'140235','Enterprise Way @ Commerce',49.89403,-119.41983,0,1452331143
-140236,'140236','Gordon @ Sutherland',49.88044,-119.47687,0,1452331144
-140237,'140237','Gordon @ Sutherland',49.87937,-119.47727,0,1452331145
-140238,'140238','Innovation @ Quail Rdg',49.95172,-119.38978,0,1452331146
-140239,'140239','Enterprise @ Banks',49.88925,-119.42682,0,1452331147
-140240,'140240','Springfield @ Leckie',49.87982,-119.4261,0,1452331169
-140241,'140241','Glenmore @ Begbie',49.9414,-119.43123,0,1452331170
-140242,'140242','Glenmore @ Begbie',49.94145,-119.43094,0,1452331171
-140243,'140243','Lakeshore @ Richter',49.85482,-119.48989,0,1452331172
-140244,'140244','KLO @ Richter',49.86196,-119.48878,0,1452331173
-140245,'140245','Rutland @ Rains',49.91014,-119.38691,0,1452331174
-140246,'140246','Rutland @ Rains',49.91049,-119.38661,0,1452331175
-140247,'140247','S Perimeter Way @ Mountainside',49.78899,-119.52113,0,1452331176
-140248,'140248','Innovation @ Spectrum',49.94787,-119.38919,0,1452331177
-140249,'140249','Innovation @ Spectrum',49.94857,-119.38921,0,1452331178
-140250,'140250','Innovation @ Fleet',49.94975,-119.38983,0,1452331200
-140251,'140251','Innovation @ Fleet Court',49.95003,-119.38966,0,1452331201
+140216,'140216','Rutland Rd N @ Bach Rd',49.89656,-119.3868,0,1452331082
+140221,'140221','Beach Ave @ 4th St',49.77477,-119.73514,0,1452331108
+140222,'140222','Beach Ave @ 4th St',49.7747,-119.73506,0,1452331109
+140233,'140233','Ellis St @ Clement Ave',49.89404,-119.49347,0,1452331141
+140236,'140236','Gordon Dr @ Sutherland Ave',49.88044,-119.47687,0,1452331144
+140237,'140237','Gordon Dr @ Sutherland Ave',49.87937,-119.47727,0,1452331145
+140238,'140238','Innovation Dr @ Airport Way',49.95172,-119.38978,0,1452331146
+140239,'140239','Enterprise Way @ Banks Rd',49.88925,-119.42682,0,1452331147
+140240,'140240','Springfield Rd @ Leckie Rd',49.87982,-119.4261,0,1452331169
+140241,'140241','Glenmore Rd N @ Begbie Rd',49.9414,-119.43123,0,1452331170
+140242,'140242','Glenmore Rd N @ Begbie Rd',49.94145,-119.43094,0,1452331171
+140243,'140243','Lakeshore Rd @ Richter St',49.85482,-119.48989,0,1452331172
+140244,'140244','KLO Rd @ Richter St',49.86196,-119.48878,0,1452331173
+140245,'140245','Rutland Rd N @ Rains Rd',49.91014,-119.38691,0,1452331174
+140246,'140246','Rutland Rd N @ Rains Rd',49.91049,-119.38661,0,1452331175
+140247,'140247','S Perimeter Way @ Mountainside Dr',49.78899,-119.52113,0,1452331176
+140248,'140248','Innovation Dr @ Spectrum Ave',49.94787,-119.38919,0,1452331177
+140249,'140249','Innovation Dr @ Spectrum Crt',49.94857,-119.38921,0,1452331178
+140250,'140250','Innovation Dr @ Fleet Ave',49.94975,-119.38983,0,1452331200
+140251,'140251','Innovation Dr @ Fleet Crt',49.95003,-119.38966,0,1452331201
 140252,'140252','Vly @ Gln Pk',49.91716,-119.4362,0,1452331202
-140254,'140254','Rutland @ McIntosh',49.89226,-119.38696,0,1452331204
-140256,'140256','Steele Rd @ Arbor Vw',49.80637,-119.4723,0,1452331206
-140258,'140258','Sutherland @ Chandler',49.88028,-119.46876,0,1452331208
-140259,'140259','Acland @ Old Vernon',49.91874,-119.38408,0,1452331209
-140269,'140269','Vally @ Drysdale',49.92323,-119.43303,0,1452331240
+140254,'140254','Rutland Rd N @ McIntosh Rd',49.89226,-119.38696,0,1452331204
+140256,'140256','Steele Rd @ Arbor Vw Dr',49.80637,-119.4723,0,1452331206
+140258,'140258','Sutherland Ave @ Chandler St',49.88028,-119.46876,0,1452331208
+140259,'140259','Acland Rd @ Old Vernon Rd',49.91874,-119.38408,0,1452331209
+140269,'140269','Vly Rd @ Drysdale Blvd',49.92323,-119.43303,0,1452331240
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 db1b8a891..f0239089f 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
@@ -9,20 +9,19 @@
 100,140243,9,0
 100,103044,10,0
 100,103016,11,0
-100,102997,12,0
-100,140244,13,0
-100,103020,14,0
-100,103028,15,0
-100,102995,16,0
-100,102984,17,0
-100,140053,18,0
-100,102956,19,0
-100,102930,20,0
-100,102910,21,0
-100,102892,22,0
-100,102883,23,0
-100,102869,24,0
-100,102861,25,1
+100,140244,12,0
+100,103020,13,0
+100,103028,14,0
+100,102995,15,0
+100,102984,16,0
+100,140053,17,0
+100,102956,18,0
+100,102930,19,0
+100,102910,20,0
+100,102892,21,0
+100,102883,22,0
+100,102869,23,0
+100,102861,24,1
 101,102861,1,0
 101,102868,2,0
 101,102881,3,0
@@ -96,42 +95,6 @@
 300,103096,29,0
 300,103101,30,0
 300,103092,31,0
-400,103016,1,0
-400,140244,2,0
-400,103457,3,0
-400,103059,4,0
-400,103088,5,0
-400,103507,6,0
-400,103127,7,0
-400,140239,8,0
-400,140235,9,0
-400,103263,10,0
-400,140156,11,0
-400,103374,12,0
-400,140140,13,0
-400,140142,14,0
-400,140144,15,0
-400,140146,16,0
-400,140138,17,0
-400,140100,18,1
-401,140099,1,0
-401,140147,2,0
-401,140145,3,0
-401,140143,4,0
-401,140141,5,0
-401,103362,6,0
-401,140157,7,0
-401,103256,8,0
-401,103215,9,0
-401,140234,10,0
-401,103141,11,0
-401,103126,12,0
-401,103512,13,0
-401,103084,14,0
-401,103054,15,0
-401,103030,16,0
-401,103040,17,0
-401,103016,18,1
 500,103023,1,0
 500,140028,2,0
 500,140029,3,0
@@ -277,42 +240,41 @@
 801,103382,9,0
 801,103380,10,0
 801,103377,11,0
-801,103370,12,0
-801,140254,13,0
-801,103365,14,0
-801,140148,15,0
-801,103321,16,0
-801,103297,17,0
-801,103274,18,0
-801,103260,19,0
-801,103240,20,0
-801,103221,21,0
-801,103201,22,0
-801,103184,23,0
-801,103171,24,0
-801,103142,25,0
-801,103125,26,0
-801,103108,27,0
-801,103097,28,0
-801,103069,29,0
-801,103057,30,0
-801,103014,31,0
-801,102996,32,0
-801,102986,33,0
-801,102973,34,0
-801,102950,35,0
-801,140048,36,0
-801,140045,37,0
-801,140046,38,0
-801,102914,39,0
-801,102928,40,0
-801,102952,41,0
-801,102961,42,0
-801,102976,43,0
-801,102982,44,0
-801,140244,45,0
-801,103020,46,0
-801,103030,47,1
+801,140254,12,0
+801,103365,13,0
+801,140148,14,0
+801,103321,15,0
+801,103297,16,0
+801,103274,17,0
+801,103260,18,0
+801,103240,19,0
+801,103221,20,0
+801,103201,21,0
+801,103184,22,0
+801,103171,23,0
+801,103142,24,0
+801,103125,25,0
+801,103108,26,0
+801,103097,27,0
+801,103069,28,0
+801,103057,29,0
+801,103014,30,0
+801,102996,31,0
+801,102986,32,0
+801,102973,33,0
+801,102950,34,0
+801,140048,35,0
+801,140045,36,0
+801,140046,37,0
+801,102914,38,0
+801,102928,39,0
+801,102952,40,0
+801,102961,41,0
+801,102976,42,0
+801,102982,43,0
+801,140244,44,0
+801,103020,45,0
+801,103030,46,1
 900,102859,1,0
 900,102875,2,0
 900,102884,3,0
@@ -405,35 +367,34 @@
 1001,103382,13,0
 1001,103380,14,0
 1001,103377,15,0
-1001,103370,16,0
-1001,140254,17,0
-1001,103365,18,0
-1001,140149,19,0
-1001,103321,20,0
-1001,103297,21,0
-1001,103274,22,0
-1001,103260,23,0
-1001,103240,24,0
-1001,103221,25,0
-1001,103165,26,0
-1001,103141,27,0
-1001,103126,28,0
-1001,103092,29,0
-1001,103070,30,0
-1001,103060,31,0
-1001,103046,32,0
-1001,103015,33,0
-1001,102991,34,0
-1001,102975,35,0
-1001,102964,36,0
-1001,102953,37,0
-1001,102933,38,0
-1001,102921,39,0
-1001,102909,40,0
-1001,102900,41,0
-1001,102889,42,0
-1001,102874,43,0
-1001,102854,44,1
+1001,140254,16,0
+1001,103365,17,0
+1001,140149,18,0
+1001,103321,19,0
+1001,103297,20,0
+1001,103274,21,0
+1001,103260,22,0
+1001,103240,23,0
+1001,103221,24,0
+1001,103165,25,0
+1001,103141,26,0
+1001,103126,27,0
+1001,103092,28,0
+1001,103070,29,0
+1001,103060,30,0
+1001,103046,31,0
+1001,103015,32,0
+1001,102991,33,0
+1001,102975,34,0
+1001,102964,35,0
+1001,102953,36,0
+1001,102933,37,0
+1001,102921,38,0
+1001,102909,39,0
+1001,102900,40,0
+1001,102889,41,0
+1001,102874,42,0
+1001,102854,43,1
 1100,102855,1,0
 1100,102875,2,0
 1100,102886,3,0
@@ -486,45 +447,43 @@
 1101,103382,4,0
 1101,103380,5,0
 1101,103377,6,0
-1101,103370,7,0
-1101,140254,8,0
-1101,103365,9,0
-1101,103363,10,0
-1101,103361,11,0
-1101,103364,12,0
-1101,103369,13,0
-1101,103366,14,0
-1101,103346,15,0
-1101,103331,16,0
-1101,103310,17,0
-1101,103308,18,0
-1101,103304,19,0
-1101,103291,20,0
-1101,103271,21,0
-1101,103253,22,0
-1101,103246,23,0
-1101,103227,24,0
-1101,103202,25,0
-1101,103190,26,0
-1101,103156,27,0
-1101,103130,28,0
-1101,103097,29,0
-1101,103071,30,0
-1101,103057,31,0
-1101,103014,32,0
-1101,102996,33,0
-1101,102986,34,0
-1101,102972,35,0
-1101,102955,36,0
-1101,140258,37,0
-1101,102944,38,0
-1101,102927,39,0
-1101,102917,40,0
-1101,102906,41,0
-1101,102897,42,0
-1101,102887,43,0
-1101,102874,44,0
-1101,102855,45,1
+1101,140254,7,0
+1101,103365,8,0
+1101,103363,9,0
+1101,103361,10,0
+1101,103364,11,0
+1101,103369,12,0
+1101,103366,13,0
+1101,103346,14,0
+1101,103331,15,0
+1101,103310,16,0
+1101,103308,17,0
+1101,103304,18,0
+1101,103291,19,0
+1101,103271,20,0
+1101,103253,21,0
+1101,103246,22,0
+1101,103227,23,0
+1101,103202,24,0
+1101,103190,25,0
+1101,103156,26,0
+1101,103130,27,0
+1101,103097,28,0
+1101,103071,29,0
+1101,103057,30,0
+1101,103014,31,0
+1101,102996,32,0
+1101,102986,33,0
+1101,102972,34,0
+1101,140258,35,0
+1101,102944,36,0
+1101,102927,37,0
+1101,102917,38,0
+1101,102906,39,0
+1101,102897,40,0
+1101,102887,41,0
+1101,102874,42,0
+1101,102855,43,1
 1200,103016,1,0
 1200,140244,2,0
 1200,103020,3,0
@@ -562,10 +521,9 @@
 1201,103054,14,0
 1201,103042,15,0
 1201,103030,16,0
-1201,103040,17,0
-1201,103039,18,0
-1201,103016,19,1
-1201,103072,20,1
+1201,103039,17,0
+1201,103016,18,1
+1201,103072,19,1
 1300,140104,1,0
 1300,140159,2,0
 1300,140249,3,0
@@ -729,16 +687,15 @@
 1700,103191,14,0
 1700,103451,15,0
 1700,103833,16,0
-1700,140161,17,0
-1700,140256,18,0
-1700,103439,19,0
-1700,103828,20,0
-1700,103408,21,0
-1700,103824,22,0
-1700,103820,23,0
-1700,103818,24,0
-1700,103816,25,0
-1700,103815,26,0
+1700,140256,17,0
+1700,103439,18,0
+1700,103828,19,0
+1700,103408,20,0
+1700,103824,21,0
+1700,103820,22,0
+1700,103818,23,0
+1700,103816,24,0
+1700,103815,25,0
 1800,102856,1,0
 1800,102866,2,0
 1800,102880,3,0
@@ -796,10 +753,9 @@
 1900,103140,12,0
 1900,140252,13,0
 1900,103203,14,0
-1900,103224,15,0
-1900,140269,16,0
-1900,103243,17,0
-1900,140133,18,1
+1900,140269,15,0
+1900,103243,16,0
+1900,140133,17,1
 1901,140133,1,0
 1901,103104,2,0
 1901,103154,3,0
@@ -1264,17 +1220,6 @@
 3200,140016,27,0
 3200,140017,28,0
 3200,103658,29,0
-8801,103054,1,0
-8801,103042,2,0
-8801,103030,3,0
-8801,102861,4,0
-8801,103744,5,0
-8801,103078,6,0
-8801,103162,7,0
-8801,103183,8,0
-8801,140065,9,0
-8801,140008,10,0
-8801,140004,11,1
 9700,140004,1,0
 9700,140071,2,0
 9700,140007,3,0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_rts_trips b/app-android/src/main/res-current/raw/current_gtfs_rts_trips
index 2910d5894..671a37ccf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_rts_trips
+++ b/app-android/src/main/res-current/raw/current_gtfs_rts_trips
@@ -2,8 +2,6 @@
 101,0,'Mission Rec Exch',1
 200,0,'North End Shuttle',2
 300,0,'Dilworth Mtn',3
-401,0,'Pandosy',4
-400,0,'UBCO',4
 500,0,'Downtown',5
 501,0,'Mission Rec Exch',5
 600,0,'Downtown',6
@@ -46,6 +44,5 @@
 2801,0,'Westbank',28
 2900,0,'Bear Crk',29
 3200,0,'The Lks',32
-8801,0,'Westbank Exch',88
 9700,0,'UBCO',97
 9701,0,'Westbank',97
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 0fb0a63c3..032cd6d50 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,7 +1,63 @@
-'2091',20240623,1
-'2086',20240624,1
-'2086',20240625,1
-'2086',20240626,1
-'2086',20240627,1
-'2086',20240628,1
-'1781',20240629,1
+'3091',20240630,1
+'2931',20240701,1
+'1798',20240702,1
+'1798',20240703,1
+'1798',20240704,1
+'1798',20240705,1
+'2931',20240706,1
+'3091',20240707,1
+'1798',20240708,1
+'1798',20240709,1
+'1798',20240710,1
+'1798',20240711,1
+'1798',20240712,1
+'2931',20240713,1
+'3091',20240714,1
+'1798',20240715,1
+'1798',20240716,1
+'1798',20240717,1
+'1798',20240718,1
+'1798',20240719,1
+'2931',20240720,1
+'3091',20240721,1
+'1798',20240722,1
+'1798',20240723,1
+'1798',20240724,1
+'1798',20240725,1
+'1798',20240726,1
+'2931',20240727,1
+'3091',20240728,1
+'1798',20240729,1
+'1798',20240730,1
+'1798',20240731,1
+'1798',20240801,1
+'1798',20240802,1
+'2931',20240803,1
+'3091',20240804,1
+'3091',20240805,1
+'1798',20240806,1
+'1798',20240807,1
+'1798',20240808,1
+'1798',20240809,1
+'2931',20240810,1
+'3091',20240811,1
+'1798',20240812,1
+'1798',20240813,1
+'1798',20240814,1
+'1798',20240815,1
+'1798',20240816,1
+'2931',20240817,1
+'3091',20240818,1
+'1798',20240819,1
+'1798',20240820,1
+'1798',20240821,1
+'1798',20240822,1
+'1798',20240823,1
+'2931',20240824,1
+'3091',20240825,1
+'1798',20240826,1
+'1798',20240827,1
+'1798',20240828,1
+'1798',20240829,1
+'1798',20240830,1
+'2931',20240831,1
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102728 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102728
index 9e179591f..3e949067e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102728
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102728
@@ -1,6 +1,6 @@
-'1781',1000,81600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63600,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'1781',1901,75300,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,75400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1000,63600,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1901,72900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,75300,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102853 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102853
index 474ca4a39..e7f18762b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102853
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102853
@@ -1,3 +1,3 @@
-'1781',9700,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2086',9700,63000,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,1000,,'',0,1000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,5500,4,'',0,500,,'',0,2000,,'',0,1700,4,'',0,300,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,2400,,'',0,6600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,7800,4,'',0
-'2091',9700,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'1798',9700,63000,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,5500,4,'',0,500,,'',0,2000,,'',0,900,,'',0,1100,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,2400,,'',0,6600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,7800,4,'',0
+'2931',9700,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3091',9700,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102854 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102854
index 5fb2e20c7..d021cad22 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102854
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102854
@@ -1,6 +1,6 @@
-'1781',1000,80800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',1001,82600,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7600,4,'',0,6900,4,'',0,5800,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0
-'2086',1000,63000,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'2086',1001,62200,4,'',0,3200,4,'',0,5800,4,'',0,2700,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,6300,4,'',0,1900,4,'',0,1900,4,'',0,1800,4,'',0,6000,4,'',0,2800,4,'',0,7000,4,'',0,3300,4,'',0,6900,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,8300,4,'',0,1600,4,'',0,1300,4,'',0,2100,4,'',0,5900,4,'',0,1800,4,'',0,1700,4,'',0,5600,4,'',0,1400,4,'',0,2500,4,'',0,8200,4,'',0,8400,4,'',0,4300,4,'',0,8200,4,'',0,8000,4,'',0,4500,4,'',0,8300,4,'',0,8500,4,'',0
-'2091',1000,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'2091',1001,82600,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,9900,4,'',0,10000,4,'',0,17000,4,'',0
+'1798',1000,63000,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'1798',1001,62200,4,'',0,3200,4,'',0,5800,4,'',0,2700,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,6300,4,'',0,1900,4,'',0,1900,4,'',0,1800,4,'',0,6000,4,'',0,2800,4,'',0,7000,4,'',0,3300,4,'',0,6900,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,8300,4,'',0,1600,4,'',0,1300,4,'',0,2100,4,'',0,5900,4,'',0,1800,4,'',0,1700,4,'',0,5600,4,'',0,1400,4,'',0,2500,4,'',0,8200,4,'',0,8400,4,'',0,4300,4,'',0,8200,4,'',0,8000,4,'',0,4500,4,'',0,8300,4,'',0,8500,4,'',0
+'2931',1000,80800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',1001,82600,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7600,4,'',0,6900,4,'',0,5800,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0
+'3091',1000,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'3091',1001,82600,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,9900,4,'',0,10000,4,'',0,17000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102855 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102855
index 1e3b0f73b..251daa8a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102855
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102855
@@ -1,6 +1,6 @@
-'1781',1100,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'1781',1101,81300,4,'',0,4000,4,'',0,6100,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0
-'2086',1100,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2086',1101,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6900,4,'',0,1300,4,'',0,1500,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
-'2091',1100,73900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'2091',1101,82600,4,'',0,19300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10600,4,'',0,9400,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'1798',1100,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'1798',1101,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6900,4,'',0,2800,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
+'2931',1100,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'2931',1101,81300,4,'',0,4000,4,'',0,6100,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0
+'3091',1100,73900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'3091',1101,82600,4,'',0,19300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10600,4,'',0,9400,4,'',0,9900,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_102856 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102856
index 9ac5246d9..b72bbd6b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102856
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102856
@@ -1,9 +1,9 @@
-'1781',600,82800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'1781',601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,71700,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
-'2086',601,61500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',600,90500,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0
-'2091',601,80000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61000,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'2091',1800,73000,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',600,71700,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
+'1798',601,61500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',600,82800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'2931',601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,90500,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0
+'3091',601,80000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61000,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'2931',1800,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73000,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102857 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102857
index 0e2a4c437..699edc33d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102857
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102857
@@ -1,3 +1,3 @@
-'1781',1801,80100,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,12600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
-'2086',1801,64200,4,'',0,10800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
-'2091',1801,83100,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11400,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
+'1798',1801,64200,4,'',0,10800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
+'2931',1801,80100,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,12600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
+'3091',1801,83100,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11400,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102859 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102859
index df2ce7531..481835265 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102859
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102859
@@ -1,9 +1,9 @@
-'1781',200,81500,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,6300,,'',0,1000,4,'',0,7000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9700,,'',0,1000,4,'',0,9300,,'',0,1000,4,'',0
-'2086',200,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,8700,,'',0,1300,4,'',0,17400,,'',0,1300,4,'',0,11200,,'',0,1300,4,'',0,8200,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
-'2091',200,83000,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,10500,,'',0,1000,4,'',0,8800,,'',0,1000,4,'',0,9200,,'',0,1000,4,'',0,16800,,'',0,1000,4,'',0
-'1781',900,102500,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'1781',901,110400,4,'',0,20500,4,'',0,25000,4,'',0,17900,4,'',0
-'2086',900,90000,,'',0,22000,,'',0,31500,,'',0
-'2086',901,94100,4,'',0,31200,4,'',0,26300,4,'',0
-'2091',900,104500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'2091',901,112400,4,'',0,20000,4,'',0,10000,4,'',0,20000,4,'',0
+'1798',200,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,8700,,'',0,1300,4,'',0,17400,,'',0,1300,4,'',0,11200,,'',0,1300,4,'',0,8200,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
+'2931',200,81500,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,6300,,'',0,1000,4,'',0,7000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9700,,'',0,1000,4,'',0,9300,,'',0,1000,4,'',0
+'3091',200,83000,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,10500,,'',0,1000,4,'',0,8800,,'',0,1000,4,'',0,9200,,'',0,1000,4,'',0,16800,,'',0,1000,4,'',0
+'1798',900,90000,,'',0,22000,,'',0,31500,,'',0
+'1798',901,94100,4,'',0,31200,4,'',0,26300,4,'',0
+'2931',900,102500,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'2931',901,110400,4,'',0,20500,4,'',0,25000,4,'',0,17900,4,'',0
+'3091',900,104500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'3091',901,112400,4,'',0,20000,4,'',0,10000,4,'',0,20000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102860 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102860
index dbc9a50ee..b6b43af1e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102860
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102860
@@ -1,6 +1,6 @@
-'1781',500,81000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
-'1781',501,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',500,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,1200,4,'',0,6000,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'2086',501,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,85400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0
-'2091',501,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'1798',501,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,81000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
+'2931',501,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',500,85400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0
+'3091',501,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102861 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102861
index 8a66390c0..d145b804d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102861
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102861
@@ -1,7 +1,6 @@
-'1781',100,82500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7500,4,'',0,9300,4,'',0,10200,4,'',0,10100,4,'',0
-'1781',101,73500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2086',100,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,800,4,'',0,700,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'2086',101,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',100,82600,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,10000,4,'',0,9900,4,'',0
-'2091',101,73500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',8801,154600,,'',0
+'1798',100,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
+'1798',101,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',100,82500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7500,4,'',0,9300,4,'',0,10200,4,'',0,10100,4,'',0
+'2931',101,73500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'3091',100,82600,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,10000,4,'',0,9900,4,'',0
+'3091',101,73500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102862 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102862
index 352a73279..1b76b5c49 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102862
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102862
@@ -1,3 +1,3 @@
-'1781',9701,70800,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'2086',9701,54500,,'',0,7300,,'',0,2100,,'',0,1200,,'',0,5200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,900,4,'',0,1100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,900,4,'',0,1100,,'',0,6100,,'',0,2500,,'',0,1200,4,'',0,1300,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6400,4,'',0,2500,4,'',0
-'2091',9701,72800,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,4,'',0,9100,4,'',0
+'1798',9701,54500,,'',0,7300,,'',0,2100,,'',0,1200,,'',0,5200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,900,4,'',0,1100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,900,4,'',0,1100,,'',0,6100,,'',0,2500,,'',0,1200,4,'',0,1300,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6400,4,'',0,2500,4,'',0
+'2931',9701,70800,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3091',9701,72800,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,4,'',0,9100,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102863 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102863
index 53aeec36c..44b8a20b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102863
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102863
@@ -1,3 +1,3 @@
-'1781',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72300,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72300,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102865 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102865
index 262b18114..0969e4b57 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102865
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102865
@@ -1,3 +1,3 @@
-'1781',200,81600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,81600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102866 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102866
index d534df247..1b92cf62b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102866
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102866
@@ -1,6 +1,6 @@
-'1781',601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,61600,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',601,80100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61100,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'2091',1800,73100,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,61600,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61100,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'2931',1800,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73100,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102867 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102867
index faf3dcd21..f4b29eb5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102867
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102867
@@ -1,6 +1,6 @@
-'1781',600,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,71500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',600,90300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1801,75900,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,64000,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'2091',1801,82900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,71500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',600,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,90300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1801,64000,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'2931',1801,75900,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102868 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102868
index b3bb18466..a0008a58f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102868
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102868
@@ -1,3 +1,3 @@
-'1781',101,73600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',101,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',101,73600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'3091',101,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102869 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102869
index 52d753b6c..ee2dbbc26 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102869
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102869
@@ -1,3 +1,3 @@
-'1781',100,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
+'1798',100,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102870 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102870
index c43d9fa82..0333309a3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102870
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102870
@@ -1,3 +1,3 @@
-'1781',200,81700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,81700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102874 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102874
index 0698b000f..aa7363180 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102874
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102874
@@ -1,9 +1,9 @@
-'1781',901,110200,,'',0,20500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93900,,'',0,31200,,'',0,26300,,'',0
-'2091',901,112200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'1781',1001,82400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
-'2086',1001,62100,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,1900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,8300,,'',0,1600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,82400,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'1781',1101,81100,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,1300,,'',0,1500,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,82400,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',901,93900,,'',0,31200,,'',0,26300,,'',0
+'2931',901,110200,,'',0,20500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,112200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',1001,62100,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,1900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,8300,,'',0,1600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,82400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
+'3091',1001,82400,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1101,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,81100,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,82400,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102875 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102875
index 2f9734319..19d6ac338 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102875
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102875
@@ -1,9 +1,9 @@
-'1781',200,82500,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
-'2091',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'1781',900,102700,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90200,,'',0,22000,,'',0,31500,,'',0
-'2091',900,104700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'1781',1100,80200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',200,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
+'2931',200,82500,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',900,90200,,'',0,22000,,'',0,31500,,'',0
+'2931',900,102700,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,104700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',1100,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102877 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102877
index 4dca935ce..8fbb8f96f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102877
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102877
@@ -1,3 +1,3 @@
-'1781',1000,81000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63100,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,63100,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102879 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102879
index c1820a906..03b83ba6e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102879
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102879
@@ -1,9 +1,9 @@
-'1781',200,82400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'1781',600,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,71400,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',600,90200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1801,75800,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63900,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'2091',1801,82800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',200,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',600,71400,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',600,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,90200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1801,63900,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'2931',1801,75800,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102880 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102880
index e0f89c5d7..8326f98e7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102880
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102880
@@ -1,6 +1,6 @@
-'1781',601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,61700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',601,80200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61200,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'2091',1800,73100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,61700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61200,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'2931',1800,73100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102881 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102881
index dd35f6928..2f7c56d29 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102881
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102881
@@ -1,3 +1,3 @@
-'1781',101,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',101,73700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',101,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'3091',101,73700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102882 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102882
index d6e2236fc..03a696ce2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102882
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102882
@@ -1,3 +1,3 @@
-'1781',901,110000,,'',0,20500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93700,,'',0,31200,,'',0,26300,,'',0
-'2091',901,112000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,93700,,'',0,31200,,'',0,26300,,'',0
+'2931',901,110000,,'',0,20500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,112000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102883 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102883
index b3de6448f..a3aea9036 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102883
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102883
@@ -1,3 +1,3 @@
-'1781',100,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
+'1798',100,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102884 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102884
index e1ebf6122..5b9bf82fc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102884
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102884
@@ -1,3 +1,3 @@
-'1781',900,102800,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90300,,'',0,22000,,'',0,31500,,'',0
-'2091',900,104800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90300,,'',0,22000,,'',0,31500,,'',0
+'2931',900,102800,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,104800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102885 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102885
index 0fea8e708..bffe7366a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102885
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102885
@@ -1,3 +1,3 @@
-'1781',200,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102886 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102886
index 9f9279b30..cfd5f74d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102886
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102886
@@ -1,3 +1,3 @@
-'1781',1100,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74200,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74200,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102887 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102887
index 146964c6b..b67dde8b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102887
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102887
@@ -1,3 +1,3 @@
-'1781',1101,80900,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,1400,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,82200,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1101,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80900,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,82200,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102888 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102888
index 294a21791..186e3b3d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102888
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102888
@@ -1,3 +1,3 @@
-'1781',200,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102889 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102889
index d2ef8498e..ce1e0e3d3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102889
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102889
@@ -1,3 +1,3 @@
-'1781',1001,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2086',1001,62000,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,8300,,'',0,1600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,82300,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1001,62000,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,8300,,'',0,1600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3091',1001,82300,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102890 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102890
index fb0c0ca2c..b72df3e38 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102890
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102890
@@ -1,3 +1,3 @@
-'1781',901,105900,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93600,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,93600,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105900,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,111900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102891 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102891
index 3a6826786..181d4c53d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102891
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102891
@@ -1,3 +1,3 @@
-'1781',900,102900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90400,,'',0,22000,,'',0,31500,,'',0
-'2091',900,104900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90400,,'',0,22000,,'',0,31500,,'',0
+'2931',900,102900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,104900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102892 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102892
index 4d655d03d..777e372dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102892
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102892
@@ -1,3 +1,3 @@
-'1781',100,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,82300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
+'1798',100,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,82300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102893 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102893
index 1a739e07b..36d4c8fdb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102893
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102893
@@ -1,6 +1,6 @@
-'1781',900,102900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90400,,'',0,22000,,'',0,31500,,'',0
-'2091',900,104900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'1781',1000,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63200,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',900,90400,,'',0,22000,,'',0,31500,,'',0
+'2931',900,102900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,104900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',1000,63200,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102894 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102894
index 19963f577..f41be4b38 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102894
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102894
@@ -1,6 +1,6 @@
-'1781',600,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,71200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',600,90100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1801,75700,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'2091',1801,82700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,71200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',600,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,90100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1801,63800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'2931',1801,75700,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102895 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102895
index 0fea8e708..bffe7366a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102895
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102895
@@ -1,3 +1,3 @@
-'1781',200,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102896 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102896
index e15883b96..304cd0331 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102896
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102896
@@ -1,3 +1,3 @@
-'1781',101,73800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',101,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',101,73800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'3091',101,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102897 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102897
index 85297d519..612f41e27 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102897
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102897
@@ -1,3 +1,3 @@
-'1781',1101,80800,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,5400,,'',0,1500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,82100,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1101,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80800,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,82100,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102898 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102898
index d788a1e12..462ac660f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102898
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102898
@@ -1,6 +1,6 @@
-'1781',601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,61800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',601,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61300,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'2091',1800,73200,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,61800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61300,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'2931',1800,73200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73200,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102899 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102899
index 52d75e939..3178d7819 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102899
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102899
@@ -1,3 +1,3 @@
-'1781',1100,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74300,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74300,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102900 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102900
index dac95d0dd..fd4a302aa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102900
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102900
@@ -1,6 +1,6 @@
-'1781',901,105800,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93500,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'1781',1001,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
-'2086',1001,61900,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,82200,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',901,93500,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105800,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,111800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',1001,61900,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
+'3091',1001,82200,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102901 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102901
index cd0639144..ed2d7b853 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102901
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102901
@@ -1,3 +1,3 @@
-'1781',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102902 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102902
index 8d7f34832..52727b0ac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102902
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102902
@@ -1,3 +1,3 @@
-'1781',1000,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63200,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,63200,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102903 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102903
index 0ef023e8d..00cf02e26 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102903
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102903
@@ -1,6 +1,6 @@
-'1781',600,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,71200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',600,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1801,75700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'2091',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,71200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',600,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1801,63800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'2931',1801,75700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102905 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102905
index eca6956ef..24f1e6c4d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102905
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102905
@@ -1,6 +1,6 @@
-'1781',600,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,71100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',600,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1801,75600,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'2091',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,71100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',600,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1801,63700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'2931',1801,75600,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102906 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102906
index f263c6f13..69f055ceb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102906
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102906
@@ -1,3 +1,3 @@
-'1781',1101,80700,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,5400,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,82000,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1101,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80700,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,82000,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102907 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102907
index 0eb4aad11..24632c73e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102907
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102907
@@ -1,3 +1,3 @@
-'1781',900,103000,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90500,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90500,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103000,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102908 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102908
index 9c0786325..4c1fc3e4f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102908
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102908
@@ -1,6 +1,6 @@
-'1781',601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,61800,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',601,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61300,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'2091',1800,73300,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,61800,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61300,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'2931',1800,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73300,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102909 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102909
index ed49c8618..a236e329d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102909
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102909
@@ -1,6 +1,6 @@
-'1781',901,105700,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93400,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'1781',1001,82100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2086',1001,61900,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,82200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',901,93400,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105700,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,111700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',1001,61900,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,82100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3091',1001,82200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102910 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102910
index de3aa0266..f395e27b1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102910
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102910
@@ -1,3 +1,3 @@
-'1781',100,82100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,82200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'1798',100,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,82100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,82200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102911 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102911
index cd0639144..ed2d7b853 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102911
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102911
@@ -1,3 +1,3 @@
-'1781',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102912 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102912
index 878848431..63aef51a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102912
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102912
@@ -1,3 +1,3 @@
-'1781',1100,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74400,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74400,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102913 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102913
index 76b04f0b3..41cfbfbcd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102913
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102913
@@ -1,3 +1,3 @@
-'1781',200,82200,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82200,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102914 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102914
index bb118b062..b73a9d729 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102914
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102914
@@ -1,6 +1,6 @@
-'1781',101,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2091',101,73900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',801,64700,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62700,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',101,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2931',101,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',101,73900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62700,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64700,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102915 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102915
index da3333745..fd31bff6d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102915
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102915
@@ -1,3 +1,3 @@
-'1781',1000,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63300,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,63300,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102916 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102916
index 8257452bc..7e02f9eae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102916
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102916
@@ -1,3 +1,3 @@
-'1781',900,103100,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90600,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105100,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90600,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103100,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105100,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102917 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102917
index 92125cff8..e1b74ba61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102917
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102917
@@ -1,3 +1,3 @@
-'1781',1101,80600,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,5400,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81900,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1101,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80600,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81900,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102918 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102918
index 25e5cad4e..4179a8594 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102918
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102918
@@ -1,3 +1,3 @@
-'1781',901,105600,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93300,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111600,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,93300,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105600,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,111600,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102919 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102919
index cd0639144..ed2d7b853 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102919
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102919
@@ -1,3 +1,3 @@
-'1781',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102920 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102920
index 89ad39195..a91032e74 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102920
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102920
@@ -1,3 +1,3 @@
-'1781',1100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74500,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74500,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102921 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102921
index 72d251b23..b69d0a6cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102921
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102921
@@ -1,3 +1,3 @@
-'1781',1001,82000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2086',1001,61800,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,82100,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1001,61800,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,82000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3091',1001,82100,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102922 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102922
index a9a759feb..97088247a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102922
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102922
@@ -1,3 +1,3 @@
-'1781',200,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102923 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102923
index 7e8e78fe8..184c7f013 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102923
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102923
@@ -1,3 +1,3 @@
-'1781',1000,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63300,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,63300,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102924 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102924
index 9720d0de8..75c302723 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102924
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102924
@@ -1,3 +1,3 @@
-'1781',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102925 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102925
index fadfb04ca..b4eebc691 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102925
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102925
@@ -1,3 +1,3 @@
-'1781',900,103200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90700,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90700,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102926 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102926
index da1a021fa..d00f92500 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102926
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102926
@@ -1,3 +1,3 @@
-'1781',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93200,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,93200,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102927 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102927
index 71479fa77..ed0eaacf4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102927
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102927
@@ -1,3 +1,3 @@
-'1781',1101,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,5400,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81800,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1101,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81800,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102928 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102928
index c79d072aa..b0bd59406 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102928
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102928
@@ -1,6 +1,6 @@
-'1781',101,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2091',101,73900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',801,64800,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62700,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',101,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2931',101,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'3091',101,73900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62700,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64800,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102929 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102929
index 1b507d52e..3f21eb4d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102929
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102929
@@ -1,3 +1,3 @@
-'1781',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70300,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70300,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102930 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102930
index 01c91ccd8..3e9fc78b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102930
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102930
@@ -1,6 +1,6 @@
-'1781',100,82000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,82100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'1781',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70100,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',100,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,82000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,82100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'1798',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'2931',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70100,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102931 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102931
index e6daf9300..bf724db07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102931
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102931
@@ -1,3 +1,3 @@
-'1781',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102932 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102932
index 9720d0de8..75c302723 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102932
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102932
@@ -1,3 +1,3 @@
-'1781',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102933 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102933
index 561748510..9e701e748 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102933
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102933
@@ -1,3 +1,3 @@
-'1781',1001,81900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2086',1001,61800,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,82000,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1001,61800,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,81900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3091',1001,82000,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102934 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102934
index 9720d0de8..75c302723 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102934
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102934
@@ -1,3 +1,3 @@
-'1781',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102935 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102935
index 486451697..3e61218c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102935
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102935
@@ -1,3 +1,3 @@
-'1781',200,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102936 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102936
index c9e0a11fe..1775b3a35 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102936
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102936
@@ -1,3 +1,3 @@
-'1781',1000,81300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63300,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,63300,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102937 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102937
index fadfb04ca..b4eebc691 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102937
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102937
@@ -1,3 +1,3 @@
-'1781',900,103200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90700,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90700,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102938 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102938
index e6daf9300..bf724db07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102938
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102938
@@ -1,3 +1,3 @@
-'1781',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102939 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102939
index 6772007a7..319fec9fc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102939
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102939
@@ -1,3 +1,3 @@
-'1781',501,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102941 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102941
index 752a54a3b..90898738d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102941
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102941
@@ -1,3 +1,3 @@
-'1781',800,70100,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70300,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,70100,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70300,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102942 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102942
index da1a021fa..d00f92500 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102942
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102942
@@ -1,3 +1,3 @@
-'1781',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93200,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,93200,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102944 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102944
index ebe226b87..0e9b7b3be 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102944
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102944
@@ -1,3 +1,3 @@
-'1781',1101,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81800,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1101,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81800,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102945 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102945
index 6077a7650..87e173da7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102945
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102945
@@ -1,3 +1,3 @@
-'1781',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102948 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102948
index da1a021fa..d00f92500 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102948
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102948
@@ -1,3 +1,3 @@
-'1781',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2086',901,93200,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,93200,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
+'3091',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102950 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102950
index 8e6781db3..ea39d5bfd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102950
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102950
@@ -1,3 +1,3 @@
-'1781',801,64400,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62300,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,64300,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,62300,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,64400,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64300,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102951 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102951
index 40607cb69..d1ede60b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102951
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102951
@@ -1,3 +1,3 @@
-'1781',900,103300,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90800,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105300,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90800,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103300,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105300,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102952 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102952
index 912ab3dd3..0eda09f32 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102952
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102952
@@ -1,6 +1,6 @@
-'1781',101,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2091',101,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',801,64900,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62800,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'1798',101,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2931',101,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',101,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62800,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64900,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102953 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102953
index 3eaf16b52..018a3fe31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102953
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102953
@@ -1,3 +1,3 @@
-'1781',1001,81800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2086',1001,61700,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,81900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1001,61700,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,81800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3091',1001,81900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102954 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102954
index 3f0185fd3..41a4967ac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102954
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102954
@@ -1,3 +1,3 @@
-'1781',800,70200,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70400,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,70200,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70400,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102955 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102955
deleted file mode 100644
index 677921694..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102955
+++ /dev/null
@@ -1 +0,0 @@
-'1781',1101,80400,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102956 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102956
index 4160c1573..615780e2b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102956
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102956
@@ -1,6 +1,6 @@
-'1781',100,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,82000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'1781',800,65800,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70000,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',100,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,82000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'1798',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'2931',800,65800,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70000,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102957 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102957
index 442a8d6fb..6d95b3d3b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102957
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102957
@@ -1,3 +1,3 @@
-'1781',1100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74700,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74700,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102958 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102958
index 449898596..d6aecc31d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102958
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102958
@@ -1,3 +1,3 @@
-'1781',501,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102959 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102959
index 673dc84d1..f6ca2f40a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102959
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102959
@@ -1,6 +1,6 @@
-'1781',600,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,75300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63400,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,82200,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,70700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,63400,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,75300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82200,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102960 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102960
index 45bd9609d..445746ee5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102960
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102960
@@ -1,6 +1,6 @@
-'1781',601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61600,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73500,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,62100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61600,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73500,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102961 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102961
index 59fb5d982..b1037f409 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102961
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102961
@@ -1,6 +1,6 @@
-'1781',101,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',801,64900,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62900,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'1798',101,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',101,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62900,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64900,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102962 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102962
index a8b54b3e1..516c8d2cc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102962
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102962
@@ -1,3 +1,3 @@
-'1781',900,103400,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90900,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90900,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103400,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102963 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102963
index cfdabfed6..c68d39c97 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102963
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102963
@@ -1,3 +1,3 @@
-'1781',901,105300,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2086',901,93000,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111300,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,93000,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105300,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
+'3091',901,111300,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102964 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102964
index 5b7334997..12d5414ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102964
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102964
@@ -1,3 +1,3 @@
-'1781',1001,81700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,61600,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,81900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1001,61600,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,81700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,81900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102965 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102965
index 51da8fb7e..9eff02014 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102965
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102965
@@ -1,6 +1,6 @@
-'1781',600,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70600,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63300,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,70600,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,63300,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102966 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102966
index c43ccdcb0..b2202eaf6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102966
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102966
@@ -1,6 +1,6 @@
-'1781',601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61600,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73600,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,62100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61600,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73600,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102968 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102968
index 6f3be9d42..6467bfa90 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102968
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102968
@@ -1,6 +1,6 @@
-'1781',600,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63300,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,70500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,63300,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102969 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102969
index 0bb849e67..114a6b567 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102969
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102969
@@ -1,3 +1,3 @@
-'1781',901,105400,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2086',901,93100,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,93100,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105400,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
+'3091',901,111400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102970 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102970
index d3ca6878b..4048861ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102970
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102970
@@ -1,3 +1,3 @@
-'1781',1100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1100,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102971 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102971
index a8b54b3e1..516c8d2cc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102971
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102971
@@ -1,3 +1,3 @@
-'1781',900,103400,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,90900,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,90900,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103400,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102972 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102972
index d217c8092..608f39ba2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102972
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102972
@@ -1,3 +1,3 @@
-'1781',1101,80300,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,5400,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81600,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1101,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80300,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81600,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102973 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102973
index d560ca0cb..8b261c350 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102973
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102973
@@ -1,3 +1,3 @@
-'1781',801,64300,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62300,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64300,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,62300,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64300,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64300,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102974 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102974
index 0fb014f51..73c3aaea3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102974
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102974
@@ -1,3 +1,3 @@
-'1781',1000,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63500,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,63500,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102975 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102975
index 90d2bcea4..17864cc49 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102975
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102975
@@ -1,3 +1,3 @@
-'1781',1001,81600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,61600,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,81800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1001,61600,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,81600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,81800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102976 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102976
index c17b57fb2..140efd1f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102976
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102976
@@ -1,6 +1,6 @@
-'1781',101,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2091',101,74200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',801,65000,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62900,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'1798',101,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2931',101,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',101,74200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62900,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,65000,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102977 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102977
index e69371412..d877b5265 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102977
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102977
@@ -1,6 +1,6 @@
-'1781',601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62200,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,80700,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61700,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73600,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,62200,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80700,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61700,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73600,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102978 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102978
index 3310fa2ba..9ef0f6517 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102978
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102978
@@ -1,3 +1,3 @@
-'1781',501,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102979 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102979
index 760f9d4d5..5af86adc5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102979
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102979
@@ -1,6 +1,6 @@
-'1781',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70500,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'1781',1100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70500,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',1100,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102982 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102982
index f05a76747..2a9c7e705 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102982
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102982
@@ -1,6 +1,6 @@
-'1781',101,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2086',101,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2091',101,74200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',801,65000,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,63000,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,65000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'1798',101,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'2931',101,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
+'3091',101,74200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,63000,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,65000,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,65000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102984 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102984
index 6a971a5dd..31b00a9e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102984
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102984
@@ -1,6 +1,6 @@
-'1781',100,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'1781',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',100,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'1798',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'2931',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102985 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102985
index 31164de53..8723b2229 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102985
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102985
@@ -1,3 +1,3 @@
-'1781',9700,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2086',9700,63800,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,1100,,'',0,5000,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
-'2091',9700,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'1798',9700,63800,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,900,,'',0,5100,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
+'2931',9700,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3091',9700,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102986 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102986
index 8dfa90939..6349823b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102986
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102986
@@ -1,6 +1,6 @@
-'1781',801,64300,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62200,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,64200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'1781',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5400,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81500,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62200,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,64300,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81500,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102987 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102987
index ad82037b4..68443e4ea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102987
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102987
@@ -1,6 +1,6 @@
-'1781',600,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70400,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,75100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63200,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,82000,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,70400,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,63200,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,75100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82000,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102988 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102988
index 36e17e65b..aa48a5d0c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102988
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102988
@@ -1,6 +1,6 @@
-'1781',601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62300,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61800,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,62300,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61800,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102989 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102989
index 91f1a4e66..4b57f41d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102989
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102989
@@ -1,3 +1,3 @@
-'1781',9701,70000,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2086',9701,61200,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'2091',9701,75100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'1798',9701,61200,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'2931',9701,70000,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
+'3091',9701,75100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102990 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102990
index f6f0830f0..91e2caff7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102990
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102990
@@ -1,6 +1,6 @@
-'1781',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70500,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'1781',1100,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,74900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70500,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',1100,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,74900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102991 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102991
index b51dad306..9998a7e4b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102991
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102991
@@ -1,3 +1,3 @@
-'1781',1001,81500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,61500,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,81700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1001,61500,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,81500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,81700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102993 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102993
index cfada61ee..583cebd67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102993
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102993
@@ -1,3 +1,3 @@
-'1781',901,105100,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2086',901,92800,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111100,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,92800,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105100,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
+'3091',901,111100,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102994 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102994
index bd22b3c3e..af0f185fc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102994
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102994
@@ -1,3 +1,3 @@
-'1781',900,103700,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,91200,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,91200,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103700,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102995 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102995
index f8056a324..5bab10137 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102995
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102995
@@ -1,6 +1,6 @@
-'1781',100,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,81800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'1781',800,65600,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,65900,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',100,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,81800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'1798',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,65600,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,65900,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102996 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102996
index bf8eaac8d..27cf624c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102996
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102996
@@ -1,6 +1,6 @@
-'1781',801,64200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62200,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,64200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'1781',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62200,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,64200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102997 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102997
deleted file mode 100644
index f0586f191..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102997
+++ /dev/null
@@ -1 +0,0 @@
-'1781',100,81300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102998 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102998
index b5840e563..2633b59f6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102998
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102998
@@ -1,3 +1,3 @@
-'1781',800,64700,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72400,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64700,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72400,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102999 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102999
index 54b0d2d08..36dc86fc9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102999
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_102999
@@ -1,3 +1,3 @@
-'1781',101,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,74800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',101,74800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103000
index 2426cd773..ae7bf0b6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103000
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103000
@@ -1,3 +1,3 @@
-'1781',1901,75200,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72800,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,75300,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1901,72800,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,75200,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75300,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103002
index 0450082ed..f407984bb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103002
@@ -1,3 +1,3 @@
-'1781',1000,82800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,64700,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,64700,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,82800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103003 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103003
index 96d4719bb..95aad3251 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103003
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103003
@@ -1,3 +1,3 @@
-'1781',1900,73300,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,70800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1900,70800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73300,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103004 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103004
index b1b6ac1e1..043320fef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103004
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103004
@@ -1,6 +1,6 @@
-'1781',800,70400,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70600,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'1781',1100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,70400,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70600,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',1100,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103005
index 3a705a0b1..4da35867b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103005
@@ -1,6 +1,6 @@
-'1781',600,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70300,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85300,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,75000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63100,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,81900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,70300,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85300,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,63100,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,75000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,81900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103006
index 5dc3ff545..be7928488 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103006
@@ -1,3 +1,3 @@
-'1781',501,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,5700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103007
index 828a74176..d0fd4098b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103007
@@ -1,3 +1,3 @@
-'1781',1901,75100,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,75200,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1901,72700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,75100,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75200,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103008
index 31d7dd92f..699dc7092 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103008
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103008
@@ -1,3 +1,3 @@
-'1781',1900,73400,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1900,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73400,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103009
index f617dbb0a..030fbb3c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103009
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103009
@@ -1,6 +1,6 @@
-'1781',1000,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63700,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2800,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'1781',1901,75400,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,73000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,75500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1000,63700,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2800,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1901,73000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,75400,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103010
index 20381ccbe..f8480282a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103010
@@ -1,6 +1,6 @@
-'1781',601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62300,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61800,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,62300,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61800,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103011 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103011
index bfe99078f..bc5d15769 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103011
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103011
@@ -1,3 +1,3 @@
-'1781',900,103900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,91400,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,91400,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103012
index 474a3cc9b..67d44f21b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103012
@@ -1,3 +1,3 @@
-'1781',901,105000,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2086',901,92700,,'',0,31200,,'',0,26300,,'',0
-'2091',901,111000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,92700,,'',0,31200,,'',0,26300,,'',0
+'2931',901,105000,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
+'3091',901,111000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103013
index 1f2d0cbb9..960fd1d2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103013
@@ -1,3 +1,3 @@
-'1781',1901,75100,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72700,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,75200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1901,72700,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,75100,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103014
index 0a235d7b5..876c458df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103014
@@ -1,6 +1,6 @@
-'1781',801,64200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62100,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'1781',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62100,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103015 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103015
index 2a0de7565..e3085bab6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103015
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103015
@@ -1,6 +1,6 @@
-'1781',1001,81200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,61300,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,81500,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'1781',1900,73200,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1001,61300,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,81200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,81500,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1900,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73200,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103016
index b72bd8a32..b4b77ba6f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103016
@@ -1,7 +1,5 @@
-'1781',100,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,81300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2086',400,153000,,'',0
-'2086',401,84800,4,'',0
-'2086',1200,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'2086',1201,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
+'1798',100,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,81300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1798',1200,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'1798',1201,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103018
index bfe99078f..bc5d15769 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103018
@@ -1,3 +1,3 @@
-'1781',900,103900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,91400,,'',0,22000,,'',0,31500,,'',0
-'2091',900,105900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',900,91400,,'',0,22000,,'',0,31500,,'',0
+'2931',900,103900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,105900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103020 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103020
index ebf9a2331..3eeed14dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103020
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103020
@@ -1,10 +1,10 @@
-'1781',100,81400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'1781',101,74400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',100,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2086',101,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',100,81500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2091',101,74400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',801,65200,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,63200,,'',0,8600,,'',0,2700,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,65200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'2086',1200,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'1798',100,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',101,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',100,81400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'2931',101,74400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',100,81500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3091',101,74400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,63200,,'',0,8600,,'',0,2700,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,65200,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,65200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'1798',1200,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103021
index 064ea6178..b853ce195 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103021
@@ -1 +1 @@
-'2086',1501,80000,,'',0,2300,4,'',0,70700,,'',0,2400,4,'',0
+'1798',1501,80000,,'',0,2300,4,'',0,70700,,'',0,2400,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103022 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103022
index f9f5cf402..b231826a2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103022
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103022
@@ -1,6 +1,6 @@
-'1781',1601,80100,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7500,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7700,,'',0,2700,4,'',0
-'2086',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'2091',1601,90000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'1781',1700,83100,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8400,,'',0,1800,4,'',0
-'2086',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,800,,'',0,1700,4,'',0,4900,4,'',0,100,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,1000,,'',0,1500,4,'',0,500,,'',0,500,4,'',0,2000,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
-'2091',1700,83000,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0
+'1798',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
+'2931',1601,80100,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7500,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7700,,'',0,2700,4,'',0
+'3091',1601,90000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
+'1798',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,2500,4,'',0,5000,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2500,4,'',0,500,,'',0,2500,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
+'2931',1700,83100,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8400,,'',0,1800,4,'',0
+'3091',1700,83000,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103023
index 05ab06b71..c1780791c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103023
@@ -1,12 +1,12 @@
-'1781',100,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'1781',101,75800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,5600,4,'',0
-'2086',100,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',101,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,700,4,'',0,800,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
-'2091',100,80500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
-'1781',500,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',501,81200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
-'2086',500,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',501,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,1700,4,'',0,1300,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2091',500,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,82700,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
+'1798',100,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
+'2931',100,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
+'2931',101,75800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,5600,4,'',0
+'3091',100,80500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',101,75800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
+'1798',500,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',501,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'2931',500,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,81200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
+'3091',500,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',501,82700,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103024
index 7c5d4b3ed..b642dd184 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103024
@@ -1,3 +1,3 @@
-'1781',901,104900,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2086',901,92600,,'',0,31200,,'',0,26300,,'',0
-'2091',901,110900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',901,92600,,'',0,31200,,'',0,26300,,'',0
+'2931',901,104900,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
+'3091',901,110900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103025
index 04a964006..11d229f51 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103025
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103025
@@ -1,3 +1,3 @@
-'1781',101,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,74900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',101,74900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103026 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103026
index 9403985e6..d1c6a4c3d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103026
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103026
@@ -1,3 +1,3 @@
-'1781',1900,73500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1900,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103027 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103027
index 7916110b9..1f08af235 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103027
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103027
@@ -1 +1 @@
-'2086',2900,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2900,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103028 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103028
index 20a49e90d..65f97e503 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103028
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103028
@@ -1,6 +1,6 @@
-'1781',100,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'1781',101,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',100,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,800,,'',0,700,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2086',101,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,4,'',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',100,81600,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2091',101,74500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',100,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',101,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',100,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'2931',101,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',100,81600,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3091',101,74500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103029 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103029
index 59dd86126..67193f6c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103029
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103029
@@ -1,6 +1,6 @@
-'1781',601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,80500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73400,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61500,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73400,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,62000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61500,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73400,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73400,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103030 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103030
index af56e954b..6923f2505 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103030
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103030
@@ -1,9 +1,7 @@
-'2086',401,84300,,'',0
-'1781',800,65500,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'1781',801,65300,4,'',0,10100,4,'',0,8100,4,'',0,7600,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,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,7000,4,'',0,3300,4,'',0,7400,4,'',0,2800,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,10000,4,'',0,11000,4,'',0,11000,4,'',0
-'2086',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2086',801,63300,4,'',0,8600,4,'',0,2700,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1500,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1400,4,'',0,5300,4,'',0,1200,4,'',0,1800,4,'',0,2000,4,'',0,6000,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
-'2091',800,65800,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'2091',801,65300,4,'',0,10000,4,'',0,8500,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,9000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3400,4,'',0,7500,4,'',0,3400,4,'',0,8500,4,'',0,8500,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0
-'2086',1201,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'2086',8801,152600,,'',0
+'1798',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'1798',801,63300,4,'',0,8600,4,'',0,2700,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1500,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1400,4,'',0,5300,4,'',0,1200,4,'',0,1800,4,'',0,2000,4,'',0,6000,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
+'2931',800,65500,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'2931',801,65300,4,'',0,10100,4,'',0,8100,4,'',0,7600,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,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,7000,4,'',0,3300,4,'',0,7400,4,'',0,2800,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,10000,4,'',0,11000,4,'',0,11000,4,'',0
+'3091',800,65800,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'3091',801,65300,4,'',0,10000,4,'',0,8500,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,9000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3400,4,'',0,7500,4,'',0,3400,4,'',0,8500,4,'',0,8500,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0
+'1798',1201,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103031 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103031
index 87ae415df..76d86e3c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103031
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103031
@@ -1,6 +1,6 @@
-'1781',600,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70900,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,75400,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63500,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,82400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',600,70900,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,63500,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,75400,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103033
index 3134d5d76..ee56a785b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103033
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103033
@@ -1,9 +1,9 @@
-'1781',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'2091',800,70700,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'1781',900,104000,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,91500,,'',0,22000,,'',0,31500,,'',0
-'2091',900,110000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'1781',1100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'2931',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70700,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',900,91500,,'',0,22000,,'',0,31500,,'',0
+'2931',900,104000,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,110000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',1100,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103035
index 77af9a57b..3abb4d8cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103035
@@ -1,3 +1,3 @@
-'1781',1901,75000,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,75100,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1901,72600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,75000,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75100,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103036 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103036
index 3b56ac169..cab404071 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103036
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103036
@@ -1,6 +1,6 @@
-'1781',1000,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63800,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2700,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'1781',1901,75400,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,73000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,75500,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1000,63800,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2700,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1901,73000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,75400,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75500,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103038
index 7f3d0f90e..6a73b4361 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103038
@@ -1 +1 @@
-'2086',1200,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'1798',1200,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103039
index 7535e6d7c..bcfc33208 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103039
@@ -1 +1 @@
-'2086',1201,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
+'1798',1201,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103040
deleted file mode 100644
index e8389773d..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103040
+++ /dev/null
@@ -1,2 +0,0 @@
-'2086',401,84500,,'',0
-'2086',1201,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103041
index de45ea2d6..3f07f4e8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103041
@@ -1,12 +1,12 @@
-'1781',300,73100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75600,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'1781',601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62400,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61900,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'1781',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',300,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,73100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75600,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',601,62400,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61900,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',1900,71100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103042
index 69d16c453..cfa82837a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103042
@@ -1,2 +1 @@
-'2086',1201,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2086',8801,152200,,'',0
+'1798',1201,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103043
index fef137614..060e2767a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103043
@@ -1 +1 @@
-'2086',2900,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'1798',2900,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103044
index 36fa9df90..725f1d8c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103044
@@ -1,3 +1,3 @@
-'1781',100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1798',100,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103045
index aca9fdbaa..993269dd6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103045
@@ -1 +1 @@
-'2086',1200,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'1798',1200,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103046
index 0c626e15f..10ff0619b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103046
@@ -1,6 +1,6 @@
-'1781',1001,81100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,61300,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'1781',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1001,61300,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,81100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1900,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103047
index 7411e6d99..d941efe43 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103047
@@ -1 +1 @@
-'2086',2900,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2900,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103048
index a26713a2f..ca8edcf04 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103048
@@ -1,9 +1,9 @@
-'1781',600,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85200,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,74900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63000,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,81800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'1781',1901,74900,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,75000,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',600,70200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85200,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,63000,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,74900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,81800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',1901,72500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,74900,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75000,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103049
index f696c29a5..fad1e1ad6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103049
@@ -1,3 +1,3 @@
-'1781',9701,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2086',9701,60800,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'2091',9701,74700,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'1798',9701,60800,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'2931',9701,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
+'3091',9701,74700,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103050
index d4258be09..38d3bfc36 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103050
@@ -1,6 +1,6 @@
-'1781',1000,81900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63900,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2600,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'1781',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,73100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'2091',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1000,63900,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2600,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1901,73100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'2931',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103051 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103051
index de45ea2d6..3f07f4e8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103051
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103051
@@ -1,12 +1,12 @@
-'1781',300,73100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75600,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'1781',601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62400,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61900,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'1781',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',300,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,73100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75600,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',601,62400,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61900,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',1900,71100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103052 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103052
index 380630d3a..ce93dc242 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103052
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103052
@@ -1,3 +1,3 @@
-'1781',300,73000,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75500,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,73000,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75500,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103053
index 8672062d5..ccba5c6f6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103053
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103053
@@ -1,3 +1,3 @@
-'1781',300,73400,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75900,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,73400,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75900,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103054 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103054
index d586fb282..7abf4190a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103054
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103054
@@ -1,3 +1 @@
-'2086',401,84100,,'',0
-'2086',1201,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
-'2086',8801,152000,,'',0
+'1798',1201,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103056
index b3f294cd7..077d010ee 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103056
@@ -1,9 +1,9 @@
-'1781',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'2091',800,70700,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'1781',900,104200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2086',900,91700,,'',0,22000,,'',0,31500,,'',0
-'2091',900,110200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'1781',1100,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,75100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'2931',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70700,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',900,91700,,'',0,22000,,'',0,31500,,'',0
+'2931',900,104200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
+'3091',900,110200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',1100,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,75100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103057
index d565fe724..751a38ab1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103057
@@ -1,9 +1,9 @@
-'1781',801,64000,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62000,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,64000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'1781',901,104800,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2086',901,92500,,'',0,31200,,'',0,26300,,'',0
-'2091',901,110800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'1781',1101,80000,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2086',1101,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5400,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81300,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,62000,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,64000,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',901,92500,,'',0,31200,,'',0,26300,,'',0
+'2931',901,104800,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
+'3091',901,110800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',1101,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80000,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81300,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103058
index 58da18eb0..e19e2b7fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103058
@@ -1,6 +1,6 @@
-'1781',1000,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63900,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2700,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'1781',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,73100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
-'2091',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',1000,63900,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2700,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1901,73100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
+'2931',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103059
index 64edd44d6..89c79b312 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103059
@@ -1,2 +1 @@
-'2086',400,153600,,'',0
-'2086',1200,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
+'1798',1200,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103060 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103060
index 0a2007846..359b2e417 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103060
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103060
@@ -1,6 +1,6 @@
-'1781',1001,81000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,61200,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2091',1001,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'1781',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1001,61200,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
+'2931',1001,81000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1900,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103061
index 1d5a6e06e..2a14e44f8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103061
@@ -1,3 +1,3 @@
-'1781',9701,65800,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2086',9701,61000,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'2091',9701,74900,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'1798',9701,61000,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'2931',9701,65800,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
+'3091',9701,74900,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103062
index 4d51c76b1..6de72f3d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103062
@@ -1,3 +1,3 @@
-'1781',101,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'3091',101,75100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103063
index 8331ebff8..74c17a979 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103063
@@ -1 +1 @@
-'2086',2900,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'1798',2900,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103065 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103065
index 65221009a..1f023e555 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103065
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103065
@@ -1,3 +1,3 @@
-'1781',2000,75500,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,74900,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75500,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,74900,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103066 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103066
index 122c0670a..f1a8ae203 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103066
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103066
@@ -1 +1 @@
-'2086',2900,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'1798',2900,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103067
index 0fd0dfb03..87eecedeb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103067
@@ -1,3 +1,3 @@
-'1781',9700,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2086',9700,54400,,'',0,7700,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,1100,,'',0,5000,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
-'2091',9700,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'1798',9700,54400,,'',0,7700,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,4900,,'',0,1100,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
+'2931',9700,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3091',9700,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103069
index 2dd7b94fe..3f51c3111 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103069
@@ -1,9 +1,9 @@
-'1781',801,63900,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,61900,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,63900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'1781',900,104500,4,'',0,28500,4,'',0,29500,4,'',0,17500,4,'',0
-'1781',901,104600,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2086',900,92000,4,'',0,22000,4,'',0,31500,4,'',0
-'2086',901,92300,,'',0,31200,,'',0,22300,,'',0
-'2091',900,110500,4,'',0,20000,4,'',0,10000,4,'',0,20000,4,'',0
-'2091',901,110600,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
+'1798',801,61900,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,63900,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,63900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',900,92000,4,'',0,22000,4,'',0,31500,4,'',0
+'1798',901,92300,,'',0,31200,,'',0,22300,,'',0
+'2931',900,104500,4,'',0,28500,4,'',0,29500,4,'',0,17500,4,'',0
+'2931',901,104600,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
+'3091',900,110500,4,'',0,20000,4,'',0,10000,4,'',0,20000,4,'',0
+'3091',901,110600,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103070
index f2849dedb..d3cbacf9a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103070
@@ -1,3 +1,3 @@
-'1781',1001,80800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,61100,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8300,4,'',0
-'2091',1001,81100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
+'1798',1001,61100,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8300,4,'',0
+'2931',1001,80800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,81100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103071
index 4d12f145b..82ba8ee39 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103071
@@ -1,3 +1,3 @@
-'1781',1101,75900,,'',0,7500,4,'',0,500,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,900,4,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,600,4,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,4,'',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,600,4,'',0,6400,,'',0,2900,,'',0,3000,,'',0,15500,,'',0,3900,4,'',0,6600,,'',0,10000,,'',0,10000,,'',0,10800,4,'',0
-'2086',1101,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81200,,'',0,4200,4,'',0,15000,,'',0,10000,,'',0,1400,4,'',0,8600,,'',0,9900,4,'',0,100,,'',0,10000,,'',0,4400,4,'',0,5600,,'',0,10600,,'',0,9400,,'',0,900,4,'',0,9100,,'',0,10000,,'',0,3400,4,'',0,6600,,'',0,10000,,'',0,11800,4,'',0
+'1798',1101,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75900,,'',0,7500,4,'',0,500,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,900,4,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,600,4,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,4,'',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,600,4,'',0,6400,,'',0,2900,,'',0,3000,,'',0,15500,,'',0,3900,4,'',0,6600,,'',0,10000,,'',0,10000,,'',0,10800,4,'',0
+'3091',1101,81200,,'',0,4200,4,'',0,15000,,'',0,10000,,'',0,1400,4,'',0,8600,,'',0,9900,4,'',0,100,,'',0,10000,,'',0,4400,4,'',0,5600,,'',0,10600,,'',0,9400,,'',0,900,4,'',0,9100,,'',0,10000,,'',0,3400,4,'',0,6600,,'',0,10000,,'',0,11800,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103072
index 22d523947..0465b1d47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103072
@@ -1,6 +1,6 @@
-'1781',1200,92600,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,4000,,'',0,8000,,'',0,46500,,'',0
-'1781',1201,95800,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,8000,4,'',0,42500,4,'',0
-'2086',1200,105500,,'',0,95000,,'',0
-'2086',1201,112700,4,'',0
-'2091',1200,85900,,'',0,7700,,'',0,18900,,'',0,18700,,'',0,14300,,'',0,8000,,'',0,18800,,'',0,8100,,'',0
-'2091',1201,93100,4,'',0,7700,4,'',0,14900,4,'',0,18700,4,'',0,18300,4,'',0,8000,4,'',0,14800,4,'',0,8100,4,'',0
+'1798',1200,105500,,'',0,95000,,'',0
+'1798',1201,112700,4,'',0
+'2931',1200,92600,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,4000,,'',0,8000,,'',0,46500,,'',0
+'2931',1201,95800,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,8000,4,'',0,42500,4,'',0
+'3091',1200,85900,,'',0,7700,,'',0,18900,,'',0,18700,,'',0,14300,,'',0,8000,,'',0,18800,,'',0,8100,,'',0
+'3091',1201,93100,4,'',0,7700,4,'',0,14900,4,'',0,18700,4,'',0,18300,4,'',0,8000,4,'',0,14800,4,'',0,8100,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103073 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103073
index 7921c3e67..b9f300c9e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103073
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103073
@@ -1,3 +1,3 @@
-'1781',1000,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,64300,,'',0,5900,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,64300,,'',0,5900,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103075 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103075
index fa7602312..f27b5a802 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103075
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103075
@@ -1,3 +1,3 @@
-'1781',800,63300,,'',0,7600,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'2091',800,71100,,'',0,10200,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'2931',800,63300,,'',0,7600,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,71100,,'',0,10200,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103076 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103076
index 755bc4a94..61dc91d6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103076
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103076
@@ -1,6 +1,6 @@
-'1781',300,72100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
-'2091',300,74600,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'1781',1000,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,64400,,'',0,5900,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',300,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
+'2931',300,72100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,74600,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',1000,64400,,'',0,5900,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103077
index 36489b174..05c5ff4d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103077
@@ -1,5 +1,5 @@
-'1781',1100,81600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,75500,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'2086',1400,122600,4,'',0,77400,4,'',0
-'2086',1401,113500,,'',0,78000,,'',0
+'1798',1100,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,81600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,75500,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1400,122600,4,'',0,77400,4,'',0
+'1798',1401,113500,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103078
index be3b5aae5..0dffb6753 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103078
@@ -1,2 +1 @@
-'2086',2900,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'2086',8801,155500,,'',0
+'1798',2900,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103079
index 1b3898f49..50b068467 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103079
@@ -1,9 +1,9 @@
-'1781',300,72000,,'',0,2300,4,'',0,9700,,'',0,6300,4,'',0,13600,,'',0,6300,4,'',0,23800,,'',0,6300,4,'',0,33700,,'',0,6300,4,'',0,12700,,'',0,2300,4,'',0,18700,,'',0,6300,4,'',0
-'2086',300,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,14700,,'',0,6300,4,'',0,9200,,'',0,2200,4,'',0
-'2091',300,74500,,'',0,6300,4,'',0,19200,,'',0,2300,4,'',0,12700,,'',0,6300,4,'',0,23700,,'',0,6300,4,'',0,13700,,'',0,6300,4,'',0,29700,,'',0,2300,4,'',0,7700,,'',0,2300,4,'',0
-'1781',1900,73000,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'1781',1901,75700,4,'',0,7500,4,'',0,7500,4,'',0,3600,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,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,1600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
-'2086',1900,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2086',1901,73300,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
-'2091',1900,80000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2091',1901,75800,4,'',0,14300,4,'',0,11600,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,11100,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
+'1798',300,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,14700,,'',0,6300,4,'',0,9200,,'',0,2200,4,'',0
+'2931',300,72000,,'',0,2300,4,'',0,9700,,'',0,6300,4,'',0,13600,,'',0,6300,4,'',0,23800,,'',0,6300,4,'',0,33700,,'',0,6300,4,'',0,12700,,'',0,2300,4,'',0,18700,,'',0,6300,4,'',0
+'3091',300,74500,,'',0,6300,4,'',0,19200,,'',0,2300,4,'',0,12700,,'',0,6300,4,'',0,23700,,'',0,6300,4,'',0,13700,,'',0,6300,4,'',0,29700,,'',0,2300,4,'',0,7700,,'',0,2300,4,'',0
+'1798',1900,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'1798',1901,73300,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
+'2931',1900,73000,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'2931',1901,75700,4,'',0,7500,4,'',0,7500,4,'',0,3600,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,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,1600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
+'3091',1900,80000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,75800,4,'',0,14300,4,'',0,11600,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,11100,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103080 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103080
index 2d1cd95e3..7b25e97fa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103080
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103080
@@ -1,9 +1,9 @@
-'1781',600,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,74800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,62900,,'',0,10700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,81700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'1781',1901,74800,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72400,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,74900,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',600,70100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,62900,,'',0,10700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,74800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,81700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',1901,72400,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,74800,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,74900,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103081
index 76165b42a..c04516c6b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103081
@@ -1,5 +1,5 @@
-'1781',1000,84600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',1001,251100,0,'North Rutland',0
-'2086',1000,54700,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'2091',1001,232100,0,'Rutland Exch',0
+'1798',1000,54700,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',1001,251100,0,'Rutland Exch',0
+'3091',1000,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'3091',1001,232100,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103082
index 5699b1c8d..f50825d4f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103082
@@ -1,3 +1,3 @@
-'1781',300,73500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80000,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,73500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,80000,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103083 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103083
index cdb9855e4..fe5a6c81f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103083
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103083
@@ -1,3 +1,3 @@
-'1781',300,72900,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75400,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,72900,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75400,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103084 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103084
index 83efc1b09..283f72c1e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103084
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103084
@@ -1,2 +1 @@
-'2086',401,84000,,'',0
-'2086',1201,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'1798',1201,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103086 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103086
index b1c04e2a8..41b06844e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103086
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103086
@@ -1,4 +1,4 @@
-'1781',1100,81700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,75600,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'2086',1401,113600,,'',0,78000,,'',0
+'1798',1100,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,81700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,75600,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1401,113600,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103087 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103087
index 448487259..81b8c01ad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103087
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103087
@@ -1,9 +1,9 @@
-'1781',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62500,,'',0,11100,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,62000,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,73900,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'1781',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'2091',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',601,62500,,'',0,11100,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,62000,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,73900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73900,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',1900,71300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'2931',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103088
index 1569155ba..87ac07e5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103088
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103088
@@ -1,2 +1 @@
-'2086',400,153700,,'',0
-'2086',1200,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
+'1798',1200,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103089 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103089
index 95b532b15..6743e5da6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103089
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103089
@@ -1,3 +1,3 @@
-'1781',300,72800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75300,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,72800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75300,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103090 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103090
index 5b09895ab..3208a4ee0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103090
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103090
@@ -1,3 +1,3 @@
-'1781',300,73200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75700,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,73200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75700,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103091 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103091
index 0104312a7..95c5086de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103091
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103091
@@ -1,3 +1,3 @@
-'1781',100,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,81100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1798',100,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,81100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103092
index fc1324d59..c9c500c0a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103092
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103092
@@ -1,6 +1,6 @@
-'1781',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'2086',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'1781',1001,80400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,60700,,'',0,3200,,'',0,1800,,'',0,6500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,3000,,'',0,7300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4200,,'',0,5600,,'',0,1400,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,80700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,13000,,'',0
+'1798',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
+'3091',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',1001,60700,,'',0,3200,,'',0,1800,,'',0,6500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,3000,,'',0,7300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4200,,'',0,5600,,'',0,1400,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,80400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,80700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103093
index 73f734e67..d5ed18f18 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103093
@@ -1,3 +1,3 @@
-'1781',101,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'3091',101,75200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103094 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103094
index 43cc2afdc..a824fea30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103094
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103094
@@ -1 +1 @@
-'2086',2900,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103095 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103095
index 73d5108df..d573de88e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103095
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103095
@@ -1,3 +1,3 @@
-'1781',300,73600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80100,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,73600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,80100,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103096 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103096
index 68bc06b6d..772573349 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103096
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103096
@@ -1,3 +1,3 @@
-'1781',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'2086',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
+'3091',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103097 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103097
index 127771876..af040c80a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103097
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103097
@@ -1,7 +1,7 @@
-'1781',801,63500,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,61600,,'',0,8500,,'',0,2500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'2091',801,63500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1101,75600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80900,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
-'2086',1400,122500,,'',0,73400,,'',0
+'1798',801,61600,,'',0,8500,,'',0,2500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'2931',801,63500,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,63500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1101,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80900,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
+'1798',1400,122500,,'',0,73400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103098 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103098
index 06c88a89b..b2c06e773 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103098
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103098
@@ -1,3 +1,3 @@
-'1781',300,73300,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75800,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,73300,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75800,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103099 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103099
index b0dc44118..b3b155baf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103099
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103099
@@ -1,3 +1,3 @@
-'1781',300,72200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
-'2091',300,74700,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
+'2931',300,72200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,74700,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103101 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103101
index 68bc06b6d..772573349 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103101
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103101
@@ -1,3 +1,3 @@
-'1781',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'2086',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
+'3091',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103102 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103102
index b0dc44118..b3b155baf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103102
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103102
@@ -1,3 +1,3 @@
-'1781',300,72200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
-'2091',300,74700,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
+'2931',300,72200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,74700,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103103 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103103
index b7503e238..e982ecc31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103103
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103103
@@ -1,9 +1,9 @@
-'1781',600,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,70000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2091',600,85000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,74700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,62800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2091',1801,81600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'1781',1901,74700,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,74800,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',600,70000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
+'2931',600,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,62800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
+'2931',1801,74700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,81600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',1901,72300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,74700,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,74800,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103104 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103104
index 12ee5ecfc..1eb51b99c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103104
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103104
@@ -1,9 +1,9 @@
-'1781',600,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65800,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,74500,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1801,62600,,'',0,10700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'2091',1801,81400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'1781',1901,74400,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,74500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',600,65800,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,62600,,'',0,10700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'2931',1801,74500,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1801,81400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1901,72000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,74400,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,74500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103105 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103105
index 1235cec5b..a2bde382e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103105
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103105
@@ -1,3 +1,3 @@
-'1781',1000,82400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,64400,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,64400,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,82400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103107 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103107
index 16edc75ed..e7b64eef2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103107
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103107
@@ -1,9 +1,9 @@
-'1781',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62600,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,74000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,62100,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,74000,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'1781',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',601,62600,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,62100,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,74000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,74000,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',1900,71300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103108 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103108
index 34bb10597..615280b87 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103108
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103108
@@ -1,3 +1,3 @@
-'1781',801,63400,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,61500,,'',0,8500,,'',0,2500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,63400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,61500,,'',0,8500,,'',0,2500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,63400,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,63400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103110 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103110
index 43cc2afdc..a824fea30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103110
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103110
@@ -1 +1 @@
-'2086',2900,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103111 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103111
index 95ac448b5..5c4bf07e5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103111
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103111
@@ -1,3 +1,3 @@
-'1781',300,72700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2091',300,75200,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
+'2931',300,72700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75200,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103113 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103113
index 7cbf04cce..af3c4c2c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103113
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103113
@@ -1,3 +1,3 @@
-'1781',100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,81000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1798',100,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,81000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103114 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103114
index 05f6d8696..055ffd663 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103114
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103114
@@ -1,3 +1,3 @@
-'1781',1200,93200,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'2091',1200,90500,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'2931',1200,93200,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,90500,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103115 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103115
index 7380c7faf..5ad485154 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103115
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103115
@@ -1 +1 @@
-'2086',2900,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103116 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103116
index 5d19aef2b..0c681401e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103116
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103116
@@ -1,3 +1,3 @@
-'1781',1201,95200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'2086',1201,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,92500,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,95200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
+'3091',1201,92500,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103117 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103117
index 45414d2c9..d2c0a11c7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103117
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103117
@@ -1,3 +1,3 @@
-'1781',300,73700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80200,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,73700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,80200,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103118 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103118
index 62693c733..56642f696 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103118
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103118
@@ -1,3 +1,3 @@
-'1781',300,74000,,'',0,16000,,'',0,15900,,'',0,34100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'2086',300,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80500,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,74000,,'',0,16000,,'',0,15900,,'',0,34100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
+'3091',300,80500,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103119 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103119
index 8a90a5470..1076119df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103119
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103119
@@ -1,3 +1,3 @@
-'1781',101,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',101,75200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103121 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103121
index 9ab0cb971..1dc79106f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103121
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103121
@@ -1,3 +1,3 @@
-'1781',800,63500,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'2091',800,71300,,'',0,10300,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'2931',800,63500,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,71300,,'',0,10300,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103122 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103122
index 2c947590f..287be94fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103122
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103122
@@ -1,3 +1,3 @@
-'1781',1000,82500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,64500,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,64500,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,82500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103123 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103123
index 7c7f3436d..689ff97c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103123
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103123
@@ -1,3 +1,3 @@
-'1781',300,72300,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
-'2091',300,74800,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
+'2931',300,72300,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,74800,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103125 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103125
index e04e10f9d..ba99aef5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103125
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103125
@@ -1,3 +1,3 @@
-'1781',801,63400,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,61500,,'',0,8500,,'',0,2400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,63400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,61500,,'',0,8500,,'',0,2400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,63400,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,63400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103126 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103126
index 0b2aa05db..5907c4768 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103126
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103126
@@ -1,4 +1,3 @@
-'2086',401,83200,,'',0
-'1781',1001,80200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8300,,'',0,1600,,'',0,5300,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,80500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',1001,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8300,,'',0,1600,,'',0,5300,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,80200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,80500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103127 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103127
index 39510e817..db0db4e64 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103127
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103127
@@ -1,4 +1,3 @@
-'2086',400,154800,,'',0
-'1781',1000,82600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,64500,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,64500,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,82600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103128 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103128
index 45414d2c9..d2c0a11c7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103128
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103128
@@ -1,3 +1,3 @@
-'1781',300,73700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80200,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,73700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,80200,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103129 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103129
index f5f19705f..828f446ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103129
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103129
@@ -1,3 +1,3 @@
-'1781',300,72600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
-'2091',300,75100,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
+'2931',300,72600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75100,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103130 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103130
index c3ce8e111..0a45f62ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103130
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103130
@@ -1,4 +1,4 @@
-'1781',1101,75500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80800,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
-'2086',1400,122400,,'',0,73500,,'',0
+'1798',1101,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80800,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
+'1798',1400,122400,,'',0,73500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103131 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103131
index 8b6783106..828213d66 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103131
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103131
@@ -1,9 +1,9 @@
-'1781',600,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,62700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'2091',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'1781',1901,74600,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,74700,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',600,65900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,62700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'2931',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',1901,72200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,74600,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,74700,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103132 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103132
index 2b070ad52..bb022c2b1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103132
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103132
@@ -1,3 +1,3 @@
-'1781',1800,74200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,62300,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,74200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',1800,62300,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,74200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,74200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103133 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103133
index 352d32ce7..359b91776 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103133
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103133
@@ -1,3 +1,3 @@
-'1781',100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',100,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',100,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
+'3091',100,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103134 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103134
index a2504ff1c..ed7d3caad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103134
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103134
@@ -1,3 +1,3 @@
-'1781',2001,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103135 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103135
index a02d3296c..3a33aa1c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103135
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103135
@@ -1,3 +1,3 @@
-'1781',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103136 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103136
index aeae4ea99..c1c1c6c5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103136
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103136
@@ -1,6 +1,6 @@
-'1781',601,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62700,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,81200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,74100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,62200,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,74100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,62700,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,81200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,62200,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,74100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,74100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103138 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103138
index b19124785..7185f8caf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103138
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103138
@@ -1,4 +1,4 @@
-'1781',1100,81900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,75800,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'2086',1401,113700,,'',0,78000,,'',0
+'1798',1100,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,81900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,75800,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
+'1798',1401,113700,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103139 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103139
index ea95cee6f..4131dd81b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103139
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103139
@@ -1,3 +1,3 @@
-'1781',101,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',101,75300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103140 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103140
index 0ddc03f2d..0c207b1d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103140
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103140
@@ -1,3 +1,3 @@
-'1781',1900,73900,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,80900,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1900,71500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,73900,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,80900,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103141 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103141
index f931e46ea..0651a7305 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103141
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103141
@@ -1,4 +1,3 @@
-'2086',401,83100,,'',0
-'1781',1001,80100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8200,,'',0,1600,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,80400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',1001,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8200,,'',0,1600,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,80100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,80400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103142 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103142
index 5f1f1f9e9..318a622d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103142
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103142
@@ -1,3 +1,3 @@
-'1781',801,63200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,61300,,'',0,4500,,'',0,6500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,63200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,61300,,'',0,4500,,'',0,6500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,63200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,63200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103143 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103143
index f5f19705f..828f446ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103143
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103143
@@ -1,3 +1,3 @@
-'1781',300,72600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
-'2091',300,75100,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
+'2931',300,72600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75100,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103144 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103144
index e4afddf40..dc2035f0f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103144
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103144
@@ -1,3 +1,3 @@
-'1781',800,63600,,'',0,7600,,'',0,4600,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'2091',800,71400,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
+'2931',800,63600,,'',0,7600,,'',0,4600,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71400,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103145 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103145
index 46ec57d3a..c72e2464c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103145
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103145
@@ -1,3 +1,3 @@
-'1781',300,73900,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80400,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,73900,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,80400,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103146 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103146
index 856f2918a..9d4a18977 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103146
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103146
@@ -1,3 +1,3 @@
-'1781',1201,95100,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'2086',1201,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,92400,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,95100,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
+'3091',1201,92400,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103147 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103147
index b995da3f7..79d9a7ce9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103147
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103147
@@ -1,3 +1,3 @@
-'1781',300,72400,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
-'2091',300,74900,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
+'2931',300,72400,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,74900,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103148 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103148
index 123d805b8..434904f83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103148
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103148
@@ -1,3 +1,3 @@
-'1781',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103149 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103149
index 141e7d916..d542d2638 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103149
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103149
@@ -1,3 +1,3 @@
-'1781',1200,93300,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'2091',1200,90600,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'2931',1200,93300,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,90600,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103151 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103151
index 9e3a8d44a..b6fb6d0db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103151
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103151
@@ -1,3 +1,3 @@
-'1781',100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1798',100,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103152 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103152
index cde9aa58d..f9e943ebf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103152
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103152
@@ -1,3 +1,3 @@
-'1781',101,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'3091',101,75400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103153 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103153
index 3ad503c56..c276689d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103153
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103153
@@ -1,3 +1,3 @@
-'1781',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103154 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103154
index a0d86954a..0fb30647c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103154
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103154
@@ -1,9 +1,9 @@
-'1781',600,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,62700,,'',0,10700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'2091',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'1781',1901,74500,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2086',1901,72100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1901,74600,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'1798',600,65900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,62700,,'',0,10700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'2931',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',1901,72100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1901,74500,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'3091',1901,74600,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103156 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103156
index 44ae2d964..dd9297124 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103156
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103156
@@ -1,4 +1,4 @@
-'1781',1101,75400,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80700,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,4100,0,'Orchard Pk',0,5900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,122300,,'',0,73500,,'',0
+'1798',1101,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75400,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80700,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,4100,0,'Orchard Pk',0,5900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,122300,,'',0,73500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103159 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103159
index 50978ee52..ce80653bc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103159
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103159
@@ -1,6 +1,6 @@
-'1781',601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62700,,'',0,11100,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,81300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,74100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,62200,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,74100,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,62700,,'',0,11100,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,81300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,62200,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,74100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,74100,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103160 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103160
index a02d3296c..3a33aa1c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103160
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103160
@@ -1,3 +1,3 @@
-'1781',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103161 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103161
index 1251c4152..52a57ec43 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103161
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103161
@@ -1 +1 @@
-'2086',2900,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103162 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103162
index 52e3b12a8..5a6487682 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103162
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103162
@@ -1,2 +1 @@
-'2086',2900,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'2086',8801,155900,,'',0
+'1798',2900,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103163 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103163
index 471ea9ca4..21637d71b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103163
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103163
@@ -1,3 +1,3 @@
-'1781',2001,64800,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,81700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,64800,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103164 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103164
index 595ec229c..ee9efff06 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103164
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103164
@@ -1,3 +1,3 @@
-'1781',2000,80500,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75900,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80500,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75900,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103165 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103165
index 75e46c707..4ac15235b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103165
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103165
@@ -1,3 +1,3 @@
-'1781',1001,80000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8200,,'',0,1600,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,80300,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',1001,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8200,,'',0,1600,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,80000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,80300,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103166 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103166
index 123d805b8..434904f83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103166
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103166
@@ -1,3 +1,3 @@
-'1781',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103167 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103167
index a2504ff1c..ed7d3caad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103167
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103167
@@ -1,3 +1,3 @@
-'1781',2001,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103168 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103168
index 123d805b8..434904f83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103168
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103168
@@ -1,3 +1,3 @@
-'1781',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2091',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
+'1798',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
+'2931',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103169 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103169
index 9cd9da0b3..3d1eb2568 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103169
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103169
@@ -1,3 +1,3 @@
-'1781',800,63700,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
-'2091',800,71500,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
+'2931',800,63700,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71500,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103170 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103170
index 0e294e153..838331ef4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103170
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103170
@@ -1,3 +1,3 @@
-'1781',300,72500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
-'2091',300,75000,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
+'2931',300,72500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75000,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103171 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103171
index 57113dc55..b25927652 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103171
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103171
@@ -1,3 +1,3 @@
-'1781',801,63200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,61300,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,63200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,61300,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,63200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,63200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103172 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103172
index 0e294e153..838331ef4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103172
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103172
@@ -1,3 +1,3 @@
-'1781',300,72500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2086',300,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
-'2091',300,75000,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
+'1798',300,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
+'2931',300,72500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
+'3091',300,75000,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103173 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103173
index 68db7ea89..f7d478406 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103173
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103173
@@ -1 +1 @@
-'2086',2900,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103174 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103174
index bee412b49..aa2cafc5a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103174
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103174
@@ -1,3 +1,3 @@
-'1781',9700,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2086',9700,54600,,'',0,7700,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,1100,,'',0,5000,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1800,,'',0,2000,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
-'2091',9700,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'1798',9700,54600,,'',0,7700,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,4900,,'',0,1000,,'',0,1800,,'',0,2000,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
+'2931',9700,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3091',9700,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103176 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103176
index b8ce4dc12..72ff67076 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103176
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103176
@@ -1,3 +1,3 @@
-'1781',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103177 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103177
index c6de727cd..69dfc1000 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103177
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103177
@@ -1,3 +1,3 @@
-'1781',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103178 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103178
index 1251c4152..52a57ec43 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103178
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103178
@@ -1 +1 @@
-'2086',2900,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103180 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103180
index 509ea00a3..88581ebac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103180
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103180
@@ -1,3 +1,3 @@
-'1781',2001,64700,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2001,81600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2001,64700,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103181 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103181
index 851583131..b60d411e7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103181
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103181
@@ -1,3 +1,3 @@
-'1781',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103182 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103182
index 7bfc7d722..3d9eded30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103182
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103182
@@ -1,3 +1,3 @@
-'1781',2001,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103183 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103183
index 685ecf76a..fed4ff420 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103183
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103183
@@ -1,5 +1,4 @@
-'1781',2000,80700,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,80100,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'2086',2900,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'2086',8801,160000,,'',0
+'1798',2000,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80700,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,80100,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2900,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103184 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103184
index 93986480e..9276cb238 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103184
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103184
@@ -1,3 +1,3 @@
-'1781',801,63100,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,61200,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'2091',801,63100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,61200,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'2931',801,63100,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,63100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103185 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103185
index bd4301ff1..814a5fc47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103185
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103185
@@ -1,3 +1,3 @@
-'1781',101,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'3091',101,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103186 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103186
index 64b27d5ae..2c5066f3d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103186
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103186
@@ -1,3 +1,3 @@
-'1781',800,63800,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'2091',800,71500,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'2931',800,63800,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71500,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103187 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103187
index eb87bb078..3549e3d53 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103187
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103187
@@ -1,3 +1,3 @@
-'1781',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103188 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103188
index 4c1379494..faf0f6c06 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103188
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103188
@@ -1,3 +1,3 @@
-'1781',100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,80800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1798',100,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,80800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103189 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103189
index f7e5a13ac..207cb8a80 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103189
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103189
@@ -1,4 +1,4 @@
-'1781',1100,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,113900,,'',0,77900,,'',0
+'1798',1100,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,113900,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103190 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103190
index 2d6308539..092377077 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103190
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103190
@@ -1,4 +1,4 @@
-'1781',1101,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,122300,,'',0,73400,,'',0
+'1798',1101,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,122300,,'',0,73400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103191 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103191
index 5e9fa3bfa..e443adc41 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103191
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103191
@@ -1,3 +1,3 @@
-'1781',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103192 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103192
index 903a61223..e2fd407fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103192
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103192
@@ -1,3 +1,3 @@
-'1781',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103193 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103193
index 925154525..4c4f48252 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103193
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103193
@@ -1,4 +1,4 @@
-'1781',1400,81400,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
-'2086',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
-'2086',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
-'2091',1400,83600,4,'',0,26400,4,'',0,14500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
+'1798',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
+'1798',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'2931',1400,81400,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
+'3091',1400,83600,4,'',0,26400,4,'',0,14500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103195 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103195
index 0c4f879ee..c2b9f954d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103195
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103195
@@ -1,3 +1,3 @@
-'1781',2000,80300,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75700,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80300,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75700,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103197 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103197
index 7bfc7d722..3d9eded30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103197
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103197
@@ -1,3 +1,3 @@
-'1781',2001,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103198 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103198
index fab4293db..2dd737831 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103198
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103198
@@ -1,3 +1,3 @@
-'1781',1401,80300,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
-'2086',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,82500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,80300,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
+'3091',1401,82500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103201 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103201
index 03b9feb09..c37558da1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103201
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103201
@@ -1,3 +1,3 @@
-'1781',801,63000,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,61100,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'2091',801,63000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,61100,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'2931',801,63000,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,63000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103202 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103202
index e83ec2832..b45516375 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103202
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103202
@@ -1,4 +1,4 @@
-'1781',1101,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,122200,,'',0,73500,,'',0
+'1798',1101,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,122200,,'',0,73500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103203 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103203
index 742c449a5..61dfbf398 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103203
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103203
@@ -1,3 +1,3 @@
-'1781',1900,74100,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'2091',1900,81100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1900,71700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'2931',1900,74100,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,81100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103204 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103204
index 26cea9f15..030460076 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103204
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103204
@@ -1,3 +1,3 @@
-'1781',800,63900,,'',0,7600,,'',0,8500,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'2091',800,71600,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'2931',800,63900,,'',0,7600,,'',0,8500,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71600,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103205 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103205
index d8a9b7413..193a5340a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103205
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103205
@@ -1,4 +1,4 @@
-'1781',1100,82100,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80000,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,113900,,'',0,78000,,'',0
+'1798',1100,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82100,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80000,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,113900,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103206 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103206
index 7a5d9d230..3c4be2b02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103206
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103206
@@ -1,3 +1,3 @@
-'1781',1800,74300,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,62400,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,74300,,'',0,10200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',1800,62400,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,74300,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,74300,,'',0,10200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103214 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103214
index 9f5e4a190..2a7810cf2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103214
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103214
@@ -1,3 +1,3 @@
-'1781',100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',100,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',100,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
+'3091',100,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103215 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103215
deleted file mode 100644
index 0df742e8e..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103215
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,82800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103216 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103216
index b7f2a31cc..21daa3e4d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103216
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103216
@@ -1,3 +1,3 @@
-'1781',2001,65100,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65100,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,82000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103217 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103217
index 07b58e012..788d6eda2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103217
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103217
@@ -1,3 +1,3 @@
-'1781',2000,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103219 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103219
index 93470b92d..f82ae4bb5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103219
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103219
@@ -1,3 +1,3 @@
-'1781',2001,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2001,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2001,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103220 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103220
index ee0efb830..3dabbdf4c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103220
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103220
@@ -1,4 +1,4 @@
-'1781',2000,80900,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,80300,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'2086',2900,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2000,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80900,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,80300,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2900,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103221 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103221
index b665b4194..0dcca682b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103221
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103221
@@ -1,6 +1,6 @@
-'1781',801,62900,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,61000,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2091',801,62900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,80100,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',801,61000,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
+'2931',801,62900,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,62900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,80100,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103222 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103222
index 8a5ae82c8..f17c83822 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103222
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103222
@@ -1,6 +1,6 @@
-'1781',800,64000,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,71700,,'',0,10500,,'',0,9000,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,64900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64000,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71700,,'',0,10500,,'',0,9000,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,64900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103224 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103224
deleted file mode 100644
index 1101125a7..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103224
+++ /dev/null
@@ -1,2 +0,0 @@
-'1781',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2091',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103226 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103226
index ed13de777..cbb2e295b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103226
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103226
@@ -1,3 +1,3 @@
-'1781',1800,74300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,62400,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,74300,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',1800,62400,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,74300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,74300,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103227 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103227
index 8b992d132..682b61be8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103227
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103227
@@ -1,4 +1,4 @@
-'1781',1101,75200,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80500,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,122100,,'',0,73600,,'',0
+'1798',1101,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75200,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80500,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,122100,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103230 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103230
index e960546cb..1da926aa3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103230
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103230
@@ -1 +1 @@
-'2086',2900,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103231 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103231
index 78eb4bd82..47affd49a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103231
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103231
@@ -1,3 +1,3 @@
-'1781',1201,94900,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1201,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,92200,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,94900,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1201,92200,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103232 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103232
index 158715403..364104696 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103232
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103232
@@ -1,3 +1,3 @@
-'1781',1200,93500,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
-'2091',1200,90800,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
+'2931',1200,93500,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,90800,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103233 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103233
index 7ed562d05..3fe10e9f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103233
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103233
@@ -1,3 +1,3 @@
-'1781',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103234 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103234
index b1b7d10ac..9b4a0a538 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103234
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103234
@@ -1,4 +1,4 @@
-'1781',2000,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'2086',2900,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2000,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2900,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103235 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103235
index 5d67746b8..64d389fbb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103235
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103235
@@ -1,4 +1,4 @@
-'1781',1100,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114000,,'',0,77900,,'',0
+'1798',1100,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114000,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103236 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103236
index ca35bee66..19821d99a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103236
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103236
@@ -1,3 +1,3 @@
-'1781',1800,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,62500,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2091',1800,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',1800,62500,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
+'2931',1800,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103239 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103239
index 175a5e761..cb14f3e8c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103239
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103239
@@ -1,3 +1,3 @@
-'1781',2000,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103240 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103240
index c6e9ebcef..c631bbe20 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103240
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103240
@@ -1,6 +1,6 @@
-'1781',801,62800,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,60900,,'',0,4500,,'',0,6500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'2091',801,62800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8100,,'',0,1600,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,80000,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',801,60900,,'',0,4500,,'',0,6500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
+'2931',801,62800,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,62800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8100,,'',0,1600,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,80000,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103243 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103243
index a76faf4ef..fd9c6f1cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103243
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103243
@@ -1,3 +1,3 @@
-'1781',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
-'2091',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1900,71800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'2931',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103244 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103244
index 900b31d16..3a9878d14 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103244
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103244
@@ -1,3 +1,3 @@
-'1781',2001,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103245 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103245
index e2fdcaa37..657d1a76a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103245
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103245
@@ -1,6 +1,6 @@
-'1781',800,64000,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'2091',800,71700,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,65000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,85600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'2931',800,64000,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71700,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,65000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,85600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103246 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103246
index b947ee203..c025592b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103246
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103246
@@ -1,4 +1,4 @@
-'1781',1101,75100,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80400,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,122100,,'',0,73500,,'',0
+'1798',1101,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75100,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80400,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,122100,,'',0,73500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103248
index 0441de48c..88f13a3c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103248
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103248
@@ -1,3 +1,3 @@
-'1781',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103249 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103249
index b1b7d10ac..9b4a0a538 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103249
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103249
@@ -1,4 +1,4 @@
-'1781',2000,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'2086',2900,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2000,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2900,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103250 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103250
index 9b9ebd3c5..074e7b7e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103250
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103250
@@ -1,4 +1,4 @@
-'1781',1100,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114100,,'',0,77900,,'',0
+'1798',1100,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114100,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103251 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103251
index 9b79e31c9..0c6ef1be7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103251
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103251
@@ -1 +1 @@
-'2086',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103252 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103252
index f30f2ea20..e3c5b5623 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103252
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103252
@@ -1,4 +1,4 @@
-'1781',1100,82300,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80200,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114100,,'',0,78000,,'',0
+'1798',1100,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82300,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80200,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114100,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103253 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103253
index 59d4a477c..4f5c29d88 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103253
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103253
@@ -1,4 +1,4 @@
-'1781',1101,75000,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80300,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,122000,,'',0,73600,,'',0
+'1798',1101,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,75000,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80300,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,122000,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103254 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103254
index 7ed562d05..3fe10e9f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103254
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103254
@@ -1,3 +1,3 @@
-'1781',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103256 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103256
index 23b46a2f2..3b59e7ea3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103256
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103256
@@ -1,4 +1,3 @@
-'2086',401,82700,,'',0
-'1781',9701,74300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2086',9701,60400,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'2091',9701,74400,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
+'1798',9701,60400,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'2931',9701,74300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
+'3091',9701,74400,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103257 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103257
index ad5500fb1..3bb8e5c79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103257
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103257
@@ -1,4 +1,4 @@
-'2086',1501,80200,,'',0,73000,,'',0
-'1781',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,80200,,'',0,73000,,'',0
+'1798',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,3000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103258 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103258
index 9b79e31c9..0c6ef1be7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103258
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103258
@@ -1 +1 @@
-'2086',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103260 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103260
index e6da6083d..7cd5d4023 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103260
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103260
@@ -1,6 +1,6 @@
-'1781',801,62800,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,60900,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
-'2091',801,62800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8100,,'',0,1700,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,80000,,'',0,12000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',801,60900,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
+'2931',801,62800,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,62800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8100,,'',0,1700,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,80000,,'',0,12000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103261 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103261
index 7ed562d05..3fe10e9f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103261
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103261
@@ -1,3 +1,3 @@
-'1781',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103262 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103262
index 9b79e31c9..0c6ef1be7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103262
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103262
@@ -1 +1 @@
-'2086',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103263 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103263
index c24360b4e..3d9b1551f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103263
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103263
@@ -1,4 +1,3 @@
-'2086',400,155300,,'',0
-'1781',9700,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2086',9700,54900,,'',0,7700,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2200,,'',0,5100,,'',0,1000,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,2000,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2400,,'',0,2600,,'',0
-'2091',9700,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
+'1798',9700,54900,,'',0,7700,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,900,,'',0,900,,'',0,1800,,'',0,2000,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2400,,'',0,2600,,'',0
+'2931',9700,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3091',9700,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103264 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103264
index 92213f2cb..96eb6f529 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103264
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103264
@@ -1,6 +1,6 @@
-'1781',800,64100,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,71800,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,65000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64100,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71800,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,65000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103265 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103265
index 60e0c9c69..aae5d146e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103265
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103265
@@ -1,11 +1,11 @@
-'1781',2401,81900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'2086',2401,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2401,72400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2501,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2091',2501,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'1781',2601,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'2091',2601,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'2086',2801,71200,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
-'2086',2900,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2401,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2401,81900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
+'3091',2401,72400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2501,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'2931',2501,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'1798',2601,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'2931',2601,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2801,71200,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
+'1798',2900,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103266 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103266
index 9e26a0793..e29ad8d45 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103266
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103266
@@ -1,3 +1,3 @@
-'1781',2000,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103268 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103268
index 900b31d16..3a9878d14 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103268
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103268
@@ -1,3 +1,3 @@
-'1781',2001,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103271 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103271
index 29c012441..5387d0295 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103271
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103271
@@ -1,4 +1,4 @@
-'1781',1101,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121900,,'',0,73600,,'',0
+'1798',1101,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121900,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103272 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103272
index 4c84ec312..0a167763a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103272
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103272
@@ -1,3 +1,3 @@
-'1781',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103274 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103274
index 669162f1c..6d89ddcbd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103274
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103274
@@ -1,6 +1,6 @@
-'1781',801,62700,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,60800,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,62700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75900,,'',0,16100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',801,60800,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,62700,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,62700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,75900,,'',0,16100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103277 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103277
index a3c2c1596..2b57db4ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103277
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103277
@@ -1,4 +1,4 @@
-'1781',1100,82400,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80300,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114200,,'',0,77900,,'',0
+'1798',1100,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82400,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80300,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114200,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103278 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103278
index 0d6231373..c9f5a1198 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103278
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103278
@@ -1,6 +1,6 @@
-'1781',800,64100,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'2091',800,71800,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,65100,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,85800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
+'2931',800,64100,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71800,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,65100,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,85800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103279 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103279
index d4881f24d..7e631f095 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103279
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103279
@@ -1,11 +1,11 @@
-'1781',2401,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'2086',2401,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2401,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
-'1781',2501,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2091',2501,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'1781',2601,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'2091',2601,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'2086',2801,71200,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
-'2086',2900,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2401,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2401,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
+'3091',2401,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
+'1798',2501,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'2931',2501,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'1798',2601,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'2931',2601,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2801,71200,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
+'1798',2900,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103282 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103282
index 680c3d702..187046689 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103282
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103282
@@ -1,3 +1,3 @@
-'1781',2001,64400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2001,81300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2001,64400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103283 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103283
index ff3c9072c..d9519c88a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103283
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103283
@@ -1,5 +1,5 @@
-'1781',1000,84500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',1001,251100,0,'North Rutland',0
-'2086',1000,54600,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'2091',1001,232100,0,'Rutland Exch',0
+'1798',1000,54600,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',1001,251100,0,'Rutland Exch',0
+'3091',1000,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'3091',1001,232100,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103285 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103285
index 69cf4d925..ae6bafe1f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103285
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103285
@@ -1,3 +1,3 @@
-'1781',1200,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1200,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1200,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103286 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103286
index 9b9fb0db9..7fdf00778 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103286
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103286
@@ -1,3 +1,3 @@
-'1781',1201,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1201,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1201,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103287 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103287
index 6b3a4162e..a1736bf42 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103287
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103287
@@ -1,3 +1,3 @@
-'1781',1000,84300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54400,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',1000,54400,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103288 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103288
index dc0b38f39..71ed5a6bf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103288
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103288
@@ -1,3 +1,3 @@
-'1781',1000,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54500,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',1000,54500,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103289 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103289
index ac55588fc..ce16c1227 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103289
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103289
@@ -1,4 +1,4 @@
-'1781',1100,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114300,,'',0,77900,,'',0
+'1798',1100,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114300,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103290 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103290
index dd3cdefa7..5c3093b6e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103290
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103290
@@ -1,3 +1,3 @@
-'1781',1601,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,92300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,92300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103291 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103291
index 9755fbf13..875f1f6dd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103291
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103291
@@ -1,4 +1,4 @@
-'1781',1101,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121900,,'',0,73600,,'',0
+'1798',1101,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121900,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103292 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103292
index 3ca8b0faa..e4106751e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103292
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103292
@@ -1,3 +1,3 @@
-'1781',1000,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54600,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',1000,54600,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103293 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103293
index 01657c6a5..e00ee7f14 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103293
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103293
@@ -1 +1 @@
-'2086',1501,81800,,'',0,73000,,'',0
+'1798',1501,81800,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103294 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103294
index c6677318f..9f7a059e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103294
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103294
@@ -1 +1 @@
-'2086',1501,81600,,'',0,73000,,'',0
+'1798',1501,81600,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103295 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103295
index 151875f7b..1a08c6576 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103295
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103295
@@ -1 +1 @@
-'2086',1501,80500,,'',0,73000,,'',0
+'1798',1501,80500,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103296 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103296
index e111a95f0..6eaa1031a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103296
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103296
@@ -1,6 +1,6 @@
-'1781',800,64200,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,71900,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,65100,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,85900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64200,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71900,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,65100,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,85900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103297 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103297
index 1e658d849..870053eab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103297
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103297
@@ -1,6 +1,6 @@
-'1781',801,62700,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,60800,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,62700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75900,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',801,60800,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,62700,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,62700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,75900,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103298 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103298
index de8facddc..f223687bd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103298
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103298
@@ -1 +1 @@
-'2086',1501,80400,,'',0,73000,,'',0
+'1798',1501,80400,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103299 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103299
index 7daead4d6..7c16be2ff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103299
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103299
@@ -1,3 +1,3 @@
-'1781',2001,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2001,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2001,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103300 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103300
index 4067d3ead..e9f952ceb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103300
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103300
@@ -1,5 +1,5 @@
-'1781',1000,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',1001,251200,0,'North Rutland',0
-'2086',1000,54900,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'2091',1001,232200,0,'Rutland Exch',0
+'1798',1000,54900,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',1001,251200,0,'Rutland Exch',0
+'3091',1000,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'3091',1001,232200,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103301 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103301
index 670caeddd..9559ea344 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103301
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103301
@@ -1,11 +1,11 @@
-'1781',2401,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'2086',2401,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2401,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
-'1781',2501,94500,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2091',2501,102900,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'1781',2601,73600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'2091',2601,71700,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'2086',2801,71300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
-'2086',2900,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2401,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2401,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
+'3091',2401,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
+'1798',2501,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'2931',2501,94500,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,102900,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'1798',2601,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'2931',2601,73600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,71700,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2801,71300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
+'1798',2900,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103302 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103302
index 69035b7db..7b727ae33 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103302
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103302
@@ -1,3 +1,3 @@
-'1781',2000,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103303 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103303
index 575bbbf42..3d2baac9e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103303
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103303
@@ -1,4 +1,4 @@
-'1781',1100,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114300,,'',0,77900,,'',0
+'1798',1100,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114300,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103304 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103304
index d8721f67c..62e28f8cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103304
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103304
@@ -1,4 +1,4 @@
-'1781',1101,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121800,,'',0,73600,,'',0
+'1798',1101,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121800,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103305 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103305
index 575753000..32da26250 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103305
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103305
@@ -1,4 +1,4 @@
-'2086',1501,80300,,'',0,73000,,'',0
-'1781',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,80300,,'',0,73000,,'',0
+'1798',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,3000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103306 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103306
index 7f25f72fd..87fd2cd34 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103306
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103306
@@ -1,3 +1,3 @@
-'1781',2001,65300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,82200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103307 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103307
index ad10e11c7..8297f2d79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103307
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103307
@@ -1,4 +1,4 @@
-'1781',1100,82600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80500,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114400,,'',0,77900,,'',0
+'1798',1100,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80500,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114400,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103308 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103308
index 4f4a6e69e..c9c714b41 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103308
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103308
@@ -1,4 +1,4 @@
-'1781',1101,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121800,,'',0,73600,,'',0
+'1798',1101,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121800,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103309 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103309
index 62cd088ad..3d7cb86c5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103309
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103309
@@ -1,4 +1,4 @@
-'1781',1100,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114400,,'',0,77900,,'',0
+'1798',1100,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114400,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103310 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103310
index 1205ebcd5..2380b3dbb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103310
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103310
@@ -1,4 +1,4 @@
-'1781',1101,74700,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,80000,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121700,,'',0,73600,,'',0
+'1798',1101,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74700,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,80000,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121700,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103312 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103312
index c448349b8..c51bc8574 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103312
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103312
@@ -1,6 +1,6 @@
-'1781',800,64200,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,71900,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,65200,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64200,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,71900,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,65200,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103313 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103313
index e0f241628..52693de0b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103313
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103313
@@ -1,4 +1,4 @@
-'1781',1100,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114500,,'',0,77800,,'',0
+'1798',1100,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114500,,'',0,77800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103316 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103316
index 0b955d0de..6ea722841 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103316
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103316
@@ -1 +1 @@
-'2086',1501,80300,,'',0,73000,,'',0
+'1798',1501,80300,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103317 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103317
index 715e49686..f0f3a771c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103317
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103317
@@ -1,3 +1,3 @@
-'1781',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103319 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103319
index 7bec03bac..4c7846f15 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103319
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103319
@@ -1,3 +1,3 @@
-'1781',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103321 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103321
index abbb9924d..c8bca6a64 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103321
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103321
@@ -1,6 +1,6 @@
-'1781',801,62600,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,60700,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,62600,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',1001,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75800,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
+'1798',801,60700,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,62600,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,62600,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',1001,75800,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103322 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103322
index 925bcb920..c1df34ad8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103322
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103322
@@ -1,3 +1,3 @@
-'1781',1000,84200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54300,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',1000,54300,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103323 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103323
index 9b9fb0db9..7fdf00778 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103323
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103323
@@ -1,3 +1,3 @@
-'1781',1201,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1201,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1201,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103324 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103324
index 8c6a2e93f..aacef5c72 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103324
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103324
@@ -1,3 +1,3 @@
-'1781',1200,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
-'2091',1200,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
+'2931',1200,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103325 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103325
index ccbc89748..d24c58be2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103325
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103325
@@ -1,3 +1,3 @@
-'1781',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,3000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103326 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103326
index e36ea3396..ce6cdb5d3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103326
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103326
@@ -1,2 +1,2 @@
-'2086',1400,121000,,'',0,73800,,'',0
-'2086',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1798',1400,121000,,'',0,73800,,'',0
+'1798',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103327 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103327
index 48ec3a4df..a293b4fb6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103327
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103327
@@ -1,6 +1,6 @@
-'1781',1000,84900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3700,4,'',0,6900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'1781',1001,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1000,55000,4,'',0,7200,4,'',0,1800,4,'',0,6300,4,'',0,2000,4,'',0,1900,4,'',0,6100,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,1800,4,'',0,1900,4,'',0,6800,4,'',0,3000,4,'',0,7300,4,'',0,2900,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,1900,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1500,4,'',0,6600,4,'',0,4300,4,'',0,8400,4,'',0,8400,4,'',0,8500,4,'',0,4100,4,'',0,8500,4,'',0,8300,4,'',0,4500,4,'',0,8500,4,'',0
-'2086',1001,55000,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,0,'Orchard Pk',0
-'2091',1000,91200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0
-'2091',1001,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1000,55000,4,'',0,7200,4,'',0,1800,4,'',0,6300,4,'',0,2000,4,'',0,1900,4,'',0,6100,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,1800,4,'',0,1900,4,'',0,6800,4,'',0,3000,4,'',0,7300,4,'',0,2900,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,1900,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1500,4,'',0,6600,4,'',0,4300,4,'',0,8400,4,'',0,8400,4,'',0,8500,4,'',0,4100,4,'',0,8500,4,'',0,8300,4,'',0,4500,4,'',0,8500,4,'',0
+'1798',1001,55000,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,0,'Orchard Pk',0
+'2931',1000,84900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3700,4,'',0,6900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'2931',1001,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1000,91200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0
+'3091',1001,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103328 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103328
index 080ea95f4..05a0709cc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103328
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103328
@@ -1,6 +1,6 @@
-'1781',2501,94600,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2091',2501,103000,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'1781',2601,73700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'2091',2601,71800,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2501,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'2931',2501,94600,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103000,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'1798',2601,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'2931',2601,73700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,71800,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103329 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103329
index faff6f8ac..a41619449 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103329
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103329
@@ -1,6 +1,6 @@
-'1781',2500,93600,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,102100,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'1781',2600,74200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,110800,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'1798',2500,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,93600,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,102100,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2600,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,74200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,110800,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103331 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103331
index 0a3409e59..2ddd42cd6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103331
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103331
@@ -1,4 +1,4 @@
-'1781',1101,74600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75900,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121600,,'',0,73700,,'',0
+'1798',1101,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75900,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121600,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103334 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103334
index 731d72e53..2b7fb1936 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103334
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103334
@@ -1,4 +1,4 @@
-'1781',1100,82800,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80700,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114500,,'',0,77900,,'',0
+'1798',1100,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82800,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80700,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114500,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103335 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103335
index 368162c73..2a715003c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103335
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103335
@@ -1,2 +1,2 @@
-'2086',1400,121100,,'',0,73800,,'',0
-'2086',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1798',1400,121100,,'',0,73800,,'',0
+'1798',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103337 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103337
index 715e49686..f0f3a771c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103337
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103337
@@ -1,3 +1,3 @@
-'1781',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103340 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103340
index 6c5d6cbbe..d81b738a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103340
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103340
@@ -1,3 +1,3 @@
-'1781',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103342 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103342
index 734d54e84..020ad2017 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103342
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103342
@@ -1,3 +1,3 @@
-'1781',101,75600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2086',101,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,75600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
+'3091',101,75600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103343 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103343
index 9779cc282..37ddf023a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103343
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103343
@@ -1,3 +1,3 @@
-'1781',1001,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,0,'Orchard Pk',0
-'2091',1001,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1001,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,0,'Orchard Pk',0
+'2931',1001,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103344 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103344
index 9484e07a1..b05736dc6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103344
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103344
@@ -1,3 +1,3 @@
-'1781',1000,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54300,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',1000,54300,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103346 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103346
index 80547f5ba..8b3a62c48 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103346
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103346
@@ -1,4 +1,4 @@
-'1781',1101,74500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75800,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121600,,'',0,73600,,'',0
+'1798',1101,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75800,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121600,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103347 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103347
index 6e8e7cc74..7f7809f17 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103347
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103347
@@ -1,3 +1,3 @@
-'1781',1601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103348 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103348
index fd2ccbc19..daed1f1b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103348
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103348
@@ -1,3 +1,3 @@
-'1781',1200,93800,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1200,91100,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1200,93800,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,91100,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103349 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103349
index 1fb756081..fa2daf310 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103349
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103349
@@ -1,3 +1,3 @@
-'1781',1201,94600,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1201,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,91900,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,94600,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1201,91900,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103351 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103351
index dd4ce9f4d..fe3b2e266 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103351
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103351
@@ -1,3 +1,3 @@
-'1781',2000,80000,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75400,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80000,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75400,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103354 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103354
index c9e16f137..f2c5a6cc2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103354
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103354
@@ -1,3 +1,3 @@
-'1781',1000,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54200,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',1000,54200,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103355 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103355
index e443fd7f3..4c41294d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103355
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103355
@@ -1,3 +1,3 @@
-'1781',1601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103357 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103357
index e4e01b5a5..7a303cf20 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103357
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103357
@@ -1,4 +1,4 @@
-'1781',1100,82900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80800,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114600,,'',0,77900,,'',0
+'1798',1100,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,80800,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114600,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103359 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103359
index 8dab3d00b..950aa9946 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103359
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103359
@@ -1,3 +1,3 @@
-'1781',2001,65400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,82300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103360 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103360
index a6ffccbe8..8c7a90310 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103360
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103360
@@ -1,3 +1,3 @@
-'1781',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55100,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,1900,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1001,55100,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,1900,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103361 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103361
index 37a2ef6df..7daaaa5ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103361
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103361
@@ -1,4 +1,4 @@
-'1781',1101,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121300,,'',0,73800,,'',0
+'1798',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121300,,'',0,73800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103362 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103362
deleted file mode 100644
index 85aaaad61..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103362
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,82200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103363 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103363
index bf5342856..29efd3b36 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103363
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103363
@@ -1,4 +1,4 @@
-'1781',1101,74300,,'',0,7500,0,'Orchard Pk',0,400,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,700,0,'Orchard Pk',0,6300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,900,0,'Orchard Pk',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,700,0,'Orchard Pk',0,2300,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121300,,'',0,73700,,'',0
+'1798',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74300,,'',0,7500,0,'Orchard Pk',0,400,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,700,0,'Orchard Pk',0,6300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,900,0,'Orchard Pk',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,700,0,'Orchard Pk',0,2300,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121300,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103364 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103364
index a7baf5a79..a5b71bbcc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103364
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103364
@@ -1,4 +1,4 @@
-'1781',1101,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75600,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121400,,'',0,73700,,'',0
+'1798',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75600,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121400,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103365 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103365
index 7fcb581cc..c20365764 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103365
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103365
@@ -1,11 +1,11 @@
-'1781',801,72500,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,60500,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72400,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,1800,,'',0,5600,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'1781',1101,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121300,,'',0,73700,,'',0
-'2086',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1798',801,60500,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72500,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,72400,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,1800,,'',0,5600,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1101,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121300,,'',0,73700,,'',0
+'1798',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103366 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103366
index c50294f5f..20cdc971d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103366
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103366
@@ -1,4 +1,4 @@
-'1781',1101,74500,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,15500,,'',0,4000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75800,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,5000,0,'Orchard Pk',0,5000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121500,,'',0,73700,,'',0
+'1798',1101,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74500,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,15500,,'',0,4000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75800,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,5000,0,'Orchard Pk',0,5000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121500,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103367 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103367
index 9d4198a17..8a1677d42 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103367
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103367
@@ -1,4 +1,4 @@
-'1781',1100,83000,,'',0,7000,,'',0,2200,0,'Black Mtn',0,800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1400,0,'Black Mtn',0,5600,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,80900,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114700,,'',0,77800,,'',0
+'1798',1100,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83000,,'',0,7000,,'',0,2200,0,'Black Mtn',0,800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1400,0,'Black Mtn',0,5600,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,80900,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114700,,'',0,77800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103368 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103368
index 33b1f598c..694a00779 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103368
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103368
@@ -1 +1 @@
-'2086',1501,80700,,'',0,73000,,'',0
+'1798',1501,80700,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103369 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103369
index 36228cd21..505fe5e35 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103369
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103369
@@ -1,4 +1,4 @@
-'1781',1101,74400,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75700,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121400,,'',0,73700,,'',0
+'1798',1101,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74400,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75700,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121400,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103370 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103370
deleted file mode 100644
index 93fdafe40..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103370
+++ /dev/null
@@ -1,3 +0,0 @@
-'1781',801,72500,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'1781',1001,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'1781',1101,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103372 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103372
index 31561eb7e..c1a4f2d18 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103372
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103372
@@ -1,4 +1,4 @@
-'1781',1100,83000,,'',0,7000,,'',0,2300,0,'Black Mtn',0,700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,0,'Black Mtn',0,5500,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,11500,,'',0,6200,0,'Black Mtn',0,4300,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,81000,0,'Black Mtn',0,12500,,'',0,10000,0,'Black Mtn',0,10000,,'',0,8500,0,'Black Mtn',0,1500,,'',0,10000,,'',0,7000,0,'Black Mtn',0,3000,,'',0,10000,,'',0,9500,0,'Black Mtn',0,500,,'',0,10000,,'',0,10000,,'',0,2000,0,'Black Mtn',0,8000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'2086',1401,114700,,'',0,77900,,'',0
+'1798',1100,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83000,,'',0,7000,,'',0,2300,0,'Black Mtn',0,700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,0,'Black Mtn',0,5500,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,11500,,'',0,6200,0,'Black Mtn',0,4300,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,81000,0,'Black Mtn',0,12500,,'',0,10000,0,'Black Mtn',0,10000,,'',0,8500,0,'Black Mtn',0,1500,,'',0,10000,,'',0,7000,0,'Black Mtn',0,3000,,'',0,10000,,'',0,9500,0,'Black Mtn',0,500,,'',0,10000,,'',0,10000,,'',0,2000,0,'Black Mtn',0,8000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1401,114700,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103373 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103373
index 8dba036a9..26aadedb1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103373
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103373
@@ -1,6 +1,6 @@
-'1781',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72100,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54100,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,72100,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,54100,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103374 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103374
deleted file mode 100644
index 16016457c..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103374
+++ /dev/null
@@ -1 +0,0 @@
-'2086',400,155900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103375 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103375
index d39bb63f4..5f2192687 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103375
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103375
@@ -1,2 +1,2 @@
-'2086',1400,121200,,'',0,73700,,'',0
-'2086',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1798',1400,121200,,'',0,73700,,'',0
+'1798',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103376 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103376
index 45fc74cba..d85106d83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103376
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103376
@@ -1,6 +1,6 @@
-'1781',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72100,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54200,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,72100,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,54200,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103377 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103377
index 8a0eff9a3..d43f24e54 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103377
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103377
@@ -1,9 +1,9 @@
-'1781',801,72400,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,60400,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55500,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,1800,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'1781',1101,74100,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75400,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',801,60400,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72400,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55500,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,1800,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1101,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74100,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75400,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103378 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103378
index 5260368af..5acbd9675 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103378
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103378
@@ -1,5 +1,5 @@
-'1781',1100,92500,4,'',0,19700,4,'',0,30000,4,'',0,22500,4,'',0,17500,4,'',0,18700,4,'',0
-'2091',1100,81200,4,'',0,22500,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,22500,4,'',0
-'1781',1401,75300,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,81500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,22500,,'',0
+'2931',1100,92500,4,'',0,19700,4,'',0,30000,4,'',0,22500,4,'',0,17500,4,'',0,18700,4,'',0
+'3091',1100,81200,4,'',0,22500,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,22500,4,'',0
+'1798',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,75300,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,81500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,22500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103379 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103379
index 71a449321..b6b1bcd34 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103379
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103379
@@ -1,6 +1,6 @@
-'1781',2500,93400,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,101900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'1781',2600,74000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,110600,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'1798',2500,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,93400,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,101900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2600,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,74000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,110600,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103380 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103380
index a9e61f177..b33b90959 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103380
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103380
@@ -1,9 +1,9 @@
-'1781',801,72400,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,60400,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55400,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,1900,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'1781',1101,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',801,60400,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72400,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55400,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,1900,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1101,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103381 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103381
index f7657aa04..73e6db655 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103381
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103381
@@ -1,6 +1,6 @@
-'1781',2501,94700,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2091',2501,103100,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'1781',2601,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'2091',2601,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2501,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'2931',2501,94700,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103100,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'1798',2601,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'2931',2601,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103382 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103382
index 776867b70..efb3a183f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103382
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103382
@@ -1,9 +1,9 @@
-'1781',801,72400,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,60400,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55400,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,1800,,'',0,1700,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'1781',1101,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2086',1101,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',801,60400,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72400,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55400,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,1800,,'',0,1700,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1101,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103383 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103383
index d04d2cac6..918035770 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103383
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103383
@@ -1,3 +1,3 @@
-'1781',1100,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,93600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1100,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,93600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103384 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103384
index 24cb83487..965a74383 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103384
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103384
@@ -1,3 +1,3 @@
-'1781',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72300,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72300,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103385 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103385
index 79bbcdc4b..446acc7d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103385
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103385
@@ -1,6 +1,6 @@
-'1781',801,72300,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,60300,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72200,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55300,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,1900,,'',0,1700,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75400,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',801,60300,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72300,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,72200,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55300,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,1900,,'',0,1700,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75400,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103387 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103387
index 9d6bce078..5f6eb65e1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103387
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103387
@@ -1,3 +1,3 @@
-'1781',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55200,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,1900,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1001,55200,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,1900,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103388 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103388
index 4c16c31b8..a5df780dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103388
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103388
@@ -1,3 +1,3 @@
-'1781',2500,93100,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,101600,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,93100,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,101600,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103389 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103389
index 289c4ef6d..979fa6d33 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103389
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103389
@@ -1,3 +1,3 @@
-'1781',2501,94900,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'2091',2501,103300,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'2931',2501,94900,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103300,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103392 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103392
index 823cf25a1..41beb7e8c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103392
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103392
@@ -1,6 +1,6 @@
-'1781',801,72300,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,60300,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72200,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2086',1001,55200,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,1900,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',801,60300,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72300,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,72200,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55200,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,1900,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103393 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103393
index 4686c596c..e9a3450ef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103393
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103393
@@ -1,3 +1,3 @@
-'1781',2600,73900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,110500,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'1798',2600,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,110500,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103395 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103395
index c51784b21..5f4015142 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103395
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103395
@@ -1,3 +1,3 @@
-'1781',2601,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2601,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103396 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103396
index 04d1d6d24..1ee3435e7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103396
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103396
@@ -1,5 +1,5 @@
-'1781',1001,250900,0,'North Rutland',0
-'2091',1001,231900,0,'Rutland Exch',0
-'1781',1101,73900,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'2086',1101,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75200,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'2931',1001,250900,0,'Rutland Exch',0
+'3091',1001,231900,0,'Rutland Exch',0
+'1798',1101,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,73900,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
+'3091',1101,75200,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103399 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103399
index 2e7ab4d4a..4545f671f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103399
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103399
@@ -1,3 +1,3 @@
-'1781',1201,94500,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1201,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,91800,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,94500,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1201,91800,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103401 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103401
index 33b1f598c..694a00779 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103401
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103401
@@ -1 +1 @@
-'2086',1501,80700,,'',0,73000,,'',0
+'1798',1501,80700,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103403 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103403
index 0f308859f..a3fabea53 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103403
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103403
@@ -1,3 +1,3 @@
-'1781',2500,93000,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,101500,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,93000,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,101500,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103405 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103405
index b67c85bbb..97a2b1132 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103405
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103405
@@ -1,3 +1,3 @@
-'1781',1100,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1100,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103406 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103406
index 23fafe635..2ba7426e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103406
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103406
@@ -1,3 +1,3 @@
-'1781',1200,93900,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1200,91200,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1200,93900,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,91200,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103407 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103407
index c9f3a104d..383fc7c70 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103407
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103407
@@ -1,3 +1,3 @@
-'1781',2501,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'2091',2501,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'2931',2501,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103408 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103408
index 73f55dc92..c923b2aaf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103408
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103408
@@ -1,3 +1,3 @@
-'1781',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,800,,'',0,6200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103410 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103410
index aa552477d..8a87feee6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103410
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103410
@@ -1,3 +1,3 @@
-'1781',1100,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1100,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103411 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103411
index b67c85bbb..97a2b1132 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103411
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103411
@@ -1,3 +1,3 @@
-'1781',1100,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1100,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103412 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103412
index aa552477d..8a87feee6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103412
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103412
@@ -1,3 +1,3 @@
-'1781',1100,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1100,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103414 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103414
index e1ee514a2..8627f1cb9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103414
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103414
@@ -1,3 +1,3 @@
-'1781',1401,75400,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,81600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,75400,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,81600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103416 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103416
index 3ffe72e1c..e5cd0d404 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103416
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103416
@@ -1,5 +1,5 @@
-'1781',1001,250800,0,'North Rutland',0
-'2091',1001,231800,0,'Rutland Exch',0
-'1781',1101,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'2086',1101,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'2931',1001,250800,0,'Rutland Exch',0
+'3091',1001,231800,0,'Rutland Exch',0
+'1798',1101,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
+'3091',1101,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103417 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103417
index aa2a52f5c..45df9a73e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103417
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103417
@@ -1,3 +1,3 @@
-'1781',2001,65500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2086',2001,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'3091',2001,82400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103418 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103418
index dae7c06fb..893270f64 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103418
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103418
@@ -1,3 +1,3 @@
-'1781',2000,75900,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75300,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75900,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75300,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103419 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103419
index 7c63b288d..436215a79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103419
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103419
@@ -1,3 +1,3 @@
-'1781',1201,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1201,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1201,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103420 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103420
index b41ab0058..b98d9b12b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103420
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103420
@@ -1,3 +1,3 @@
-'1781',1200,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1200,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1200,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103421 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103421
index 4bffacc39..f63799633 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103421
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103421
@@ -1,3 +1,3 @@
-'1781',1100,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,93900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1100,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,93900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103422 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103422
index 9bd16d0e4..4e4554523 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103422
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103422
@@ -1,3 +1,3 @@
-'1781',2500,92900,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,101400,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92900,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,101400,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103423 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103423
index 3960e4c5f..846ad7aa2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103423
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103423
@@ -1 +1 @@
-'2086',1501,80800,,'',0,73000,,'',0
+'1798',1501,80800,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103424 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103424
index c485b2fdb..715e3ca5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103424
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103424
@@ -1 +1 @@
-'2086',1501,81200,,'',0,73000,,'',0
+'1798',1501,81200,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103425 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103425
index d92d32ad3..beef2d450 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103425
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103425
@@ -1,2 +1,2 @@
-'1781',2300,141700,0,'Old Vernon Rd',0
-'2086',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,141700,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103426 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103426
index edd7a2a45..dca99e474 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103426
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103426
@@ -1,3 +1,3 @@
-'1781',1100,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,94100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
+'1798',1100,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,94100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103427 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103427
index c9f3a104d..383fc7c70 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103427
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103427
@@ -1,3 +1,3 @@
-'1781',2501,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'2091',2501,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'2931',2501,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103428 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103428
index a525ecd14..39571a206 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103428
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103428
@@ -1,3 +1,3 @@
-'1781',1100,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,94000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
+'1798',1100,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,94000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103429 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103429
index c33129544..b6028dcb7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103429
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103429
@@ -1,3 +1,3 @@
-'1781',1100,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2086',1100,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
+'1798',1100,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
+'3091',1100,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103430 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103430
index b83f81f67..00bf88856 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103430
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103430
@@ -1,8 +1,8 @@
-'1781',1001,250800,0,'North Rutland',0
-'2091',1001,231800,0,'Rutland Exch',0
-'1781',1100,83800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,15000,4,'',0,10000,4,'',0
-'1781',1101,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'2086',1100,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1500,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
-'2086',1101,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1100,94300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,16000,4,'',0,11500,4,'',0
-'2091',1101,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'2931',1001,250800,0,'Rutland Exch',0
+'3091',1001,231800,0,'Rutland Exch',0
+'1798',1100,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
+'1798',1101,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1100,83800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,15000,4,'',0,10000,4,'',0
+'2931',1101,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
+'3091',1100,94300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,16000,4,'',0,11500,4,'',0
+'3091',1101,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103432 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103432
index 0156b73f3..28534b657 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103432
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103432
@@ -1,3 +1,3 @@
-'1781',1601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103433 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103433
index 7c63b288d..436215a79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103433
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103433
@@ -1,3 +1,3 @@
-'1781',1201,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1201,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1201,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103434 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103434
index 49248addf..41268f1f7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103434
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103434
@@ -1,3 +1,3 @@
-'1781',2600,73700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,110300,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'1798',2600,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,110300,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103435 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103435
index ea01abaaf..e1b1dcca9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103435
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103435
@@ -1,3 +1,3 @@
-'1781',2601,74000,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72100,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2601,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74000,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,72100,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103436 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103436
index b41ab0058..b98d9b12b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103436
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103436
@@ -1,3 +1,3 @@
-'1781',1200,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1200,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1200,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103439 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103439
index a6b06e3fe..f926e542d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103439
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103439
@@ -1,3 +1,3 @@
-'1781',1700,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103440 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103440
index 607174c16..236be339a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103440
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103440
@@ -1 +1 @@
-'2086',1501,81100,,'',0,73000,,'',0
+'1798',1501,81100,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103441 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103441
index 15331f896..65b67637d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103441
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103441
@@ -1 +1 @@
-'2086',1501,80900,,'',0,73000,,'',0
+'1798',1501,80900,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103444 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103444
index 15331f896..65b67637d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103444
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103444
@@ -1 +1 @@
-'2086',1501,80900,,'',0,73000,,'',0
+'1798',1501,80900,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103445 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103445
index 04d49b967..0741d9184 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103445
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103445
@@ -1,3 +1,3 @@
-'1781',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103446 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103446
index 3d3baa725..48770ee38 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103446
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103446
@@ -1,3 +1,3 @@
-'1781',1401,75600,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,81800,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,75600,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,81800,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103447 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103447
index ef214b5d1..557b623ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103447
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103447
@@ -1,3 +1,3 @@
-'1781',2500,92700,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,101200,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92700,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,101200,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103448 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103448
index 89e396090..61b1b35c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103448
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103448
@@ -1,3 +1,3 @@
-'1781',1400,81000,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,83200,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,81000,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,83200,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103450 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103450
index efb1584d9..57d76cafc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103450
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103450
@@ -1,3 +1,3 @@
-'1781',2501,95200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'2091',2501,103600,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'2931',2501,95200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103600,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103451 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103451
index f8ba88072..d27d860a0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103451
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103451
@@ -1,3 +1,3 @@
-'1781',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103452 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103452
index 2ad55750d..01ecb5f20 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103452
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103452
@@ -1,3 +1,3 @@
-'1781',2000,75800,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75200,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75800,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75200,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103457 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103457
index 725b43d61..64d1cf566 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103457
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103457
@@ -1,2 +1 @@
-'2086',400,153300,,'',0
-'2086',1200,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
+'1798',1200,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103458 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103458
index 5847a1d88..417c0d6bc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103458
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103458
@@ -1,3 +1,3 @@
-'1781',1200,94100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1200,91400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1200,94100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,91400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103459 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103459
index 60a136599..d4cc5b5c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103459
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103459
@@ -1,3 +1,3 @@
-'1781',2600,73500,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,110100,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'1798',2600,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73500,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,110100,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103460 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103460
index 8f8666a9b..be5859ed5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103460
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103460
@@ -1,3 +1,3 @@
-'1781',2001,65600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2086',2001,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'3091',2001,82500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103461 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103461
index 82c2bb490..7156380f3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103461
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103461
@@ -1,3 +1,3 @@
-'1781',1201,94300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1201,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,91600,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,94300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1201,91600,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103462 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103462
index 813bec1ef..d64c577c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103462
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103462
@@ -1,3 +1,3 @@
-'1781',2601,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2601,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103463 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103463
index 581293238..8cfa38ee8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103463
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103463
@@ -1,3 +1,3 @@
-'1781',2500,92500,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,101000,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92500,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,101000,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103464 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103464
index 4e90aac72..c9fa4be79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103464
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103464
@@ -1 +1 @@
-'2086',1501,81000,,'',0,73000,,'',0
+'1798',1501,81000,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103465 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103465
index 15b97a6b6..f88d4f00a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103465
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103465
@@ -1,3 +1,3 @@
-'1781',2501,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103467 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103467
index 1f9557e7c..41a48a01d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103467
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103467
@@ -1,3 +1,3 @@
-'1781',2000,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103469 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103469
index 37ad2a9fb..a77f2f4b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103469
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103469
@@ -1,3 +1,3 @@
-'1781',2401,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103470 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103470
index 607174c16..236be339a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103470
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103470
@@ -1 +1 @@
-'2086',1501,81100,,'',0,73000,,'',0
+'1798',1501,81100,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103471 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103471
index 37ad2a9fb..a77f2f4b4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103471
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103471
@@ -1,3 +1,3 @@
-'1781',2401,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103472 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103472
index cfa8d121e..4e68aca5d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103472
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103472
@@ -1,4 +1,4 @@
-'1781',2300,71400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'2091',2300,80800,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'2086',3200,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
+'1798',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'2931',2300,71400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,80800,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',3200,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103473 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103473
index c2bd575c2..7622a32fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103473
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103473
@@ -1,3 +1,3 @@
-'1781',2600,73400,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,110000,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
+'1798',2600,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73400,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,110000,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103474 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103474
index 73cad32c8..aadf59a09 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103474
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103474
@@ -1,3 +1,3 @@
-'1781',2001,65700,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2086',2001,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,14100,,'',0
+'1798',2001,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65700,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'3091',2001,82600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,14100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103477 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103477
index dd927083c..d050cd19e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103477
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103477
@@ -1,3 +1,3 @@
-'1781',1400,81200,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,83400,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,81200,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,83400,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103478 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103478
index 7bdf553ac..93e5bc09e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103478
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103478
@@ -1,2 +1,2 @@
-'1781',2301,101200,0,'Old Vernon Rd',0
-'2086',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,101200,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103480 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103480
index d9a2a8f91..051e15afd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103480
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103480
@@ -1,2 +1,2 @@
-'1781',2300,141900,0,'Old Vernon Rd',0
-'2086',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,141900,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103481 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103481
index fa9111d02..c1de96ad5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103481
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103481
@@ -1,3 +1,3 @@
-'1781',2401,83000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103482 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103482
index 903a61223..e2fd407fe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103482
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103482
@@ -1,3 +1,3 @@
-'1781',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103483 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103483
index 4ea23ba7c..8b0ee4f1b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103483
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103483
@@ -1,3 +1,3 @@
-'1781',2500,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'2086',2500,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
+'3091',2500,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103484 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103484
index 1f9557e7c..41a48a01d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103484
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103484
@@ -1,3 +1,3 @@
-'1781',2000,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103485 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103485
index 2d293c5f8..9a38d5318 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103485
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103485
@@ -1,3 +1,3 @@
-'1781',2501,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103486 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103486
index 34d38fbec..45a20a03f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103486
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103486
@@ -1,3 +1,3 @@
-'1781',2001,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2086',2001,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'1798',2001,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'3091',2001,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103489 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103489
index 968b742a6..4a4405ec0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103489
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103489
@@ -1,6 +1,6 @@
-'1781',1200,94200,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,4000,4,'',0,46500,4,'',0
-'1781',1201,94200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2086',1200,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
-'2086',1201,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1200,91500,4,'',0,3700,4,'',0,18900,4,'',0,18700,4,'',0,18300,4,'',0,4000,4,'',0,18800,4,'',0,8100,4,'',0
-'2091',1201,91500,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1200,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
+'1798',1201,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1200,94200,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,4000,4,'',0,46500,4,'',0
+'2931',1201,94200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
+'3091',1200,91500,4,'',0,3700,4,'',0,18900,4,'',0,18700,4,'',0,18300,4,'',0,4000,4,'',0,18800,4,'',0,8100,4,'',0
+'3091',1201,91500,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103490 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103490
index 46194eb82..52203cffa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103490
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103490
@@ -1,3 +1,3 @@
-'1781',1401,75800,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,82000,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,75800,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,82000,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103491 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103491
index 6a79bb3d8..94a449c04 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103491
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103491
@@ -1,3 +1,3 @@
-'1781',2001,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2086',2001,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'1798',2001,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'3091',2001,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103492 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103492
index d8f9b8ae0..7f87eebe7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103492
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103492
@@ -1,3 +1,3 @@
-'1781',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103493 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103493
index 6cf8ac760..4f3c7c088 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103493
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103493
@@ -1,3 +1,3 @@
-'1781',2400,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103495 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103495
index 1121fc1de..840714ad1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103495
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103495
@@ -1,3 +1,3 @@
-'1781',2401,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73600,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73600,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103497 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103497
index 2ff0ed5b7..b6b7d8aae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103497
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103497
@@ -1,3 +1,3 @@
-'1781',2501,95800,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,104200,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'1798',2501,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,95800,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,104200,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103500 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103500
index d8f9b8ae0..7f87eebe7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103500
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103500
@@ -1,3 +1,3 @@
-'1781',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103501 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103501
index 0b7290a7a..3acba2b39 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103501
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103501
@@ -1,3 +1,3 @@
-'1781',1400,80800,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,83000,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,80800,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,83000,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103502 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103502
index acf7e8a38..77cca7fa6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103502
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103502
@@ -1,3 +1,3 @@
-'1781',2600,73300,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,105900,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'1798',2600,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73300,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,105900,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103503 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103503
index 0ae7cfb74..ec47a2618 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103503
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103503
@@ -1,2 +1,2 @@
-'1781',2301,101100,0,'Old Vernon Rd',0
-'2086',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,101100,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103505 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103505
index 39f076dc1..f62dba9dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103505
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103505
@@ -1,3 +1,3 @@
-'1781',2601,74300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2601,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,72400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103506 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103506
index 874fbb809..a41fd6e22 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103506
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103506
@@ -1,2 +1,2 @@
-'1781',2300,141900,0,'Old Vernon Rd',0
-'2086',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,141900,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103507 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103507
deleted file mode 100644
index bb077f335..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103507
+++ /dev/null
@@ -1 +0,0 @@
-'2086',400,154400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103508 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103508
index 4ea23ba7c..8b0ee4f1b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103508
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103508
@@ -1,3 +1,3 @@
-'1781',2500,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'2086',2500,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
+'3091',2500,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103509 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103509
index 2d293c5f8..9a38d5318 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103509
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103509
@@ -1,3 +1,3 @@
-'1781',2501,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103510 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103510
index 695f863d2..16723d084 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103510
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103510
@@ -1,3 +1,3 @@
-'1781',2001,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2086',2001,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'1798',2001,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'3091',2001,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103511 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103511
index b5643e88b..c59844260 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103511
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103511
@@ -1,3 +1,3 @@
-'1781',2501,95900,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,104300,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'1798',2501,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,95900,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,104300,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103512 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103512
deleted file mode 100644
index dab262772..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103512
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,83500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103513 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103513
index f6be678cb..35bff87ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103513
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103513
@@ -1,3 +1,3 @@
-'1781',2401,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,14100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,14100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103515 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103515
index a9d0cee84..48f8935a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103515
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103515
@@ -1,3 +1,3 @@
-'1781',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103516 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103516
index 2c51fb5fe..59d5d2509 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103516
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103516
@@ -1,3 +1,3 @@
-'1781',2400,71900,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81100,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,71900,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81100,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103518 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103518
index 7834e8974..77286a2ff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103518
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103518
@@ -1,3 +1,3 @@
-'1781',2001,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2086',2001,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'1798',2001,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'3091',2001,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103519 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103519
index d8f9b8ae0..7f87eebe7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103519
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103519
@@ -1,3 +1,3 @@
-'1781',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103520 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103520
index 648dd196b..e7e70707d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103520
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103520
@@ -1,3 +1,3 @@
-'1781',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103521 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103521
index bdfa46978..ed48dde12 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103521
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103521
@@ -1,3 +1,3 @@
-'1781',1400,80700,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,82900,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,80700,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,82900,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103522 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103522
index d514e5d9c..19c16181c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103522
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103522
@@ -1,3 +1,3 @@
-'1781',1601,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103523 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103523
index 90f24045b..a40993dfe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103523
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103523
@@ -1,3 +1,3 @@
-'1781',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103524 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103524
index c55b8a814..e27ad3525 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103524
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103524
@@ -1,3 +1,3 @@
-'1781',1401,80000,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,82200,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,80000,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,82200,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103525 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103525
index b82a02964..41a328522 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103525
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103525
@@ -1,3 +1,3 @@
-'1781',2501,95600,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,104000,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,95600,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,104000,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103526 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103526
index 8bfb962b1..a53ced486 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103526
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103526
@@ -1,3 +1,3 @@
-'1781',1400,80600,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,82800,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,80600,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,82800,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103527 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103527
index 0c2244bcc..707066af8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103527
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103527
@@ -1,3 +1,3 @@
-'1781',2500,92200,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'2086',2500,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100700,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'1798',2500,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92200,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
+'3091',2500,100700,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103528 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103528
index fe6b39b71..8ac5af369 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103528
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103528
@@ -1,3 +1,3 @@
-'1781',2600,73200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,105800,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'1798',2600,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,105800,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103529 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103529
index d8f9b8ae0..7f87eebe7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103529
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103529
@@ -1,3 +1,3 @@
-'1781',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103531 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103531
index a9d0cee84..48f8935a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103531
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103531
@@ -1,3 +1,3 @@
-'1781',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103532 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103532
index 8573b3a78..c347026d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103532
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103532
@@ -1,3 +1,3 @@
-'1781',2001,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2086',2001,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'1798',2001,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'3091',2001,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103533 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103533
index d92da8141..094e1cdbf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103533
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103533
@@ -1,3 +1,3 @@
-'1781',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103535 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103535
index a664f68d5..adf811ebf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103535
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103535
@@ -1,3 +1,3 @@
-'1781',2501,100000,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,104400,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'1798',2501,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,100000,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,104400,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103537 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103537
index b88b95926..b252e17bb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103537
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103537
@@ -1,3 +1,3 @@
-'1781',2500,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2086',2500,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'1798',2500,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'3091',2500,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103538 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103538
index daa9805b6..f730107c9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103538
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103538
@@ -1,3 +1,3 @@
-'1781',1401,80400,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
-'2086',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,82600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,80400,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
+'3091',1401,82600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103539 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103539
index 086000c82..273c104aa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103539
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103539
@@ -1,3 +1,3 @@
-'1781',1401,80100,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,82300,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,80100,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,82300,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103540 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103540
index 816844102..290052e31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103540
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103540
@@ -1,3 +1,3 @@
-'1781',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103541 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103541
index 3addbf4db..a7fc7b22c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103541
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103541
@@ -1,6 +1,6 @@
-'1781',2400,71800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'1781',2600,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'1798',2400,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,71800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2600,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103542 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103542
index 7a57a01c5..36cc04305 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103542
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103542
@@ -1,6 +1,6 @@
-'1781',2401,83200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2601,74400,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2086',2601,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72500,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2401,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2601,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74400,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'3091',2601,72500,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103547 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103547
index a5a91e281..298090967 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103547
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103547
@@ -1,2 +1,2 @@
-'1781',2301,100800,0,'Old Vernon Rd',0
-'2086',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,100800,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103548 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103548
index dc676b79a..e077ec43c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103548
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103548
@@ -1,2 +1,2 @@
-'1781',2300,142200,0,'Old Vernon Rd',0
-'2086',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,142200,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103550 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103550
index 9188b923e..311f80d67 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103550
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103550
@@ -1,3 +1,3 @@
-'1781',1401,80200,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2086',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
-'2091',1401,82400,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
+'1798',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
+'2931',1401,80200,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
+'3091',1401,82400,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103551 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103551
index 92c8312ba..80b9f36d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103551
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103551
@@ -1,6 +1,6 @@
-'1781',2400,71700,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,80900,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'1781',2600,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'1798',2400,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,71700,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,80900,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2600,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103552 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103552
index de7c281ff..87e8dd53e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103552
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103552
@@ -1,6 +1,6 @@
-'1781',2401,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2601,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2086',2601,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2401,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2601,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'3091',2601,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103553 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103553
index 38684567a..77b977b82 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103553
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103553
@@ -1,3 +1,3 @@
-'1781',2001,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2086',2001,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
+'1798',2001,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'3091',2001,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103554 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103554
index 3ad503c56..c276689d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103554
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103554
@@ -1,3 +1,3 @@
-'1781',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2086',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'2091',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'1798',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'2931',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'3091',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103556 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103556
index 81b5639f6..4cdd7a93f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103556
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103556
@@ -1,6 +1,6 @@
-'1781',2401,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2601,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2086',2601,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2401,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2601,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'3091',2601,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103557 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103557
index 807240809..c512979aa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103557
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103557
@@ -1,6 +1,6 @@
-'1781',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'1781',1401,80500,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
-'2086',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'2086',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
-'2091',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'2091',1401,82700,4,'',0,22400,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
+'1798',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
+'1798',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
+'2931',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
+'2931',1401,80500,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
+'3091',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
+'3091',1401,82700,4,'',0,22400,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103561 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103561
index 7ef84e9a9..adc1fb997 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103561
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103561
@@ -1,2 +1,2 @@
-'1781',2300,142200,0,'Old Vernon Rd',0
-'2086',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,142200,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103562 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103562
index 816844102..290052e31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103562
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103562
@@ -1,3 +1,3 @@
-'1781',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103563 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103563
index 533795d15..abe98ac26 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103563
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103563
@@ -1,6 +1,6 @@
-'1781',2400,71600,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,80800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'1781',2600,73000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,105600,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'1798',2400,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,71600,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,80800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2600,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,73000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,105600,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103564 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103564
index 504e03649..b3ef7263a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103564
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103564
@@ -1,2 +1,2 @@
-'1781',2301,100800,0,'Old Vernon Rd',0
-'2086',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,100800,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103565 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103565
index 775d234d7..6815140a5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103565
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103565
@@ -1,9 +1,9 @@
-'1781',2401,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2501,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'1781',2601,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2086',2601,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2401,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2501,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'1798',2601,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'3091',2601,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103566 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103566
index 02ee3f6c2..e7cf0fa13 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103566
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103566
@@ -1,3 +1,3 @@
-'1781',2001,70100,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2086',2001,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,83000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,70100,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
+'3091',2001,83000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103569 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103569
index 5377681e7..a35307d03 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103569
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103569
@@ -1,2 +1,2 @@
-'1781',2300,70500,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
-'2086',2300,55600,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'1798',2300,55600,,'',0,7500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'2931',2300,70500,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103573 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103573
index c1dbbd333..d6adf53ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103573
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103573
@@ -1 +1 @@
-'2086',2801,72800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103574 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103574
index 136864277..c568e4137 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103574
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103574
@@ -1,2 +1,2 @@
-'1781',2301,94200,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9700,,'',0,10000,,'',0,19400,,'',0
-'2086',2301,55700,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'1798',2301,55700,,'',0,7700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,94200,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9700,,'',0,10000,,'',0,19400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103575 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103575
index a06ef1f05..19c3c5ba7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103575
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103575
@@ -1,9 +1,9 @@
-'1781',2401,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,74000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2501,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'1781',2601,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2086',2601,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2401,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,74000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2501,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'1798',2601,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'3091',2601,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103576 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103576
index 3107c1554..c9002b3e4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103576
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103576
@@ -1,2 +1,2 @@
-'1781',2300,142300,0,'Old Vernon Rd',0
-'2086',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,142300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103577 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103577
index 01a32574d..99db6e143 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103577
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103577
@@ -1,2 +1,2 @@
-'1781',2301,100700,0,'Old Vernon Rd',0
-'2086',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,100700,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103579 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103579
index 61d316cc1..3af711dcd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103579
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103579
@@ -1,3 +1,3 @@
-'1781',2001,70400,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
-'2086',2001,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,83300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,70400,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
+'3091',2001,83300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103580 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103580
index 00e1831dc..fbc414419 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103580
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103580
@@ -1,3 +1,3 @@
-'1781',2000,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'2091',2000,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'2931',2000,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103581 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103581
index 00e1831dc..fbc414419 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103581
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103581
@@ -1,3 +1,3 @@
-'1781',2000,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'2091',2000,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'2931',2000,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103582 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103582
index 81952875a..8af70ab07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103582
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103582
@@ -1,3 +1,3 @@
-'1781',2001,70300,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2086',2001,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,83200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,70300,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'3091',2001,83200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103584 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103584
index 22dea05fc..a8f7e50b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103584
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103584
@@ -1,9 +1,9 @@
-'1781',2400,71500,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,80700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'1781',2500,91700,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2086',2500,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100200,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'1781',2600,72900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,105500,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'1798',2400,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,71500,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,80700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2500,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,91700,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'3091',2500,100200,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'1798',2600,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,72900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,105500,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103585 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103585
index c1dbbd333..d6adf53ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103585
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103585
@@ -1 +1 @@
-'2086',2801,72800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103586 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103586
index 6738431f9..dacdf0777 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103586
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103586
@@ -1,3 +1,3 @@
-'1781',2000,75400,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'2091',2000,74800,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'2931',2000,75400,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,74800,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103589 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103589
index 5aaf13abb..c36b6077a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103589
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103589
@@ -1 +1 @@
-'2086',2801,72700,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72700,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103590 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103590
index 02f2cd038..0e3764dc5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103590
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103590
@@ -1,3 +1,3 @@
-'1781',2001,70200,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2086',2001,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
-'2091',2001,83100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
+'2931',2001,70200,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
+'3091',2001,83100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103593 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103593
index 0fd7082de..2446ae637 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103593
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103593
@@ -1,9 +1,9 @@
-'1781',2401,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2501,100300,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2091',2501,104700,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'1781',2601,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2086',2601,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2401,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2501,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'2931',2501,100300,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,104700,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'1798',2601,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'3091',2601,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103594 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103594
index 880f9dc35..273f60ad3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103594
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103594
@@ -1 +1 @@
-'2086',2801,73000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,73000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103595 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103595
index 1b3609dd7..add0fa7a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103595
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103595
@@ -1,9 +1,9 @@
-'1781',2400,71400,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,80600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'1781',2500,91600,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2086',2500,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100100,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'1781',2600,72800,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2086',2600,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2091',2600,105400,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'1798',2400,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,71400,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,80600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2500,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,91600,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'3091',2500,100100,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'1798',2600,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'2931',2600,72800,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'3091',2600,105400,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103596 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103596
index 368c9ca5d..77d36c318 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103596
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103596
@@ -1,3 +1,3 @@
-'1781',2000,75200,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'2091',2000,74600,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2000,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'2931',2000,75200,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,74600,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103597 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103597
index cb03d2c47..21ef2f5cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103597
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103597
@@ -1,12 +1,12 @@
-'1781',2001,70500,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
-'2086',2001,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
-'2091',2001,83400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'1781',2401,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2501,100400,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2086',2501,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2091',2501,104800,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'1781',2601,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2086',2601,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2001,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
+'2931',2001,70500,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
+'3091',2001,83400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2401,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2501,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'2931',2501,100400,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
+'3091',2501,104800,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
+'1798',2601,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
+'3091',2601,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103598 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103598
index 880f9dc35..273f60ad3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103598
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103598
@@ -1 +1 @@
-'2086',2801,73000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,73000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103599 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103599
index 8e2c334d2..937651efc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103599
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103599
@@ -1,2 +1,2 @@
-'1781',2301,100600,0,'Old Vernon Rd',0
-'2086',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,100600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103600 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103600
index bd5513743..a5da2fd31 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103600
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103600
@@ -1,2 +1,2 @@
-'1781',2300,142400,0,'Old Vernon Rd',0
-'2086',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,142400,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103602 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103602
index 4a2c804cf..5539b326b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103602
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103602
@@ -1 +1 @@
-'2086',2801,73100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,73100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103604 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103604
index e7cdc096b..8fa0921e4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103604
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103604
@@ -1,2 +1,2 @@
-'1781',2300,70600,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
-'2086',2300,55700,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'1798',2300,55700,,'',0,7500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'2931',2300,70600,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103607 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103607
index 9f228a355..ddc29c5de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103607
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103607
@@ -1,2 +1,2 @@
-'1781',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'2086',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'1798',2301,55600,,'',0,7700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103608 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103608
index c24f901c3..b441695e9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103608
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103608
@@ -1,3 +1,3 @@
-'1781',2101,63100,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73300,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63100,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73300,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103609 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103609
index 9f228a355..ddc29c5de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103609
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103609
@@ -1,2 +1,2 @@
-'1781',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'2086',2301,55600,,'',0,7700,,'',0,7600,,'',0,4900,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'1798',2301,55600,,'',0,7700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103610 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103610
index c16db6571..08ada6fc2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103610
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103610
@@ -1,2 +1,2 @@
-'1781',2300,70700,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
-'2086',2300,55800,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'1798',2300,55800,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'2931',2300,70700,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103611 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103611
index 94394c9cc..de43250db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103611
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103611
@@ -1,3 +1,3 @@
-'1781',2300,70700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,10200,,'',0,9100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,55800,,'',0,7500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'2091',2300,80000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,55800,,'',0,7500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7300,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'2931',2300,70700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,10200,,'',0,9100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,80000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103613 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103613
index 399feecb1..08b012514 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103613
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103613
@@ -1,2 +1,2 @@
-'1781',2301,100500,0,'Old Vernon Rd',0
-'2086',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,100500,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103614 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103614
index eef2d3d1e..2a70391ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103614
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103614
@@ -1,3 +1,3 @@
-'1781',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103615 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103615
index eef2d3d1e..2a70391ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103615
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103615
@@ -1,3 +1,3 @@
-'1781',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103616 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103616
index eef2d3d1e..2a70391ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103616
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103616
@@ -1,3 +1,3 @@
-'1781',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103617 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103617
index 0d2bf443b..05d80ebf7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103617
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103617
@@ -1,3 +1,3 @@
-'1781',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103618 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103618
index 9480fde1d..948bb9a1a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103618
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103618
@@ -1,3 +1,3 @@
-'1781',2101,63700,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73900,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63700,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73900,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103619 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103619
index ce939dc27..ff52f428d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103619
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103619
@@ -1,2 +1,2 @@
-'1781',2301,100500,0,'Old Vernon Rd',0
-'2086',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,100500,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103620 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103620
index 533dcb820..631ef7b56 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103620
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103620
@@ -1,2 +1,2 @@
-'1781',2300,142600,0,'Old Vernon Rd',0
-'2086',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,142600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103621 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103621
index 81fab0eb9..c91b4e82b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103621
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103621
@@ -1,3 +1,3 @@
-'1781',2101,63200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73400,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73400,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103622 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103622
index 57af31eaa..37ca077f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103622
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103622
@@ -1,3 +1,3 @@
-'1781',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103623 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103623
index 0d2bf443b..05d80ebf7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103623
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103623
@@ -1,3 +1,3 @@
-'1781',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103624 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103624
index 57af31eaa..37ca077f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103624
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103624
@@ -1,3 +1,3 @@
-'1781',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103625 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103625
index 96ca9997e..532a4d262 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103625
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103625
@@ -1,3 +1,3 @@
-'1781',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103626 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103626
index 762dc4a15..1433f0e3b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103626
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103626
@@ -1,3 +1,3 @@
-'1781',2101,63900,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74100,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63900,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74100,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103627 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103627
index 63175bde2..76859c792 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103627
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103627
@@ -1,3 +1,3 @@
-'1781',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103628 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103628
index 60dd6ff3e..96c57a5be 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103628
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103628
@@ -1,3 +1,3 @@
-'1781',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103629 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103629
index 57af31eaa..37ca077f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103629
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103629
@@ -1,3 +1,3 @@
-'1781',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103630 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103630
index 63175bde2..76859c792 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103630
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103630
@@ -1,3 +1,3 @@
-'1781',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103631 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103631
index a3000753a..613fe3b32 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103631
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103631
@@ -1,3 +1,3 @@
-'1781',2101,64400,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64400,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103632 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103632
index 3f33e947f..9baf4dda5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103632
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103632
@@ -1,3 +1,3 @@
-'1781',2101,63300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,73500,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,63300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,73500,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103633 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103633
index 40ad40d0b..910af18f0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103633
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103633
@@ -1,3 +1,3 @@
-'1781',2101,64400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103634 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103634
index 44a209bba..0a4965576 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103634
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103634
@@ -1,3 +1,3 @@
-'1781',2101,64100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103636 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103636
index 3c1bdb84b..097736c63 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103636
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103636
@@ -1,3 +1,3 @@
-'1781',2101,64500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
+'1798',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103637 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103637
index cb5e3be26..3339a1b73 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103637
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103637
@@ -1,3 +1,3 @@
-'1781',2101,65100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,75400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
+'1798',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,65100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,75400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103638 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103638
index db31bae59..bc91a7e1c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103638
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103638
@@ -1,3 +1,3 @@
-'1781',2101,64500,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74800,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64500,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74800,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103639 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103639
index ab9e1df31..126f140cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103639
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103639
@@ -1,3 +1,3 @@
-'1781',2101,65000,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,75300,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,65000,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,75300,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103640 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103640
index 6eb1c209f..f04dcfd4b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103640
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103640
@@ -1,3 +1,3 @@
-'1781',2101,64200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74500,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74500,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103641 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103641
index 50c258e14..56a55c42b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103641
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103641
@@ -1,3 +1,3 @@
-'1781',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103642 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103642
index 9c5768f99..46f1f4bf3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103642
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103642
@@ -1,3 +1,3 @@
-'1781',2101,64300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103643 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103643
index 19b9bd76f..526af2d12 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103643
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103643
@@ -1,3 +1,3 @@
-'1781',2101,65300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,14400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,75600,,'',0,14500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
+'1798',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,65300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,14400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,75600,,'',0,14500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103644 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103644
index 12b64fd74..02b5462f8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103644
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103644
@@ -1,3 +1,3 @@
-'1781',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103645 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103645
index 1d37f4b3c..893f360ea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103645
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103645
@@ -1,3 +1,3 @@
-'1781',2101,64900,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,75200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64900,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,75200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103646 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103646
index 50c258e14..56a55c42b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103646
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103646
@@ -1,3 +1,3 @@
-'1781',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103647 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103647
index d20dc3f72..55f1e0b39 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103647
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103647
@@ -1,3 +1,3 @@
-'1781',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103648 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103648
index 12b64fd74..02b5462f8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103648
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103648
@@ -1,3 +1,3 @@
-'1781',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103649 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103649
index d20dc3f72..55f1e0b39 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103649
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103649
@@ -1,3 +1,3 @@
-'1781',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2086',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
-'2091',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
+'1798',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
+'2931',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
+'3091',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103650 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103650
index 485d2f760..b387bed33 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103650
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103650
@@ -1,3 +1,3 @@
-'1781',2300,71100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,14300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,60200,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1600,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'2091',2300,80400,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,60200,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3300,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'2931',2300,71100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,14300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,80400,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103652 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103652
index 6d216732c..59bce4cf0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103652
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103652
@@ -1,3 +1,3 @@
-'1781',2301,73600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,6500,0,'Old Vernon Rd',0,3600,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2301,83100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,73600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,6500,0,'Old Vernon Rd',0,3600,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2301,83100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103653 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103653
index 700fbb977..fa3811c9c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103653
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103653
@@ -1,3 +1,3 @@
-'1781',2300,71200,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,2700,,'',0,6900,,'',0,7300,,'',0,10200,,'',0,5100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,60300,,'',0,3500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'2091',2300,80500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,60300,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'2931',2300,71200,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,2700,,'',0,6900,,'',0,7300,,'',0,10200,,'',0,5100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,80500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103654 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103654
index fb8eca3ca..b47ffdf7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103654
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103654
@@ -1,3 +1,3 @@
-'1781',2300,71300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,60400,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'2091',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,60400,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'2931',2300,71300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103655 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103655
index 0e89e6b47..785bd33b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103655
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103655
@@ -1,3 +1,3 @@
-'1781',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103656 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103656
index 9ca4794a1..8ee887db2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103656
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103656
@@ -1,2 +1,2 @@
-'1781',2301,94300,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'2086',2301,55800,,'',0,7700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'1798',2301,55800,,'',0,7700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,94300,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103657 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103657
index 8b51bc315..2c54c58c9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103657
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103657
@@ -1,3 +1,3 @@
-'1781',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2500,0,'Old Vernon Rd',0,7600,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6600,,'',0,2900,,'',0,7100,,'',0,10400,,'',0,9000,,'',0,10500,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,1800,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,7500,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2500,0,'Old Vernon Rd',0,7600,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6600,,'',0,2900,,'',0,7100,,'',0,10400,,'',0,9000,,'',0,10500,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103658 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103658
index ea5e38dd4..c58cbd121 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103658
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103658
@@ -1,4 +1,4 @@
-'1781',2300,71400,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7300,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,60500,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'2091',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'2086',3200,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',2300,60500,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
+'2931',2300,71400,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7300,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',3200,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103659 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103659
index 4df767098..367df8056 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103659
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103659
@@ -1,3 +1,3 @@
-'1781',2300,73200,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,82600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,73200,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,82600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103660 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103660
index b62744921..93a4c0abe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103660
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103660
@@ -1,6 +1,6 @@
-'1781',2300,73300,4,'',0,7100,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,2600,4,'',0,7500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7100,4,'',0,4000,4,'',0,6000,4,'',0,3600,4,'',0,7400,4,'',0,3000,4,'',0,6700,4,'',0,2800,4,'',0,7200,4,'',0,10300,4,'',0,9100,4,'',0,10400,4,'',0,11200,4,'',0,10800,4,'',0,11000,4,'',0
-'1781',2301,73300,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'2086',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,82800,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,14000,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
-'2091',2301,82800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'1798',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,73300,4,'',0,7100,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,2600,4,'',0,7500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7100,4,'',0,4000,4,'',0,6000,4,'',0,3600,4,'',0,7400,4,'',0,3000,4,'',0,6700,4,'',0,2800,4,'',0,7200,4,'',0,10300,4,'',0,9100,4,'',0,10400,4,'',0,11200,4,'',0,10800,4,'',0,11000,4,'',0
+'2931',2301,73300,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,82800,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,14000,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
+'3091',2301,82800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103661 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103661
index 8f16cd5e0..6cb845aa9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103661
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103661
@@ -1,4 +1,4 @@
-'1781',2300,71500,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'2091',2300,80900,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'2086',3200,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'1798',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'2931',2300,71500,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,80900,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',3200,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103662 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103662
index a0cd4877d..575abd337 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103662
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103662
@@ -1,3 +1,3 @@
-'1781',2300,73100,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,82500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,73100,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,82500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103663 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103663
index c6b3c2081..c0e2ed05a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103663
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103663
@@ -1,3 +1,3 @@
-'1781',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'2091',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'2931',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103664 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103664
index d4d34fb4d..e23edaefe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103664
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103664
@@ -1,3 +1,3 @@
-'1781',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'2091',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
+'2931',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103665 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103665
index da811f444..34b9529ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103665
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103665
@@ -1,3 +1,3 @@
-'1781',2201,83600,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81300,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,83600,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81300,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103666 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103666
index d693cc5ba..97c2c4616 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103666
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103666
@@ -1,3 +1,3 @@
-'1781',2300,71700,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'2091',2300,81100,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'2931',2300,71700,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81100,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103667 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103667
index c2b855abc..94b669a04 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103667
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103667
@@ -1,3 +1,3 @@
-'1781',2200,91100,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'2091',2200,84400,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'2931',2200,91100,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,84400,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103668 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103668
index aabaa1028..86e8a8f0d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103668
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103668
@@ -1,3 +1,3 @@
-'1781',2300,72900,,'',0,7100,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,82400,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,72900,,'',0,7100,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,82400,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103669 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103669
index 9562e55e8..dec5268c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103669
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103669
@@ -1,3 +1,3 @@
-'1781',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103670 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103670
index cbde6d4c5..cd0f72b0f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103670
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103670
@@ -1,3 +1,3 @@
-'1781',2300,72900,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,72900,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103671 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103671
index e7e4a874f..2e7ea6381 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103671
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103671
@@ -1,3 +1,3 @@
-'1781',2200,91000,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
-'2091',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
+'2931',2200,91000,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103672 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103672
index 9562e55e8..dec5268c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103672
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103672
@@ -1,3 +1,3 @@
-'1781',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103673 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103673
index 4e83aadba..202e5491b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103673
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103673
@@ -1,3 +1,3 @@
-'1781',2300,71800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'2091',2300,81200,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'2931',2300,71800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81200,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103674 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103674
index e40f277f9..4a17ca116 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103674
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103674
@@ -1,3 +1,3 @@
-'1781',2300,72800,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,72800,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103675 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103675
index a7e716195..1c3230b21 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103675
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103675
@@ -1,3 +1,3 @@
-'1781',2200,90900,,'',0,10900,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
-'2091',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
+'2931',2200,90900,,'',0,10900,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103676 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103676
index c7495b0ec..cda8518cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103676
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103676
@@ -1,3 +1,3 @@
-'1781',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'2091',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'2931',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103677 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103677
index dca69b772..38991fd15 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103677
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103677
@@ -1,3 +1,3 @@
-'1781',2300,72800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,82200,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,72800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,82200,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103678 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103678
index 1aa9f4e83..c5676cca7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103678
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103678
@@ -1,3 +1,3 @@
-'1781',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
-'2091',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
+'2931',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103679 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103679
index 1c3518c4a..ef2f1a4e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103679
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103679
@@ -1,4 +1,4 @@
-'1781',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'2091',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'2086',3200,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'1798',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'2931',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
+'1798',3200,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103680 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103680
index 123efd661..1b8a1272f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103680
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103680
@@ -1,2 +1,2 @@
-'1781',2300,70500,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
-'2086',2300,55600,,'',0,7500,,'',0,7000,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'1798',2300,55600,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
+'2931',2300,70500,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103681 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103681
index 51bc61e74..dcf84c7a5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103681
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103681
@@ -1,3 +1,3 @@
-'1781',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103682 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103682
index 06e3d1944..13f76ede8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103682
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103682
@@ -1,3 +1,3 @@
-'1781',2201,83800,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81500,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,83800,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81500,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103683 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103683
index c299a2f35..f311deb85 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103683
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103683
@@ -1,3 +1,3 @@
-'1781',2300,72100,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'2091',2300,81500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'2931',2300,72100,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103684 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103684
index 01d21a7a1..5a1f3384f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103684
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103684
@@ -1,3 +1,3 @@
-'1781',2300,72000,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'2091',2300,81400,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
+'2931',2300,72000,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81400,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103685 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103685
index 6de9e1419..9c7e3ba1e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103685
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103685
@@ -1,4 +1,4 @@
-'1781',2300,72400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,81800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'2086',3200,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,72400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,81800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
+'1798',3200,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103686 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103686
index bf12f0eb0..6cf0ce43b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103686
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103686
@@ -1,6 +1,6 @@
-'1781',2200,90500,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'1781',2201,83900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
-'2086',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2200,84100,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2091',2201,81600,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
+'1798',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2200,90500,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'2931',2201,83900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2200,84100,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'3091',2201,81600,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103688 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103688
index 8b0f7a809..8eab05d99 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103688
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103688
@@ -1,3 +1,3 @@
-'1781',2300,72600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2300,82000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
+'1798',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2300,72600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,82000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689
index faecd50d4..92ff2a113 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689
@@ -1,3 +1,3 @@
-'1781',2201,84000,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81700,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,84000,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81700,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690
index 4a10905a7..3c0606101 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690
@@ -1,3 +1,3 @@
-'1781',2200,90500,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62500,,'',0,2800,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
-'2091',2200,84100,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62500,,'',0,2800,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
+'2931',2200,90500,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,84100,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103691 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103691
index d6abcbfe1..a4693c916 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103691
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103691
@@ -1,3 +1,3 @@
-'1781',2201,84100,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81800,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,84100,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81800,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103692 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103692
index 1ac35c79c..813539d22 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103692
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103692
@@ -1,3 +1,3 @@
-'1781',2200,90300,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62400,,'',0,2700,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
-'2091',2200,83900,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62400,,'',0,2700,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
+'2931',2200,90300,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83900,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103693 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103693
index 883bcf330..3c8fb16a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103693
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103693
@@ -1,3 +1,3 @@
-'1781',2201,84100,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,84100,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103694 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103694
index 04cc022fd..3efdb804f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103694
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103694
@@ -1,3 +1,3 @@
-'1781',2201,84200,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81900,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,84200,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81900,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103695 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103695
index 81bc86eb0..2cd7854f0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103695
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103695
@@ -1,3 +1,3 @@
-'1781',2200,90100,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62400,,'',0,2500,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'2091',2200,83700,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62400,,'',0,2500,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'2931',2200,90100,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83700,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103700 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103700
index 700884e54..a6c79fb41 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103700
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103700
@@ -1,3 +1,3 @@
-'1781',2200,85900,,'',0,15100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,83500,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85900,,'',0,15100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83500,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103701 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103701
index 5367f381a..1470f0652 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103701
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103701
@@ -1,3 +1,3 @@
-'1781',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'2091',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'2931',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103702 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103702
index 4cecec0d2..a21d2a10b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103702
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103702
@@ -1,3 +1,3 @@
-'1781',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'2091',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'2931',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103703 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103703
index 71e60721c..389ad283c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103703
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103703
@@ -1,3 +1,3 @@
-'1781',2200,85800,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,9700,,'',0,13000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,83400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85800,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,9700,,'',0,13000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103704 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103704
index 633ef227e..133c9d83d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103704
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103704
@@ -1,3 +1,3 @@
-'1781',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'2091',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'2931',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103705 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103705
index f22d3ddfb..76a87447b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103705
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103705
@@ -1,3 +1,3 @@
-'1781',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
-'2091',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
+'2931',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103706 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103706
index f45714066..0049c159a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103706
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103706
@@ -1,3 +1,3 @@
-'1781',2200,85700,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85700,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103707 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103707
index db6bf2fca..75cb0718d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103707
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103707
@@ -1,3 +1,3 @@
-'1781',2200,85700,,'',0,15100,,'',0,10000,,'',0,19300,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17800,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85700,,'',0,15100,,'',0,10000,,'',0,19300,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17800,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103708 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103708
index a2c61b612..808ca0186 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103708
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103708
@@ -1,3 +1,3 @@
-'1781',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
-'2091',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
+'2931',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103709 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103709
index 279e5222b..97d85c2e5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103709
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103709
@@ -1,3 +1,3 @@
-'1781',2200,85600,,'',0,15100,,'',0,10000,,'',0,15200,,'',0,9800,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,83200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85600,,'',0,15100,,'',0,10000,,'',0,15200,,'',0,9800,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103710 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103710
index 11ebef266..e7e1f1527 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103710
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103710
@@ -1,3 +1,3 @@
-'1781',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
-'2086',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
-'2091',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
+'2931',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
+'3091',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103711 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103711
index fb5d42bf0..5f0eb7118 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103711
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103711
@@ -1,3 +1,3 @@
-'1781',2200,85500,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85500,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103712 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103712
index dde594af1..5d42c460f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103712
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103712
@@ -1,3 +1,3 @@
-'1781',2201,84600,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
-'2086',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'2091',2201,82300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'2931',2201,84600,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
+'3091',2201,82300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103713 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103713
index 435fbe4b6..8d34fb8a5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103713
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103713
@@ -1,3 +1,3 @@
-'1781',2200,85400,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85400,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103714 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103714
index 43080db80..048312968 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103714
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103714
@@ -1,3 +1,3 @@
-'1781',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,17500,,'',0,5800,,'',0
-'2086',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
-'2091',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
+'2931',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,17500,,'',0,5800,,'',0
+'3091',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103715 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103715
index 8fe2e6d18..e4750d0d0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103715
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103715
@@ -1,3 +1,3 @@
-'1781',2200,85400,,'',0,15100,,'',0,10000,,'',0,15000,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,83000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85400,,'',0,15100,,'',0,10000,,'',0,15000,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103716 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103716
index 12757080d..fd36ca682 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103716
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103716
@@ -1,3 +1,3 @@
-'1781',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'2086',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
-'2091',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
+'2931',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
+'3091',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103717 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103717
index bea6960c1..cc7cd24ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103717
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103717
@@ -1,3 +1,3 @@
-'1781',2201,84800,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'2086',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'2091',2201,82500,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'2931',2201,84800,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
+'3091',2201,82500,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103718 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103718
index a1b10c44f..2f1e78b23 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103718
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103718
@@ -1,3 +1,3 @@
-'1781',2200,85300,,'',0,15100,,'',0,10000,,'',0,14900,,'',0,10000,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85300,,'',0,15100,,'',0,10000,,'',0,14900,,'',0,10000,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103719 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103719
index c097c429e..15dd7c6e3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103719
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103719
@@ -1,3 +1,3 @@
-'1781',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'2086',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
-'2091',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
+'2931',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
+'3091',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103720 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103720
index 7c7efb3ab..bbe7365ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103720
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103720
@@ -1,3 +1,3 @@
-'1781',2200,85200,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85200,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103721 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103721
index ded1329dc..9e505c1d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103721
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103721
@@ -1,3 +1,3 @@
-'1781',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103722 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103722
index 0ffbd1168..4864a05cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103722
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103722
@@ -1,3 +1,3 @@
-'1781',2200,85100,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,82800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85100,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,82800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103723 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103723
index 87a8d8483..88f01ece4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103723
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103723
@@ -1,3 +1,3 @@
-'1781',2200,85000,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2091',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'2931',2200,85000,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744
index 954257752..0e7c658af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744
@@ -1,4 +1,3 @@
-'2086',8801,155300,,'',0
-'1781',9701,71400,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',9701,55100,,'',0,7300,,'',0,2100,,'',0,1200,,'',0,5200,,'',0,2100,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
-'2091',9701,73300,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',9701,55100,,'',0,7300,,'',0,2100,,'',0,1200,,'',0,5200,,'',0,2100,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
+'2931',9701,71400,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9701,73300,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745
index eb669cec9..11c0a4403 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745
@@ -1,3 +1,3 @@
-'1781',9700,72300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',9700,62300,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5600,0,'Downtown',0,400,,'',0,2000,,'',0,1800,0,'Downtown',0,200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
-'2091',9700,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',9700,62300,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5600,0,'Downtown',0,400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
+'2931',9700,72300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9700,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103800 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103800
index a66efd81e..2bd6b2b16 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103800
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103800
@@ -1,6 +1,6 @@
-'1781',100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',100,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',1601,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',100,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
+'3091',100,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103801 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103801
index bc64c7fc2..24a3bec01 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103801
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103801
@@ -1,6 +1,6 @@
-'1781',101,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,5600,,'',0
-'2086',101,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,700,,'',0,800,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',101,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'1781',1601,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
-'2091',1601,92600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',101,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',101,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,5600,,'',0
+'3091',101,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
+'2931',1601,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,92600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103802 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103802
index ec960b44f..32f2c1554 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103802
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103802
@@ -1,3 +1,3 @@
-'1781',1601,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103803 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103803
index 6a4e465ad..ac0861d5d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103803
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103803
@@ -1,3 +1,3 @@
-'1781',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103804 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103804
index 404e96042..bf3595feb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103804
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103804
@@ -1,3 +1,3 @@
-'1781',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103805 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103805
index 208bd0a55..7aed956eb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103805
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103805
@@ -1,3 +1,3 @@
-'1781',1601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103806 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103806
index 834553b62..e6f08d03f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103806
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103806
@@ -1,3 +1,3 @@
-'1781',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103807 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103807
index e534e8de1..56bf26744 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103807
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103807
@@ -1,3 +1,3 @@
-'1781',1601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103808 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103808
index cd0699cc8..43dfca2b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103808
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103808
@@ -1,3 +1,3 @@
-'1781',1601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103809 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103809
index bcc594ef2..1ed69a182 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103809
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103809
@@ -1,3 +1,3 @@
-'1781',1601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103810 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103810
index 149a2b358..3a326d335 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103810
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103810
@@ -1,3 +1,3 @@
-'1781',1601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103811 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103811
index 47f9b4a38..ae564fa92 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103811
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103811
@@ -1,3 +1,3 @@
-'1781',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103812 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103812
index 44f9969e2..6896f1456 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103812
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103812
@@ -1,3 +1,3 @@
-'1781',1601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103813 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103813
index bb0daf58f..dc0c36ea1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103813
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103813
@@ -1,3 +1,3 @@
-'1781',1601,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103814 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103814
index 2c741a353..86f58c092 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103814
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103814
@@ -1,3 +1,3 @@
-'1781',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103815 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103815
index e01f38b2c..421b0e651 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103815
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103815
@@ -1,4 +1,4 @@
-'2086',1501,82100,,'',0,73100,,'',0
-'1781',1700,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,82100,,'',0,73100,,'',0
+'1798',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103816 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103816
index 7ed36377f..0cbf1a862 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103816
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103816
@@ -1,4 +1,4 @@
-'2086',1501,82000,,'',0,73100,,'',0
-'1781',1700,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,82000,,'',0,73100,,'',0
+'1798',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103817 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103817
index 0bd6255c4..7bcb83938 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103817
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103817
@@ -1,4 +1,4 @@
-'2086',1501,80200,,'',0,73000,,'',0
-'1781',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,800,,'',0,6600,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,1000,,'',0,2000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,80200,,'',0,73000,,'',0
+'1798',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,7400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,3000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103818 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103818
index 5574d075f..a4de34896 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103818
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103818
@@ -1,4 +1,4 @@
-'2086',1501,81900,,'',0,73100,,'',0
-'1781',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1501,81900,,'',0,73100,,'',0
+'1798',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103820 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103820
index 300245f6c..70f55b6d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103820
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103820
@@ -1,3 +1,3 @@
-'1781',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,4800,,'',0,2200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103821 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103821
index e0abd35a8..14cc8d815 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103821
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103821
@@ -1,3 +1,3 @@
-'1781',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,3000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103824 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103824
index 1f17cf21a..95e912671 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103824
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103824
@@ -1,3 +1,3 @@
-'1781',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103825 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103825
index 731170022..1ef394bea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103825
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103825
@@ -1,3 +1,3 @@
-'1781',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,3000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103826 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103826
index 48e87fd93..4924f3498 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103826
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103826
@@ -1,3 +1,3 @@
-'1781',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,1000,,'',0,2000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,3000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103827 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103827
index f202007c6..3a8d502ac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103827
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103827
@@ -1,3 +1,3 @@
-'1781',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103828 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103828
index e4d28e8c3..6bb2e4426 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103828
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103828
@@ -1,3 +1,3 @@
-'1781',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103829 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103829
index 472e14580..b9c0a40d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103829
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103829
@@ -1,3 +1,3 @@
-'1781',1700,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6500,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,1000,,'',0,2000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103833 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103833
index d6b68df5d..ad270d4d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103833
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103833
@@ -1,3 +1,3 @@
-'1781',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2086',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,800,,'',0,6400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103844 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103844
index 4e53047ac..dd11a0555 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103844
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103844
@@ -1,6 +1,6 @@
-'1781',2200,85000,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'1781',2201,85000,4,'',0,15100,4,'',0,10000,4,'',0,14700,4,'',0,10200,4,'',0,16800,4,'',0,10000,4,'',0,9600,4,'',0,14000,4,'',0,17700,4,'',0,17500,4,'',0,9800,4,'',0
-'2086',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'2086',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
-'2091',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2091',2201,82700,4,'',0,9700,4,'',0,22800,4,'',0,26900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
+'1798',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
+'1798',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
+'2931',2200,85000,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
+'2931',2201,85000,4,'',0,15100,4,'',0,10000,4,'',0,14700,4,'',0,10200,4,'',0,16800,4,'',0,10000,4,'',0,9600,4,'',0,14000,4,'',0,17700,4,'',0,17500,4,'',0,9800,4,'',0
+'3091',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'3091',2201,82700,4,'',0,9700,4,'',0,22800,4,'',0,26900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103845 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103845
index 52882ca57..eb474147f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103845
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103845
@@ -1 +1 @@
-'2086',1301,94500,,'',0,41000,,'',0,57500,,'',0
+'1798',1301,94500,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103848 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103848
index 220b58291..1666cd1d1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103848
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103848
@@ -1 +1 @@
-'2086',1300,94200,,'',0,41000,,'',0,57500,,'',0
+'1798',1300,94200,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103849 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103849
index bca45aa1e..22f43599a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103849
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103849
@@ -1 +1 @@
-'2086',1300,94300,,'',0,41000,,'',0,57500,,'',0
+'1798',1300,94300,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103851 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103851
index 4be42c33d..d3823cbce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103851
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103851
@@ -1 +1 @@
-'2086',1301,94600,,'',0,41000,,'',0,57500,,'',0
+'1798',1301,94600,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103852 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103852
index 7ec3df480..2d8f0594c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103852
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103852
@@ -1 +1 @@
-'2086',1301,94400,,'',0,41000,,'',0,57500,,'',0
+'1798',1301,94400,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103853 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103853
index bca45aa1e..22f43599a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103853
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103853
@@ -1 +1 @@
-'2086',1300,94300,,'',0,41000,,'',0,57500,,'',0
+'1798',1300,94300,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103858 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103858
index 5fbf08311..b875df5d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103858
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103858
@@ -1,2 +1,2 @@
-'2086',1300,94400,4,'',0,41000,4,'',0,57500,4,'',0
-'2086',1301,94400,,'',0,41000,,'',0,57500,,'',0
+'1798',1300,94400,4,'',0,41000,4,'',0,57500,4,'',0
+'1798',1301,94400,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104911 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104911
index 813bec1ef..d64c577c8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104911
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104911
@@ -1,3 +1,3 @@
-'1781',2601,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2601,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
-'2091',2601,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2601,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
+'2931',2601,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2601,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104912 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104912
index 0b1bc1cdf..b837461e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104912
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104912
@@ -1,3 +1,3 @@
-'1781',2200,90400,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62500,,'',0,2700,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
-'2091',2200,84000,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62500,,'',0,2700,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
+'2931',2200,90400,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,84000,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104913 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104913
index 307abde7e..91b7e5445 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104913
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104913
@@ -1,2 +1,2 @@
-'1781',2300,142500,0,'Old Vernon Rd',0
-'2086',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,142500,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104914 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104914
index c9f52d55b..f942c79d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104914
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104914
@@ -1 +1 @@
-'2086',1501,81400,,'',0,73000,,'',0
+'1798',1501,81400,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104916 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104916
index d12e1986c..810253d7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104916
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_104916
@@ -1,4 +1,4 @@
-'2086',1300,93800,,'',0,41000,,'',0,57500,,'',0
-'1781',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'2091',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',1300,93800,,'',0,41000,,'',0,57500,,'',0
+'1798',2300,55400,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'2931',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140000
index 982936894..1d984ff0b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140000
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140000
@@ -1,3 +1,3 @@
-'1781',9701,70600,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0
-'2086',9701,61600,,'',0,2100,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1000,0,'Downtown',0,1000,,'',0,6100,,'',0,2500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'2091',9701,75600,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'1798',9701,61600,,'',0,2100,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1000,0,'Downtown',0,1000,,'',0,6100,,'',0,2500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'2931',9701,70600,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0
+'3091',9701,75600,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140001 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140001
index ecea9d911..bcc3a2ba8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140001
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140001
@@ -1 +1 @@
-'2086',3200,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'1798',3200,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140002
index 0e88a3f4d..783a7ecfe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140002
@@ -1,3 +1,3 @@
-'1781',9701,70400,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2086',9701,61400,,'',0,2100,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1000,0,'Downtown',0,1000,,'',0,6100,,'',0,2500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'2091',9701,75400,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
+'1798',9701,61400,,'',0,2100,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1000,0,'Downtown',0,1000,,'',0,6100,,'',0,2500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'2931',9701,70400,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
+'3091',9701,75400,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140003 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140003
index c7323b0b7..75edf1d46 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140003
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140003
@@ -1,3 +1,3 @@
-'1781',9700,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2086',9700,63500,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,1000,,'',0,1000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0
-'2091',9700,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'1798',9700,63500,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,900,,'',0,5100,,'',0,1900,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0
+'2931',9700,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3091',9700,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140004 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140004
index 76d83f4d5..cfca38740 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140004
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140004
@@ -1,7 +1,6 @@
-'2086',8801,161600,4,'',0
-'1781',9700,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1781',9701,72900,4,'',0,9000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2086',9700,61000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,1800,0,'Downtown',0,200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'2086',9701,60500,4,'',0,3300,4,'',0,2100,4,'',0,5200,4,'',0,1300,4,'',0,2200,4,'',0,6100,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,6200,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,1700,4,'',0,5600,4,'',0,1700,4,'',0,1900,4,'',0,6000,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2100,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,8900,4,'',0,8800,4,'',0,8600,4,'',0,5000,4,'',0
-'2091',9700,80900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',9701,74800,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,10000,4,'',0
+'1798',9700,61000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'1798',9701,60500,4,'',0,3300,4,'',0,2100,4,'',0,5200,4,'',0,1300,4,'',0,2200,4,'',0,6100,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,6200,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,1700,4,'',0,5600,4,'',0,1700,4,'',0,1900,4,'',0,6000,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2100,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,8900,4,'',0,8800,4,'',0,8600,4,'',0,5000,4,'',0
+'2931',9700,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',9701,72900,4,'',0,9000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3091',9700,80900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9701,74800,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140005
index 99802bbfb..9b40d7fc8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140005
@@ -1,24 +1,24 @@
-'1781',2000,75100,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,16400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'1781',2001,70600,4,'',0,10300,4,'',0,11400,4,'',0,10600,4,'',0,10300,4,'',0,10600,4,'',0,10300,4,'',0,10000,4,'',0,9500,4,'',0,11900,4,'',0,9000,4,'',0,10700,4,'',0,15000,4,'',0,10800,4,'',0,10000,4,'',0
-'2086',2000,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'2086',2001,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
-'2091',2000,74500,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'2091',2001,83500,4,'',0,10100,4,'',0,10900,4,'',0,10300,4,'',0,10800,4,'',0,10200,4,'',0,14800,4,'',0,9900,4,'',0,10000,4,'',0,10300,4,'',0,10100,4,'',0
-'1781',2400,71300,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'1781',2401,83600,4,'',0,10000,4,'',0,9800,4,'',0,11100,4,'',0,10400,4,'',0,10700,4,'',0,8900,4,'',0,16300,4,'',0,9400,4,'',0,10200,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
-'2086',2400,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2086',2401,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
-'2091',2400,80500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'2091',2401,74200,4,'',0,10300,4,'',0,10700,4,'',0,10400,4,'',0,14800,4,'',0,10100,4,'',0,10900,4,'',0,10200,4,'',0,9300,4,'',0,10700,4,'',0,10100,4,'',0,9900,4,'',0
-'1781',2500,91500,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'1781',2501,100500,4,'',0,13200,4,'',0,17300,4,'',0,14100,4,'',0,39100,4,'',0
-'2086',2500,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2086',2501,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
-'2091',2500,100000,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'2091',2501,104900,4,'',0,26800,4,'',0,29100,4,'',0,22900,4,'',0
-'1781',2600,72700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'1781',2601,74800,4,'',0,10000,4,'',0,19500,4,'',0,17300,4,'',0,13200,4,'',0,17200,4,'',0,9100,4,'',0,12400,4,'',0,19900,4,'',0,7000,4,'',0,13500,4,'',0
-'2086',2600,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'2086',2601,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
-'2091',2600,105300,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'2091',2601,72900,4,'',0,7400,4,'',0,32400,4,'',0,23100,4,'',0,28800,4,'',0,30300,4,'',0
+'1798',2000,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
+'1798',2001,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
+'2931',2000,75100,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,16400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'2931',2001,70600,4,'',0,10300,4,'',0,11400,4,'',0,10600,4,'',0,10300,4,'',0,10600,4,'',0,10300,4,'',0,10000,4,'',0,9500,4,'',0,11900,4,'',0,9000,4,'',0,10700,4,'',0,15000,4,'',0,10800,4,'',0,10000,4,'',0
+'3091',2000,74500,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'3091',2001,83500,4,'',0,10100,4,'',0,10900,4,'',0,10300,4,'',0,10800,4,'',0,10200,4,'',0,14800,4,'',0,9900,4,'',0,10000,4,'',0,10300,4,'',0,10100,4,'',0
+'1798',2400,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'1798',2401,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
+'2931',2400,71300,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'2931',2401,83600,4,'',0,10000,4,'',0,9800,4,'',0,11100,4,'',0,10400,4,'',0,10700,4,'',0,8900,4,'',0,16300,4,'',0,9400,4,'',0,10200,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
+'3091',2400,80500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'3091',2401,74200,4,'',0,10300,4,'',0,10700,4,'',0,10400,4,'',0,14800,4,'',0,10100,4,'',0,10900,4,'',0,10200,4,'',0,9300,4,'',0,10700,4,'',0,10100,4,'',0,9900,4,'',0
+'1798',2500,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'1798',2501,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
+'2931',2500,91500,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'2931',2501,100500,4,'',0,13200,4,'',0,17300,4,'',0,14100,4,'',0,39100,4,'',0
+'3091',2500,100000,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'3091',2501,104900,4,'',0,26800,4,'',0,29100,4,'',0,22900,4,'',0
+'1798',2600,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
+'1798',2601,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
+'2931',2600,72700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
+'2931',2601,74800,4,'',0,10000,4,'',0,19500,4,'',0,17300,4,'',0,13200,4,'',0,17200,4,'',0,9100,4,'',0,12400,4,'',0,19900,4,'',0,7000,4,'',0,13500,4,'',0
+'3091',2600,105300,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
+'3091',2601,72900,4,'',0,7400,4,'',0,32400,4,'',0,23100,4,'',0,28800,4,'',0,30300,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140006
index 34ffacb63..5c84b1b6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140006
@@ -1,9 +1,9 @@
-'1781',2101,63000,,'',0,2700,4,'',0,4600,,'',0,2700,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,100,,'',0,6800,4,'',0,2100,,'',0,2800,4,'',0,7800,,'',0,6800,4,'',0,3600,,'',0,6800,4,'',0,3800,,'',0,6800,4,'',0,3500,,'',0,6800,4,'',0,4100,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,500,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,6400,,'',0,2700,4,'',0,700,,'',0,6700,4,'',0,7800,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0,7900,,'',0,2500,4,'',0,7800,,'',0,2500,4,'',0
-'2086',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5900,,'',0,2300,,'',0,500,4,'',0,6300,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
-'2091',2101,73200,,'',0,6800,4,'',0,3700,,'',0,6800,4,'',0,3200,,'',0,6800,4,'',0,4500,,'',0,6800,4,'',0,3400,,'',0,6800,4,'',0,8000,,'',0,2800,4,'',0,7500,,'',0,2800,4,'',0,2400,,'',0,6800,4,'',0,8200,,'',0,2800,4,'',0,7200,,'',0,2800,4,'',0,7600,,'',0,2600,4,'',0
-'1781',2200,93100,4,'',0,9700,4,'',0,10000,4,'',0,19500,4,'',0,9600,4,'',0,13100,4,'',0,9700,4,'',0,9600,4,'',0,17700,4,'',0,13700,4,'',0,17500,4,'',0,9800,4,'',0
-'1781',2201,82900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,12800,,'',0,10000,,'',0,9700,,'',0,18000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
-'2086',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2200,85300,4,'',0,9700,4,'',0,26800,4,'',0,22900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
-'2091',2201,80600,,'',0,9600,,'',0,22800,,'',0,22900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5900,,'',0,2300,,'',0,500,4,'',0,6300,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
+'2931',2101,63000,,'',0,2700,4,'',0,4600,,'',0,2700,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,100,,'',0,6800,4,'',0,2100,,'',0,2800,4,'',0,7800,,'',0,6800,4,'',0,3600,,'',0,6800,4,'',0,3800,,'',0,6800,4,'',0,3500,,'',0,6800,4,'',0,4100,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,500,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,6400,,'',0,2700,4,'',0,700,,'',0,6700,4,'',0,7800,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0,7900,,'',0,2500,4,'',0,7800,,'',0,2500,4,'',0
+'3091',2101,73200,,'',0,6800,4,'',0,3700,,'',0,6800,4,'',0,3200,,'',0,6800,4,'',0,4500,,'',0,6800,4,'',0,3400,,'',0,6800,4,'',0,8000,,'',0,2800,4,'',0,7500,,'',0,2800,4,'',0,2400,,'',0,6800,4,'',0,8200,,'',0,2800,4,'',0,7200,,'',0,2800,4,'',0,7600,,'',0,2600,4,'',0
+'1798',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
+'1798',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2200,93100,4,'',0,9700,4,'',0,10000,4,'',0,19500,4,'',0,9600,4,'',0,13100,4,'',0,9700,4,'',0,9600,4,'',0,17700,4,'',0,13700,4,'',0,17500,4,'',0,9800,4,'',0
+'2931',2201,82900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,12800,,'',0,10000,,'',0,9700,,'',0,18000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2200,85300,4,'',0,9700,4,'',0,26800,4,'',0,22900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
+'3091',2201,80600,,'',0,9600,,'',0,22800,,'',0,22900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140007
index 3683851b8..8e50c7241 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140007
@@ -1,3 +1,3 @@
-'1781',9700,71700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',9700,61700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,1800,0,'Downtown',0,200,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
-'2091',9700,81700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',9700,61700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
+'2931',9700,71700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9700,81700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140008
index 9369e4206..f8ffb38ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140008
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140008
@@ -1,4 +1,3 @@
-'2086',8801,160600,,'',0
-'1781',9701,72000,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',9701,55700,,'',0,7300,,'',0,2100,,'',0,5200,,'',0,1200,,'',0,2200,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8900,,'',0,4700,,'',0,9000,,'',0
-'2091',9701,73900,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',9701,55700,,'',0,7300,,'',0,2100,,'',0,5200,,'',0,1200,,'',0,2200,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8900,,'',0,4700,,'',0,9000,,'',0
+'2931',9701,72000,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9701,73900,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140009
index 05ee85e36..b26a75bea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140009
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140009
@@ -1,6 +1,6 @@
-'1781',2000,81300,4,'',0,10000,4,'',0,8800,4,'',0,10300,4,'',0,10600,4,'',0,10400,4,'',0,10700,4,'',0,12400,4,'',0,9100,4,'',0,19300,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
-'1781',2001,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2000,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
-'2086',2001,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2000,80700,4,'',0,10300,4,'',0,10400,4,'',0,10700,4,'',0,10800,4,'',0,10100,4,'',0,10900,4,'',0,9300,4,'',0,10200,4,'',0,11100,4,'',0,10000,4,'',0,9700,4,'',0
-'2091',2001,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2000,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
+'1798',2001,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2000,81300,4,'',0,10000,4,'',0,8800,4,'',0,10300,4,'',0,10600,4,'',0,10400,4,'',0,10700,4,'',0,12400,4,'',0,9100,4,'',0,19300,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
+'2931',2001,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2000,80700,4,'',0,10300,4,'',0,10400,4,'',0,10700,4,'',0,10800,4,'',0,10100,4,'',0,10900,4,'',0,9300,4,'',0,10200,4,'',0,11100,4,'',0,10000,4,'',0,9700,4,'',0
+'3091',2001,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140010
index 991c9609d..a708e21e1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140010
@@ -1,12 +1,12 @@
-'1781',2400,73000,4,'',0,10000,4,'',0,18300,4,'',0,11000,4,'',0,10400,4,'',0,10600,4,'',0,16900,4,'',0,5100,4,'',0,16100,4,'',0,2500,4,'',0,10800,4,'',0,10500,4,'',0,10500,4,'',0
-'1781',2401,81700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'2086',2400,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
-'2086',2401,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2400,82200,4,'',0,10700,4,'',0,10400,4,'',0,10700,4,'',0,10200,4,'',0,10800,4,'',0,10300,4,'',0,9200,4,'',0,10800,4,'',0,10100,4,'',0,10200,4,'',0
-'2091',2401,72200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'1781',2500,93700,4,'',0,17200,4,'',0,13300,4,'',0,17100,4,'',0,40300,4,'',0
-'1781',2501,94200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2500,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
-'2086',2501,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2091',2500,102200,4,'',0,22800,4,'',0,29500,4,'',0,26900,4,'',0
-'2091',2501,102600,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
+'1798',2400,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
+'1798',2401,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2400,73000,4,'',0,10000,4,'',0,18300,4,'',0,11000,4,'',0,10400,4,'',0,10600,4,'',0,16900,4,'',0,5100,4,'',0,16100,4,'',0,2500,4,'',0,10800,4,'',0,10500,4,'',0,10500,4,'',0
+'2931',2401,81700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
+'3091',2400,82200,4,'',0,10700,4,'',0,10400,4,'',0,10700,4,'',0,10200,4,'',0,10800,4,'',0,10300,4,'',0,9200,4,'',0,10800,4,'',0,10100,4,'',0,10200,4,'',0
+'3091',2401,72200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2500,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
+'1798',2501,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
+'2931',2500,93700,4,'',0,17200,4,'',0,13300,4,'',0,17100,4,'',0,40300,4,'',0
+'2931',2501,94200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2500,102200,4,'',0,22800,4,'',0,29500,4,'',0,26900,4,'',0
+'3091',2501,102600,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140011 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140011
index 64d6acf6e..425474d30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140011
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140011
@@ -1,7 +1,7 @@
-'1781',2600,74300,4,'',0,11400,4,'',0,16800,4,'',0,13300,4,'',0,17200,4,'',0,17600,4,'',0,12300,4,'',0,9000,4,'',0,19700,4,'',0,2800,4,'',0,17700,4,'',0
-'1781',2601,73300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2086',2600,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
-'2086',2601,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'2091',2600,110900,4,'',0,22800,4,'',0,29100,4,'',0,30300,4,'',0
-'2091',2601,71400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'2086',2900,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
+'1798',2600,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
+'1798',2601,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
+'2931',2600,74300,4,'',0,11400,4,'',0,16800,4,'',0,13300,4,'',0,17200,4,'',0,17600,4,'',0,12300,4,'',0,9000,4,'',0,19700,4,'',0,2800,4,'',0,17700,4,'',0
+'2931',2601,73300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
+'3091',2600,110900,4,'',0,22800,4,'',0,29100,4,'',0,30300,4,'',0
+'3091',2601,71400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
+'1798',2900,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140012
index 5ec963a60..3a80da8ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140012
@@ -1,3 +1,3 @@
-'1781',501,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140013
index 7916110b9..1f08af235 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140013
@@ -1 +1 @@
-'2086',2900,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
+'1798',2900,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140014
index c2e10bab6..980871462 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140014
@@ -1 +1 @@
-'2086',3200,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140015 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140015
index d7195abf2..cb532bcbd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140015
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140015
@@ -1 +1 @@
-'2086',3200,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140016 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140016
index 84f644b6b..c54297713 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140016
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140016
@@ -1 +1 @@
-'2086',3200,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140017
index 84f644b6b..c54297713 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140017
@@ -1 +1 @@
-'2086',3200,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140018
index 8a933a636..afcafb915 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140018
@@ -1,3 +1,3 @@
-'1781',501,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',501,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140019 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140019
index 7edefeb4d..48b181088 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140019
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140019
@@ -1,3 +1,3 @@
-'1781',501,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',501,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140020 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140020
index 5a60fb564..0bdfc37c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140020
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140020
@@ -1,3 +1,3 @@
-'1781',501,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',501,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140021
index 3aa3c0ffe..71af12118 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140021
@@ -1,3 +1,3 @@
-'1781',501,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140022 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140022
index 1cdbbe294..ea1e945e3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140022
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140022
@@ -1,3 +1,3 @@
-'1781',501,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140023
index 61a367796..63808c0cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140023
@@ -1,3 +1,3 @@
-'1781',501,75800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,75800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140024
index f7e359678..596737458 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140024
@@ -1,3 +1,3 @@
-'1781',501,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140025
index d06c8fc7d..02f6231e7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140025
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140025
@@ -1,3 +1,3 @@
-'1781',501,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140026 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140026
index 122665fe3..dc2705fa3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140026
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140026
@@ -1,3 +1,3 @@
-'1781',501,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140027 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140027
index 59b45b5a5..8fc1f7843 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140027
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140027
@@ -1,3 +1,3 @@
-'1781',501,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,1700,,'',0,1300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140028 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140028
index 1a84ab821..ce6d116eb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140028
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140028
@@ -1,3 +1,3 @@
-'1781',500,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',500,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',500,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140029 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140029
index 498669ae5..9c03bfd61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140029
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140029
@@ -1,3 +1,3 @@
-'1781',500,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',500,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',500,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140030 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140030
index a3fa5fbc4..c2c7c0c45 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140030
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140030
@@ -1,3 +1,3 @@
-'1781',500,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',500,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',500,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140031 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140031
index 790a3964d..78c143cbe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140031
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140031
@@ -1,3 +1,3 @@
-'1781',500,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',500,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140032 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140032
index 790a3964d..78c143cbe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140032
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140032
@@ -1,3 +1,3 @@
-'1781',500,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',500,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140033 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140033
index f99e12801..cc4b3eb4f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140033
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140033
@@ -1,3 +1,3 @@
-'1781',500,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1000,,'',0,2000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',500,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140034
index 820040365..a7acaaa47 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140034
@@ -1,3 +1,3 @@
-'1781',500,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',500,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140035
index 2d37ebbdb..af9f4809a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140035
@@ -1,3 +1,3 @@
-'1781',500,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1100,,'',0,2000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140036 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140036
index 96d24b44f..07d1f078a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140036
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140036
@@ -1,3 +1,3 @@
-'1781',500,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',500,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140037
index e38ed388e..c6b3e16c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140037
@@ -1,3 +1,3 @@
-'1781',500,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',500,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140038
index 96ee8b95b..7f3b1fdbb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140038
@@ -1,3 +1,3 @@
-'1781',500,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',500,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140039
index b09ebe8be..d643d7ecc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140039
@@ -1,3 +1,3 @@
-'1781',500,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',500,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140040
index 93462368e..2127d78a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140040
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140040
@@ -1,3 +1,3 @@
-'1781',500,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2086',500,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',500,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140041
index 35c2bbc07..600219775 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140041
@@ -1,3 +1,3 @@
-'1781',500,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2086',500,63300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
+'1798',500,63300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3091',500,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140042
index 432fefd38..2a18353aa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140042
@@ -1,3 +1,3 @@
-'1781',500,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2086',500,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
+'1798',500,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3091',500,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140043
index e60ae56eb..ef61a3313 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140043
@@ -1,3 +1,3 @@
-'1781',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70200,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'2931',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70200,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140044
index 642ac041f..1b3c8af49 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140044
@@ -1,3 +1,3 @@
-'1781',501,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',501,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140045
index d2eede935..59b58d01f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140045
@@ -1,3 +1,3 @@
-'1781',801,64600,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62500,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,62500,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64600,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140046
index 96e3d6080..0c3c9d012 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140046
@@ -1,3 +1,3 @@
-'1781',801,64700,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62600,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64600,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,62600,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64700,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64600,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140047
index cf817b22a..eb9f79325 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140047
@@ -1,3 +1,3 @@
-'1781',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70200,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70200,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140048
index 3871b9e17..54f3eb0ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140048
@@ -1,3 +1,3 @@
-'1781',801,64500,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,62400,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,64400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,62400,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,64500,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,64400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140049
index 5724b22cf..bbcc52bf4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140049
@@ -1,3 +1,3 @@
-'1781',9700,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2086',9700,63200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,1100,,'',0,1000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,6400,,'',0,2600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0
-'2091',9700,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
+'1798',9700,63200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,900,,'',0,5100,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,6400,,'',0,2600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0
+'2931',9700,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3091',9700,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140050
index 7c76a0848..dfac3b76f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140050
@@ -1,8 +1,9 @@
-'2086',500,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
-'2091',500,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'1781',600,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,71000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',600,85900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1801,75600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2086',1801,63700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
-'2091',1801,82500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'1798',500,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
+'2931',500,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',600,71000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',600,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,85900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1801,63700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
+'2931',1801,75600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'3091',1801,82500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140051 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140051
index 444b4235c..8ad11fea6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140051
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140051
@@ -1,6 +1,6 @@
-'1781',601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,61900,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2091',601,80400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'1781',1800,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1800,61400,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
-'2091',1800,73400,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',601,61900,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
+'2931',601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,80400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',1800,61400,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
+'2931',1800,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1800,73400,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140053
index 96f7fcd71..193b1e321 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140053
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140053
@@ -1,6 +1,6 @@
-'1781',100,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,800,,'',0,700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'1781',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2086',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
+'1798',100,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
+'1798',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
+'3091',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140054 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140054
index 45d3ee983..ad785a037 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140054
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140054
@@ -1 +1 @@
-'2086',3200,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140055
index aaca7f3ad..bb22ee687 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140055
@@ -1,3 +1,3 @@
-'1781',1200,93100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2086',1200,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
-'2091',1200,90400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
+'1798',1200,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
+'2931',1200,93100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
+'3091',1200,90400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140056 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140056
index 574e4556f..53c4f0f42 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140056
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140056
@@ -1,3 +1,3 @@
-'1781',1000,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,63400,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,63400,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140057
index be2e40384..566704019 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140057
@@ -1,3 +1,3 @@
-'1781',500,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2086',500,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,1200,,'',0,6000,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',500,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
+'1798',500,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',500,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
+'3091',500,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140058
index 1be52cc9e..5cefe0060 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140058
@@ -1 +1 @@
-'2086',2801,72100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140059
index 42e7fa138..43022209d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140059
@@ -1 +1 @@
-'2086',2801,72300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140060 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140060
index d82e1680c..d72002054 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140060
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140060
@@ -1 +1 @@
-'2086',2801,72400,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72400,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140061
index d82e1680c..d72002054 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140061
@@ -1 +1 @@
-'2086',2801,72400,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72400,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140062
index 0ac0f4646..0b58e0b02 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140062
@@ -1 +1 @@
-'2086',2801,72500,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72500,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140063
index 935eb841d..350616a79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140063
@@ -1 +1 @@
-'2086',2801,72600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140064
index 935eb841d..350616a79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140064
@@ -1 +1 @@
-'2086',2801,72600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140065 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140065
index 3b5bea883..1360dc310 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140065
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140065
@@ -1,5 +1,4 @@
-'1781',2000,80800,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2086',2000,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2000,80200,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'2086',2900,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
-'2086',8801,160100,,'',0
+'1798',2000,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2000,80800,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
+'3091',2000,80200,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
+'1798',2900,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140066 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140066
index 93470b92d..f82ae4bb5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140066
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140066
@@ -1,3 +1,3 @@
-'1781',2001,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2086',2001,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
-'2091',2001,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
+'1798',2001,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
+'2931',2001,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
+'3091',2001,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140067
index b88b95926..b252e17bb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140067
@@ -1,3 +1,3 @@
-'1781',2500,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2086',2500,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'1798',2500,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'3091',2500,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140068
index e15aa2d63..73ec85a8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140068
@@ -1,3 +1,3 @@
-'1781',2500,92000,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2086',2500,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100500,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
+'1798',2500,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92000,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
+'3091',2500,100500,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140069
index 518995d66..805f88c39 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140069
@@ -1 +1 @@
-'2086',2900,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140071
index 7ab02206e..b308dab7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140071
@@ -1,3 +1,3 @@
-'1781',9700,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',9700,61200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,1800,0,'Downtown',0,200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'2091',9700,81200,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',9700,61200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
+'2931',9700,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9700,81200,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140072
index 04a19fdd4..8105b39d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140072
@@ -1,3 +1,3 @@
-'1781',9701,72700,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',9701,60300,,'',0,3300,,'',0,2100,,'',0,5200,,'',0,1300,,'',0,2200,,'',0,6000,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8800,,'',0,8600,,'',0,5000,,'',0
-'2091',9701,74600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',9701,60300,,'',0,3300,,'',0,2100,,'',0,5200,,'',0,1300,,'',0,2200,,'',0,6000,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8800,,'',0,8600,,'',0,5000,,'',0
+'2931',9701,72700,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9701,74600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140073 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140073
index 2a0e04c8e..f7d8543ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140073
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140073
@@ -1,3 +1,3 @@
-'1781',9700,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',9700,61900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,1600,0,'Downtown',0,4400,,'',0,2000,,'',0,1800,0,'Downtown',0,200,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
-'2091',9700,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',9700,61900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,1600,0,'Downtown',0,4400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
+'2931',9700,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9700,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140074 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140074
index 4252904e5..e6877a8db 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140074
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140074
@@ -1,3 +1,3 @@
-'1781',9701,71800,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',9701,55500,,'',0,7300,,'',0,2100,,'',0,5200,,'',0,1200,,'',0,2200,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,1700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8900,,'',0,4700,,'',0,9000,,'',0
-'2091',9701,73700,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',9701,55500,,'',0,7300,,'',0,2100,,'',0,5200,,'',0,1200,,'',0,2200,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,1700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8900,,'',0,4700,,'',0,9000,,'',0
+'2931',9701,71800,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',9701,73700,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140077
index be7665b07..ec4c46afb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140077
@@ -1 +1 @@
-'2086',3200,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140078
index 7bb8dcfa4..f750f4cad 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140078
@@ -1 +1 @@
-'2086',3200,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140079
index 83d15c958..4ec551c95 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140079
@@ -1 +1 @@
-'2086',3200,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140080 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140080
index c6df0b537..52a8e1141 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140080
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140080
@@ -1 +1 @@
-'2086',3200,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140081
index 08f0511ba..4a528e791 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140081
@@ -1 +1 @@
-'2086',3200,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140082
index bb7e78475..c075a28fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140082
@@ -1 +1 @@
-'2086',3200,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140083 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140083
index 0e51c56e6..191f1f87b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140083
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140083
@@ -1 +1 @@
-'2086',3200,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140084 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140084
index 3477e92ce..808a3005a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140084
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140084
@@ -1 +1 @@
-'2086',3200,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140085 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140085
index 3477e92ce..808a3005a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140085
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140085
@@ -1 +1 @@
-'2086',3200,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140086 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140086
index f74adfce1..9db48b670 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140086
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140086
@@ -1 +1 @@
-'2086',3200,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140087 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140087
index 87a21cf6b..00ab631b1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140087
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140087
@@ -1 +1 @@
-'2086',3200,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140088
index ed1d54a8c..1e5026ba7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140088
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140088
@@ -1 +1 @@
-'2086',3200,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140089 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140089
index 45d3ee983..ad785a037 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140089
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140089
@@ -1 +1 @@
-'2086',3200,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140090 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140090
index ecea9d911..bcc3a2ba8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140090
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140090
@@ -1 +1 @@
-'2086',3200,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'1798',3200,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140091 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140091
index 0164535d7..e47b13d10 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140091
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140091
@@ -1 +1 @@
-'2086',3200,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'1798',3200,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140092
index 0164535d7..e47b13d10 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140092
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140092
@@ -1 +1 @@
-'2086',3200,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
+'1798',3200,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140093
index c2e10bab6..980871462 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140093
@@ -1 +1 @@
-'2086',3200,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140094 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140094
index 8e1f7145a..d7a092f94 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140094
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140094
@@ -1,3 +1,3 @@
-'1781',2501,95100,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
-'2091',2501,103500,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
+'2931',2501,95100,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103500,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140095 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140095
index 095989dc9..c8c804bc0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140095
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140095
@@ -1,3 +1,3 @@
-'1781',2500,92800,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,101300,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92800,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,101300,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140096 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140096
index f5d5ccbcd..90e1cdcd3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140096
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140096
@@ -1 +1 @@
-'2086',3200,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
+'1798',3200,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140098 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140098
index 818599c71..8774fbd71 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140098
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140098
@@ -1,2 +1,2 @@
-'1781',2301,74700,4,'',0,7100,4,'',0,3200,4,'',0,6600,4,'',0,19500,4,'',0,9000,4,'',0,2700,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,8000,4,'',0,2000,4,'',0,18000,4,'',0,9500,4,'',0,13500,4,'',0,19500,4,'',0,11200,4,'',0,10800,4,'',0,15000,4,'',0
-'2091',2301,84200,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,18000,4,'',0,5500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
+'2931',2301,74700,4,'',0,7100,4,'',0,3200,4,'',0,6600,4,'',0,19500,4,'',0,9000,4,'',0,2700,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,8000,4,'',0,2000,4,'',0,18000,4,'',0,9500,4,'',0,13500,4,'',0,19500,4,'',0,11200,4,'',0,10800,4,'',0,15000,4,'',0
+'3091',2301,84200,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,18000,4,'',0,5500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140099 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140099
index 1b79e106a..4d8164a48 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140099
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140099
@@ -1,4 +1,3 @@
-'2086',401,81500,,'',0
-'1781',600,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',600,65000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140100 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140100
index ebdfa24d5..6472a42d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140100
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140100
@@ -1,4 +1,3 @@
-'2086',400,160700,4,'',0
-'1781',601,83400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2086',601,64200,4,'',0,11100,4,'',0,15100,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0
-'2091',601,82900,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0
+'1798',601,64200,4,'',0,11100,4,'',0,15100,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0
+'2931',601,83400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3091',601,82900,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140101 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140101
index dfb16a830..497c00a3f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140101
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140101
@@ -1,6 +1,6 @@
-'1781',800,65500,4,'',0,7600,4,'',0,8600,4,'',0,3700,4,'',0,7500,4,'',0,7300,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,8000,4,'',0,4400,4,'',0,14900,4,'',0,11000,4,'',0,11000,4,'',0
-'1781',801,71500,,'',0,4100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,5400,4,'',0,1700,4,'',0,1800,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1400,4,'',0,5500,4,'',0,1400,4,'',0,1400,4,'',0,1300,4,'',0,1500,4,'',0,5500,4,'',0,1300,4,'',0,1300,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2400,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
-'2086',801,55500,,'',0,8500,,'',0,6300,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2091',800,73200,4,'',0,10600,4,'',0,9000,4,'',0,9400,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,4500,4,'',0,8600,4,'',0,8800,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,17000,4,'',0
-'2091',801,71500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,4500,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,5400,4,'',0,1700,4,'',0,1800,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1400,4,'',0,5500,4,'',0,1400,4,'',0,1400,4,'',0,1300,4,'',0,1500,4,'',0,5500,4,'',0,1300,4,'',0,1300,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2400,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
+'1798',801,55500,,'',0,8500,,'',0,6300,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'2931',800,65500,4,'',0,7600,4,'',0,8600,4,'',0,3700,4,'',0,7500,4,'',0,7300,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,8000,4,'',0,4400,4,'',0,14900,4,'',0,11000,4,'',0,11000,4,'',0
+'2931',801,71500,,'',0,4100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',800,73200,4,'',0,10600,4,'',0,9000,4,'',0,9400,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,4500,4,'',0,8600,4,'',0,8800,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,17000,4,'',0
+'3091',801,71500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,4500,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140102 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140102
index b6a13d19a..8070931a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140102
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140102
@@ -1,6 +1,6 @@
-'1781',9700,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'1781',9701,73700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2086',9700,55500,4,'',0,7800,4,'',0,2100,4,'',0,6200,4,'',0,2100,4,'',0,2200,4,'',0,5100,4,'',0,1000,4,'',0,2100,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,6100,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,2100,4,'',0,6000,4,'',0,1900,4,'',0,2100,4,'',0,6000,4,'',0,2100,4,'',0,2000,4,'',0,5900,4,'',0,1800,4,'',0,1700,4,'',0,6000,4,'',0,1700,4,'',0,1600,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,1600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2300,4,'',0,2400,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2400,4,'',0,2600,4,'',0
-'2086',9701,55800,,'',0,6000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'2091',9700,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0
-'2091',9701,73800,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
+'1798',9700,55500,4,'',0,7800,4,'',0,2100,4,'',0,6200,4,'',0,2100,4,'',0,2200,4,'',0,6100,4,'',0,2100,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,6100,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,2100,4,'',0,6000,4,'',0,1900,4,'',0,2100,4,'',0,6000,4,'',0,2100,4,'',0,2000,4,'',0,5900,4,'',0,900,4,'',0,900,4,'',0,1700,4,'',0,6000,4,'',0,1700,4,'',0,1600,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,1600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2300,4,'',0,2400,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2400,4,'',0,2600,4,'',0
+'1798',9701,55800,,'',0,6000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'2931',9700,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'2931',9701,73700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
+'3091',9700,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0
+'3091',9701,73800,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140103 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140103
index 4fb78fe17..db6b7db2a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140103
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140103
@@ -1,5 +1,5 @@
-'1781',2300,65900,,'',0,7300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,0,'Old Vernon Rd',0,3000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
-'1781',2301,95100,4,'',0,7100,4,'',0,3000,4,'',0,8900,4,'',0,26100,4,'',0,20700,4,'',0,3400,4,'',0,9600,4,'',0,10000,4,'',0,19300,4,'',0
-'2086',2300,55000,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1000,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'2086',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,5300,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1700,4,'',0,5700,4,'',0,1700,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'2091',2300,75500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
+'1798',2300,55000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,6700,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'1798',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
+'2931',2300,65900,,'',0,7300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,0,'Old Vernon Rd',0,3000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
+'2931',2301,95100,4,'',0,7100,4,'',0,3000,4,'',0,8900,4,'',0,26100,4,'',0,20700,4,'',0,3400,4,'',0,9600,4,'',0,10000,4,'',0,19300,4,'',0
+'3091',2300,75500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140104 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140104
index d6aadf6d0..0eb9ce1f6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140104
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140104
@@ -1,2 +1,2 @@
-'2086',1300,93500,,'',0,41000,,'',0,57500,,'',0
-'2086',1301,95400,4,'',0,45000,4,'',0,53500,4,'',0
+'1798',1300,93500,,'',0,41000,,'',0,57500,,'',0
+'1798',1301,95400,4,'',0,45000,4,'',0,53500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140105 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140105
index f3c0bb03c..054b62405 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140105
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140105
@@ -1,5 +1,5 @@
-'1781',801,71900,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,55900,,'',0,8500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2091',801,71900,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',2300,141500,0,'Old Vernon Rd',0
-'2086',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',801,55900,,'',0,8500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'2931',801,71900,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,71900,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,141500,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140106 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140106
index dc9fde4b4..7b08a866d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140106
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140106
@@ -1,5 +1,5 @@
-'1781',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72700,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'1781',2301,101600,0,'Old Vernon Rd',0
-'2086',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72700,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
+'1798',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,101600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140107 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140107
index b152f000d..435cc845a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140107
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140107
@@ -1,5 +1,5 @@
-'1781',801,72000,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,60000,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,71900,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'1781',2300,141600,0,'Old Vernon Rd',0
-'2086',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'1798',801,60000,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72000,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,71900,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
+'2931',2300,141600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140108 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140108
index 62c8110d0..071f42ba3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140108
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140108
@@ -1,5 +1,5 @@
-'1781',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72700,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'1781',2301,101500,0,'Old Vernon Rd',0
-'2086',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'2931',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72700,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
+'1798',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,101500,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140109 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140109
index 2c15711b6..f3305e8ca 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140109
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140109
@@ -1,5 +1,5 @@
-'1781',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72600,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'1781',2301,101500,0,'Old Vernon Rd',0
-'2086',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'1798',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72600,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
+'1798',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
+'2931',2301,101500,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140111 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140111
index 1790d208b..98ef356ec 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140111
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140111
@@ -1,3 +1,3 @@
-'1781',801,72100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,60100,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72000,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,60100,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,72000,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140112 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140112
index 21fe7e2f2..5ffa80456 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140112
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140112
@@ -1,3 +1,3 @@
-'1781',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72600,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
+'1798',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72600,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140113 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140113
index 99643682b..c7704f7fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140113
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140113
@@ -1,3 +1,3 @@
-'1781',9701,74000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2086',9701,60100,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
-'2091',9701,74100,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
+'1798',9701,60100,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
+'2931',9701,74000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
+'3091',9701,74100,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140114 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140114
index cd73b11a0..b7b67091f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140114
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140114
@@ -1,3 +1,3 @@
-'1781',9700,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2086',9700,55200,,'',0,7700,,'',0,2100,,'',0,6100,,'',0,2100,,'',0,2200,,'',0,5100,,'',0,1000,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2400,,'',0,2600,,'',0
-'2091',9700,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
+'1798',9700,55200,,'',0,7700,,'',0,2100,,'',0,6100,,'',0,2100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,900,,'',0,900,,'',0,1800,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2400,,'',0,2600,,'',0
+'2931',9700,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3091',9700,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140116 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140116
index 15b97a6b6..f88d4f00a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140116
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140116
@@ -1,3 +1,3 @@
-'1781',2501,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2086',2501,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2091',2501,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
+'1798',2501,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
+'2931',2501,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
+'3091',2501,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140117 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140117
index 489feb366..222992c6c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140117
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140117
@@ -1,3 +1,3 @@
-'1781',2500,92400,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'2086',2500,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2091',2500,100900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
+'1798',2500,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
+'2931',2500,92400,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
+'3091',2500,100900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140131 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140131
index 3f8b01200..6a1223f87 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140131
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140131
@@ -1,3 +1,3 @@
-'1781',601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62800,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,81400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',601,62800,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,81400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140132 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140132
index e77ebeb12..793b5730d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140132
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140132
@@ -1,3 +1,3 @@
-'1781',601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,62900,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,81500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',601,62900,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,81500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140133 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140133
index 4589e42f6..5ce82aaf2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140133
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140133
@@ -1,15 +1,15 @@
-'1781',600,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65700,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84700,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'1781',1800,74400,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,8300,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
-'1781',1801,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1800,62500,4,'',0,10600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
-'2086',1801,62500,,'',0,10700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'2091',1800,74400,4,'',0,10300,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11200,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
-'2091',1801,81300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'1781',1900,74300,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,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,10000,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0
-'1781',1901,74300,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2086',1900,71900,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
-'2086',1901,71900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
-'2091',1900,81300,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
-'2091',1901,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
+'1798',600,65700,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84700,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',1800,62500,4,'',0,10600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
+'1798',1801,62500,,'',0,10700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
+'2931',1800,74400,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,8300,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
+'2931',1801,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1800,74400,4,'',0,10300,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11200,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
+'3091',1801,81300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1900,71900,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
+'1798',1901,71900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
+'2931',1900,74300,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,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,10000,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0
+'2931',1901,74300,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
+'3091',1900,81300,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
+'3091',1901,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140134 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140134
index fd90f660d..04cc97e17 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140134
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140134
@@ -1,3 +1,3 @@
-'1781',601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,63000,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,81700,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',601,63000,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,81700,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140135 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140135
index 45196d51f..7c4e10e14 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140135
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140135
@@ -1,3 +1,3 @@
-'1781',600,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65600,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',600,65600,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140136 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140136
index 77ba4afc6..963aa9129 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140136
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140136
@@ -1,3 +1,3 @@
-'1781',601,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,63500,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,82200,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
+'1798',601,63500,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,82200,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140137 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140137
index bec8b07af..66402a151 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140137
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140137
@@ -1,3 +1,3 @@
-'1781',600,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',600,65400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140138 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140138
index d51eec42c..77624601b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140138
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140138
@@ -1,4 +1,3 @@
-'2086',400,160500,,'',0
-'1781',601,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,64000,,'',0,11100,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,82700,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
+'1798',601,64000,,'',0,11100,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,82700,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140139 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140139
index 14ecdbbe3..3b1321a24 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140139
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140139
@@ -1,3 +1,3 @@
-'1781',600,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',600,65100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140140 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140140
deleted file mode 100644
index 6ccf36ecc..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140140
+++ /dev/null
@@ -1 +0,0 @@
-'2086',400,160000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140141 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140141
deleted file mode 100644
index 278fa30c8..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140141
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,82100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140142 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140142
deleted file mode 100644
index a22cdc712..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140142
+++ /dev/null
@@ -1 +0,0 @@
-'2086',400,160200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140143 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140143
deleted file mode 100644
index 6e755f4fa..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140143
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,82000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140144 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140144
deleted file mode 100644
index 982803d24..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140144
+++ /dev/null
@@ -1 +0,0 @@
-'2086',400,160300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140145 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140145
deleted file mode 100644
index 2cb920f2a..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140145
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,81900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140146 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140146
deleted file mode 100644
index 982803d24..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140146
+++ /dev/null
@@ -1 +0,0 @@
-'2086',400,160300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140147 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140147
deleted file mode 100644
index b8aacdf78..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140147
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,81800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140148 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140148
index ec3916d5b..006bf2d9d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140148
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140148
@@ -1,3 +1,3 @@
-'1781',801,62500,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2086',801,60600,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,62500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,60600,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,62500,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,62500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140149 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140149
index 73da81ed2..028eab5e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140149
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140149
@@ -1,3 +1,3 @@
-'1781',1001,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,4,'',0
-'2086',1001,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,1800,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75700,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,4,'',0
+'1798',1001,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,1800,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,4,'',0
+'3091',1001,75700,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140150 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140150
index 0c02a8a1c..a5d624fdd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140150
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140150
@@ -1,3 +1,3 @@
-'1781',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140151 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140151
index 21e3b1b14..4bb209963 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140151
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140151
@@ -1,3 +1,3 @@
-'1781',1000,83800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54000,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',1000,54000,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140152 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140152
index 804c7880d..6f39119f8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140152
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140152
@@ -1,6 +1,6 @@
-'1781',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,65300,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,65300,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140153 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140153
index f81f0131a..54ff66995 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140153
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140153
@@ -1 +1 @@
-'2086',2900,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
+'1798',2900,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140154 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140154
index 1d0fb5796..812f929ef 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140154
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140154
@@ -1 +1 @@
-'2086',2900,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'1798',2900,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140155 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140155
index 122c0670a..f1a8ae203 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140155
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140155
@@ -1 +1 @@
-'2086',2900,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
+'1798',2900,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140156 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140156
deleted file mode 100644
index c0c01b507..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140156
+++ /dev/null
@@ -1 +0,0 @@
-'2086',400,155700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140157 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140157
deleted file mode 100644
index 096e7598f..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140157
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,82400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140158 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140158
index 6c3ab60b5..48bb7fff5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140158
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140158
@@ -1,3 +1,3 @@
-'1781',1201,95300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'2086',1201,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
-'2091',1201,92600,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
+'1798',1201,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
+'2931',1201,95300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
+'3091',1201,92600,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140159 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140159
index d20af430f..44c24658b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140159
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140159
@@ -1,4 +1,4 @@
-'2086',1300,93600,,'',0,41000,,'',0,57500,,'',0
-'1781',2300,70000,,'',0,3300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,55100,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'2091',2300,75600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
+'1798',1300,93600,,'',0,41000,,'',0,57500,,'',0
+'1798',2300,55100,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'2931',2300,70000,,'',0,3300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,75600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140160 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140160
index 5840e48ef..5e04db164 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140160
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140160
@@ -1,4 +1,4 @@
-'2086',1301,95100,,'',0,45000,,'',0,53500,,'',0
-'1781',2301,74600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,6200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9300,,'',0,10200,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'2086',2301,60300,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2301,84100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',1301,95100,,'',0,45000,,'',0,53500,,'',0
+'1798',2301,60300,,'',0,3700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,74600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,6200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9300,,'',0,10200,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
+'3091',2301,84100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140161 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140161
deleted file mode 100644
index bda329ac0..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140161
+++ /dev/null
@@ -1 +0,0 @@
-'1781',1700,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140162 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140162
index 365bb51ac..16b2a339f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140162
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140162
@@ -1,3 +1,3 @@
-'1781',601,82900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,63700,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,82400,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
+'1798',601,63700,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,82900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,82400,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140163 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140163
index 16ad332a3..bfcb013e4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140163
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140163
@@ -1,3 +1,3 @@
-'1781',600,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65200,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84200,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',600,65200,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84200,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140164 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140164
index 831ca336e..9f6b31b6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140164
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140164
@@ -1,6 +1,6 @@
-'1781',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2086',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72000,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'1781',1000,83900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,54100,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
-'2091',1000,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
+'1798',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
+'3091',800,72000,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',1000,54100,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
+'2931',1000,83900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140165 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140165
index 2978b0f93..bf7a2e13b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140165
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140165
@@ -1,2 +1,2 @@
-'2086',2800,70700,4,'',0,9500,4,'',0,4600,4,'',0,71100,4,'',0,8900,4,'',0,9400,4,'',0
-'2086',2801,71000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
+'1798',2800,70700,4,'',0,9500,4,'',0,4600,4,'',0,71100,4,'',0,8900,4,'',0,9400,4,'',0
+'1798',2801,71000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140166 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140166
index a0addff05..06ef9dc26 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140166
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140166
@@ -1 +1 @@
-'2086',2800,65700,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65700,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140167 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140167
index a3c6ef1ee..a494bf2f6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140167
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140167
@@ -1 +1 @@
-'2086',2800,65200,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65200,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140168 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140168
index acfbdde44..2755839c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140168
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140168
@@ -1,3 +1,3 @@
-'1781',2400,72600,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72600,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140169 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140169
index bcb65910e..6491ea1a6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140169
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140169
@@ -1 +1 @@
-'2086',2800,70500,,'',0,9500,,'',0,4600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,70500,,'',0,9500,,'',0,4600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140170 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140170
index 6cf8ac760..4f3c7c088 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140170
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140170
@@ -1,3 +1,3 @@
-'1781',2400,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140171 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140171
index fd508de74..a78f589d5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140171
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140171
@@ -1 +1 @@
-'2086',2800,65500,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65500,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140172 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140172
index 0340812bf..a4784b84a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140172
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140172
@@ -1 +1 @@
-'2086',2800,64700,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,64700,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140173 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140173
index e4cfc71f3..0d7b3f3c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140173
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140173
@@ -1 +1 @@
-'2086',2800,65000,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65000,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140174 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140174
index 2fc62df83..2a65754f6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140174
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140174
@@ -1 +1 @@
-'2086',2800,64600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,64600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140175 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140175
index c0ff4096a..bf33ea487 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140175
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140175
@@ -1 +1 @@
-'2086',2800,64900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,64900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140176 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140176
index 2fc62df83..2a65754f6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140176
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140176
@@ -1 +1 @@
-'2086',2800,64600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,64600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140177 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140177
index 5a4d6d164..cee8cc5ac 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140177
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140177
@@ -1,3 +1,3 @@
-'1781',2400,72400,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72400,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140178 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140178
index e758dc5b4..c6463a198 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140178
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140178
@@ -1 +1 @@
-'2086',2800,65400,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65400,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140179 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140179
index 1e22db277..3834441e6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140179
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140179
@@ -1,3 +1,3 @@
-'1781',2400,72500,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72500,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140180 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140180
index 77f9d79fd..97d441e8d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140180
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140180
@@ -1 +1 @@
-'2086',2801,71300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
+'1798',2801,71300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140181 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140181
index 6d3b1d75d..5599cd971 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140181
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140181
@@ -1,3 +1,3 @@
-'1781',2400,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140182 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140182
index 6d3b1d75d..5599cd971 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140182
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140182
@@ -1,3 +1,3 @@
-'1781',2400,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140183 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140183
index 5b999fdda..db344e898 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140183
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140183
@@ -1 +1 @@
-'2086',2800,65600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140184 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140184
index ee1790636..712101145 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140184
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140184
@@ -1 +1 @@
-'2086',2800,70200,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,70200,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140185 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140185
index ee1790636..712101145 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140185
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140185
@@ -1 +1 @@
-'2086',2800,70200,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,70200,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140186 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140186
index 916021335..2379b9794 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140186
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140186
@@ -1 +1 @@
-'2086',2800,70300,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,70300,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140187 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140187
index 2fa7d8128..68cc35cbc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140187
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140187
@@ -1 +1 @@
-'2086',2800,65900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140188 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140188
index c83ae5c3d..9480ac768 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140188
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140188
@@ -1 +1 @@
-'2086',2800,70000,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,70000,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140189 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140189
index 2fa7d8128..68cc35cbc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140189
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140189
@@ -1 +1 @@
-'2086',2800,65900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140190 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140190
index 59befd802..0a750c240 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140190
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140190
@@ -1 +1 @@
-'2086',2800,70100,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,70100,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140191 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140191
index ed3da447e..35d213474 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140191
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140191
@@ -1 +1 @@
-'2086',2801,71800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,71800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140192 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140192
index ab3c657ac..fce4b96ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140192
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140192
@@ -1 +1 @@
-'2086',2800,65300,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65300,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140193 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140193
index 05b23864f..6b30de902 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140193
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140193
@@ -1,3 +1,3 @@
-'1781',2400,72100,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81300,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72100,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81300,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140194 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140194
index e54a5cc08..0dc21872a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140194
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140194
@@ -1,3 +1,3 @@
-'1781',2400,72200,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81400,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72200,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81400,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140195 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140195
index 92b1dfe20..a9607da46 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140195
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140195
@@ -1,3 +1,3 @@
-'1781',2400,72300,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2086',2400,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2091',2400,81500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
+'1798',2400,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
+'2931',2400,72300,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
+'3091',2400,81500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140196 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140196
index 3a81ea5bb..ab374a71f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140196
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140196
@@ -1 +1 @@
-'2086',2800,65100,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65100,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140197 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140197
index a3c6ef1ee..a494bf2f6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140197
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140197
@@ -1 +1 @@
-'2086',2800,65200,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,65200,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140198 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140198
index ccb773f5f..f6cb339c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140198
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140198
@@ -1,3 +1,3 @@
-'1781',2401,82700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,82700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140199 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140199
index 4024d277c..bd873a668 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140199
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140199
@@ -1,3 +1,3 @@
-'1781',2401,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2086',2401,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2401,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2401,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'3091',2401,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140200 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140200
index 4024d277c..bd873a668 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140200
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140200
@@ -1,3 +1,3 @@
-'1781',2401,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2086',2401,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2401,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2401,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'3091',2401,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140201 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140201
index f84e200f6..253cf8c07 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140201
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140201
@@ -1 +1 @@
-'2086',2800,70600,,'',0,9500,,'',0,4600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2800,70600,,'',0,9500,,'',0,4600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140202 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140202
index 6e4fa4724..560460672 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140202
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140202
@@ -1,3 +1,3 @@
-'1781',2401,82200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2086',2401,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2401,72700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,14200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2401,82200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'3091',2401,72700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,14200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140203 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140203
index aa750e5a1..d6f21c13f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140203
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140203
@@ -1,3 +1,3 @@
-'1781',2401,82300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2086',2401,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2401,72800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2401,82300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'3091',2401,72800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140204 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140204
index 9117c8ac4..21e833506 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140204
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140204
@@ -1 +1 @@
-'2086',2801,72000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140205 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140205
index 4f83fc382..90868d7ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140205
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140205
@@ -1 +1 @@
-'2086',2801,71900,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,71900,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140206 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140206
index 1be52cc9e..5cefe0060 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140206
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140206
@@ -1 +1 @@
-'2086',2801,72100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,72100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140207 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140207
index bdba7dd18..40a21ce45 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140207
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140207
@@ -1,3 +1,3 @@
-'1781',2401,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140208 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140208
index bdba7dd18..40a21ce45 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140208
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140208
@@ -1,3 +1,3 @@
-'1781',2401,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2086',2401,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2091',2401,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
+'2931',2401,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
+'3091',2401,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140209 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140209
index 6ab077ea9..7c6b89e9f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140209
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140209
@@ -1,3 +1,3 @@
-'1781',2401,82400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2086',2401,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2091',2401,72900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
+'1798',2401,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
+'2931',2401,82400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
+'3091',2401,72900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140210 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140210
index dfde4eed3..16e3008d8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140210
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140210
@@ -1 +1 @@
-'2086',2801,71500,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,71500,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140211 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140211
index e09ec921b..41f0fe9b7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140211
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140211
@@ -1 +1 @@
-'2086',2801,71600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,71600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140212 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140212
index c6c3f450c..ffbd973d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140212
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140212
@@ -1 +1 @@
-'2086',2801,71700,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
+'1798',2801,71700,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214
index 51cf25164..eaf500a85 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214
@@ -1,2 +1,2 @@
-'2086',2800,64500,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
-'2086',2801,73200,4,'',0,9300,4,'',0,69800,4,'',0,9900,4,'',0,9500,4,'',0,10000,4,'',0
+'1798',2800,64500,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
+'1798',2801,73200,4,'',0,9300,4,'',0,69800,4,'',0,9900,4,'',0,9500,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140216 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140216
index a35e33f74..82b44d3af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140216
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140216
@@ -1,3 +1,3 @@
-'1781',800,64500,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72200,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64500,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72200,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221
index da6ccb679..366e0f3d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221
@@ -1,3 +1,3 @@
-'1781',2201,84200,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2086',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
-'2091',2201,81900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
+'2931',2201,84200,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
+'3091',2201,81900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222
index f282c8091..44968a12d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222
@@ -1,3 +1,3 @@
-'1781',2200,90100,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2086',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
-'2091',2200,83700,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
+'1798',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
+'2931',2200,90100,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
+'3091',2200,83700,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140233 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140233
index 294a21791..186e3b3d6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140233
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140233
@@ -1,3 +1,3 @@
-'1781',200,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2086',200,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2091',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
+'1798',200,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
+'2931',200,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
+'3091',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140234 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140234
deleted file mode 100644
index 95f244b7e..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140234
+++ /dev/null
@@ -1 +0,0 @@
-'2086',401,82900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140235 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140235
deleted file mode 100644
index 4c13f7335..000000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140235
+++ /dev/null
@@ -1 +0,0 @@
-'2086',400,155100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140236 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140236
index 45ef12b12..17e39fa7f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140236
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140236
@@ -1,3 +1,3 @@
-'1781',500,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',500,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,1200,,'',0,2000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',500,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',500,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',500,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',500,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140237 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140237
index 4e6d99087..924b22dfb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140237
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140237
@@ -1,3 +1,3 @@
-'1781',501,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2086',501,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,5700,,'',0,1300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2091',501,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
+'1798',501,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'2931',501,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
+'3091',501,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140238 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140238
index e7c8b7a9c..cf32a4d0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140238
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140238
@@ -1,4 +1,4 @@
-'2086',1301,95000,,'',0,45000,,'',0,53500,,'',0
-'1781',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,10100,,'',0,6300,,'',0,2600,,'',0,2400,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2000,,'',0,7700,,'',0,3400,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'2086',2301,60000,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',1301,95000,,'',0,45000,,'',0,53500,,'',0
+'1798',2301,60000,,'',0,3700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,10100,,'',0,6300,,'',0,2600,,'',0,2400,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2000,,'',0,7700,,'',0,3400,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
+'3091',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140239 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140239
index 276ef649c..a3227527a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140239
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140239
@@ -1,4 +1,3 @@
-'2086',400,154900,,'',0
-'1781',1000,82700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',1000,64600,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2091',1000,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
+'1798',1000,64600,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
+'2931',1000,82700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',1000,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140240 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140240
index 8c5c4f40c..fa196e291 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140240
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140240
@@ -1,3 +1,3 @@
-'1781',1100,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2086',1100,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'2091',1100,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
+'1798',1100,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
+'2931',1100,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
+'3091',1100,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140241 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140241
index 971c99a99..901cf239f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140241
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140241
@@ -1,3 +1,3 @@
-'1781',600,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',600,65500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2091',600,84500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
+'1798',600,65500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
+'2931',600,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',600,84500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140242 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140242
index 5f1ef682b..0e7868c76 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140242
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140242
@@ -1,3 +1,3 @@
-'1781',601,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',601,63300,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2091',601,81900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
+'1798',601,63300,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
+'2931',601,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3091',601,81900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140243 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140243
index 36fa9df90..725f1d8c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140243
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140243
@@ -1,3 +1,3 @@
-'1781',100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2086',100,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2091',100,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'1798',100,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'2931',100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'3091',100,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140244 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140244
index 911cdcd93..48350e7df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140244
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140244
@@ -1,10 +1,10 @@
-'1781',101,74300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2086',100,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2086',101,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,700,,'',0,800,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,800,0,'College',0,700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2091',100,81400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2091',101,74300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2086',400,153100,,'',0
-'1781',801,65100,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2086',801,63100,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'2091',801,65100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'2086',1200,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
+'1798',100,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
+'1798',101,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
+'2931',100,81300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
+'2931',101,74300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
+'3091',100,81400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3091',101,74300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',801,63100,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
+'2931',801,65100,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
+'3091',801,65100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
+'1798',1200,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140245 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140245
index 7738ab225..bf35eb90a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140245
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140245
@@ -1,3 +1,3 @@
-'1781',801,72200,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2086',801,60200,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72100,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,60200,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72200,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,72100,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140246 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140246
index 8ed9650f8..076026d8f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140246
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140246
@@ -1,3 +1,3 @@
-'1781',800,64800,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2086',800,62300,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'2091',800,72500,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
+'1798',800,62300,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
+'2931',800,64800,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
+'3091',800,72500,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140247 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140247
index 2c741a353..86f58c092 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140247
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140247
@@ -1,3 +1,3 @@
-'1781',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2086',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
+'3091',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140248
index c4c80061d..4d0e2b9a8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140248
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140248
@@ -1,4 +1,4 @@
-'2086',1301,95000,,'',0,45000,,'',0,53500,,'',0
-'1781',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,2200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'2086',2301,60200,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',1301,95000,,'',0,45000,,'',0,53500,,'',0
+'1798',2301,60200,,'',0,3700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,2200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
+'3091',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140249 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140249
index fdeb9850d..256df227c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140249
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140249
@@ -1,4 +1,4 @@
-'2086',1300,93700,,'',0,41000,,'',0,57500,,'',0
-'1781',2300,70200,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,2800,,'',0,6800,,'',0,7300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2500,,'',0,7100,,'',0,3100,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,55300,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'2091',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
+'1798',1300,93700,,'',0,41000,,'',0,57500,,'',0
+'1798',2300,55300,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'2931',2300,70200,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,2800,,'',0,6800,,'',0,7300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2500,,'',0,7100,,'',0,3100,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140250 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140250
index be3e719c0..7e39b982a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140250
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140250
@@ -1,4 +1,4 @@
-'2086',1301,95000,,'',0,45000,,'',0,53500,,'',0
-'1781',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3200,,'',0,10100,,'',0,6200,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,8000,,'',0,2000,,'',0,7800,,'',0,3400,,'',0,6800,,'',0,2800,,'',0,6700,,'',0,3300,,'',0,10200,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'2086',2301,60100,,'',0,3700,,'',0,7600,,'',0,8900,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'2091',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
+'1798',1301,95000,,'',0,45000,,'',0,53500,,'',0
+'1798',2301,60100,,'',0,3700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
+'2931',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3200,,'',0,10100,,'',0,6200,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,8000,,'',0,2000,,'',0,7800,,'',0,3400,,'',0,6800,,'',0,2800,,'',0,6700,,'',0,3300,,'',0,10200,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
+'3091',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140251 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140251
index d12e1986c..810253d7a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140251
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140251
@@ -1,4 +1,4 @@
-'2086',1300,93800,,'',0,41000,,'',0,57500,,'',0
-'1781',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'2086',2300,55400,,'',0,7500,,'',0,3000,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1700,,'',0,5700,,'',0,3000,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'2091',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
+'1798',1300,93800,,'',0,41000,,'',0,57500,,'',0
+'1798',2300,55400,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
+'2931',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
+'3091',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140252 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140252
index dfde10898..06c217688 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140252
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140252
@@ -1,3 +1,3 @@
-'1781',1900,74000,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2086',1900,71600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'2091',1900,81000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
+'1798',1900,71600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
+'2931',1900,74000,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,81000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140254 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140254
index 1d75cb9d1..613db2e5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140254
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140254
@@ -1,8 +1,11 @@
-'2086',801,60500,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72400,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'2086',1001,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,1800,,'',0,5500,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2091',1001,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'2086',1101,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'2086',1400,121200,,'',0,73800,,'',0
-'2086',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'1798',801,60500,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72500,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
+'3091',801,72400,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',1001,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,1800,,'',0,5500,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
+'2931',1001,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'Rutland Exch',0
+'3091',1001,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
+'1798',1101,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
+'3091',1101,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
+'1798',1400,121200,,'',0,73800,,'',0
+'1798',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140256 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140256
index 65cde54b5..c6b75f8a1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140256
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140256
@@ -1,2 +1,3 @@
-'2086',1700,61700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,800,,'',0,6300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,1000,,'',0,2000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
-'2091',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1700,61700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
+'2931',1700,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
+'3091',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140258 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140258
index 915f5cb9a..4c3d281a4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140258
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140258
@@ -1,2 +1,3 @@
-'2086',1101,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,5400,,'',0,1500,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'2091',1101,81700,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'1798',1101,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
+'2931',1101,80400,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
+'3091',1101,81700,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140259 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140259
index 80987e2e6..fbc886b42 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140259
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140259
@@ -1,2 +1,3 @@
-'2086',801,60000,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2091',801,72000,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
+'1798',801,60000,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
+'2931',801,72000,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
+'3091',801,72000,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140269 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140269
index 6e0ed5a92..fd9c6f1cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140269
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140269
@@ -1 +1,3 @@
-'2086',1900,71800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'1798',1900,71800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
+'2931',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
+'3091',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',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 af1ed12d7..a25c834c7 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 @@
     <string name="current_gtfs_rts_area_max_lat">50.07352</string>
     <string name="current_gtfs_rts_area_min_lng">-119.7902</string>
     <string name="current_gtfs_rts_area_max_lng">-119.34723</string>
-    <integer name="current_gtfs_rts_first_departure_in_sec">1719149100</integer><!-- 2024/06/23 06:25:00 PDT -->
-    <integer name="current_gtfs_rts_last_departure_in_sec">1719736380</integer><!-- 2024/06/30 01:33:00 PDT -->
+    <integer name="current_gtfs_rts_first_departure_in_sec">1719753900</integer><!-- 2024/06/30 06:25:00 PDT -->
+    <integer name="current_gtfs_rts_last_departure_in_sec">1725179580</integer><!-- 2024/09/01 01:33:00 PDT -->
 </resources>
diff --git a/app-android/src/main/res-next/raw/next_gtfs_rts_routes b/app-android/src/main/res-next/raw/next_gtfs_rts_routes
deleted file mode 100644
index 36b6d1622..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_rts_routes
+++ /dev/null
@@ -1,28 +0,0 @@
-1,'1','Lakeshore','004B8D',49,3
-2,'2','North End Shuttle','8CC63F',50,3
-3,'3','Dilworth Mt','F37421',51,3
-5,'5','Gordon','FCAFF7',53,3
-6,'6','Glenmore / UBCO Express','00AA47',54,3
-8,'8','University / College','ED1D8F',56,3
-9,'9','Shopper Shuttle','8177B7',57,3
-10,'10','North Rutland','49176B',1567,3
-11,'11','Rutland','B2221E',1568,3
-12,'12','McCulloch','4F6F19',1569,3
-13,'13','Quail Rdg','77AF99',1570,3
-14,'14','Black Mtn','E270AB',1571,3
-15,'15','Crawford','5D87A1',1572,3
-16,'16','Kettle Vly','0073AE',1573,3
-17,'17','South Rdg','F49A5D',1574,3
-18,'18','Glenmore / Downtown','B3AA7E',1575,3
-19,'19','Glenmore / Orchard Pk','BF83B9',1576,3
-20,'20','Lakeview','A54499',1598,3
-21,'21','Glenrosa','00B5AD',1599,3
-22,'22','Peachland','B06E0E',1600,3
-23,'23','Lk Country','8E0C3A',1601,3
-24,'24','Shannon Rdg','E31937',1602,3
-25,'25','East Boundary','AC5C3B',1603,3
-26,'26','Old Okanagan','F37421',1604,3
-28,'28','Shannon Lk','875D9F',1606,3
-29,'29','Bear Crk','7C3F25',1607,3
-32,'32','The Lks','FFC20E',1631,3
-97,'97','Okanagan','8CC63F',1822,3
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
deleted file mode 100644
index b1638bfa5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_rts_stops
+++ /dev/null
@@ -1,956 +0,0 @@
-102728,'102728','Spall @ Bernard',49.88798,-119.45463,0,1448701418
-102853,'102853','Queensway Exch',49.88742,-119.4959,0,1448702467
-102854,'102854','Queensway Exch',49.88738,-119.49474,0,1448702468
-102855,'102855','Queensway Exch',49.88738,-119.49449,0,1448702469
-102856,'102856','Queensway Exch',49.88739,-119.49419,0,1448702470
-102857,'102857','Queensway Exch',49.88736,-119.49393,0,1448702471
-102859,'102859','Queensway Exch',49.88726,-119.49432,0,1448702473
-102860,'102860','Queensway Exch',49.88726,-119.4946,0,1448702495
-102861,'102861','Queensway Exch',49.88726,-119.49483,0,1448702496
-102862,'102862','Queensway Exch',49.88742,-119.49615,0,1448702497
-102863,'102863','Rutland @ Sumac',49.90388,-119.38677,0,1448702498
-102865,'102865','Water @ Doyle',49.88923,-119.49651,0,1448702500
-102866,'102866','Doyle @ St Paul',49.88895,-119.4915,0,1448702501
-102867,'102867','Doyle @ Bertram',49.88904,-119.49058,0,1448702502
-102868,'102868','Water @ Leon',49.88467,-119.49665,0,1448702503
-102869,'102869','Water @ Leon',49.8842,-119.49635,0,1448702504
-102870,'102870','Water @ Cawston',49.89209,-119.49652,0,1448702526
-102874,'102874','Bernard @ Bertram',49.88637,-119.48987,0,1448702530
-102875,'102875','Richter @ Lawrence',49.88563,-119.48856,0,1448702531
-102877,'102877','Bernard @ Richter',49.88628,-119.48818,0,1448702533
-102879,'102879','Richter @ Wilson',49.89102,-119.48855,0,1448702535
-102880,'102880','Richter @ Fuller',49.89061,-119.48841,0,1448702557
-102881,'102881','Pandosy @ Buckland',49.88166,-119.4951,0,1448702558
-102882,'102882','Leon @ Richter',49.88454,-119.4869,0,1448702559
-102883,'102883','Pandosy @ Buckland',49.88135,-119.49494,0,1448702560
-102884,'102884','Leon @ Richter',49.88445,-119.48666,0,1448702561
-102885,'102885','Richter @ Clement',49.89321,-119.48854,0,1448702562
-102886,'102886','Richter @ Dehart',49.88192,-119.48865,0,1448702563
-102887,'102887','Richter @ Dehart',49.8822,-119.48838,0,1448702564
-102888,'102888','Ellis @ Ind',49.89581,-119.49349,0,1448702565
-102889,'102889','Bernard @ Ethel',49.88636,-119.48312,0,1448702566
-102890,'102890','Leon @ Ethel',49.88453,-119.48369,0,1448702588
-102891,'102891','Leon @ Ethel',49.88444,-119.48386,0,1448702589
-102892,'102892','Pandosy @ Sutherland',49.8797,-119.49357,0,1448702590
-102893,'102893','Bernard @ Ethel',49.88627,-119.48235,0,1448702591
-102894,'102894','Cawston @ Ethel',49.89168,-119.48331,0,1448702592
-102895,'102895','Richter @ Gaston',49.89568,-119.48854,0,1448702593
-102896,'102896','Pandosy @ Sutherland',49.87905,-119.49294,0,1448702594
-102897,'102897','Richter @ Sutherland',49.88004,-119.48842,0,1448702595
-102898,'102898','Cawston @ Ethel',49.89159,-119.48234,0,1448702596
-102899,'102899','Sutherland @ Richter',49.87981,-119.48813,0,1448702597
-102900,'102900','Bernard @ Graham',49.88638,-119.48019,0,1448703270
-102901,'102901','Ellis @ Recreation',49.89799,-119.49346,0,1448703271
-102902,'102902','Bernard @ Graham',49.88631,-119.47974,0,1448703272
-102903,'102903','Cawston @ Graham',49.89167,-119.48059,0,1448703273
-102905,'102905','Graham @ Clement',49.89328,-119.47995,0,1448703275
-102906,'102906','Sutherland @ Ethel',49.87987,-119.4831,0,1448703276
-102907,'102907','Bernard @ Gordon',49.88626,-119.47807,0,1448703277
-102908,'102908','Graham @ Clement',49.89322,-119.47981,0,1448703278
-102909,'102909','Bernard @ Gordon',49.88643,-119.478,0,1448703279
-102910,'102910','Pandosy @ Cadder',49.87673,-119.49122,0,1448703301
-102911,'102911','Ellis @ Roanoke',49.89957,-119.49347,0,1448703302
-102912,'102912','Sutherland @ Ethel',49.87979,-119.48227,0,1448703303
-102913,'102913','Richter @ Bay',49.89928,-119.48853,0,1448703304
-102914,'102914','Pandosy @ Cadder',49.87589,-119.4913,0,1448703305
-102915,'102915','Bernard @ Gordon',49.88625,-119.47605,0,1448703306
-102916,'102916','Lawrence @ Gordon',49.88526,-119.47631,0,1448703307
-102917,'102917','Sutherland @ Bowes',49.87987,-119.48026,0,1448703308
-102918,'102918','Lawrence @ Gordon',49.88534,-119.47589,0,1448703309
-102919,'102919','Ellis @ Okanagan',49.90105,-119.49342,0,1448703310
-102920,'102920','Sutherland @ Lequime',49.87978,-119.47865,0,1448703332
-102921,'102921','Bernard @ Danjou',49.88636,-119.47432,0,1448703333
-102922,'102922','Richter @ Okanagan',49.90119,-119.48853,0,1448703334
-102923,'102923','Bernard @ Danjou',49.88631,-119.47413,0,1448703335
-102924,'102924','Ellis @ Oxford',49.90187,-119.49319,0,1448703336
-102925,'102925','Lawrence @ Kelglen',49.88523,-119.47319,0,1448703337
-102926,'102926','Lawrence @ Kelglen',49.88532,-119.47289,0,1448703338
-102927,'102927','Sutherland @ Gordon',49.88026,-119.47594,0,1448703339
-102928,'102928','Kelowna General Hosp',49.87391,-119.49134,0,1448703340
-102929,'102929','Springfield @ Ethel',49.87645,-119.48061,0,1448703341
-102930,'102930','Kelowna General Hosp',49.87353,-119.49118,0,1448703363
-102931,'102931','Sutherland @ Gordon',49.88017,-119.47525,0,1448703364
-102932,'102932','Cambridge @ Ellis',49.9035,-119.4924,0,1448703365
-102933,'102933','Bernard @ Richmond',49.88637,-119.47123,0,1448703366
-102934,'102934','Cambridge @ Kingsway',49.90348,-119.49063,0,1448703367
-102935,'102935','Richter @ Cambridge',49.90303,-119.48852,0,1448703368
-102936,'102936','Bernard @ Richmond',49.88628,-119.47099,0,1448703369
-102937,'102937','Lawrence @ Richmond',49.88523,-119.47072,0,1448703370
-102938,'102938','Sutherland @ Capri',49.88017,-119.47325,0,1448703371
-102939,'102939','Gordon @ Springfield',49.87646,-119.47723,0,1448703372
-102941,'102941','Springfield @ Gordon',49.87679,-119.47658,0,1448703395
-102942,'102942','Lawrence @ Richmond',49.8853,-119.47019,0,1448703396
-102944,'102944','Sutherland @ Pacific',49.88025,-119.47239,0,1448703398
-102945,'102945','Sutherland @ Pacific',49.88017,-119.4713,0,1448703399
-102948,'102948','Lawrence @ Lakeview',49.88532,-119.46744,0,1448703402
-102950,'102950','Springfield @ Wilkinson',49.8771,-119.47202,0,1448703425
-102951,'102951','Lawrence @ Alta Vista',49.88522,-119.46664,0,1448703426
-102952,'102952','Pandosy @ Morrison',49.86934,-119.49134,0,1448703427
-102953,'102953','Bernard @ Highland',49.88635,-119.46602,0,1448703428
-102954,'102954','Springfield @ Wilkinson',49.8769,-119.47106,0,1448703429
-102955,'102955','Sutherland @ Chandler',49.88033,-119.46761,0,1448703430
-102956,'102956','Pandosy @ Patterson',49.8686,-119.49115,0,1448703431
-102957,'102957','Sutherland @ Chandler',49.88024,-119.46766,0,1448703432
-102958,'102958','Gordon @ Guisachan',49.87245,-119.47608,0,1448703433
-102959,'102959','Clifton @ Hartwick',49.89387,-119.46595,0,1448703434
-102960,'102960','Clifton @ Hartwick',49.89365,-119.4657,0,1448703456
-102961,'102961','Pandosy @ Patterson',49.86803,-119.49133,0,1448703457
-102962,'102962','Burtch @ Kelglen',49.88298,-119.46507,0,1448703458
-102963,'102963','Burtch @ Kelglen',49.88286,-119.46508,0,1448703459
-102964,'102964','Bernard @ Noble',49.88634,-119.46366,0,1448703460
-102965,'102965','Clifton @ Lambert',49.8959,-119.4659,0,1448703461
-102966,'102966','Clifton @ Lambert',49.89544,-119.46565,0,1448703462
-102968,'102968','Clifton @ Lynwood',49.89726,-119.46588,0,1448703464
-102969,'102969','Lawrence @ Burtch',49.88455,-119.46294,0,1448703465
-102970,'102970','Burtch @ Dickson',49.87844,-119.46587,0,1448703487
-102971,'102971','Lawrence @ Burtch',49.8844,-119.46287,0,1448703488
-102972,'102972','Burtch @ Dickson',49.8782,-119.46574,0,1448703489
-102973,'102973','Springfield @ Burtch',49.87707,-119.46632,0,1448703490
-102974,'102974','Bernard @ Burtch',49.88654,-119.46173,0,1448703491
-102975,'102975','Bernard @ Cherry Cresent',49.887,-119.46121,0,1448703492
-102976,'102976','Pandosy @ Raymer',49.86571,-119.49129,0,1448703493
-102977,'102977','High @ Glengarry',49.89773,-119.46413,0,1448703494
-102978,'102978','Gordon @ Cameron',49.86989,-119.47471,0,1448703495
-102979,'102979','Springfield @ Burtch',49.87673,-119.46501,0,1448703496
-102982,'102982','Pandosy @ Groves',49.86339,-119.49129,0,1448703520
-102984,'102984','Pandosy @ Groves',49.86394,-119.49115,0,1448703522
-102985,'102985','Harvey @ Kirschner - Parkinson Sta',49.88182,-119.45904,0,1448703523
-102986,'102986','Springfield @ Dayton',49.87693,-119.46171,0,1448703524
-102987,'102987','High @ Tronson',49.89847,-119.46225,0,1448703525
-102988,'102988','High @ Tronson',49.89915,-119.46132,0,1448703526
-102989,'102989','Harvey @ Kirschner - Parkinson Sta',49.88204,-119.45807,0,1448703527
-102990,'102990','Springfield @ Dayton',49.87672,-119.46062,0,1448703549
-102991,'102991','Bernard @ Dilworth Cresent',49.8884,-119.45621,0,1448703550
-102993,'102993','Parkinson @ Ufton',49.88315,-119.45636,0,1448703552
-102994,'102994','Parkinson @ Ufton',49.8831,-119.45592,0,1448703553
-102995,'102995','Pandosy @ KLO',49.86229,-119.49117,0,1448703554
-102996,'102996','Springfield @ Kirschner',49.87694,-119.45876,0,1448703555
-102997,'102997','KLO @ Lakeshore',49.86196,-119.49084,0,1448703556
-102998,'102998','Rutland @ Klassen',49.90721,-119.38669,0,1448703557
-102999,'102999','Lakeshore @ Cedar',49.86167,-119.49131,0,1448703558
-103000,'103000','Glenmore @ Dilworth',49.88976,-119.45456,0,1448724412
-103002,'103002','Hwy 33 @ Enterprise',49.8907,-119.42352,0,1448724414
-103003,'103003','Glenmore @ Bernard',49.88905,-119.45421,0,1448724415
-103004,'103004','Springfield @ Kirschner',49.87677,-119.45797,0,1448724416
-103005,'103005','High @ Kennedy',49.90041,-119.45849,0,1448724417
-103006,'103006','Gordon @ Raymer',49.86456,-119.47437,0,1448724418
-103007,'103007','Glenmore @ Highland Dr',49.89402,-119.45454,0,1448724419
-103008,'103008','Glenmore @ Highland Dr',49.89407,-119.45415,0,1448724420
-103009,'103009','Enterprise @ Spall',49.88407,-119.45354,0,1448724421
-103010,'103010','High @ Kennedy',49.90041,-119.45754,0,1448724443
-103011,'103011','Spall @ Windsor',49.88042,-119.4547,0,1448724444
-103012,'103012','Spall @ Windsor',49.88087,-119.45438,0,1448724445
-103013,'103013','Glenmore @ Mtn',49.89592,-119.45449,0,1448724446
-103014,'103014','Springfield @ Spall',49.8772,-119.45597,0,1448724447
-103015,'103015','Enterprise @ Spall',49.88415,-119.4529,0,1448724448
-103016,'103016','Pandosy Exch',49.8604,-119.49115,0,1448724449
-103018,'103018','Spall @ Kent',49.87864,-119.45469,0,1448724451
-103020,'103020','KLO @ Casorso',49.86093,-119.48492,0,1448724474
-103021,'103021','Mission Rec Exch',49.83712,-119.48059,0,1448724475
-103022,'103022','Mission Rec Exch',49.83693,-119.48062,0,1448724476
-103023,'103023','Mission Rec Exch',49.8366,-119.48062,0,1448724477
-103024,'103024','Spall @ Kent',49.87888,-119.45447,0,1448724478
-103025,'103025','Lakeshore @ Pandosy Exch',49.86026,-119.49128,0,1448724479
-103026,'103026','Glenmore @ Mtn',49.89679,-119.45408,0,1448724480
-103027,'103027','Westside @ Nancee Way',49.88307,-119.53813,0,1448724481
-103028,'103028','Okanagan College Exch',49.86127,-119.47932,0,1448724482
-103029,'103029','Clement @ Cerise',49.89239,-119.47059,0,1448724483
-103030,'103030','Okanagan College Exch',49.86105,-119.47988,0,1448724505
-103031,'103031','Clement @ Cerise',49.89277,-119.47138,0,1448724506
-103033,'103033','Springfield @ Spall',49.87716,-119.45386,0,1448724508
-103035,'103035','Glenmore @ High',49.89996,-119.45438,0,1448724510
-103036,'103036','Enterprise @ Enterprise Court',49.88316,-119.45031,0,1448724511
-103038,'103038','KLO @ Gordon',49.86091,-119.47554,0,1448724513
-103039,'103039','Lanfranco @ Lakeshore',49.85815,-119.4903,0,1448724514
-103040,'103040','Casorso @ Lanfranco',49.85831,-119.48549,0,1448724536
-103041,'103041','Glenmore @ Summit',49.90187,-119.45352,0,1448724537
-103042,'103042','KLO @ Holland',49.86109,-119.47275,0,1448724538
-103043,'103043','Westside @ Bear Crk',49.89228,-119.54262,0,1448724539
-103044,'103044','Lakeshore @ Lanfranco',49.85714,-119.49113,0,1448724540
-103045,'103045','KLO @ Holland',49.86091,-119.47253,0,1448724541
-103046,'103046','Enterprise @ Hardy',49.88332,-119.44811,0,1448724542
-103047,'103047','Westside @ Westpoint Pk',49.88551,-119.54411,0,1448724543
-103048,'103048','Glenmore @ Glenmeadows',49.90405,-119.45336,0,1448724544
-103049,'103049','Hwy 97 @ Banks - Banks Sta',49.88563,-119.42664,0,1448724545
-103050,'103050','Enterprise @ Hardy',49.88325,-119.44694,0,1448724567
-103051,'103051','Glenmore @ Glenmeadows',49.904,-119.45297,0,1448724568
-103052,'103052','Summit @ Vly',49.9012,-119.45024,0,1448724569
-103053,'103053','Summit @ Vly',49.90111,-119.45021,0,1448724570
-103054,'103054','KLO @ Saint Amand',49.86108,-119.4663,0,1448724571
-103056,'103056','Springfield @ Barlee',49.87716,-119.44781,0,1448724573
-103057,'103057','Springfield @ Barlee',49.87738,-119.44737,0,1448724574
-103058,'103058','Enterprise @ Cooper',49.88324,-119.44458,0,1448724575
-103059,'103059','KLO @ Saint Amand',49.8609,-119.46676,0,1448724576
-103060,'103060','Enterprise @ Cooper',49.88333,-119.44438,0,1448724598
-103061,'103061','Harvey @ Cooper - Cooper Sta',49.88202,-119.44467,0,1448724599
-103062,'103062','Lakeshore @ Swordy',49.85481,-119.49002,0,1448724600
-103063,'103063','Bear Crk @ McNaughton',49.89299,-119.54761,0,1448724601
-103065,'103065','Boucherie @ Carrall',49.82514,-119.60949,0,1448724603
-103066,'103066','Parkinson @ Bear Crk',49.89893,-119.54703,0,1448724604
-103067,'103067','Harvey @ Cooper - Cooper Sta',49.88176,-119.44216,0,1448724605
-103069,'103069','Orchard Pk Exch',49.88025,-119.44247,0,1448724607
-103070,'103070','Orchard Pk Exch',49.88041,-119.44248,0,1448724629
-103071,'103071','Orchard Pk Exch',49.88056,-119.44248,0,1448724630
-103072,'103072','Orchard Pk Exch',49.88065,-119.44234,0,1448724631
-103073,'103073','Orchard Pk Exch',49.8805,-119.44234,0,1448724632
-103075,'103075','Orchard Pk Exch',49.88037,-119.44234,0,1448724634
-103076,'103076','Enterprise @ Cooper',49.88322,-119.44167,0,1448724635
-103077,'103077','Orchard Pk Exch',49.87962,-119.44228,0,1448724636
-103078,'103078','Boucherie @ Hayman',49.87266,-119.5447,0,1448724637
-103079,'103079','Orchard Pk Exch',49.88008,-119.44231,0,1448724638
-103080,'103080','Glenmore @ Yates',49.90911,-119.4509,0,1448724660
-103081,'103081','McCurdy @ Alsgard',49.90125,-119.40612,0,1448724661
-103082,'103082','Summit @ Denali',49.89883,-119.44257,0,1448724662
-103083,'103083','Summit @ Denali',49.89841,-119.44231,0,1448724663
-103084,'103084','KLO @ Benvoulin',49.86104,-119.45854,0,1448724664
-103086,'103086','Springfield @ Cooper',49.8771,-119.44164,0,1448724666
-103087,'103087','Glenmore @ Yates',49.90967,-119.45011,0,1448724667
-103088,'103088','KLO @ Benvoulin',49.86088,-119.45995,0,1448724668
-103089,'103089','Summit @ Lillooet',49.89569,-119.43997,0,1448724669
-103090,'103090','Yates @ Glenmore',49.90895,-119.44894,0,1448724691
-103091,'103091','Lakeshore @ Bechard',49.85151,-119.48683,0,1448724692
-103092,'103092','Enterprise @ Dilworth',49.88331,-119.43862,0,1448724693
-103093,'103093','Lakeshore @ Bechard',49.85151,-119.48697,0,1448724694
-103094,'103094','Parkinson @ Westlake',49.89125,-119.55277,0,1448724695
-103095,'103095','Summit @ Chilcotin',49.89592,-119.43912,0,1448724696
-103096,'103096','Dilworth @ Leckie',49.88699,-119.43781,0,1448724697
-103097,'103097','Springfield @ Benvoulin',49.87734,-119.44014,0,1448724698
-103098,'103098','Yates @ Vly',49.90866,-119.44724,0,1448724699
-103099,'103099','Dilworth @ Leckie',49.887,-119.43767,0,1448724700
-103101,'103101','Dilworth @ Enterprise',49.88438,-119.43778,0,1448725374
-103102,'103102','Dilworth @ Enterprise',49.88451,-119.43764,0,1448725375
-103103,'103103','Glenmore @ Watson',49.91122,-119.44942,0,1448725376
-103104,'103104','Glenmore @ Cross',49.9224,-119.43994,0,1448725377
-103105,'103105','Enterprise @ Dilworth',49.88322,-119.43689,0,1448725378
-103107,'103107','Glenmore @ Watson',49.91165,-119.44873,0,1448725380
-103108,'103108','Dilworth @ Baron',49.8789,-119.43703,0,1448725381
-103110,'103110','Westlake @ Keloka',49.88711,-119.55568,0,1448725404
-103111,'103111','Summit @ Skeena',49.8986,-119.43643,0,1448725405
-103113,'103113','Lakeshore @ Barrera',49.84894,-119.48617,0,1448725407
-103114,'103114','KLO @ Como',49.86091,-119.45055,0,1448725408
-103115,'103115','Westlake @ Horizon',49.88503,-119.55698,0,1448725409
-103116,'103116','KLO @ Como',49.86104,-119.44997,0,1448725410
-103117,'103117','Summit @ Skeena',49.89885,-119.43561,0,1448725411
-103118,'103118','Dilworth @ Omineca',49.8912,-119.43322,0,1448725412
-103119,'103119','Lakeshore @ Barrera',49.84868,-119.48634,0,1448725413
-103121,'103121','Baron @ Underhill',49.87958,-119.43414,0,1448725436
-103122,'103122','Enterprise @ Leckie',49.88404,-119.43275,0,1448725437
-103123,'103123','Dilworth @ Omineca',49.89152,-119.43264,0,1448725438
-103125,'103125','Baron @ Underhill',49.87964,-119.43327,0,1448725440
-103126,'103126','Enterprise @ Leckie',49.88561,-119.43186,0,1448725441
-103127,'103127','Enterprise @ Hunter',49.88592,-119.43166,0,1448725442
-103128,'103128','Summit @ Lillooet',49.89927,-119.43362,0,1448725443
-103129,'103129','Summit @ Lillooet',49.89936,-119.43308,0,1448725444
-103130,'103130','Springfield @ Durnin',49.87779,-119.43249,0,1448725466
-103131,'103131','Glenmore @ Ballou',49.91564,-119.44633,0,1448725467
-103132,'103132','Cross @ Glenmore',49.92343,-119.44008,0,1448725468
-103133,'103133','Lakeshore @ Cook',49.84624,-119.48736,0,1448725469
-103134,'103134','Anders @ Thacker',49.85992,-119.54544,0,1448725470
-103135,'103135','Anders @ Thacker',49.86003,-119.54574,0,1448725471
-103136,'103136','Glenmore @ Kane',49.91616,-119.44563,0,1448725472
-103138,'103138','Springfield @ Durnin',49.87814,-119.43089,0,1448725474
-103139,'103139','Lakeshore @ Cook',49.84517,-119.48784,0,1448725475
-103140,'103140','Kane @ Drysdale',49.91535,-119.44385,0,1448725497
-103141,'103141','Enterprise @ Banks',49.88868,-119.42863,0,1448725498
-103142,'103142','Baron @ Leckie',49.88249,-119.42873,0,1448725499
-103143,'103143','Summit @ Purcell',49.89963,-119.43066,0,1448725500
-103144,'103144','Baron @ Leckie',49.88246,-119.42857,0,1448725501
-103145,'103145','Dilworth @ Cascade',49.89286,-119.42815,0,1448725502
-103146,'103146','KLO @ Spiers',49.86056,-119.44227,0,1448725503
-103147,'103147','Dilworth @ Cascade',49.89277,-119.42812,0,1448725504
-103148,'103148','Summit @ Nahanni',49.89991,-119.4301,0,1448725505
-103149,'103149','KLO @ Spiers',49.8605,-119.44237,0,1448725506
-103151,'103151','Lakeshore @ Truswell',49.84396,-119.48769,0,1448725529
-103152,'103152','Lakeshore @ Truswell',49.84381,-119.48795,0,1448725530
-103153,'103153','Black Mtn @ Large',49.87201,-119.34848,0,1448725531
-103154,'103154','Glenmore @ Dallas',49.91798,-119.44468,0,1448725532
-103156,'103156','Springfield @ Leckie',49.87964,-119.42761,0,1448725534
-103159,'103159','Glenmore @ Dallas',49.91841,-119.44403,0,1448725537
-103160,'103160','Thacker @ Douglas',49.8564,-119.54544,0,1448725559
-103161,'103161','Westlake @ Starlight',49.87915,-119.56426,0,1448725560
-103162,'103162','Boucherie @ Stuart',49.86412,-119.5551,0,1448725561
-103163,'103163','Anders @ Olalla',49.86016,-119.55063,0,1448725562
-103164,'103164','Anders @ Olalla',49.86031,-119.55198,0,1448725563
-103165,'103165','Enterprise @ Powick',49.89028,-119.42541,0,1448725564
-103166,'103166','960 Block Dilworth',49.89692,-119.42629,0,1448725565
-103167,'103167','Thacker @ Douglas',49.85579,-119.5457,0,1448725566
-103168,'103168','Summit @ Dilworth',49.89871,-119.4268,0,1448725567
-103169,'103169','1900 Block Baron',49.8837,-119.42518,0,1448725568
-103170,'103170','Summit @ Dilworth',49.8988,-119.4268,0,1448725590
-103171,'103171','Baron @ Banks',49.88431,-119.42479,0,1448725591
-103172,'103172','970 Block Dilworth',49.89653,-119.426,0,1448725592
-103173,'103173','Westlake @ Caledonia',49.87347,-119.56304,0,1448725593
-103174,'103174','Hwy 97 @ Banks - Banks Sta',49.88688,-119.42413,0,1448725594
-103176,'103176','Gordon @ Steele',49.80585,-119.47308,0,1448725596
-103177,'103177','Gordon @ Powerline Pk',49.80533,-119.47633,0,1448725597
-103178,'103178','Westlake @ Rosewood',49.8777,-119.5663,0,1448725598
-103180,'103180','Hudson @ Boucherie',49.86235,-119.5565,0,1448725621
-103181,'103181','Thacker @ Collens Hl',49.85383,-119.54566,0,1448725622
-103182,'103182','Thacker @ Collens Hl',49.85383,-119.54591,0,1448725623
-103183,'103183','Hudson @ Boucherie',49.86245,-119.55688,0,1448725624
-103184,'103184','Baron @ Spedding',49.88631,-119.42205,0,1448725625
-103185,'103185','Lakeshore @ Bluebird',49.84032,-119.48865,0,1448725626
-103186,'103186','Baron @ Spedding',49.88635,-119.42179,0,1448725627
-103187,'103187','Gordon @ Frost',49.80374,-119.47688,0,1448725628
-103188,'103188','Lakeshore @ Lexington',49.84046,-119.48847,0,1448725629
-103189,'103189','Springfield @ Parkview',49.88042,-119.42189,0,1448725630
-103190,'103190','Springfield @ Parkview',49.88061,-119.4216,0,1448725652
-103191,'103191','S Rdg @ Frost',49.80337,-119.48271,0,1448725653
-103192,'103192','Hwy 33 @ Rutland',49.8891,-119.38773,0,1448725654
-103193,'103193','Rutland Exch',49.89064,-119.39239,0,1448725655
-103195,'103195','Thacker @ Beverly',49.85252,-119.54781,0,1448725657
-103197,'103197','Thacker @ Beverly',49.85268,-119.54852,0,1448725659
-103198,'103198','Lynrick @ Loseth',49.86761,-119.35336,0,1448725660
-103201,'103201','Ziprick @ Terai',49.88831,-119.41764,0,1448726335
-103202,'103202','Springfield @ Ziprick',49.88061,-119.41854,0,1448726336
-103203,'103203','Vly @ Longhill',49.91991,-119.43415,0,1448726337
-103204,'103204','Ziprick @ Terai',49.88805,-119.4175,0,1448726338
-103205,'103205','Springfield @ Ziprick',49.88036,-119.41841,0,1448726339
-103206,'103206','Snowsell @ Cross',49.92446,-119.44177,0,1448726340
-103214,'103214','Lakeshore @ Lequime',49.83651,-119.48721,0,1448726369
-103216,'103216','Ogden @ Boucherie',49.853,-119.55566,0,1448726371
-103217,'103217','Ogden @ Boucherie',49.85288,-119.55563,0,1448726372
-103219,'103219','Alhambra @ Brentwood',49.86201,-119.56683,0,1448726374
-103220,'103220','Alhambra @ Brentwood',49.86203,-119.56697,0,1448726396
-103221,'103221','Hwy 33 @ Nickel',49.88912,-119.4134,0,1448726397
-103222,'103222','Hwy 33 @ Taylor',49.88903,-119.41316,0,1448726398
-103224,'103224','Vly @ Drysdale',49.9232,-119.43309,0,1448726400
-103226,'103226','Snowsell @ Porthill',49.92719,-119.43902,0,1448726402
-103227,'103227','Springfield @ Graham',49.87976,-119.41336,0,1448726403
-103230,'103230','1380 Block Stevens',49.86627,-119.57189,0,1448726427
-103231,'103231','KLO @ McCulloch',49.85971,-119.42417,0,1448726428
-103232,'103232','KLO @ McCulloch',49.85955,-119.42419,0,1448726429
-103233,'103233','Brentwood @ Denny',49.86118,-119.5693,0,1448726430
-103234,'103234','Brentwood @ Denny',49.86127,-119.56926,0,1448726431
-103235,'103235','Springfield @ Gerstmar',49.87881,-119.41188,0,1448726432
-103236,'103236','Union @ Wyndham',49.92785,-119.43703,0,1448726433
-103239,'103239','Boucherie @ Montigny',49.84895,-119.55707,0,1448726436
-103240,'103240','Hwy 33 @ Gerstmar',49.88913,-119.41001,0,1448726458
-103243,'103243','Union @ Vly',49.9254,-119.43203,0,1448726461
-103244,'103244','Boucherie @ Montigny',49.84871,-119.55757,0,1448726462
-103245,'103245','Hwy 33 @ Gerstmar',49.88904,-119.40886,0,1448726463
-103246,'103246','Gerstmar @ Thompson',49.87904,-119.40955,0,1448726464
-103248,'103248','Lakeshore @ Old Mdws',49.83198,-119.48779,0,1448726466
-103249,'103249','Brentwood @ Applewood',49.86146,-119.57255,0,1448726467
-103250,'103250','Gerstmar @ Thompson',49.87903,-119.40941,0,1448726489
-103251,'103251','Ross @ Stevens',49.86582,-119.57582,0,1448726490
-103252,'103252','Graham @ Gerstmar',49.88176,-119.40874,0,1448726491
-103253,'103253','Graham @ Irma',49.88185,-119.40857,0,1448726492
-103254,'103254','Brentwood @ Applewood',49.86137,-119.57259,0,1448726493
-103256,'103256','Hwy 97 @ McCurdy - McCurdy Sta',49.90021,-119.41008,0,1448726495
-103257,'103257','Gordon @ Welke',49.83149,-119.48334,0,1448726496
-103258,'103258','Ross @ Western',49.86368,-119.57583,0,1448726497
-103260,'103260','Hwy 33 @ Bryden',49.88912,-119.40635,0,1448726520
-103261,'103261','Brentwood @ Vista',49.8614,-119.57523,0,1448726521
-103262,'103262','Ross @ Brentwood',49.86189,-119.57587,0,1448726522
-103263,'103263','Hwy 97 @ McCurdy - McCurdy Sta',49.90245,-119.40752,0,1448726523
-103264,'103264','Hwy 33 @ Davie',49.88903,-119.40539,0,1448726524
-103265,'103265','Ross @ Brentwood',49.86081,-119.5774,0,1448726525
-103266,'103266','Boucherie @ Gregory',49.84694,-119.55991,0,1448726526
-103268,'103268','Boucherie @ Gregory',49.84647,-119.56099,0,1448726528
-103271,'103271','Graham @ Matt',49.88186,-119.40343,0,1448726552
-103272,'103272','Lakeshore @ Simeon',49.82828,-119.48869,0,1448726553
-103274,'103274','Hwy 33 @ Franklyn',49.88911,-119.40301,0,1448726555
-103277,'103277','Graham @ Matt',49.88177,-119.40282,0,1448726558
-103278,'103278','Hwy 33 @ Barber',49.88902,-119.4018,0,1448726559
-103279,'103279','Ross @ Applegreen',49.86082,-119.58009,0,1448726560
-103282,'103282','Ross @ Applegreen',49.86076,-119.58012,0,1448726584
-103283,'103283','McCurdy @ Mayfair',49.90129,-119.40309,0,1448726585
-103285,'103285','McCulloch @ Hart',49.85346,-119.41668,0,1448726587
-103286,'103286','McCulloch @ Hart',49.85344,-119.41593,0,1448726588
-103287,'103287','Leathead @ Franklyn',49.89543,-119.40033,0,1448726589
-103288,'103288','Franklyn @ Pearson',49.89809,-119.40092,0,1448726590
-103289,'103289','Hollydell @ Stirling',49.88276,-119.39981,0,1448726591
-103290,'103290','Lakeshore @ Willms',49.82597,-119.4887,0,1448726613
-103291,'103291','Hollydell @ Stirling',49.88282,-119.39969,0,1448726614
-103292,'103292','Franklyn @ McCurdy',49.90087,-119.40091,0,1448726615
-103293,'103293','Dehart @ Bartholomew',49.82657,-119.47627,0,1448726616
-103294,'103294','Crawford @ Dehart',49.82868,-119.46415,0,1448726617
-103295,'103295','Crawford @ Dehart',49.82873,-119.46431,0,1448726618
-103296,'103296','Hwy 33 @ Hollywood',49.88896,-119.39876,0,1448726619
-103297,'103297','Hwy 33 @ Hollywood',49.88914,-119.39897,0,1448726620
-103298,'103298','Dehart @ Bartholomew',49.82648,-119.47621,0,1448726621
-103299,'103299','Ross @ Cameron',49.86073,-119.58302,0,1448726622
-103300,'103300','Finns @ Fitzpatrick',49.90654,-119.40249,0,1448727295
-103301,'103301','Ross @ Riffington',49.86086,-119.58389,0,1448727296
-103302,'103302','Boucherie @ Sunnyside',49.84387,-119.56543,0,1448727297
-103303,'103303','Hollywood @ Perry',49.88084,-119.3983,0,1448727298
-103304,'103304','Hollywood @ Perry',49.88117,-119.39815,0,1448727299
-103305,'103305','Gordon @ Balsam',49.82502,-119.48329,0,1448727300
-103306,'103306','Boucherie @ Sunnyside',49.84366,-119.56609,0,1448727301
-103307,'103307','Hollywood @ Quigley',49.87754,-119.39834,0,1448727302
-103308,'103308','Hollywood @ Juniper',49.87776,-119.3982,0,1448727303
-103309,'103309','Hollywood @ Springfield',49.87562,-119.39835,0,1448727304
-103310,'103310','Hollywood @ Springfield',49.87517,-119.39822,0,1448727326
-103312,'103312','Hwy 33 @ Aurora',49.88894,-119.39593,0,1448727328
-103313,'103313','Springfield @ Monterey',49.87438,-119.39757,0,1448727329
-103316,'103316','Dehart @ Gordon',49.823,-119.48252,0,1448727332
-103317,'103317','Lakeshore @ Dehart',49.82219,-119.48899,0,1448727333
-103319,'103319','Lakeshore @ Dehart',49.82253,-119.48892,0,1448727335
-103321,'103321','Hwy 33 @ Dougall',49.88912,-119.39428,0,1448727358
-103322,'103322','Leathead @ Tartan',49.89539,-119.39396,0,1448727359
-103323,'103323','McCulloch @ Reekie',49.85199,-119.40978,0,1448727360
-103324,'103324','McCulloch @ Reekie',49.85166,-119.4099,0,1448727361
-103325,'103325','Gordon @ Dehart',49.82218,-119.48322,0,1448727362
-103326,'103326','Dougall Rd @ McIntosh',49.89262,-119.39273,0,1448727363
-103327,'103327','Fitzpatrick @ Findlay',49.90721,-119.39684,0,1448727364
-103328,'103328','Ross @ Bartley',49.8602,-119.58971,0,1448727365
-103329,'103329','Ross @ Bartley',49.86011,-119.58953,0,1448727366
-103331,'103331','Springfield @ Hollywood',49.87446,-119.3941,0,1448727389
-103334,'103334','Springfield @ Hollywood',49.87437,-119.39381,0,1448727392
-103335,'103335','Leathead @ Asher',49.8953,-119.39157,0,1448727393
-103337,'103337','Lakeshore @ Eldorado',49.82061,-119.49098,0,1448727395
-103340,'103340','Lakeshore @ Eldorado',49.82059,-119.49122,0,1448727419
-103342,'103342','4069 Block Lakeshore',49.83785,-119.48796,0,1448727421
-103343,'103343','Fitzpatrick @ Chichester',49.9072,-119.39401,0,1448727422
-103344,'103344','Leathead @ Pinetree',49.89539,-119.39024,0,1448727423
-103346,'103346','Springfield @ Neptune',49.87758,-119.39045,0,1448727425
-103347,'103347','Lakeshore @ Keith',49.81881,-119.49314,0,1448727426
-103348,'103348','3280 Block McCulloch',49.84643,-119.40986,0,1448727427
-103349,'103349','3280 Block McCulloch',49.84644,-119.40976,0,1448727428
-103351,'103351','Boucherie @ Mission Hl',49.84013,-119.57359,0,1448727451
-103354,'103354','Leathead @ Ford',49.8956,-119.38807,0,1448727454
-103355,'103355','Lakeshore @ Keith',49.81814,-119.49415,0,1448727455
-103357,'103357','Springfield @ Neptune',49.87771,-119.38854,0,1448727457
-103359,'103359','Boucherie @ Mission Hl',49.83973,-119.57402,0,1448727459
-103360,'103360','Fitzpatrick @ Stafford',49.9072,-119.39121,0,1448727481
-103361,'103361','Rutland @ Robson',49.88676,-119.38697,0,1448727482
-103363,'103363','Rutland @ Gray',49.88848,-119.38698,0,1448727484
-103364,'103364','Rutland @ Holbrook',49.88519,-119.38699,0,1448727485
-103365,'103365','Rutland @ Shepherd',49.8909,-119.38698,0,1448727486
-103366,'103366','Rutland @ Jupiter',49.87934,-119.38775,0,1448727487
-103367,'103367','Rutland @ Jupiter',49.88005,-119.38759,0,1448727488
-103368,'103368','1230 Block Crawford',49.82022,-119.4669,0,1448727489
-103369,'103369','Rutland @ Benchview',49.8829,-119.38703,0,1448727490
-103370,'103370','Rutland @ McIntosh',49.89274,-119.38697,0,1448727512
-103372,'103372','Rutland @ Belgo',49.88213,-119.38689,0,1448727514
-103373,'103373','Rutland @ Mugford',49.89296,-119.3868,0,1448727515
-103375,'103375','Rutland @ Hardie',49.89512,-119.38697,0,1448727517
-103376,'103376','Rutland @ Briarwood',49.89433,-119.38683,0,1448727518
-103377,'103377','Rutland @ Leathead',49.89668,-119.38696,0,1448727519
-103378,'103378','Hwy 33 @ Sadler',49.88894,-119.38603,0,1448727520
-103379,'103379','Ross @ Daimler',49.85624,-119.59386,0,1448727521
-103380,'103380','Rutland @ Hartman',49.89945,-119.38689,0,1448727543
-103381,'103381','Ross @ Daimler',49.85618,-119.594,0,1448727544
-103382,'103382','Rutland @ McCurdy',49.90065,-119.38688,0,1448727545
-103383,'103383','Husch @ Scarboro',49.88365,-119.38526,0,1448727546
-103384,'103384','Rutland @ McCurdy',49.90151,-119.38674,0,1448727547
-103385,'103385','Rutland @ Sumac',49.90334,-119.38691,0,1448727548
-103387,'103387','Fitzpatrick @ Aldon',49.90719,-119.38815,0,1448727550
-103388,'103388','3120 Block E Boundary',49.8486,-119.58899,0,1448727551
-103389,'103389','3130 Block E Boundary',49.84856,-119.58912,0,1448727552
-103392,'103392','Rutland @ Fitzpatrick',49.90671,-119.38689,0,1448727576
-103393,'103393','Old Okanagan @ Daimler',49.85604,-119.59657,0,1448727577
-103395,'103395','Old Okanagan @ Daimler',49.85604,-119.59671,0,1448727579
-103396,'103396','McCurdy @ Keyes',49.90123,-119.38454,0,1448727580
-103399,'103399','McCulloch @ June Spgs',49.84102,-119.4083,0,1448727583
-103401,'103401','Westridge @ Crawford',49.81736,-119.46382,0,1448728257
-103403,'103403','E Boundary @ Vineyard',49.84568,-119.589,0,1448728259
-103405,'103405','Husch @ Molnar',49.88365,-119.38152,0,1448728261
-103406,'103406','McCulloch @ June Spgs',49.8408,-119.40699,0,1448728262
-103407,'103407','E Boundary @ Eagle',49.84488,-119.58914,0,1448728263
-103408,'103408','Gordon @ Buck',49.81364,-119.48294,0,1448728264
-103410,'103410','Molnar @ Milton',49.88754,-119.37968,0,1448728287
-103411,'103411','Molnar @ Husch',49.88419,-119.37963,0,1448728288
-103412,'103412','Molnar @ Holbrook',49.88578,-119.37969,0,1448728289
-103414,'103414','Hwy 33 @ Molnar',49.88894,-119.37879,0,1448728291
-103416,'103416','McCurdy @ Friesen',49.90163,-119.38037,0,1448728293
-103417,'103417','Boucherie @ Grn Bay',49.835,-119.5793,0,1448728294
-103418,'103418','Boucherie @ Grn Bay',49.83474,-119.57944,0,1448728295
-103419,'103419','3520 Block McCulloch',49.84053,-119.40368,0,1448728296
-103420,'103420','3530 Block McCulloch',49.84037,-119.40298,0,1448728318
-103421,'103421','Muir @ McKenzie',49.88973,-119.37732,0,1448728319
-103422,'103422','E Boundary @ Elk',49.84047,-119.58896,0,1448728320
-103423,'103423','Westridge @ Blueridge',49.81368,-119.46525,0,1448728321
-103424,'103424','Parkridge @ Mission Rdg',49.81499,-119.45803,0,1448728322
-103425,'103425','Old Vernon @ Acland',49.91813,-119.38287,0,1448728323
-103426,'103426','Hardie @ Hemlock',49.8949,-119.37682,0,1448728324
-103427,'103427','E Boundary @ Elk',49.84023,-119.5891,0,1448728325
-103428,'103428','Merrifield @ Mugford',49.89233,-119.37614,0,1448728326
-103429,'103429','Craig @ Hartman',49.89947,-119.37696,0,1448728327
-103430,'103430','McCurdy @ Craig',49.90185,-119.37751,0,1448728349
-103432,'103432','Chute Lk @ Barnaby',49.8097,-119.49825,0,1448728351
-103433,'103433','McCulloch @ Spaarpak',49.8401,-119.39967,0,1448728352
-103434,'103434','Old Okanagan @ Shamrock',49.84915,-119.60106,0,1448728353
-103435,'103435','Old Okanagan @ Shamrock',49.84924,-119.60116,0,1448728354
-103436,'103436','McCulloch @ Spaarpak',49.84003,-119.40003,0,1448728355
-103439,'103439','870 Block Gordon',49.80993,-119.47199,0,1448728358
-103440,'103440','Parkridge @ Appleridge',49.81226,-119.45691,0,1448728380
-103441,'103441','Westridge @ Appleridge',49.81085,-119.46306,0,1448728381
-103444,'103444','Westridge @ Westridge Court',49.80905,-119.46136,0,1448728384
-103445,'103445','Chute Lk @ Winery',49.80597,-119.49958,0,1448728385
-103446,'103446','Hwy 33 @ Toovey',49.8779,-119.36902,0,1448728386
-103447,'103447','Rdg Ests @ Elk',49.8362,-119.59467,0,1448728387
-103448,'103448','Hwy 33 @ Toovey',49.87883,-119.36932,0,1448728388
-103450,'103450','Elk @ Rdg Ests',49.83628,-119.59588,0,1448728411
-103451,'103451','Arbor Vw @ Windsong',49.80578,-119.48125,0,1448728412
-103452,'103452','Boucherie @ Pritchard',49.83094,-119.58828,0,1448728413
-103457,'103457','Okanagan College Exch',49.86095,-119.4812,0,1448728418
-103458,'103458','McCulloch @ McClain',49.83795,-119.39291,0,1448728419
-103459,'103459','Old Okanagan @ Louie',49.84551,-119.6064,0,1448728420
-103460,'103460','Pritchard @ Boucherie',49.83058,-119.58902,0,1448728442
-103461,'103461','McCulloch @ Lakevale',49.83774,-119.39156,0,1448728443
-103462,'103462','Old Okanagan @ Louie',49.84547,-119.60728,0,1448728444
-103463,'103463','Elk @ Cougar',49.839,-119.60133,0,1448728445
-103464,'103464','Parkridge @ Westridge',49.80764,-119.45594,0,1448728446
-103465,'103465','Elk @ Cougar',49.83914,-119.60246,0,1448728447
-103467,'103467','Old Boucherie @ Pritchard',49.82781,-119.58937,0,1448728449
-103469,'103469','Woodstock @ Sandstone',49.84963,-119.6137,0,1448728451
-103470,'103470','Parkridge @ Woodridge',49.80949,-119.45623,0,1448728473
-103471,'103471','Woodstock @ Shannon Court',49.85085,-119.6149,0,1448728474
-103472,'103472','Main @ Grant',50.0273,-119.40354,0,1448728475
-103473,'103473','Old Okanagan @ Old Raven',49.84478,-119.60989,0,1448728476
-103474,'103474','Old Boucherie @ Pritchard',49.82791,-119.58995,0,1448728477
-103477,'103477','Hwy 33 @ Langford',49.88913,-119.37944,0,1448728480
-103478,'103478','Old Vernon @ Morrison',49.91821,-119.37012,0,1448728481
-103480,'103480','Old Vernon @ Morrison',49.91807,-119.36946,0,1448728504
-103481,'103481','Shannon Way @ Westville',49.84902,-119.6156,0,1448728505
-103482,'103482','Hwy 33 @ Sadler',49.8891,-119.38583,0,1448728506
-103483,'103483','Carrington @ Elk',49.83844,-119.60908,0,1448728507
-103484,'103484','Old Boucherie @ Hitchner',49.82774,-119.59299,0,1448728508
-103485,'103485','Carrington @ Elk',49.83866,-119.60907,0,1448728509
-103486,'103486','Old Boucherie @ Hitchner',49.82783,-119.59359,0,1448728510
-103489,'103489','McCulloch @ Gallaghers Blvd',49.83796,-119.38226,0,1448728513
-103490,'103490','Hwy 33 @ Hume',49.86878,-119.36109,0,1448728535
-103491,'103491','1950 Block Old Boucherie',49.82781,-119.59699,0,1448728536
-103492,'103492','1950 Block Old Boucherie',49.8277,-119.59702,0,1448728537
-103493,'103493','Shannon Lk @ Shannon Way',49.84953,-119.61979,0,1448728538
-103495,'103495','Shannon Lk @ Shannon Way',49.84942,-119.6201,0,1448728540
-103497,'103497','Louie @ Elk',49.84029,-119.61252,0,1448728542
-103500,'103500','Old Boucherie @ Boucherie',49.82767,-119.59875,0,1448729217
-103501,'103501','Hwy 33 @ Traut',49.86906,-119.36299,0,1448729218
-103502,'103502','Old Okanagan @ Bayview',49.84351,-119.61736,0,1448729219
-103503,'103503','Old Vernon @ McKenzie',49.91962,-119.36428,0,1448729220
-103505,'103505','Old Okanagan @ Bayview',49.8436,-119.61734,0,1448729222
-103506,'103506','Old Vernon @ McKenzie',49.91962,-119.36414,0,1448729223
-103508,'103508','3530 Block Carrington',49.83681,-119.61117,0,1448729225
-103509,'103509','3530 Block Carrington',49.83686,-119.6113,0,1448729226
-103510,'103510','2070 Block Boucherie',49.82765,-119.60019,0,1448729248
-103511,'103511','Louie @ Butt',49.8385,-119.61494,0,1448729249
-103513,'103513','Shannon Lk @ Old Okanagan Hwy',49.8466,-119.6224,0,1448729251
-103515,'103515','Loseth @ Autumn',49.86608,-119.35416,0,1448729253
-103516,'103516','Shannon Lk @ Old Okanagan Hwy',49.84616,-119.62221,0,1448729254
-103518,'103518','2030 Block Boucherie',49.82678,-119.60213,0,1448729256
-103519,'103519','2030 Block Boucherie',49.82671,-119.60205,0,1448729257
-103520,'103520','Quilchena @ Providence',49.79664,-119.51164,0,1448729279
-103521,'103521','Loseth @ Feedham',49.86921,-119.3554,0,1448729280
-103522,'103522','5150 Block Chute Lk',49.79561,-119.50219,0,1448729281
-103523,'103523','Quilchena @ Thalia',49.79623,-119.51483,0,1448729282
-103524,'103524','Sunrise @ Loseth',49.86218,-119.35772,0,1448729283
-103525,'103525','Butt @ Carrington',49.83557,-119.61434,0,1448729284
-103526,'103526','Large @ St Clare',49.87188,-119.35377,0,1448729285
-103527,'103527','Butt @ Carrington',49.83535,-119.61439,0,1448729286
-103528,'103528','Old Okanagan @ Shannon Lk',49.84479,-119.62391,0,1448729287
-103529,'103529','2040 Block Boucherie',49.82626,-119.60476,0,1448729288
-103531,'103531','Loseth @ Lynrick',49.8675,-119.35471,0,1448729311
-103532,'103532','2040 Block Boucherie',49.82617,-119.60524,0,1448729312
-103533,'103533','370 Block Quilchena',49.79505,-119.51869,0,1448729313
-103535,'103535','Butt @ Louie',49.837,-119.61936,0,1448729315
-103537,'103537','Butt @ Louie',49.83691,-119.61937,0,1448729317
-103538,'103538','Hwy 33 @ Oswell',49.86825,-119.35058,0,1448729318
-103539,'103539','Sunrise @ Lynrick',49.86315,-119.35367,0,1448729319
-103540,'103540','Quilchena @ Raven',49.79397,-119.52096,0,1448729341
-103541,'103541','3330 Block Old Okanagan',49.84244,-119.62545,0,1448729342
-103542,'103542','3340 Block Old Okanagan',49.84236,-119.62557,0,1448729343
-103547,'103547','Old Vernon @ Scotty Crk',49.93322,-119.36423,0,1448729348
-103548,'103548','Old Vernon @ Scotty Crk',49.93301,-119.36409,0,1448729349
-103550,'103550','Lynrick @ Autumn',49.86528,-119.35062,0,1448729372
-103551,'103551','Old Okanagan @ Chieftain',49.8403,-119.62544,0,1448729373
-103552,'103552','Old Okanagan @ Chieftain',49.84021,-119.62556,0,1448729374
-103553,'103553','Boucherie @ Carrall',49.82524,-119.60947,0,1448729375
-103554,'103554','Black Mtn @ Linda',49.8708,-119.34797,0,1448729376
-103556,'103556','Old Okanagan @ Quince',49.8383,-119.62555,0,1448729378
-103557,'103557','Black Mtn @ Begley',49.86937,-119.34723,0,1448729379
-103561,'103561','3600 Block Old Vernon',49.93716,-119.36407,0,1448729404
-103562,'103562','Quilchena @ Providence',49.79129,-119.52185,0,1448729405
-103563,'103563','Old Okanagan @ Butt',49.8371,-119.6254,0,1448729406
-103564,'103564','3660 Block Old Vernon',49.93754,-119.36421,0,1448729407
-103565,'103565','Old Okanagan @ Butt',49.83656,-119.62553,0,1448729408
-103566,'103566','Boucherie @ Carrall',49.82474,-119.61267,0,1448729409
-103569,'103569','5600 Block Airport Way',49.95585,-119.38145,0,1448729412
-103573,'103573','Elliott @ Reece',49.84423,-119.63405,0,1448729437
-103574,'103574','5600 Block Airport Way',49.95571,-119.38163,0,1448729438
-103575,'103575','Old Okanagan @ Bering',49.83419,-119.62551,0,1448729439
-103576,'103576','Old Vernon @ Bulman',49.94041,-119.36411,0,1448729440
-103577,'103577','Old Vernon @ Bulman',49.94079,-119.36455,0,1448729441
-103579,'103579','Gellatly @ Carrington',49.82888,-119.62044,0,1448729443
-103580,'103580','Gellatly @ Witt',49.82736,-119.61874,0,1448729465
-103581,'103581','Gellatly @ Carrington',49.82941,-119.62109,0,1448729466
-103582,'103582','Gellatly @ Witt',49.82757,-119.619,0,1448729467
-103584,'103584','3590 Block Old Okanagan',49.83343,-119.62537,0,1448729469
-103585,'103585','Elliott @ Neufeld',49.84199,-119.63402,0,1448729470
-103586,'103586','Boucherie @ Gellatly',49.82381,-119.61586,0,1448729471
-103589,'103589','Smith Crk @ Elliott',49.84782,-119.63926,0,1448729474
-103590,'103590','Boucherie @ Gellatly',49.82377,-119.61659,0,1448729496
-103593,'103593','Old Okanagan @ Drought',49.83067,-119.62549,0,1448729499
-103594,'103594','Elliott @ Butt',49.83642,-119.63117,0,1448729500
-103595,'103595','Old Okanagan @ Drought',49.83014,-119.62535,0,1448729501
-103596,'103596','Dobbin @ Old Okanagan',49.82867,-119.62476,0,1448729502
-103597,'103597','Main @ Hoskins',49.82964,-119.62627,0,1448729503
-103598,'103598','3580 Block Elliott',49.83354,-119.63114,0,1448729504
-103599,'103599','Old Vernon @ Black',49.95112,-119.36886,0,1448729505
-103600,'103600','Old Vernon @ Black',49.95113,-119.36867,0,1448730178
-103602,'103602','Elliott @ Delray',49.83015,-119.63108,0,1448730180
-103604,'103604','Airport Way @ Lapointe',49.96414,-119.38173,0,1448730182
-103607,'103607','Airport Way @ Lapointe',49.96419,-119.38187,0,1448730185
-103608,'103608','Lower Glenrosa @ Paynter',49.82971,-119.63564,0,1448730186
-103609,'103609','Airport Way @ Old Vernon',49.96977,-119.38373,0,1448730187
-103610,'103610','Airport Way @ Old Vernon',49.9695,-119.38341,0,1448730209
-103611,'103611','Hwy 97 @ Old Vernon',49.97077,-119.38572,0,1448730210
-103613,'103613','Old Vernon @ Teather',49.96097,-119.36898,0,1448730212
-103614,'103614','Webber @ Dunbarton',49.83901,-119.65335,0,1448730213
-103615,'103615','Webber @ McAllister',49.84093,-119.65547,0,1448730214
-103616,'103616','Webber @ Gorman',49.83695,-119.65332,0,1448730215
-103617,'103617','Webber @ Aberdeen',49.8354,-119.65331,0,1448730216
-103618,'103618','Webber @ McRae',49.84307,-119.65903,0,1448730217
-103619,'103619','Old Vernon @ Spencer',49.97036,-119.3707,0,1448730218
-103620,'103620','Old Vernon @ Spencer',49.97048,-119.3707,0,1448730240
-103621,'103621','Lower Glenrosa @ Glenway',49.82656,-119.64675,0,1448730241
-103622,'103622','Webber @ McGregor',49.84535,-119.66172,0,1448730242
-103623,'103623','Webber @ Scotstown',49.83283,-119.65316,0,1448730243
-103624,'103624','McNair @ Webber',49.84718,-119.66355,0,1448730244
-103625,'103625','McIver @ McRae',49.84196,-119.662,0,1448730245
-103626,'103626','McIver @ McBain',49.84375,-119.66364,0,1448730246
-103627,'103627','Webber @ Salloum',49.83,-119.6532,0,1448730247
-103628,'103628','McIver @ McTaggart',49.83965,-119.66108,0,1448730248
-103629,'103629','McIver @ McRobbie',49.8467,-119.66575,0,1448730249
-103630,'103630','Lower Glenrosa @ Glenford',49.82818,-119.65282,0,1448730271
-103631,'103631','McLeod @ McGinnis',49.844,-119.66541,0,1448730272
-103632,'103632','Lower Glenrosa @ Gln',49.82501,-119.65077,0,1448730273
-103633,'103633','McGinnis @ McGee',49.84223,-119.66491,0,1448730274
-103634,'103634','McIver @ Glenrosa',49.83432,-119.65978,0,1448730275
-103636,'103636','McLeod @ McCoy',49.84589,-119.66771,0,1448730277
-103637,'103637','Glenrosa @ Gln Abbey',49.83202,-119.65859,0,1448730278
-103638,'103638','McLeod @ Blue Jay',49.84748,-119.66933,0,1448730279
-103639,'103639','Glenrosa @ McIver',49.83463,-119.66181,0,1448730280
-103640,'103640','Glenrosa @ Parkhurst',49.83652,-119.66334,0,1448730302
-103641,'103641','Canary @ Blue Jay',49.8487,-119.67165,0,1448730303
-103642,'103642','McGinnis @ Liard',49.83894,-119.66637,0,1448730304
-103643,'103643','Glenrosa @ Dunfield',49.8242,-119.65376,0,1448730305
-103644,'103644','Gts @ McMurchie',49.84472,-119.67019,0,1448730306
-103645,'103645','Glenrosa @ Rosedale',49.83822,-119.66739,0,1448730307
-103646,'103646','Oriole @ Canary',49.84766,-119.67301,0,1448730308
-103647,'103647','Gts @ McPherson',49.842,-119.67023,0,1448730309
-103648,'103648','Salmon @ Oriole',49.84566,-119.67284,0,1448730310
-103649,'103649','Gts @ Glenrosa',49.8409,-119.67024,0,1448730311
-103650,'103650','Hwy 97 @ Parkinson',50.00075,-119.40285,0,1448730333
-103652,'103652','Hwy 97 @ Commonwealth',50.00711,-119.40312,0,1448730335
-103653,'103653','Hwy 97 @ Commonwealth',50.00833,-119.4028,0,1448730336
-103654,'103654','Hwy 97 @ Beaver Lk',50.02081,-119.40618,0,1448730337
-103655,'103655','Hwy 97 @ Okanagan Ctr',50.02177,-119.40668,0,1448730338
-103656,'103656','Kelowna Airport',49.95206,-119.3833,0,1448730339
-103657,'103657','Hwy 97 @ Pollard',50.02626,-119.40528,0,1448730340
-103658,'103658','Main @ Winfield',50.02352,-119.40417,0,1448730341
-103659,'103659','Okanagan Ctr @ Berry',50.03079,-119.41034,0,1448730342
-103660,'103660','Berry @ Bottom Wood Lk',50.02947,-119.40276,0,1448730364
-103661,'103661','Bottom Wood Lk @ George Elliott',50.03105,-119.40199,0,1448730365
-103662,'103662','Okanagan Ctr @ Camp',50.03587,-119.41149,0,1448730366
-103663,'103663','Lodge @ Bottom Wood Lk',50.0347,-119.40096,0,1448730367
-103664,'103664','Lodge @ Mdw',50.03467,-119.39688,0,1448730368
-103665,'103665','Huston @ Huston',49.79564,-119.69837,0,1448730369
-103666,'103666','10300 Block Lodge',50.03466,-119.39335,0,1448730370
-103667,'103667','Buchanan @ Burden',49.79458,-119.69935,0,1448730371
-103668,'103668','Okanagan Ctr @ Seaton',50.04127,-119.41452,0,1448730372
-103669,'103669','Huston @ Shaw',49.79477,-119.70139,0,1448730373
-103670,'103670','Okanagan Ctr @ Williams',50.04408,-119.41669,0,1448730395
-103671,'103671','Buchanan @ Beach Ave',49.79245,-119.70261,0,1448730396
-103672,'103672','Huston @ Lang',49.79247,-119.70544,0,1448730397
-103673,'103673','Lodge @ Quail',50.04069,-119.39199,0,1448730398
-103674,'103674','11330 Block Okanagan Ctr',50.04746,-119.41834,0,1448730399
-103675,'103675','Buchanan @ Hwy 97 S',49.78912,-119.70749,0,1448730400
-103676,'103676','Lodge @ Sherman',50.04299,-119.39142,0,1448730401
-103677,'103677','Okanagan Ctr @ Davidson',50.05003,-119.41913,0,1448730402
-103678,'103678','11200 Block Lodge',50.04514,-119.39088,0,1448730403
-103679,'103679','Woodsdale @ Turtle Bay',50.04934,-119.40772,0,1448730404
-103680,'103680','Kelowna Airport',49.95212,-119.38314,0,1448730426
-103681,'103681','Woodsdale @ Bottom Wood Lk',50.04934,-119.40267,0,1448730427
-103682,'103682','Trepanier Bench @ Desert Pines',49.78635,-119.71073,0,1448730428
-103683,'103683','Woodsdale @ Reiswig',50.04933,-119.39768,0,1448730429
-103684,'103684','Woodsdale @ Lodge',50.04938,-119.39092,0,1448730430
-103685,'103685','Oceola @ Pretty',50.05535,-119.41125,0,1448730431
-103686,'103686','Peachland Vlg Ctr',49.78471,-119.71764,0,1448730432
-103688,'103688','Okanagan Ctr @ Oceola',50.06003,-119.41859,0,1448730434
-103689,'103689','13th St @ Lk',49.78264,-119.72329,0,1448730435
-103690,'103690','13th St @ Lk',49.7827,-119.72315,0,1448730457
-103691,'103691','Beach @ 11th St',49.78188,-119.7291,0,1448730458
-103692,'103692','Beach @ 11th St',49.78121,-119.73113,0,1448730459
-103693,'103693','Beach @ 8th St',49.7805,-119.73201,0,1448730460
-103694,'103694','Beach @ 6th St',49.77759,-119.73379,0,1448730461
-103695,'103695','Beach @ 6th St',49.77638,-119.73427,0,1448730462
-103700,'103700','Beach @ Hwy 97',49.77085,-119.73908,0,1448731139
-103701,'103701','Beach @ Hwy 97',49.77045,-119.73964,0,1448731140
-103702,'103702','Princeton @ Lakeview',49.76999,-119.7425,0,1448731141
-103703,'103703','Princeton @ Princess',49.76884,-119.74467,0,1448731142
-103704,'103704','Princeton @ Columbia',49.76867,-119.74559,0,1448731143
-103705,'103705','Princeton @ Somerset',49.76668,-119.74825,0,1448731144
-103706,'103706','Princeton @ Somerset',49.76624,-119.74866,0,1448731145
-103707,'103707','Princeton @ Lipsett',49.76471,-119.75143,0,1448731146
-103708,'103708','Princeton @ Lipsett',49.76466,-119.75171,0,1448731147
-103709,'103709','Princeton @ Gummow',49.76258,-119.75472,0,1448731148
-103710,'103710','Princeton @ Ellison',49.7623,-119.75708,0,1448731170
-103711,'103711','Princeton @ Turner',49.75947,-119.76076,0,1448731171
-103712,'103712','Princeton @ Turner',49.75959,-119.76161,0,1448731172
-103713,'103713','Princeton @ Whinton',49.757,-119.76356,0,1448731173
-103714,'103714','Princeton @ Whinton',49.75688,-119.76399,0,1448731174
-103715,'103715','Princeton @ Vernon',49.75512,-119.76637,0,1448731175
-103716,'103716','Princeton @ Vernon',49.75505,-119.76698,0,1448731176
-103717,'103717','5000 Block Princeton',49.75376,-119.77165,0,1448731177
-103718,'103718','5000 Block Princeton',49.75369,-119.77149,0,1448731178
-103719,'103719','Princeton @ Forest Hl',49.75239,-119.77841,0,1448731179
-103720,'103720','Princeton @ Keyes',49.75229,-119.77856,0,1448731201
-103721,'103721','Princeton @ Pineridge',49.7521,-119.78355,0,1448731202
-103722,'103722','Princeton @ Pineridge',49.752,-119.78354,0,1448731203
-103723,'103723','Princeton @ Bradbury',49.75194,-119.78764,0,1448731204
-103744,'103744','Hwy 97 @ Westside Rd - Westside Rd Stn',49.88178,-119.53628,0,1448731267
-103745,'103745','Hwy 97 @ Sneena - Westside Rd Stn',49.88084,-119.535,0,1448731268
-103800,'103800','Lequime Rd',49.83559,-119.48483,0,1448732100
-103801,'103801','Lequime Rd',49.8356,-119.48437,0,1448732101
-103802,'103802','Lakeshore @ Old Mdws',49.83254,-119.4873,0,1448732102
-103803,'103803','Lakeshore @ Simeon',49.8284,-119.48883,0,1448732103
-103804,'103804','Lakeshore @ Willms',49.82605,-119.48884,0,1448732104
-103805,'103805','Chute Lk @ Barnaby',49.80994,-119.49782,0,1448732105
-103806,'103806','Chute Lk @ Chute Lk Cresent',49.80179,-119.49816,0,1448732106
-103807,'103807','Chute Lk @ Chute Lk Cresent',49.80189,-119.49785,0,1448732107
-103808,'103808','Chute Lk @ S Crest',49.79838,-119.4991,0,1448732108
-103809,'103809','Chute Lk @ S Crest',49.79886,-119.49889,0,1448732109
-103810,'103810','5160 Block Chute Lk',49.7957,-119.5026,0,1448732131
-103811,'103811','Chute Lk @ Lark',49.79539,-119.50863,0,1448732132
-103812,'103812','Chute Lk @ Hedeman',49.79458,-119.51064,0,1448732133
-103813,'103813','Chute Lk @ Lakepointe',49.79132,-119.51333,0,1448732134
-103814,'103814','Chute Lk @ Farron',49.78948,-119.51741,0,1448732135
-103815,'103815','Gordon @ Old Mdws',49.8324,-119.48308,0,1448732136
-103816,'103816','Gordon @ Young',49.82893,-119.48313,0,1448732137
-103817,'103817','Gordon @ Young',49.82844,-119.48326,0,1448732138
-103818,'103818','Gordon @ Tozer',49.82426,-119.48314,0,1448732139
-103820,'103820','Gordon @ Raymer',49.81971,-119.48299,0,1448732162
-103821,'103821','Gordon @ Raymer',49.81886,-119.48325,0,1448732163
-103824,'103824','Gordon @ McClure',49.81612,-119.48299,0,1448732166
-103825,'103825','Gordon @ McClure',49.81536,-119.48323,0,1448732167
-103826,'103826','Gordon @ Buck',49.81367,-119.48318,0,1448732168
-103827,'103827','Gordon @ Paret',49.81094,-119.47795,0,1448732169
-103828,'103828','Gordon @ Paret',49.81106,-119.47778,0,1448732170
-103829,'103829','870 Block Gordon',49.80969,-119.47163,0,1448732171
-103833,'103833','Arbor Vw @ Windsong',49.80614,-119.4774,0,1448732196
-103844,'103844','Princeton @ Pierce',49.75315,-119.7902,0,1448732228
-103845,'103845','Country Club @ Via Centrale',49.95498,-119.39983,0,1448732229
-103848,'103848','Country Club @ Quail Rdg',49.96292,-119.39911,0,1448732232
-103849,'103849','Country Club @ Via Centrale',49.95503,-119.39992,0,1448732233
-103851,'103851','Quail Rdg @ Country Club',49.96253,-119.39818,0,1448732256
-103852,'103852','1840 Block Country Club Dr',49.95311,-119.39954,0,1448732257
-103853,'103853','1840 Block Country Club Dr',49.953,-119.39964,0,1448732258
-103858,'103858','1740 Block Country Club Dr',49.95116,-119.39982,0,1448732263
-104911,'104911','Old Okanagan @ Skyview',49.84488,-119.60947,0,1448762884
-104912,'104912','Beach @ 12th St',49.78188,-119.72608,0,1448762885
-104913,'104913','Old Vernon @ Teather',49.96147,-119.36886,0,1448762886
-104914,'104914','1240 Block Crawford',49.82041,-119.4668,0,1448762887
-104916,'104916','Innovation @ Airport Way',49.95166,-119.38964,0,1448762889
-140000,'140000','Harvey @ Bertram - Richter Sta',49.88379,-119.49144,0,1452329123
-140001,'140001','Woodsdale @ Rogers',50.04933,-119.40399,0,1452329124
-140002,'140002','Harvey @ Gordon - Gordon Sta',49.88373,-119.4787,0,1452329125
-140003,'140003','Harvey @ Gordon - Gordon Sta',49.88333,-119.47533,0,1452329126
-140004,'140004','Westbank Exch',49.82865,-119.63102,0,1452329127
-140005,'140005','Westbank Exch',49.82934,-119.63103,0,1452329128
-140006,'140006','Westbank Exch',49.82876,-119.63088,0,1452329129
-140007,'140007','Boucherie Mtn Exch',49.86207,-119.58528,0,1452329130
-140008,'140008','Boucherie Mtn Exch',49.86209,-119.58489,0,1452329131
-140009,'140009','Boucherie Mtn Exch',49.86198,-119.58509,0,1452329132
-140010,'140010','Boucherie Mtn Exch',49.86154,-119.58522,0,1452329154
-140011,'140011','Boucherie Mtn Exch',49.86139,-119.58522,0,1452329155
-140012,'140012','Gordon @ Lexington',49.83934,-119.48239,0,1452329156
-140013,'140013','Sneena @ Westside',49.88071,-119.5341,0,1452329157
-140014,'140014','Bottom Wood Lk @ Konschuh',50.02872,-119.40067,0,1452329158
-140015,'140015','Bottom Wood Lk @ Seniors Ctr',50.02447,-119.39926,0,1452329159
-140016,'140016','Beaver Lk @ Jensen',50.02018,-119.40119,0,1452329160
-140017,'140017','Main @ Hl',50.02083,-119.40426,0,1452329161
-140018,'140018','Ellis @ Clement',49.89318,-119.49347,0,1452329162
-140019,'140019','Clement @ Richter',49.89353,-119.48794,0,1452329163
-140020,'140020','Clement @ Ethel',49.89351,-119.4823,0,1452329185
-140021,'140021','Gordon @ Coronation',49.89238,-119.47706,0,1452329186
-140022,'140022','Gordon @ Bernard',49.88678,-119.47713,0,1452329187
-140023,'140023','Gordon @ Laurier',49.88237,-119.47716,0,1452329188
-140024,'140024','Gordon @ KLO',49.86022,-119.47447,0,1452329189
-140025,'140025','Gordon @ Lanfranco',49.85706,-119.47451,0,1452329190
-140026,'140026','Gordon @ Casorso',49.85055,-119.47694,0,1452329191
-140027,'140027','Gordon @ Cook',49.84517,-119.48059,0,1452329192
-140028,'140028','Gordon @ Lexington',49.83991,-119.48209,0,1452329193
-140029,'140029','Gordon @ Cook',49.84572,-119.47987,0,1452329194
-140030,'140030','Gordon @ Casorso',49.85125,-119.47618,0,1452329216
-140031,'140031','Gordon @ Bothe',49.85768,-119.4742,0,1452329217
-140032,'140032','Gordon @ KLO',49.86018,-119.47416,0,1452329218
-140033,'140033','Gordon @ Raymer',49.86533,-119.47407,0,1452329219
-140034,'140034','Gordon @ Cameron',49.87056,-119.47472,0,1452329220
-140035,'140035','Gordon @ Guisachan',49.87318,-119.47612,0,1452329221
-140036,'140036','Gordon @ Springfield',49.87724,-119.47694,0,1452329222
-140037,'140037','Gordon @ Harvey',49.88259,-119.47687,0,1452329223
-140038,'140038','Gordon @ Bernard',49.88689,-119.47684,0,1452329224
-140039,'140039','Gordon @ Cawston',49.89185,-119.47692,0,1452329225
-140040,'140040','Clement @ Ethel',49.89359,-119.4833,0,1452329247
-140041,'140041','Clement @ Richter',49.89365,-119.48933,0,1452329248
-140042,'140042','Ellis @ Clement',49.89315,-119.49361,0,1452329249
-140043,'140043','Cadder @ Richter',49.87633,-119.48765,0,1452329250
-140044,'140044','Ellis @ Doyle',49.89038,-119.49347,0,1452329251
-140045,'140045','Cadder @ Ethel',49.8764,-119.48314,0,1452329252
-140046,'140046','Cadder @ Richter',49.87642,-119.48892,0,1452329253
-140047,'140047','Cadder @ Pandosy',49.87632,-119.49074,0,1452329254
-140048,'140048','Springfield @ Gordon',49.87687,-119.47815,0,1452329255
-140049,'140049','Harvey @ Richter - Richter Sta',49.88354,-119.49035,0,1452329256
-140050,'140050','Clement @ Gordon',49.89372,-119.47777,0,1452329278
-140051,'140051','Clement @ Gordon',49.8934,-119.47588,0,1452329279
-140053,'140053','Pandosy @ Osprey',49.86579,-119.49115,0,1452329281
-140054,'140054','Woodsdale @ Bottom Wood Lk',50.04924,-119.404,0,1452329282
-140055,'140055','KLO @ Benvoulin',49.86088,-119.45507,0,1452329283
-140056,'140056','Bernard @ Elm',49.88626,-119.4658,0,1452329284
-140057,'140057','1300 Block Ellis',49.88954,-119.49363,0,1452329285
-140058,'140058','Asquith @ Saddleback',49.8507,-119.62354,0,1452329286
-140059,'140059','Ironridge @ Ironridge Pl',49.8545,-119.62783,0,1452329287
-140060,'140060','WildHorse @ Bridlehill',49.85388,-119.63302,0,1452329309
-140061,'140061','WildHorse @ Bridlehill',49.85346,-119.63555,0,1452329310
-140062,'140062','Whispering Hls @ Wild Horse',49.85228,-119.64166,0,1452329311
-140063,'140063','CopperRidge @ Smith',49.85389,-119.64384,0,1452329312
-140064,'140064','Smith Crk @ Sugosa',49.85176,-119.6431,0,1452329313
-140065,'140065','Hudson @ Concord',49.86268,-119.56288,0,1452329314
-140066,'140066','Hudson @ Westlake',49.86265,-119.56391,0,1452329315
-140067,'140067','Louie @ Butt',49.83779,-119.61573,0,1452329316
-140068,'140068','Louie @ Elk',49.84031,-119.61231,0,1452329317
-140069,'140069','Stevens @ Mcdougall',49.86598,-119.5675,0,1452329318
-140071,'140071','Hwy 97 @ Butt - Butt Rd Sta',49.83717,-119.6142,0,1452329341
-140072,'140072','Hwy 97 @ Butt - Butt Rd Sta',49.83532,-119.61713,0,1452329342
-140073,'140073','Hwy 97 @ Westlake - Hudson Sta',49.86426,-119.56286,0,1452329343
-140074,'140074','Hwy 97 @ Westlake - Hudson Sta',49.86317,-119.56654,0,1452329344
-140077,'140077','Bottom Wood Lk @ Powley',50.03782,-119.40308,0,1452329347
-140078,'140078','Bottom Wood Lk @ Mayrus',50.04311,-119.4031,0,1452329348
-140079,'140079','Bottom Wood Lk @ Wageman',50.04597,-119.40312,0,1452329349
-140080,'140080','Lk Hl @ Lk Breeze',50.06598,-119.41901,0,1452329371
-140081,'140081','Shoreline @ Stillwater',50.06856,-119.42013,0,1452329372
-140082,'140082','Shoreline Way @ Lk Hl',50.07352,-119.41726,0,1452329373
-140083,'140083','Lk Hl @ Shoreline Way',50.07171,-119.41646,0,1452329374
-140084,'140084','Stillwater @ Lk Hl',50.06954,-119.41854,0,1452329375
-140085,'140085','Stillwater @ Driftwood',50.06784,-119.41929,0,1452329376
-140086,'140086','Lk Hl @ Lk Breeze',50.06626,-119.41895,0,1452329377
-140087,'140087','Lk Hl @ Oceola',50.06129,-119.41834,0,1452329378
-140088,'140088','Oceola @ Pretty',50.0547,-119.41142,0,1452329379
-140089,'140089','Woodsdale @ Turtle Bay',50.04925,-119.40761,0,1452329380
-140090,'140090','Bottom Wood Lk @ Wageman',50.04629,-119.40299,0,1452329402
-140091,'140091','Bottom Wood Lk @ Mayrus',50.04335,-119.40297,0,1452329403
-140092,'140092','Bottom Wood Lk @ Powley',50.0383,-119.40293,0,1452329404
-140093,'140093','Bottom Wood Lk @ Berry',50.03032,-119.40192,0,1452329405
-140094,'140094','E Boundary @ Wolfe',49.8393,-119.5918,0,1452329406
-140095,'140095','E Boundary @ Wolfe',49.83921,-119.59181,0,1452329407
-140096,'140096','Lk Hl @ Oceola',50.06138,-119.41821,0,1452329408
-140098,'140098','UBCO Exch',49.93991,-119.39456,0,1452329410
-140099,'140099','UBCO Exch',49.93929,-119.39492,0,1452329411
-140100,'140100','UBCO Exch',49.93948,-119.39427,0,1452330084
-140101,'140101','UBCO Exch',49.93943,-119.39406,0,1452330085
-140102,'140102','UBCO Exch',49.93938,-119.39387,0,1452330086
-140103,'140103','UBCO Exch',49.93935,-119.39373,0,1452330087
-140104,'140104','UBCO Exch',49.93999,-119.39437,0,1452330088
-140105,'140105','Edwards @ Hwy 97',49.92429,-119.38502,0,1452330089
-140106,'140106','Edwards @ Hwy 97',49.92447,-119.3858,0,1452330090
-140107,'140107','Acland @ Penno',49.92214,-119.38407,0,1452330091
-140108,'140108','Acland @ Penno',49.92159,-119.38393,0,1452330092
-140109,'140109','Acland @ Old Vernon',49.91886,-119.38392,0,1452330093
-140111,'140111','Rutland @ Commercial',49.91505,-119.38664,0,1452330116
-140112,'140112','Rutland @ Commercial',49.91558,-119.3859,0,1452330117
-140113,'140113','Hwy 97 @ Sexsmith - Sexsmith Sta',49.91696,-119.38904,0,1452330118
-140114,'140114','Hwy 97 @ Old Vernon - Sexsmith Stn',49.91939,-119.38664,0,1452330119
-140116,'140116','Elk @ Acorn',49.83922,-119.60591,0,1452330121
-140117,'140117','Elk @ Acorn',49.83913,-119.60606,0,1452330122
-140131,'140131','Glenmore @ Cross',49.92337,-119.43833,0,1452330178
-140132,'140132','Glenmore @ Union',49.92765,-119.43474,0,1452330179
-140133,'140133','Glenmore @ Union',49.9263,-119.43606,0,1452330180
-140134,'140134','Glenmore @ Scenic',49.93297,-119.43329,0,1452330181
-140135,'140135','Glenmore @ Scenic',49.93288,-119.43344,0,1452330182
-140136,'140136','John Hindle @ Glenmore',49.94691,-119.42356,0,1452330183
-140137,'140137','John Hindle @ Glenmore',49.94758,-119.42474,0,1452330184
-140138,'140138','John Hindle @ Academy Way',49.93838,-119.40154,0,1452330185
-140139,'140139','John Hindle @ Upper Campus Way',49.93867,-119.40171,0,1452330186
-140148,'140148','Rutland Exch',49.89065,-119.39187,0,1452330216
-140149,'140149','Rutland Exch',49.89065,-119.39082,0,1452330217
-140150,'140150','Rutland Exch',49.89055,-119.39235,0,1452330239
-140151,'140151','Rutland Exch',49.89056,-119.3918,0,1452330240
-140152,'140152','Dougall @ Hwy 33',49.88942,-119.39279,0,1452330241
-140153,'140153','Westlake @ Peak Pt',49.88398,-119.56054,0,1452330242
-140154,'140154','Parkinson @ Pettman',49.89593,-119.54971,0,1452330243
-140155,'140155','Bear Crk @ Vancouver',49.89527,-119.54744,0,1452330244
-140158,'140158','KLO @ Benvoulin Rd',49.86109,-119.45483,0,1452330247
-140159,'140159','Innovation @ University Way',49.94257,-119.39061,0,1452330248
-140160,'140160','Innovation @ University Way',49.94336,-119.39014,0,1452330270
-140161,'140161','Arborview @ Steele',49.80656,-119.47267,0,1452330271
-140162,'140162','John Hindle @ Landfill',49.94409,-119.4123,0,1452330272
-140163,'140163','John Hindle @ Landfill',49.94415,-119.41218,0,1452330273
-140164,'140164','Shepherd @ Roxby',49.89054,-119.38836,0,1452330274
-140165,'140165','Boucherie Exch',49.86222,-119.58388,0,1452330275
-140166,'140166','Asquith @ Saddleback',49.8512,-119.62468,0,1452330276
-140167,'140167','Copper Rdg @ Smith Crk',49.85379,-119.64351,0,1452330277
-140168,'140168','Daimler @ Auburn',49.85732,-119.59814,0,1452330278
-140169,'140169','Shannon Lk @ Crystal',49.86732,-119.59091,0,1452330279
-140170,'140170','Shannon Way @ Westville',49.84892,-119.6154,0,1452330301
-140171,'140171','Wildhorse @ Bridlehill',49.85374,-119.63274,0,1452330302
-140172,'140172','Elliott @ Butt',49.83711,-119.63103,0,1452330303
-140173,'140173','Elliott @ Reece',49.8443,-119.63392,0,1452330304
-140174,'140174','Elliott @ Springer Ln',49.83371,-119.63103,0,1452330305
-140175,'140175','Elliott @ Neufeld',49.84168,-119.63387,0,1452330306
-140176,'140176','Elliott @ Solar',49.8312,-119.63098,0,1452330307
-140177,'140177','2179 Block Shannon Rdg',49.85579,-119.60559,0,1452330308
-140178,'140178','2569 Block Wildhorse',49.85309,-119.63649,0,1452330309
-140179,'140179','2886 Block Auburn',49.85562,-119.60073,0,1452330310
-140180,'140180','Bartley @ Byland',49.86302,-119.58757,0,1452330332
-140181,'140181','Byland @ Kyle',49.85908,-119.5919,0,1452330333
-140182,'140182','Byland @ Compass',49.86075,-119.58947,0,1452330334
-140183,'140183','Ironridge @ Ironridge Court',49.85452,-119.62768,0,1452330335
-140184,'140184','Shannon Lk @ Golf Course Dr',49.86354,-119.6094,0,1452330336
-140185,'140185','Shannon Lk @ Shannon Vw Dr',49.86596,-119.6049,0,1452330337
-140186,'140186','Shannon Lk @ Shannon Lk Dr',49.86691,-119.59986,0,1452330338
-140187,'140187','Shannon Lk @ Shannon Rdg',49.85308,-119.61752,0,1452330339
-140188,'140188','Shannon Lk @ Stonegrove',49.85823,-119.6168,0,1452330340
-140189,'140189','Shannon Lk @ Swite',49.85531,-119.61792,0,1452330341
-140190,'140190','Shannon Lk @ Tallus Rdg Dr',49.86248,-119.61289,0,1452330363
-140191,'140191','Shannon Lk @ Tallus Rdg',49.86323,-119.612,0,1452330364
-140192,'140192','Whispering Hls @ Copper Rdg',49.8531,-119.64055,0,1452330365
-140193,'140193','Woodstock @ Sandstone',49.85024,-119.61384,0,1452330366
-140194,'140194','Shannon Rdg @ Rdg Pl',49.85339,-119.61379,0,1452330367
-140195,'140195','Shannon Rdg @ Shannon Grn Court',49.85472,-119.61117,0,1452330368
-140196,'140196','Smith Crk @ Elliott',49.84772,-119.63908,0,1452330369
-140197,'140197','Smith Crk @ Wild Horse',49.85124,-119.64235,0,1452330370
-140198,'140198','2176 Block Shannon Rdg Dr',49.85589,-119.6056,0,1452330371
-140199,'140199','Auburn @ Shelby',49.85639,-119.60087,0,1452330372
-140200,'140200','Auburn @ Shannon Rdg',49.85377,-119.60086,0,1452331045
-140201,'140201','Bartley @ Shannon Lk',49.86403,-119.58783,0,1452331046
-140202,'140202','Byland @ Compass',49.86083,-119.58954,0,1452331047
-140203,'140203','Byland @ Kyle',49.85816,-119.59337,0,1452331048
-140204,'140204','Shannon Lk @ Alexandria',49.85515,-119.61803,0,1452331049
-140205,'140205','Shannon Lk @ Stonegrove',49.85825,-119.61694,0,1452331050
-140206,'140206','Shannon Lk @ Asquith',49.85159,-119.61851,0,1452331051
-140207,'140207','Shannon Rdg @ Lakeside Court',49.85361,-119.61363,0,1452331052
-140208,'140208','Shannon Rdg @ Shannon Grn',49.85453,-119.61203,0,1452331053
-140209,'140209','Daimler @ Auburn',49.85751,-119.5984,0,1452331054
-140210,'140210','Shannon Lk @ Crystal Dr',49.86869,-119.59306,0,1452331076
-140211,'140211','Shannon Lk @ Shannon Lk',49.86682,-119.60065,0,1452331077
-140212,'140212','Shannon Lk @ Shannon Woods Dr',49.86578,-119.60611,0,1452331078
-140214,'140214','Westbank Exch B:E',49.82962,-119.63043,0,1452331080
-140216,'140216','Rutland @ Bach',49.89656,-119.3868,0,1452331082
-140221,'140221','Beach @ 4th',49.77477,-119.73514,0,1452331108
-140222,'140222','Beach @ 4th',49.7747,-119.73506,0,1452331109
-140233,'140233','Ellis @ Clement',49.89404,-119.49347,0,1452331141
-140236,'140236','Gordon @ Sutherland',49.88044,-119.47687,0,1452331144
-140237,'140237','Gordon @ Sutherland',49.87937,-119.47727,0,1452331145
-140238,'140238','Innovation @ Quail Rdg',49.95172,-119.38978,0,1452331146
-140239,'140239','Enterprise @ Banks',49.88925,-119.42682,0,1452331147
-140240,'140240','Springfield @ Leckie',49.87982,-119.4261,0,1452331169
-140241,'140241','Glenmore @ Begbie',49.9414,-119.43123,0,1452331170
-140242,'140242','Glenmore @ Begbie',49.94145,-119.43094,0,1452331171
-140243,'140243','Lakeshore @ Richter',49.85482,-119.48989,0,1452331172
-140244,'140244','KLO @ Richter',49.86196,-119.48878,0,1452331173
-140245,'140245','Rutland @ Rains',49.91014,-119.38691,0,1452331174
-140246,'140246','Rutland @ Rains',49.91049,-119.38661,0,1452331175
-140247,'140247','S Perimeter Way @ Mountainside',49.78899,-119.52113,0,1452331176
-140248,'140248','Innovation @ Spectrum',49.94787,-119.38919,0,1452331177
-140249,'140249','Innovation @ Spectrum',49.94857,-119.38921,0,1452331178
-140250,'140250','Innovation @ Fleet',49.94975,-119.38983,0,1452331200
-140251,'140251','Innovation @ Fleet Court',49.95003,-119.38966,0,1452331201
-140252,'140252','Vly @ Gln Pk',49.91716,-119.4362,0,1452331202
-140254,'140254','Rutland @ McIntosh',49.89226,-119.38696,0,1452331204
-140256,'140256','Steele Rd @ Arbor Vw',49.80637,-119.4723,0,1452331206
-140258,'140258','Sutherland @ Chandler',49.88028,-119.46876,0,1452331208
-140259,'140259','Acland @ Old Vernon',49.91874,-119.38408,0,1452331209
-140269,'140269','Vally @ Drysdale',49.92323,-119.43303,0,1452331240
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
deleted file mode 100644
index e2fefff99..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops
+++ /dev/null
@@ -1,1258 +0,0 @@
-100,103023,1,0
-100,103800,2,0
-100,103214,3,0
-100,103188,4,0
-100,103151,5,0
-100,103133,6,0
-100,103113,7,0
-100,103091,8,0
-100,140243,9,0
-100,103044,10,0
-100,103016,11,0
-100,102997,12,0
-100,140244,13,0
-100,103020,14,0
-100,103028,15,0
-100,102995,16,0
-100,102984,17,0
-100,140053,18,0
-100,102956,19,0
-100,102930,20,0
-100,102910,21,0
-100,102892,22,0
-100,102883,23,0
-100,102869,24,0
-100,102861,25,1
-101,102861,1,0
-101,102868,2,0
-101,102881,3,0
-101,102896,4,0
-101,102914,5,0
-101,102928,6,0
-101,102952,7,0
-101,102961,8,0
-101,102976,9,0
-101,102982,10,0
-101,140244,11,0
-101,103020,12,0
-101,103028,13,0
-101,102999,14,0
-101,103025,15,0
-101,103062,16,0
-101,103093,17,0
-101,103119,18,0
-101,103139,19,0
-101,103152,20,0
-101,103185,21,0
-101,103342,22,0
-101,103801,23,0
-101,103023,24,1
-200,102859,1,0
-200,102865,2,0
-200,102870,3,0
-200,140233,4,0
-200,102888,5,0
-200,102901,6,0
-200,102911,7,0
-200,102919,8,0
-200,102924,9,0
-200,102932,10,0
-200,102934,11,0
-200,102935,12,0
-200,102922,13,0
-200,102913,14,0
-200,102895,15,0
-200,102885,16,0
-200,102879,17,0
-200,102875,18,0
-300,103079,1,0
-300,103076,2,0
-300,103102,3,0
-300,103099,4,0
-300,103123,5,0
-300,103147,6,0
-300,103172,7,0
-300,103170,8,0
-300,103143,9,0
-300,103129,10,0
-300,103111,11,0
-300,103089,12,0
-300,103083,13,0
-300,103052,14,0
-300,103041,15,0
-300,103051,16,0
-300,103090,17,0
-300,103098,18,0
-300,103053,19,0
-300,103082,20,0
-300,103095,21,0
-300,103117,22,0
-300,103128,23,0
-300,103148,24,0
-300,103168,25,0
-300,103166,26,0
-300,103145,27,0
-300,103118,28,0
-300,103096,29,0
-300,103101,30,0
-300,103092,31,0
-500,103023,1,0
-500,140028,2,0
-500,140029,3,0
-500,140030,4,0
-500,140031,5,0
-500,140032,6,0
-500,140033,7,0
-500,140034,8,0
-500,140035,9,0
-500,140036,10,0
-500,140236,11,0
-500,140037,12,0
-500,140038,13,0
-500,140039,14,0
-500,140050,15,0
-500,140040,16,0
-500,140041,17,0
-500,140042,18,0
-500,140057,19,0
-500,102860,20,1
-501,102860,1,0
-501,140044,2,0
-501,140018,3,0
-501,140019,4,0
-501,140020,5,0
-501,140021,6,0
-501,140022,7,0
-501,140023,8,0
-501,140237,9,0
-501,102939,10,0
-501,102958,11,0
-501,102978,12,0
-501,103006,13,0
-501,140024,14,0
-501,140025,15,0
-501,140026,16,0
-501,140027,17,0
-501,140012,18,0
-501,103023,19,1
-600,140099,1,0
-600,140139,2,0
-600,140163,3,0
-600,140137,4,0
-600,140241,5,0
-600,140135,6,0
-600,140133,7,0
-600,103104,8,0
-600,103154,9,0
-600,103131,10,0
-600,103103,11,0
-600,103080,12,0
-600,103048,13,0
-600,103005,14,0
-600,102987,15,0
-600,102968,16,0
-600,102965,17,0
-600,102959,18,0
-600,103031,19,0
-600,140050,20,0
-600,102905,21,0
-600,102903,22,0
-600,102894,23,0
-600,102879,24,0
-600,102867,25,0
-600,102856,26,1
-601,102856,1,0
-601,102866,2,0
-601,102880,3,0
-601,102898,4,0
-601,102908,5,0
-601,140051,6,0
-601,103029,7,0
-601,102960,8,0
-601,102966,9,0
-601,102977,10,0
-601,102988,11,0
-601,103010,12,0
-601,103041,13,0
-601,103051,14,0
-601,103087,15,0
-601,103107,16,0
-601,103136,17,0
-601,103159,18,0
-601,140131,19,0
-601,140132,20,0
-601,140134,21,0
-601,140242,22,0
-601,140136,23,0
-601,140162,24,0
-601,140138,25,0
-601,140100,26,1
-800,103030,1,0
-800,102995,2,0
-800,102984,3,0
-800,140053,4,0
-800,102956,5,0
-800,102930,6,0
-800,140047,7,0
-800,140043,8,0
-800,102929,9,0
-800,102941,10,0
-800,102954,11,0
-800,102979,12,0
-800,102990,13,0
-800,103004,14,0
-800,103033,15,0
-800,103056,16,0
-800,103075,17,0
-800,103121,18,0
-800,103144,19,0
-800,103169,20,0
-800,103186,21,0
-800,103204,22,0
-800,103222,23,0
-800,103245,24,0
-800,103264,25,0
-800,103278,26,0
-800,103296,27,0
-800,103312,28,0
-800,140152,29,0
-800,140150,30,0
-800,140164,31,0
-800,103373,32,0
-800,103376,33,0
-800,140216,34,0
-800,103384,35,0
-800,102863,36,0
-800,102998,37,0
-800,140246,38,0
-800,140112,39,0
-800,140109,40,0
-800,140108,41,0
-800,140106,42,0
-800,140101,43,1
-801,140101,1,0
-801,140105,2,0
-801,140107,3,0
-801,140259,4,0
-801,140111,5,0
-801,140245,6,0
-801,103392,7,0
-801,103385,8,0
-801,103382,9,0
-801,103380,10,0
-801,103377,11,0
-801,103370,12,0
-801,140254,13,0
-801,103365,14,0
-801,140148,15,0
-801,103321,16,0
-801,103297,17,0
-801,103274,18,0
-801,103260,19,0
-801,103240,20,0
-801,103221,21,0
-801,103201,22,0
-801,103184,23,0
-801,103171,24,0
-801,103142,25,0
-801,103125,26,0
-801,103108,27,0
-801,103097,28,0
-801,103069,29,0
-801,103057,30,0
-801,103014,31,0
-801,102996,32,0
-801,102986,33,0
-801,102973,34,0
-801,102950,35,0
-801,140048,36,0
-801,140045,37,0
-801,140046,38,0
-801,102914,39,0
-801,102928,40,0
-801,102952,41,0
-801,102961,42,0
-801,102976,43,0
-801,102982,44,0
-801,140244,45,0
-801,103020,46,0
-801,103030,47,1
-900,102859,1,0
-900,102875,2,0
-900,102884,3,0
-900,102891,4,0
-900,102893,5,0
-900,102907,6,0
-900,102916,7,0
-900,102925,8,0
-900,102937,9,0
-900,102951,10,0
-900,102971,11,0
-900,102962,12,0
-900,102994,13,0
-900,103011,14,0
-900,103018,15,0
-900,103033,16,0
-900,103056,17,0
-900,103069,18,1
-901,103069,1,0
-901,103057,2,0
-901,103024,3,0
-901,103012,4,0
-901,102993,5,0
-901,102963,6,0
-901,102969,7,0
-901,102948,8,0
-901,102942,9,0
-901,102926,10,0
-901,102918,11,0
-901,102909,12,0
-901,102900,13,0
-901,102890,14,0
-901,102882,15,0
-901,102874,16,0
-901,102859,17,1
-1000,102854,1,0
-1000,102877,2,0
-1000,102893,3,0
-1000,102902,4,0
-1000,102915,5,0
-1000,102923,6,0
-1000,102936,7,0
-1000,140056,8,0
-1000,102974,9,0
-1000,102728,10,0
-1000,103009,11,0
-1000,103036,12,0
-1000,103050,13,0
-1000,103058,14,0
-1000,103073,15,0
-1000,103076,16,0
-1000,103105,17,0
-1000,103122,18,0
-1000,103127,19,0
-1000,140239,20,0
-1000,103002,21,0
-1000,103222,22,0
-1000,103245,23,0
-1000,103264,24,0
-1000,103278,25,0
-1000,103296,26,0
-1000,103312,27,0
-1000,140152,28,0
-1000,140151,29,0
-1000,140164,30,0
-1000,103373,31,0
-1000,103376,32,0
-1000,103354,33,0
-1000,103344,34,0
-1000,103322,35,0
-1000,103287,36,0
-1000,103288,37,0
-1000,103292,38,0
-1000,103283,39,0
-1000,103081,40,0
-1000,103300,41,0
-1000,103327,42,1
-1001,103430,1,0
-1001,103416,2,0
-1001,103396,3,0
-1001,103283,4,0
-1001,103081,5,0
-1001,103300,6,0
-1001,103327,7,0
-1001,103343,8,0
-1001,103360,9,0
-1001,103387,10,0
-1001,103392,11,0
-1001,103385,12,0
-1001,103382,13,0
-1001,103380,14,0
-1001,103377,15,0
-1001,103370,16,0
-1001,140254,17,0
-1001,103365,18,0
-1001,140149,19,0
-1001,103321,20,0
-1001,103297,21,0
-1001,103274,22,0
-1001,103260,23,0
-1001,103240,24,0
-1001,103221,25,0
-1001,103165,26,0
-1001,103141,27,0
-1001,103126,28,0
-1001,103092,29,0
-1001,103070,30,0
-1001,103060,31,0
-1001,103046,32,0
-1001,103015,33,0
-1001,102991,34,0
-1001,102975,35,0
-1001,102964,36,0
-1001,102953,37,0
-1001,102933,38,0
-1001,102921,39,0
-1001,102909,40,0
-1001,102900,41,0
-1001,102889,42,0
-1001,102874,43,0
-1001,102854,44,1
-1100,102855,1,0
-1100,102875,2,0
-1100,102886,3,0
-1100,102899,4,0
-1100,102912,5,0
-1100,102920,6,0
-1100,102931,7,0
-1100,102938,8,0
-1100,102945,9,0
-1100,102957,10,0
-1100,102970,11,0
-1100,102979,12,0
-1100,102990,13,0
-1100,103004,14,0
-1100,103033,15,0
-1100,103056,16,0
-1100,103077,17,0
-1100,103086,18,0
-1100,103138,19,0
-1100,140240,20,0
-1100,103189,21,0
-1100,103205,22,0
-1100,103235,23,0
-1100,103250,24,0
-1100,103252,25,0
-1100,103277,26,0
-1100,103289,27,0
-1100,103303,28,0
-1100,103307,29,0
-1100,103309,30,0
-1100,103313,31,0
-1100,103334,32,0
-1100,103357,33,0
-1100,103367,34,0
-1100,103372,35,0
-1100,103383,36,0
-1100,103405,37,0
-1100,103411,38,0
-1100,103412,39,0
-1100,103410,40,0
-1100,103421,41,0
-1100,103428,42,0
-1100,103426,43,0
-1100,103429,44,0
-1100,103430,45,1
-1100,103378,46,1
-1101,103430,1,0
-1101,103416,2,0
-1101,103396,3,0
-1101,103382,4,0
-1101,103380,5,0
-1101,103377,6,0
-1101,103370,7,0
-1101,140254,8,0
-1101,103365,9,0
-1101,103363,10,0
-1101,103361,11,0
-1101,103364,12,0
-1101,103369,13,0
-1101,103366,14,0
-1101,103346,15,0
-1101,103331,16,0
-1101,103310,17,0
-1101,103308,18,0
-1101,103304,19,0
-1101,103291,20,0
-1101,103271,21,0
-1101,103253,22,0
-1101,103246,23,0
-1101,103227,24,0
-1101,103202,25,0
-1101,103190,26,0
-1101,103156,27,0
-1101,103130,28,0
-1101,103097,29,0
-1101,103071,30,0
-1101,103057,31,0
-1101,103014,32,0
-1101,102996,33,0
-1101,102986,34,0
-1101,102972,35,0
-1101,102955,36,0
-1101,140258,37,0
-1101,102944,38,0
-1101,102927,39,0
-1101,102917,40,0
-1101,102906,41,0
-1101,102897,42,0
-1101,102887,43,0
-1101,102874,44,0
-1101,102855,45,1
-1200,103016,1,0
-1200,140244,2,0
-1200,103020,3,0
-1200,103457,4,0
-1200,103038,5,0
-1200,103045,6,0
-1200,103059,7,0
-1200,103088,8,0
-1200,103072,9,0
-1200,140055,10,0
-1200,103114,11,0
-1200,103149,12,0
-1200,103232,13,0
-1200,103285,14,0
-1200,103324,15,0
-1200,103348,16,0
-1200,103406,17,0
-1200,103420,18,0
-1200,103436,19,0
-1200,103458,20,0
-1200,103489,21,1
-1201,103489,1,0
-1201,103461,2,0
-1201,103433,3,0
-1201,103419,4,0
-1201,103399,5,0
-1201,103349,6,0
-1201,103323,7,0
-1201,103286,8,0
-1201,103231,9,0
-1201,103146,10,0
-1201,103116,11,0
-1201,140158,12,0
-1201,103084,13,0
-1201,103054,14,0
-1201,103042,15,0
-1201,103030,16,0
-1201,103040,17,0
-1201,103039,18,0
-1201,103016,19,1
-1201,103072,20,1
-1300,140104,1,0
-1300,140159,2,0
-1300,140249,3,0
-1300,140251,4,0
-1300,104916,5,0
-1300,103848,6,0
-1300,103849,7,0
-1300,103853,8,0
-1300,103858,9,1
-1301,103858,1,0
-1301,103852,2,0
-1301,103845,3,0
-1301,103851,4,0
-1301,140238,5,0
-1301,140250,6,0
-1301,140248,7,0
-1301,140160,8,0
-1301,140104,9,1
-1400,103557,1,0
-1400,103554,2,0
-1400,103153,3,0
-1400,103526,4,0
-1400,103521,5,0
-1400,103501,6,0
-1400,103448,7,0
-1400,103477,8,0
-1400,103482,9,0
-1400,103192,10,0
-1400,103193,11,0
-1400,103326,12,0
-1400,103335,13,0
-1400,103375,14,0
-1400,140254,15,0
-1400,103365,16,0
-1400,103363,17,0
-1400,103361,18,0
-1400,103364,19,0
-1400,103369,20,0
-1400,103366,21,0
-1400,103346,22,0
-1400,103331,23,0
-1400,103310,24,0
-1400,103308,25,0
-1400,103304,26,0
-1400,103291,27,0
-1400,103271,28,0
-1400,103253,29,0
-1400,103246,30,0
-1400,103227,31,0
-1400,103202,32,0
-1400,103190,33,0
-1400,103156,34,0
-1400,103130,35,0
-1400,103097,36,0
-1400,103077,37,1
-1401,103077,1,0
-1401,103086,2,0
-1401,103138,3,0
-1401,103189,4,0
-1401,103205,5,0
-1401,103235,6,0
-1401,103250,7,0
-1401,103252,8,0
-1401,103277,9,0
-1401,103289,10,0
-1401,103303,11,0
-1401,103307,12,0
-1401,103309,13,0
-1401,103313,14,0
-1401,103334,15,0
-1401,103357,16,0
-1401,103367,17,0
-1401,103372,18,0
-1401,103193,19,0
-1401,103326,20,0
-1401,103335,21,0
-1401,103375,22,0
-1401,140254,23,0
-1401,103365,24,0
-1401,103378,25,0
-1401,103414,26,0
-1401,103446,27,0
-1401,103490,28,0
-1401,103531,29,0
-1401,103515,30,0
-1401,103524,31,0
-1401,103539,32,0
-1401,103550,33,0
-1401,103198,34,0
-1401,103538,35,0
-1401,103557,36,1
-1501,103021,1,0
-1501,103257,2,0
-1501,103817,3,0
-1501,103305,4,0
-1501,103316,5,0
-1501,103298,6,0
-1501,103295,7,0
-1501,103368,8,0
-1501,103401,9,0
-1501,103423,10,0
-1501,103441,11,0
-1501,103444,12,0
-1501,103464,13,0
-1501,103470,14,0
-1501,103440,15,0
-1501,103424,16,0
-1501,104914,17,0
-1501,103294,18,0
-1501,103293,19,0
-1501,103818,20,0
-1501,103816,21,0
-1501,103815,22,0
-1601,103022,1,0
-1601,103800,2,0
-1601,103802,3,0
-1601,103803,4,0
-1601,103804,5,0
-1601,103319,6,0
-1601,103340,7,0
-1601,103355,8,0
-1601,103432,9,0
-1601,103445,10,0
-1601,103806,11,0
-1601,103808,12,0
-1601,103810,13,0
-1601,103811,14,0
-1601,103520,15,0
-1601,103523,16,0
-1601,103533,17,0
-1601,103540,18,0
-1601,103562,19,0
-1601,140247,20,0
-1601,103814,21,0
-1601,103813,22,0
-1601,103812,23,0
-1601,103522,24,0
-1601,103809,25,0
-1601,103807,26,0
-1601,103805,27,0
-1601,103347,28,0
-1601,103337,29,0
-1601,103317,30,0
-1601,103290,31,0
-1601,103272,32,0
-1601,103248,33,0
-1601,103801,34,0
-1700,103022,1,0
-1700,103257,2,0
-1700,103817,3,0
-1700,103305,4,0
-1700,103325,5,0
-1700,103821,6,0
-1700,103825,7,0
-1700,103826,8,0
-1700,103827,9,0
-1700,103829,10,0
-1700,103176,11,0
-1700,103177,12,0
-1700,103187,13,0
-1700,103191,14,0
-1700,103451,15,0
-1700,103833,16,0
-1700,140161,17,0
-1700,140256,18,0
-1700,103439,19,0
-1700,103828,20,0
-1700,103408,21,0
-1700,103824,22,0
-1700,103820,23,0
-1700,103818,24,0
-1700,103816,25,0
-1700,103815,26,0
-1800,102856,1,0
-1800,102866,2,0
-1800,102880,3,0
-1800,102898,4,0
-1800,102908,5,0
-1800,140051,6,0
-1800,103029,7,0
-1800,102960,8,0
-1800,102966,9,0
-1800,102977,10,0
-1800,102988,11,0
-1800,103010,12,0
-1800,103041,13,0
-1800,103051,14,0
-1800,103087,15,0
-1800,103107,16,0
-1800,103136,17,0
-1800,103159,18,0
-1800,103132,19,0
-1800,103206,20,0
-1800,103226,21,0
-1800,103236,22,0
-1800,140133,23,1
-1801,140133,1,0
-1801,103104,2,0
-1801,103154,3,0
-1801,103131,4,0
-1801,103103,5,0
-1801,103080,6,0
-1801,103048,7,0
-1801,103005,8,0
-1801,102987,9,0
-1801,102968,10,0
-1801,102965,11,0
-1801,102959,12,0
-1801,103031,13,0
-1801,140050,14,0
-1801,102905,15,0
-1801,102903,16,0
-1801,102894,17,0
-1801,102879,18,0
-1801,102867,19,0
-1801,102857,20,1
-1900,103079,1,0
-1900,103060,2,0
-1900,103046,3,0
-1900,103015,4,0
-1900,103003,5,0
-1900,103008,6,0
-1900,103026,7,0
-1900,103041,8,0
-1900,103051,9,0
-1900,103087,10,0
-1900,103107,11,0
-1900,103140,12,0
-1900,140252,13,0
-1900,103203,14,0
-1900,103224,15,0
-1900,140269,16,0
-1900,103243,17,0
-1900,140133,18,1
-1901,140133,1,0
-1901,103104,2,0
-1901,103154,3,0
-1901,103131,4,0
-1901,103103,5,0
-1901,103080,6,0
-1901,103048,7,0
-1901,103035,8,0
-1901,103013,9,0
-1901,103007,10,0
-1901,103000,11,0
-1901,102728,12,0
-1901,103009,13,0
-1901,103036,14,0
-1901,103050,15,0
-1901,103058,16,0
-1901,103079,17,1
-2000,140005,1,0
-2000,103596,2,0
-2000,103581,3,0
-2000,103580,4,0
-2000,103586,5,0
-2000,103065,6,0
-2000,103529,7,0
-2000,103519,8,0
-2000,103500,9,0
-2000,103492,10,0
-2000,103484,11,0
-2000,103467,12,0
-2000,103452,13,0
-2000,103418,14,0
-2000,103351,15,0
-2000,103302,16,0
-2000,103266,17,0
-2000,103239,18,0
-2000,103217,19,0
-2000,103195,20,0
-2000,103181,21,0
-2000,103160,22,0
-2000,103135,23,0
-2000,103164,24,0
-2000,103183,25,0
-2000,140065,26,0
-2000,103220,27,0
-2000,103234,28,0
-2000,103249,29,0
-2000,140009,30,1
-2001,140009,1,0
-2001,103299,2,0
-2001,103282,3,0
-2001,103261,4,0
-2001,103254,5,0
-2001,103233,6,0
-2001,103219,7,0
-2001,140066,8,0
-2001,103180,9,0
-2001,103163,10,0
-2001,103134,11,0
-2001,103167,12,0
-2001,103182,13,0
-2001,103197,14,0
-2001,103216,15,0
-2001,103244,16,0
-2001,103268,17,0
-2001,103306,18,0
-2001,103359,19,0
-2001,103417,20,0
-2001,103460,21,0
-2001,103474,22,0
-2001,103486,23,0
-2001,103491,24,0
-2001,103510,25,0
-2001,103518,26,0
-2001,103532,27,0
-2001,103553,28,0
-2001,103566,29,0
-2001,103590,30,0
-2001,103582,31,0
-2001,103579,32,0
-2001,103597,33,0
-2001,140005,34,1
-2101,140006,1,0
-2101,103608,2,0
-2101,103621,3,0
-2101,103632,4,0
-2101,103630,5,0
-2101,103627,6,0
-2101,103623,7,0
-2101,103617,8,0
-2101,103616,9,0
-2101,103614,10,0
-2101,103615,11,0
-2101,103618,12,0
-2101,103622,13,0
-2101,103624,14,0
-2101,103629,15,0
-2101,103626,16,0
-2101,103625,17,0
-2101,103628,18,0
-2101,103634,19,0
-2101,103640,20,0
-2101,103642,21,0
-2101,103633,22,0
-2101,103631,23,0
-2101,103636,24,0
-2101,103638,25,0
-2101,103641,26,0
-2101,103646,27,0
-2101,103648,28,0
-2101,103644,29,0
-2101,103647,30,0
-2101,103649,31,0
-2101,103645,32,0
-2101,103639,33,0
-2101,103637,34,0
-2101,103643,35,0
-2200,103844,1,0
-2200,103723,2,0
-2200,103722,3,0
-2200,103720,4,0
-2200,103718,5,0
-2200,103715,6,0
-2200,103713,7,0
-2200,103711,8,0
-2200,103709,9,0
-2200,103707,10,0
-2200,103706,11,0
-2200,103703,12,0
-2200,103700,13,0
-2200,140222,14,0
-2200,103695,15,0
-2200,103692,16,0
-2200,104912,17,0
-2200,103690,18,0
-2200,103686,19,0
-2200,103675,20,0
-2200,103671,21,0
-2200,103667,22,0
-2200,140006,23,1
-2201,140006,1,0
-2201,103665,2,0
-2201,103669,3,0
-2201,103672,4,0
-2201,103682,5,0
-2201,103686,6,0
-2201,103689,7,0
-2201,103691,8,0
-2201,103693,9,0
-2201,103694,10,0
-2201,140221,11,0
-2201,103701,12,0
-2201,103702,13,0
-2201,103704,14,0
-2201,103705,15,0
-2201,103708,16,0
-2201,103710,17,0
-2201,103712,18,0
-2201,103714,19,0
-2201,103716,20,0
-2201,103717,21,0
-2201,103719,22,0
-2201,103721,23,0
-2201,103844,24,1
-2300,140103,1,0
-2300,140159,2,0
-2300,140249,3,0
-2300,140251,4,0
-2300,104916,5,0
-2300,103680,6,0
-2300,103569,7,0
-2300,103604,8,0
-2300,103610,9,0
-2300,140105,10,0
-2300,140107,11,0
-2300,103425,12,0
-2300,103480,13,0
-2300,103506,14,0
-2300,103548,15,0
-2300,103561,16,0
-2300,103576,17,0
-2300,103600,18,0
-2300,104913,19,0
-2300,103620,20,0
-2300,103611,21,0
-2300,103650,22,0
-2300,103653,23,0
-2300,103654,24,0
-2300,103658,25,0
-2300,103472,26,0
-2300,103661,27,0
-2300,103663,28,0
-2300,103664,29,0
-2300,103666,30,0
-2300,103673,31,0
-2300,103676,32,0
-2300,103678,33,0
-2300,103684,34,0
-2300,103683,35,0
-2300,103681,36,0
-2300,103679,37,0
-2300,103685,38,0
-2300,103688,39,0
-2300,103677,40,0
-2300,103674,41,0
-2300,103670,42,0
-2300,103668,43,0
-2300,103662,44,0
-2300,103659,45,0
-2300,103660,46,1
-2301,103660,1,0
-2301,103657,2,0
-2301,103655,3,0
-2301,103652,4,0
-2301,103609,5,0
-2301,103607,6,0
-2301,103574,7,0
-2301,103656,8,0
-2301,140238,9,0
-2301,140250,10,0
-2301,140248,11,0
-2301,140160,12,0
-2301,140098,13,1
-2301,103619,14,0
-2301,103613,15,0
-2301,103599,16,0
-2301,103577,17,0
-2301,103564,18,0
-2301,103547,19,0
-2301,103503,20,0
-2301,103478,21,0
-2301,140109,22,0
-2301,140108,23,0
-2301,140106,24,0
-2301,140103,25,1
-2400,140005,1,0
-2400,103595,2,0
-2400,103584,3,0
-2400,103563,4,0
-2400,103551,5,0
-2400,103541,6,0
-2400,103516,7,0
-2400,103493,8,0
-2400,140170,9,0
-2400,140193,10,0
-2400,140194,11,0
-2400,140195,12,0
-2400,140177,13,0
-2400,140179,14,0
-2400,140168,15,0
-2400,140181,16,0
-2400,140182,17,0
-2400,140010,18,1
-2401,140010,1,0
-2401,103265,2,0
-2401,103279,3,0
-2401,103301,4,0
-2401,140202,5,0
-2401,140203,6,0
-2401,140209,7,0
-2401,140199,8,0
-2401,140200,9,0
-2401,140198,10,0
-2401,140208,11,0
-2401,140207,12,0
-2401,103471,13,0
-2401,103469,14,0
-2401,103481,15,0
-2401,103495,16,0
-2401,103513,17,0
-2401,103542,18,0
-2401,103552,19,0
-2401,103556,20,0
-2401,103565,21,0
-2401,103575,22,0
-2401,103593,23,0
-2401,103597,24,0
-2401,140005,25,1
-2500,140005,1,0
-2500,103595,2,0
-2500,103584,3,0
-2500,103537,4,0
-2500,140067,5,0
-2500,140068,6,0
-2500,103527,7,0
-2500,103508,8,0
-2500,103483,9,0
-2500,140117,10,0
-2500,103463,11,0
-2500,103447,12,0
-2500,140095,13,0
-2500,103422,14,0
-2500,103403,15,0
-2500,103388,16,0
-2500,103379,17,0
-2500,103329,18,0
-2500,140010,19,1
-2501,140010,1,0
-2501,103265,2,0
-2501,103279,3,0
-2501,103301,4,0
-2501,103328,5,0
-2501,103381,6,0
-2501,103389,7,0
-2501,103407,8,0
-2501,103427,9,0
-2501,140094,10,0
-2501,103450,11,0
-2501,103465,12,0
-2501,140116,13,0
-2501,103485,14,0
-2501,103509,15,0
-2501,103525,16,0
-2501,103497,17,0
-2501,103511,18,0
-2501,103535,19,0
-2501,103565,20,0
-2501,103575,21,0
-2501,103593,22,0
-2501,103597,23,0
-2501,140005,24,1
-2600,140005,1,0
-2600,103595,2,0
-2600,103584,3,0
-2600,103563,4,0
-2600,103551,5,0
-2600,103541,6,0
-2600,103528,7,0
-2600,103502,8,0
-2600,103473,9,0
-2600,103459,10,0
-2600,103434,11,0
-2600,103393,12,0
-2600,103379,13,0
-2600,103329,14,0
-2600,140011,15,1
-2601,140011,1,0
-2601,103265,2,0
-2601,103279,3,0
-2601,103301,4,0
-2601,103328,5,0
-2601,103381,6,0
-2601,103395,7,0
-2601,103435,8,0
-2601,103462,9,0
-2601,104911,10,0
-2601,103505,11,0
-2601,103542,12,0
-2601,103552,13,0
-2601,103556,14,0
-2601,103565,15,0
-2601,103575,16,0
-2601,103593,17,0
-2601,103597,18,0
-2601,140005,19,1
-2800,140214,1,0
-2800,140176,2,0
-2800,140174,3,0
-2800,140172,4,0
-2800,140175,5,0
-2800,140173,6,0
-2800,140196,7,0
-2800,140197,8,0
-2800,140167,9,0
-2800,140192,10,0
-2800,140178,11,0
-2800,140171,12,0
-2800,140183,13,0
-2800,140166,14,0
-2800,140187,15,0
-2800,140189,16,0
-2800,140188,17,0
-2800,140190,18,0
-2800,140184,19,0
-2800,140185,20,0
-2800,140186,21,0
-2800,140169,22,0
-2800,140201,23,0
-2800,140165,24,1
-2801,140165,1,0
-2801,103265,2,0
-2801,103279,3,0
-2801,103301,4,0
-2801,140180,5,0
-2801,140210,6,0
-2801,140211,7,0
-2801,140212,8,0
-2801,140191,9,0
-2801,140205,10,0
-2801,140204,11,0
-2801,140206,12,0
-2801,140058,13,0
-2801,140059,14,0
-2801,140060,15,0
-2801,140061,16,0
-2801,140062,17,0
-2801,140063,18,0
-2801,140064,19,0
-2801,103589,20,0
-2801,103573,21,0
-2801,103585,22,0
-2801,103594,23,0
-2801,103598,24,0
-2801,103602,25,0
-2801,140214,26,1
-2900,140011,1,0
-2900,103262,2,0
-2900,103258,3,0
-2900,103251,4,0
-2900,103230,5,0
-2900,140069,6,0
-2900,103173,7,0
-2900,103178,8,0
-2900,103161,9,0
-2900,140153,10,0
-2900,103115,11,0
-2900,103110,12,0
-2900,103094,13,0
-2900,140154,14,0
-2900,103066,15,0
-2900,140155,16,0
-2900,103063,17,0
-2900,103043,18,0
-2900,103047,19,0
-2900,103027,20,0
-2900,140013,21,0
-2900,103078,22,0
-2900,103162,23,0
-2900,103183,24,0
-2900,140065,25,0
-2900,103220,26,0
-2900,103234,27,0
-2900,103249,28,0
-2900,103265,29,0
-2900,103279,30,0
-2900,103301,31,0
-3200,103472,1,0
-3200,103661,2,0
-3200,140092,3,0
-3200,140091,4,0
-3200,140090,5,0
-3200,140001,6,0
-3200,103679,7,0
-3200,103685,8,0
-3200,140096,9,0
-3200,140080,10,0
-3200,140081,11,0
-3200,140082,12,0
-3200,140083,13,0
-3200,140084,14,0
-3200,140085,15,0
-3200,140086,16,0
-3200,140087,17,0
-3200,140088,18,0
-3200,140089,19,0
-3200,140054,20,0
-3200,140079,21,0
-3200,140078,22,0
-3200,140077,23,0
-3200,140093,24,0
-3200,140014,25,0
-3200,140015,26,0
-3200,140016,27,0
-3200,140017,28,0
-3200,103658,29,0
-9700,140004,1,0
-9700,140071,2,0
-9700,140007,3,0
-9700,140073,4,0
-9700,103745,5,0
-9700,102853,6,0
-9700,140049,7,0
-9700,140003,8,0
-9700,102985,9,0
-9700,103067,10,0
-9700,103174,11,0
-9700,103263,12,0
-9700,140114,13,0
-9700,140102,14,1
-9701,140102,1,0
-9701,140113,2,0
-9701,103256,3,0
-9701,103049,4,0
-9701,103061,5,0
-9701,102989,6,0
-9701,140002,7,0
-9701,140000,8,0
-9701,102862,9,0
-9701,103744,10,0
-9701,140074,11,0
-9701,140008,12,0
-9701,140072,13,0
-9701,140004,14,1
diff --git a/app-android/src/main/res-next/raw/next_gtfs_rts_trips b/app-android/src/main/res-next/raw/next_gtfs_rts_trips
deleted file mode 100644
index 671a37ccf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_rts_trips
+++ /dev/null
@@ -1,48 +0,0 @@
-100,0,'Downtown',1
-101,0,'Mission Rec Exch',1
-200,0,'North End Shuttle',2
-300,0,'Dilworth Mtn',3
-500,0,'Downtown',5
-501,0,'Mission Rec Exch',5
-600,0,'Downtown',6
-601,0,'UBCO',6
-801,0,'College',8
-800,0,'UBCO',8
-901,0,'Downtown',9
-900,0,'Orchard Pk',9
-1001,0,'Downtown',10
-1000,0,'North Rutland',10
-1101,0,'Downtown',11
-1100,0,'Rutland',11
-1200,0,'McCulloch',12
-1201,0,'South Pandosy',12
-1300,0,'Quail Rdg',13
-1301,0,'UBCO',13
-1401,0,'Black Mtn',14
-1400,0,'Orchard Pk',14
-1501,0,'Crawford',15
-1601,0,'Kettle Vly',16
-1700,0,'Southridge',17
-1801,0,'Downtown',18
-1800,0,'Glenmore',18
-1900,0,'Glenmore',19
-1901,0,'Orchard Pk',19
-2000,0,'Boucherie Mtn',20
-2001,0,'Westbank',20
-2101,0,'Glenrosa',21
-2201,0,'Peachland',22
-2200,0,'Westbank',22
-2300,0,'Lk Country',23
-2301,0,'UBCO',23
-2400,0,'Boucherie Mtn',24
-2401,0,'Westbank',24
-2500,0,'Boucherie Mtn',25
-2501,0,'Westbank',25
-2600,0,'Boucherie Mtn',26
-2601,0,'Westbank',26
-2800,0,'Boucherie Mtn',28
-2801,0,'Westbank',28
-2900,0,'Bear Crk',29
-3200,0,'The Lks',32
-9700,0,'UBCO',97
-9701,0,'Westbank',97
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates b/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
deleted file mode 100644
index 9a20af9b0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
+++ /dev/null
@@ -1,63 +0,0 @@
-'2993',20240630,1
-'3011',20240701,1
-'3011',20240702,1
-'3011',20240703,1
-'3011',20240704,1
-'3011',20240705,1
-'2964',20240706,1
-'2993',20240707,1
-'3011',20240708,1
-'3011',20240709,1
-'3011',20240710,1
-'3011',20240711,1
-'3011',20240712,1
-'2964',20240713,1
-'2993',20240714,1
-'3011',20240715,1
-'3011',20240716,1
-'3011',20240717,1
-'3011',20240718,1
-'3011',20240719,1
-'2964',20240720,1
-'2993',20240721,1
-'3011',20240722,1
-'3011',20240723,1
-'3011',20240724,1
-'3011',20240725,1
-'3011',20240726,1
-'2964',20240727,1
-'2993',20240728,1
-'3011',20240729,1
-'3011',20240730,1
-'3011',20240731,1
-'3011',20240801,1
-'3011',20240802,1
-'2964',20240803,1
-'2993',20240804,1
-'3011',20240805,1
-'3011',20240806,1
-'3011',20240807,1
-'3011',20240808,1
-'3011',20240809,1
-'2964',20240810,1
-'2993',20240811,1
-'3011',20240812,1
-'3011',20240813,1
-'3011',20240814,1
-'3011',20240815,1
-'3011',20240816,1
-'2964',20240817,1
-'2993',20240818,1
-'3011',20240819,1
-'3011',20240820,1
-'3011',20240821,1
-'3011',20240822,1
-'3011',20240823,1
-'2964',20240824,1
-'2993',20240825,1
-'3011',20240826,1
-'3011',20240827,1
-'3011',20240828,1
-'3011',20240829,1
-'3011',20240830,1
-'2964',20240831,1
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102728 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102728
deleted file mode 100644
index 36425fa09..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102728
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1000,81600,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63600,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2964',1901,75300,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102853 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102853
deleted file mode 100644
index a6f9d8c6e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102853
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2993',9700,73000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'3011',9700,63000,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,5500,4,'',0,500,,'',0,2000,,'',0,900,,'',0,1100,,'',0,6000,,'',0,2000,,'',0,1800,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,2400,,'',0,6600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,7800,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102854 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102854
deleted file mode 100644
index d8f666779..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102854
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1000,80800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',1001,82600,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7600,4,'',0,6900,4,'',0,5800,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0
-'2993',1000,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'2993',1001,82600,4,'',0,12300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,9900,4,'',0,10000,4,'',0,17000,4,'',0
-'3011',1000,63000,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
-'3011',1001,62200,4,'',0,3200,4,'',0,5800,4,'',0,2700,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,6300,4,'',0,1900,4,'',0,1900,4,'',0,1800,4,'',0,6000,4,'',0,2800,4,'',0,7000,4,'',0,3300,4,'',0,6900,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,8300,4,'',0,1600,4,'',0,1300,4,'',0,2100,4,'',0,5900,4,'',0,1800,4,'',0,1700,4,'',0,5600,4,'',0,1400,4,'',0,2500,4,'',0,8200,4,'',0,8400,4,'',0,4300,4,'',0,8200,4,'',0,8000,4,'',0,4500,4,'',0,8300,4,'',0,8500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102855 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102855
deleted file mode 100644
index 09cdd1df9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102855
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1100,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2964',1101,81300,4,'',0,4000,4,'',0,6100,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,2900,4,'',0,7000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0
-'2993',1100,73900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'2993',1101,82600,4,'',0,19300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10600,4,'',0,9400,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'3011',1100,64500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1101,70800,4,'',0,4900,4,'',0,7400,4,'',0,1500,4,'',0,5500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,2900,4,'',0,6900,4,'',0,2800,4,'',0,6900,4,'',0,2800,4,'',0,2800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,8000,4,'',0,3000,4,'',0,10000,4,'',0,12000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102856 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102856
deleted file mode 100644
index 7ad842350..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102856
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',600,82800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2964',601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,90500,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0
-'2993',601,80000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',600,71700,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,15000,4,'',0,11200,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7300,4,'',0,3500,4,'',0,15000,4,'',0,11000,4,'',0
-'3011',601,61500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1800,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73000,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61000,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102857 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102857
deleted file mode 100644
index 4f5d5ed97..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102857
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1801,80100,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,12600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
-'2993',1801,83100,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11400,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
-'3011',1801,64200,4,'',0,10800,4,'',0,6600,4,'',0,2600,4,'',0,6900,4,'',0,2800,4,'',0,6700,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8100,4,'',0,4000,4,'',0,6800,4,'',0,2800,4,'',0,6800,4,'',0,2800,4,'',0,6900,4,'',0,2700,4,'',0,7000,4,'',0,2800,4,'',0,9500,4,'',0,7700,4,'',0,4000,4,'',0,16000,4,'',0,10900,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102859 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102859
deleted file mode 100644
index 90e95f220..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102859
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',200,81500,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,5800,,'',0,1200,4,'',0,1800,,'',0,1200,4,'',0,6300,,'',0,1000,4,'',0,7000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9000,,'',0,1000,4,'',0,9700,,'',0,1000,4,'',0,9300,,'',0,1000,4,'',0
-'2993',200,83000,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,10500,,'',0,1000,4,'',0,8800,,'',0,1000,4,'',0,9200,,'',0,1000,4,'',0,16800,,'',0,1000,4,'',0
-'3011',200,72800,,'',0,1200,4,'',0,1100,,'',0,5200,4,'',0,1800,,'',0,1300,4,'',0,1600,,'',0,5300,4,'',0,1500,,'',0,1300,4,'',0,8700,,'',0,1300,4,'',0,17400,,'',0,1300,4,'',0,11200,,'',0,1300,4,'',0,8200,,'',0,1300,4,'',0,1400,,'',0,5300,4,'',0,1000,,'',0,1300,4,'',0,2000,,'',0,5300,4,'',0,1600,,'',0,1300,4,'',0,1500,,'',0,1300,4,'',0,5700,,'',0,1300,4,'',0,1200,,'',0,1300,4,'',0,8700,,'',0,1200,4,'',0,8800,,'',0,1200,4,'',0,9300,,'',0,1200,4,'',0,9300,,'',0,5200,4,'',0
-'2964',900,102500,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2964',901,110400,4,'',0,20500,4,'',0,25000,4,'',0,17900,4,'',0
-'2993',900,104500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'2993',901,112400,4,'',0,20000,4,'',0,10000,4,'',0,20000,4,'',0
-'3011',900,90000,,'',0,22000,,'',0,31500,,'',0
-'3011',901,94100,4,'',0,31200,4,'',0,26300,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102860 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102860
deleted file mode 100644
index ff253183b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102860
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',500,81000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0
-'2964',501,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',500,85400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,9900,4,'',0
-'2993',501,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,63600,4,'',0,7000,4,'',0,3100,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,7300,4,'',0,3000,4,'',0,7200,4,'',0,3000,4,'',0,6800,4,'',0,2900,4,'',0,7000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'3011',501,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102861 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102861
deleted file mode 100644
index 071065483..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102861
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',100,82500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6700,4,'',0,3000,4,'',0,7500,4,'',0,9300,4,'',0,10200,4,'',0,10100,4,'',0
-'2964',101,73500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2993',100,82600,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9700,4,'',0,10000,4,'',0,9900,4,'',0
-'2993',101,73500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',100,62100,4,'',0,3000,4,'',0,7000,4,'',0,1500,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0
-'3011',101,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102862 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102862
deleted file mode 100644
index 263e1e8b3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102862
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,70800,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'2993',9701,72800,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,,'',0,3000,4,'',0,7000,4,'',0,9100,4,'',0
-'3011',9701,54500,,'',0,7300,,'',0,2100,,'',0,1200,,'',0,5200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,900,4,'',0,1100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,900,4,'',0,1100,,'',0,6100,,'',0,2500,,'',0,1200,4,'',0,1300,,'',0,6500,,'',0,2400,4,'',0,6500,,'',0,2400,4,'',0,2600,,'',0,6300,4,'',0,2400,,'',0,6400,4,'',0,2600,,'',0,6400,4,'',0,2500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102863 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102863
deleted file mode 100644
index 48b915331..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102863
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72300,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,62100,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102865 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102865
deleted file mode 100644
index e1885eae2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102865
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,81600,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,72900,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102866 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102866
deleted file mode 100644
index cc4c22875..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102866
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,61600,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1800,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73100,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61100,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102867 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102867
deleted file mode 100644
index 62c48fffe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102867
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,90300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',600,71500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1801,75900,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,64000,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102868 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102868
deleted file mode 100644
index 2ddb14ed1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102868
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,73600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2993',101,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102869 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102869
deleted file mode 100644
index 8f54da860..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102869
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102870 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102870
deleted file mode 100644
index 1ad1dd97d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102870
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,81700,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73000,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102874 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102874
deleted file mode 100644
index 55d1d686b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102874
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',901,110200,,'',0,20500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,112200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93900,,'',0,31200,,'',0,26300,,'',0
-'2964',1001,82400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
-'2993',1001,82400,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,62100,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,6300,,'',0,1900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,8300,,'',0,1600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2964',1101,81100,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,82400,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,70600,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,6900,,'',0,2800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102875 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102875
deleted file mode 100644
index 196ffe458..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102875
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',200,82500,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73800,,'',0,6300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,14500,,'',0
-'2964',900,102700,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,104700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90200,,'',0,22000,,'',0,31500,,'',0
-'2964',1100,80200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,64700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102877 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102877
deleted file mode 100644
index b00ff5f8e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102877
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,81000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63100,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102879 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102879
deleted file mode 100644
index 46181ebed..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102879
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',200,82400,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73700,,'',0,6300,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
-'2964',600,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,90200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',600,71400,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1801,75800,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63900,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102880 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102880
deleted file mode 100644
index 1999cc4a1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102880
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,61700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1800,73100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61200,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102881 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102881
deleted file mode 100644
index 2365a6f7b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102881
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2993',101,73700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102882 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102882
deleted file mode 100644
index e4c56d33e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102882
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,110000,,'',0,20500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,112000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93700,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102883 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102883
deleted file mode 100644
index 3b9391319..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102883
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,82400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102884 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102884
deleted file mode 100644
index 4ecfe355e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102884
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,102800,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,104800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90300,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102885 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102885
deleted file mode 100644
index e45936c2c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102885
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102886 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102886
deleted file mode 100644
index 0c0472a9b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102886
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74200,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,64900,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102887 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102887
deleted file mode 100644
index 0c65e8462..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102887
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1101,80900,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,82200,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,70400,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102888 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102888
deleted file mode 100644
index 56f6e9b7e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102888
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102889 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102889
deleted file mode 100644
index 8de6deb11..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102889
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2993',1001,82300,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,62000,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,8300,,'',0,1600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102890 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102890
deleted file mode 100644
index eb137ab0d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102890
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105900,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,111900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93600,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102891 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102891
deleted file mode 100644
index 0795244eb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102891
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,102900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,104900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90400,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102892 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102892
deleted file mode 100644
index bbe7459cf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102892
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,82300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102893 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102893
deleted file mode 100644
index 554c006fa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102893
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',900,102900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,104900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90400,,'',0,22000,,'',0,31500,,'',0
-'2964',1000,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63200,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102894 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102894
deleted file mode 100644
index 09870e674..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102894
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,90100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',600,71200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1801,75700,,'',0,14300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102895 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102895
deleted file mode 100644
index e45936c2c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102895
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,82300,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73600,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,6700,,'',0,2300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102896 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102896
deleted file mode 100644
index 879186b6b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102896
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,73800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2993',101,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102897 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102897
deleted file mode 100644
index 6c054b918..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102897
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1101,80800,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,82100,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,70300,,'',0,4900,,'',0,7400,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,2900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102898 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102898
deleted file mode 100644
index 43f0e0a85..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102898
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,61800,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1800,73200,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73200,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61300,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102899 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102899
deleted file mode 100644
index 6756cb099..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102899
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74300,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102900 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102900
deleted file mode 100644
index 9dbbd8142..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102900
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',901,105800,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,111800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93500,,'',0,31200,,'',0,26300,,'',0
-'2964',1001,82200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9800,,'',0,10000,,'',0
-'2993',1001,82200,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61900,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,5600,,'',0,1400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102901 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102901
deleted file mode 100644
index f9ae87869..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102901
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102902 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102902
deleted file mode 100644
index eb362b2a1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102902
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,81100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63200,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102903 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102903
deleted file mode 100644
index 24411e608..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102903
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',600,71200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1801,75700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102905 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102905
deleted file mode 100644
index e4e8d2859..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102905
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,90000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',600,71100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1801,75600,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102906 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102906
deleted file mode 100644
index 7d1bfb8fd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102906
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1101,80700,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,82000,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,70200,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102907 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102907
deleted file mode 100644
index 973fdcf73..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102907
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103000,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90500,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102908 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102908
deleted file mode 100644
index fe17604e5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102908
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,61800,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1800,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73300,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61300,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102909 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102909
deleted file mode 100644
index 09395b5e5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102909
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',901,105700,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,111700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93400,,'',0,31200,,'',0,26300,,'',0
-'2964',1001,82100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2993',1001,82200,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61900,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7100,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102910 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102910
deleted file mode 100644
index 554628058..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102910
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,82100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,82200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102911 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102911
deleted file mode 100644
index f9ae87869..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102911
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102912 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102912
deleted file mode 100644
index d20aaf949..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102912
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74400,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65100,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102913 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102913
deleted file mode 100644
index 1b1658f1d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102913
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,82200,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11600,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73500,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102914 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102914
deleted file mode 100644
index 0b5ea9e83..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102914
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',101,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',101,73900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60300,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',801,64700,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62700,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102915 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102915
deleted file mode 100644
index 38887ab3d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102915
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63300,,'',0,1900,,'',0,5800,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102916 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102916
deleted file mode 100644
index 9292946fa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102916
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103100,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105100,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90600,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102917 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102917
deleted file mode 100644
index 7c2031fe4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102917
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1101,80600,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,81900,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,70100,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102918 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102918
deleted file mode 100644
index e5df149e8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102918
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105600,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,111600,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93300,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102919 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102919
deleted file mode 100644
index f9ae87869..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102919
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,81900,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73200,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102920 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102920
deleted file mode 100644
index ed5671238..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102920
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74500,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65200,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102921 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102921
deleted file mode 100644
index 3405fabda..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102921
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,82000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2993',1001,82100,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61800,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102922 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102922
deleted file mode 100644
index 428e656eb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102922
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73400,,'',0,2300,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102923 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102923
deleted file mode 100644
index a744b52cb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102923
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,81200,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63300,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102924 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102924
deleted file mode 100644
index dea3efc56..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102924
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102925 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102925
deleted file mode 100644
index 62e42a703..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102925
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90700,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102926 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102926
deleted file mode 100644
index a7e6f0c1a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102926
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93200,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102927 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102927
deleted file mode 100644
index 6f54f93a7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102927
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1101,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,81800,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102928 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102928
deleted file mode 100644
index c3cb73a50..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102928
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',101,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2993',101,73900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60400,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',801,64800,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62700,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102929 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102929
deleted file mode 100644
index dc176fb62..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102929
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70300,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60100,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102930 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102930
deleted file mode 100644
index e81f395e6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102930
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',100,82000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,82100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2964',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70100,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,55900,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102931 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102931
deleted file mode 100644
index d97417dce..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102931
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102932 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102932
deleted file mode 100644
index dea3efc56..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102932
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102933 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102933
deleted file mode 100644
index 0e44e7199..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102933
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,81900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2993',1001,82000,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61800,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8000,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102934 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102934
deleted file mode 100644
index dea3efc56..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102934
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,82000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73300,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102935 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102935
deleted file mode 100644
index 0806ecbdc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102935
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,82100,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73400,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102936 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102936
deleted file mode 100644
index 749a0fd2d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102936
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,81300,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63300,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102937 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102937
deleted file mode 100644
index 62e42a703..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102937
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90700,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102938 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102938
deleted file mode 100644
index d97417dce..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102938
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102939 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102939
deleted file mode 100644
index 403c51784..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102939
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102941 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102941
deleted file mode 100644
index 6aaa2e3f9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102941
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,70100,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70300,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60200,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102942 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102942
deleted file mode 100644
index a7e6f0c1a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102942
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93200,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102944 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102944
deleted file mode 100644
index f91dad29c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102944
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1101,80500,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,81800,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,70000,,'',0,4900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102945 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102945
deleted file mode 100644
index 8b0f0c813..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102945
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74600,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65300,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102948 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102948
deleted file mode 100644
index a7e6f0c1a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102948
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105500,,'',0,24500,,'',0,25000,,'',0,17900,,'',0
-'2993',901,111500,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93200,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102950 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102950
deleted file mode 100644
index 1d410a4f1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102950
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,64400,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64300,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62300,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102951 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102951
deleted file mode 100644
index c47a85d22..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102951
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103300,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105300,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90800,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102952 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102952
deleted file mode 100644
index 0d2fa60b0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102952
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',101,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',101,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60500,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',801,64900,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'3011',801,62800,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102953 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102953
deleted file mode 100644
index 31aba3053..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102953
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,81800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2993',1001,81900,,'',0,12300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61700,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102954 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102954
deleted file mode 100644
index 34151e411..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102954
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,70200,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70400,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102955 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102955
deleted file mode 100644
index e4bd26eda..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102955
+++ /dev/null
@@ -1 +0,0 @@
-'2964',1101,80400,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102956 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102956
deleted file mode 100644
index 3c43ac27e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102956
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',100,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,82000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2964',800,65800,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70000,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,55800,,'',0,6500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102957 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102957
deleted file mode 100644
index bda278040..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102957
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74700,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65400,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102958 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102958
deleted file mode 100644
index 17e635547..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102958
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62400,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102959 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102959
deleted file mode 100644
index c20744fb3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102959
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70700,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,75300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82200,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63400,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102960 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102960
deleted file mode 100644
index 3d02f41f7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102960
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73500,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73500,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61600,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102961 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102961
deleted file mode 100644
index e97e6349f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102961
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',101,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',101,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2964',801,64900,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'3011',801,62900,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102962 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102962
deleted file mode 100644
index 031b2b4bd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102962
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103400,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90900,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102963 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102963
deleted file mode 100644
index 2ceb0f18a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102963
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105300,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2993',901,111300,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93000,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102964 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102964
deleted file mode 100644
index 92cb5a796..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102964
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,81700,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,81900,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61600,,'',0,3200,,'',0,5800,,'',0,2600,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8200,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102965 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102965
deleted file mode 100644
index 39c14b3bf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102965
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70600,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63300,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102966 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102966
deleted file mode 100644
index 0470dcec2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102966
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80600,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62100,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73600,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61600,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102968 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102968
deleted file mode 100644
index c20695aae..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102968
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70500,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,75200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82100,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63300,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102969 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102969
deleted file mode 100644
index 3aa7836b9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102969
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105400,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2993',901,111400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,93100,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102970 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102970
deleted file mode 100644
index 71922fe04..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102970
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102971 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102971
deleted file mode 100644
index 031b2b4bd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102971
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103400,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105400,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,90900,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102972 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102972
deleted file mode 100644
index 5fa47737c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102972
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1101,80300,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,81600,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,65800,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102973 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102973
deleted file mode 100644
index f46060fa0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102973
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,64300,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64300,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62300,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102974 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102974
deleted file mode 100644
index d2c9264d5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102974
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63500,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8500,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102975 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102975
deleted file mode 100644
index 028cfc144..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102975
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,81600,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,81800,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61600,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102976 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102976
deleted file mode 100644
index 3253232b1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102976
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',101,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',101,74200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60600,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',801,65000,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'3011',801,62900,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102977 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102977
deleted file mode 100644
index e984a55e1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102977
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80700,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62200,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73600,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73600,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61700,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102978 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102978
deleted file mode 100644
index 661eae453..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102978
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62500,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102979 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102979
deleted file mode 100644
index 1ea284a71..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102979
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70500,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60300,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74800,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65500,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102982 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102982
deleted file mode 100644
index 7c74d69a9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102982
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',101,74200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,9600,,'',0
-'2993',101,74200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,60700,,'',0,3000,,'',0,7100,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2964',801,65000,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,65000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'3011',801,63000,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102984 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102984
deleted file mode 100644
index 9e67261cd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102984
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',100,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2964',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102985 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102985
deleted file mode 100644
index 5ae1d5bbc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102985
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2993',9700,73700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'3011',9700,63800,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,900,,'',0,5100,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102986 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102986
deleted file mode 100644
index 954f5e108..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102986
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,64300,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62200,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2964',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,81500,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102987 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102987
deleted file mode 100644
index 28fc12352..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102987
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70400,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,75100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82000,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63200,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102988 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102988
deleted file mode 100644
index 3338f1639..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102988
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62300,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61800,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102989 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102989
deleted file mode 100644
index b26e10242..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102989
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,70000,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2993',9701,75100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'3011',9701,61200,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102990 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102990
deleted file mode 100644
index f292d7f90..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102990
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,70300,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70500,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1100,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,74900,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65600,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102991 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102991
deleted file mode 100644
index 5cebe5de3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102991
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,81500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,81700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61500,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,8400,,'',0,4300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102993 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102993
deleted file mode 100644
index 44a966bc4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102993
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105100,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2993',901,111100,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,92800,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102994 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102994
deleted file mode 100644
index fa997d6ba..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102994
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103700,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105700,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,91200,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102995 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102995
deleted file mode 100644
index 3abc8b865..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102995
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',100,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,81800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2964',800,65600,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,65900,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,55700,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102996 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102996
deleted file mode 100644
index cbc465dc8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102996
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,64200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62200,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2964',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102997 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102997
deleted file mode 100644
index b73ebb436..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102997
+++ /dev/null
@@ -1 +0,0 @@
-'2964',100,81300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102998 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102998
deleted file mode 100644
index 9dc953f8f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102998
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,64700,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72400,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,62200,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102999 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102999
deleted file mode 100644
index 6388b47d0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_102999
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,74800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',101,74800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61200,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103000 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103000
deleted file mode 100644
index b1f181bc8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103000
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1901,75200,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75300,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72800,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103002 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103002
deleted file mode 100644
index d6c6c4567..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103002
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,82800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,64700,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103003 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103003
deleted file mode 100644
index 4feef913c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103003
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1900,73300,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,70800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103004 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103004
deleted file mode 100644
index 5f94fe9d4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103004
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,70400,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70600,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60400,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103005 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103005
deleted file mode 100644
index eefa8d85e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103005
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85300,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70300,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,75000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,81900,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63100,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103006 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103006
deleted file mode 100644
index 852b264e5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103006
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62600,,'',0,3000,,'',0,7200,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103007 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103007
deleted file mode 100644
index 7640dc57c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103007
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1901,75100,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75200,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72700,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103008 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103008
deleted file mode 100644
index a744d1eb6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103008
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1900,73400,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,70900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103009 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103009
deleted file mode 100644
index 03eaa8733..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103009
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1000,81700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63700,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2800,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2964',1901,75400,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,73000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103010 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103010
deleted file mode 100644
index a4aad6e97..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103010
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80800,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62300,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73700,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73700,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61800,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103011 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103011
deleted file mode 100644
index 94f8c66c2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103011
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,91400,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103012 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103012
deleted file mode 100644
index 29f5160ba..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103012
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,105000,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2993',901,111000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,92700,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103013 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103013
deleted file mode 100644
index c27f1beb0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103013
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1901,75100,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72700,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103014 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103014
deleted file mode 100644
index f5a6d0d73..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103014
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,64200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62100,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
-'2964',1101,80200,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,81500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,65700,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103015 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103015
deleted file mode 100644
index 6a0efd787..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103015
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1001,81200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,81500,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61300,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,6000,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5400,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2964',1900,73200,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,70700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103016 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103016
deleted file mode 100644
index 8cce84476..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103016
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',100,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,81300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'3011',100,60800,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',1200,65500,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
-'3011',1201,72700,4,'',0,8100,4,'',0,4000,4,'',0,68000,4,'',0,8400,4,'',0,4400,4,'',0,8200,4,'',0,8400,4,'',0,21600,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103018 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103018
deleted file mode 100644
index 94f8c66c2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103018
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',900,103900,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,105900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,91400,,'',0,22000,,'',0,31500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103020 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103020
deleted file mode 100644
index a20124bf3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103020
+++ /dev/null
@@ -1,10 +0,0 @@
-'2964',100,81400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2964',101,74400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',100,81500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2993',101,74400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',100,61000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',101,60800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2964',801,65200,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,65200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'3011',801,63200,,'',0,8600,,'',0,2700,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'3011',1200,65600,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103021 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103021
deleted file mode 100644
index 31a08297f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103021
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80000,,'',0,2300,4,'',0,70700,,'',0,2400,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103022 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103022
deleted file mode 100644
index f35d830d5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103022
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1601,80100,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7500,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7700,,'',0,2700,4,'',0
-'2993',1601,90000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'3011',1601,60000,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,2700,4,'',0,300,,'',0,2700,4,'',0,4300,,'',0,3000,,'',0,700,4,'',0,6300,4,'',0,3000,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0,8000,,'',0,6300,,'',0,700,4,'',0,2000,4,'',0,800,,'',0,6500,,'',0,200,4,'',0,2500,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,3300,,'',0,6700,4,'',0,2800,,'',0,2700,4,'',0,7300,,'',0,2700,4,'',0
-'2964',1700,83100,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8300,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8400,,'',0,1800,4,'',0
-'2993',1700,83000,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0,8200,,'',0,1800,4,'',0
-'3011',1700,60500,,'',0,1900,4,'',0,1100,,'',0,1900,4,'',0,5100,,'',0,1900,4,'',0,1100,,'',0,2200,4,'',0,4300,,'',0,2400,4,'',0,600,,'',0,2500,4,'',0,5000,,'',0,2100,4,'',0,7400,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2100,4,'',0,7900,,'',0,2500,4,'',0,500,,'',0,2500,4,'',0,5500,,'',0,2100,4,'',0,400,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,1000,,'',0,2000,4,'',0,5000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0,7500,,'',0,2000,4,'',0,8000,,'',0,2000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103023 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103023
deleted file mode 100644
index e26b92bb1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103023
+++ /dev/null
@@ -1,12 +0,0 @@
-'2964',100,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'2964',101,75800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,7500,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,5600,4,'',0
-'2993',100,80500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',101,75800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
-'3011',100,60000,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,62000,4,'',0,3000,4,'',0,7200,4,'',0,1500,4,'',0,1500,4,'',0,5600,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1600,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,9900,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0
-'2964',500,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',501,81200,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0
-'2993',500,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',501,82700,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0
-'3011',500,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',501,63500,4,'',0,7000,4,'',0,3200,4,'',0,7100,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103024 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103024
deleted file mode 100644
index be3fc8786..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103024
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',901,104900,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2993',901,110900,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,92600,,'',0,31200,,'',0,26300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103025 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103025
deleted file mode 100644
index 6b7d55810..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103025
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',101,74900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61300,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103026 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103026
deleted file mode 100644
index de3febffe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103026
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1900,73500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103027 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103027
deleted file mode 100644
index abcb911a2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103027
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103028 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103028
deleted file mode 100644
index 50ecd93fb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103028
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',100,81500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2964',101,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',100,81600,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2993',101,74500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',100,61100,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',101,60900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103029 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103029
deleted file mode 100644
index 39859bd3d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103029
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73400,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73400,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61500,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103030 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103030
deleted file mode 100644
index d07a76106..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103030
+++ /dev/null
@@ -1,7 +0,0 @@
-'2964',800,65500,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2964',801,65300,4,'',0,10100,4,'',0,8100,4,'',0,7600,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,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,7000,4,'',0,3300,4,'',0,7400,4,'',0,2800,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,10000,4,'',0,11000,4,'',0,11000,4,'',0
-'2993',800,65800,,'',0,14200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'2993',801,65300,4,'',0,10000,4,'',0,8500,4,'',0,9000,4,'',0,9200,4,'',0,9100,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,9000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,3400,4,'',0,7500,4,'',0,3400,4,'',0,8500,4,'',0,8500,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0
-'3011',800,55500,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'3011',801,63300,4,'',0,8600,4,'',0,2700,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,1600,4,'',0,5500,4,'',0,1400,4,'',0,1600,4,'',0,1500,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5800,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1500,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,5800,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5400,4,'',0,1300,4,'',0,1300,4,'',0,1500,4,'',0,1400,4,'',0,5300,4,'',0,1200,4,'',0,1800,4,'',0,2000,4,'',0,6000,4,'',0,1800,4,'',0,2000,4,'',0,6500,4,'',0,2400,4,'',0,6300,4,'',0,2500,4,'',0,2500,4,'',0,6400,4,'',0,8500,4,'',0,4300,4,'',0,8500,4,'',0,8400,4,'',0
-'3011',1201,72200,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103031 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103031
deleted file mode 100644
index a2c8be9b8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103031
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',600,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70900,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,75400,,'',0,10300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63500,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,8100,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6900,,'',0,2700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103033 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103033
deleted file mode 100644
index 75bed1788..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103033
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70700,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60500,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'2964',900,104000,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,110000,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,91500,,'',0,22000,,'',0,31500,,'',0
-'2964',1100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,75000,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65700,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103035 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103035
deleted file mode 100644
index 51162e8c4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103035
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1901,75000,,'',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,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75100,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103036 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103036
deleted file mode 100644
index 2fec1d8e1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103036
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1000,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63800,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2700,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2964',1901,75400,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75500,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,73000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103038 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103038
deleted file mode 100644
index 55989f575..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103038
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1200,65800,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103039 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103039
deleted file mode 100644
index 2d91915d9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103039
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1201,72600,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103040 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103040
deleted file mode 100644
index 7a43c6233..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103040
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1201,72400,,'',0,8100,,'',0,4000,,'',0,68000,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8400,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103041 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103041
deleted file mode 100644
index 2329f3991..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103041
+++ /dev/null
@@ -1,12 +0,0 @@
-'2964',300,73100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75600,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2964',601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62400,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61900,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2964',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103042 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103042
deleted file mode 100644
index 780037f89..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103042
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1201,72200,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103043 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103043
deleted file mode 100644
index 476f4173e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103043
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,65300,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103044 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103044
deleted file mode 100644
index 247473e2e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103044
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'3011',100,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103045 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103045
deleted file mode 100644
index 93cb1c731..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103045
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1200,65800,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103046 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103046
deleted file mode 100644
index fe779d3fa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103046
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1001,81100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61300,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8200,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2964',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103047 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103047
deleted file mode 100644
index 561623b69..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103047
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,65500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103048 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103048
deleted file mode 100644
index 27db91497..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103048
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',600,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85200,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70200,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,74900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,81800,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63000,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2964',1901,74900,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75000,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103049 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103049
deleted file mode 100644
index 599bc0d6f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103049
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2993',9701,74700,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'3011',9701,60800,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103050 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103050
deleted file mode 100644
index aa667a58f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103050
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1000,81900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63900,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2600,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2964',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,73100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103051 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103051
deleted file mode 100644
index 2329f3991..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103051
+++ /dev/null
@@ -1,12 +0,0 @@
-'2964',300,73100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75600,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
-'2964',601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62400,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73800,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73800,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61900,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2964',1900,73600,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80600,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103052 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103052
deleted file mode 100644
index e0f78c34e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103052
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73000,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75500,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103053 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103053
deleted file mode 100644
index cdd2e7555..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103053
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73400,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75900,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103054 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103054
deleted file mode 100644
index 5c699e2ad..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103054
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1201,72100,,'',0,8100,,'',0,4000,,'',0,67900,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8500,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103056 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103056
deleted file mode 100644
index c6dcc1c77..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103056
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',800,70500,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70700,,'',0,10200,,'',0,5000,,'',0,9200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60600,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
-'2964',900,104200,,'',0,28500,,'',0,29500,,'',0,13500,,'',0
-'2993',900,110200,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,91700,,'',0,22000,,'',0,31500,,'',0
-'2964',1100,81200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,75100,0,'Black Mtn',0,16600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,65800,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103057 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103057
deleted file mode 100644
index 019ec0531..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103057
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',801,64000,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62000,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5400,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2964',901,104800,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2993',901,110800,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',901,92500,,'',0,31200,,'',0,26300,,'',0
-'2964',1101,80000,,'',0,4000,,'',0,6100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,7000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0
-'2993',1101,81300,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,65500,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103058 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103058
deleted file mode 100644
index c1b9e690f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103058
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1000,81900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63900,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,2700,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
-'2964',1901,75500,,'',0,7500,,'',0,7500,,'',0,3600,,'',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,3500,,'',0,7400,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75600,,'',0,10300,,'',0,15600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,11100,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,73100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3700,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,7500,,'',0,2300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103059 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103059
deleted file mode 100644
index 6350db5c7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103059
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1200,65900,,'',0,8100,,'',0,8000,,'',0,63600,,'',0,8400,,'',0,8500,,'',0,8300,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103060 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103060
deleted file mode 100644
index 5eba2d5bd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103060
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1001,81000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,81300,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61200,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0
-'2964',1900,73100,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,70600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103061 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103061
deleted file mode 100644
index 078b801fb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103061
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,65800,,'',0,9000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2993',9701,74900,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'3011',9701,61000,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103062 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103062
deleted file mode 100644
index 199e23810..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103062
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2993',101,75100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61400,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103063 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103063
deleted file mode 100644
index 0706915dc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103063
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,65100,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103065 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103065
deleted file mode 100644
index b6998a7cf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103065
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75500,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,74900,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103066 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103066
deleted file mode 100644
index 45ef0edcc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103066
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103067 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103067
deleted file mode 100644
index 8a0a0d5dd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103067
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2993',9700,73900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'3011',9700,54400,,'',0,7700,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,4900,,'',0,1100,,'',0,1800,,'',0,2000,,'',0,5800,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103069 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103069
deleted file mode 100644
index 15ad21042..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103069
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',801,63900,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,63900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61900,,'',0,8600,,'',0,2500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2964',900,104500,4,'',0,28500,4,'',0,29500,4,'',0,17500,4,'',0
-'2964',901,104600,,'',0,20500,,'',0,29000,,'',0,17900,,'',0
-'2993',900,110500,4,'',0,20000,4,'',0,10000,4,'',0,20000,4,'',0
-'2993',901,110600,,'',0,20000,,'',0,10000,,'',0,20000,,'',0
-'3011',900,92000,4,'',0,22000,4,'',0,31500,4,'',0
-'3011',901,92300,,'',0,31200,,'',0,22300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103070 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103070
deleted file mode 100644
index 1f5f09946..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103070
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,80800,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,81100,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,17000,,'',0
-'3011',1001,61100,,'',0,3200,,'',0,5800,,'',0,2500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4300,,'',0,5600,,'',0,1300,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8300,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103071 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103071
deleted file mode 100644
index 2999b9a1d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103071
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1101,75900,,'',0,7500,4,'',0,500,,'',0,6100,,'',0,3000,,'',0,7000,,'',0,900,4,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,600,4,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,4,'',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,600,4,'',0,6400,,'',0,2900,,'',0,3000,,'',0,15500,,'',0,3900,4,'',0,6600,,'',0,10000,,'',0,10000,,'',0,10800,4,'',0
-'2993',1101,81200,,'',0,4200,4,'',0,15000,,'',0,10000,,'',0,1400,4,'',0,8600,,'',0,9900,4,'',0,100,,'',0,10000,,'',0,4400,4,'',0,5600,,'',0,10600,,'',0,9400,,'',0,900,4,'',0,9100,,'',0,10000,,'',0,3400,4,'',0,6600,,'',0,10000,,'',0,11800,4,'',0
-'3011',1101,65400,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103072 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103072
deleted file mode 100644
index 377fc23c0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103072
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1200,92600,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,4000,,'',0,8000,,'',0,46500,,'',0
-'2964',1201,95800,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,8000,4,'',0,42500,4,'',0
-'2993',1200,85900,,'',0,7700,,'',0,18900,,'',0,18700,,'',0,14300,,'',0,8000,,'',0,18800,,'',0,8100,,'',0
-'2993',1201,93100,4,'',0,7700,4,'',0,14900,4,'',0,18700,4,'',0,18300,4,'',0,8000,4,'',0,14800,4,'',0,8100,4,'',0
-'3011',1200,105500,,'',0,95000,,'',0
-'3011',1201,112700,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103073 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103073
deleted file mode 100644
index ad644453f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103073
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,82200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,5900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,64300,,'',0,5900,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103075 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103075
deleted file mode 100644
index f00d67d88..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103075
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,63300,,'',0,7600,,'',0,4500,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3300,,'',0,7500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,71100,,'',0,10200,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,60800,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103076 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103076
deleted file mode 100644
index 13769ca98..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103076
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',300,72100,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,74600,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
-'2964',1000,82300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,64400,,'',0,5900,,'',0,1800,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,4400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103077 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103077
deleted file mode 100644
index e54b151c8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103077
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',1100,81600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,75500,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,70000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1400,122600,4,'',0,77400,4,'',0
-'3011',1401,113500,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103078 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103078
deleted file mode 100644
index 56548f767..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103078
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,65900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103079 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103079
deleted file mode 100644
index 224c17c21..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103079
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',300,72000,,'',0,2300,4,'',0,9700,,'',0,6300,4,'',0,13600,,'',0,6300,4,'',0,23800,,'',0,6300,4,'',0,33700,,'',0,6300,4,'',0,12700,,'',0,2300,4,'',0,18700,,'',0,6300,4,'',0
-'2993',300,74500,,'',0,6300,4,'',0,19200,,'',0,2300,4,'',0,12700,,'',0,6300,4,'',0,23700,,'',0,6300,4,'',0,13700,,'',0,6300,4,'',0,29700,,'',0,2300,4,'',0,7700,,'',0,2300,4,'',0
-'3011',300,65000,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,60700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,700,,'',0,6300,4,'',0,700,,'',0,2300,4,'',0,10200,,'',0,6300,4,'',0,14700,,'',0,6300,4,'',0,9200,,'',0,2200,4,'',0
-'2964',1900,73000,,'',0,7500,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2964',1901,75700,4,'',0,7500,4,'',0,7500,4,'',0,3600,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,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7400,4,'',0,1600,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
-'2993',1900,80000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,75800,4,'',0,14300,4,'',0,11600,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,11100,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
-'3011',1900,70500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
-'3011',1901,73300,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,2100,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,3700,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,7500,4,'',0,2300,4,'',0,11500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103080 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103080
deleted file mode 100644
index 1805e6174..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103080
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',600,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,74800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,81700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,62900,,'',0,10700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2964',1901,74800,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,74900,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72400,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103081 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103081
deleted file mode 100644
index 43510072d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103081
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',1000,84600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',1001,251100,0,'North Rutland',0
-'2993',1000,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'2993',1001,232100,0,'Rutland Exch',0
-'3011',1000,54700,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103082 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103082
deleted file mode 100644
index aba835ba1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103082
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,80000,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103083 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103083
deleted file mode 100644
index 574119a92..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103083
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72900,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75400,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103084 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103084
deleted file mode 100644
index e36360de5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103084
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1201,72100,,'',0,8100,,'',0,4000,,'',0,67800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103086 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103086
deleted file mode 100644
index 3401ac129..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103086
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,81700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,75600,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,70100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,113600,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103087 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103087
deleted file mode 100644
index f698178a2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103087
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62500,,'',0,11100,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,73900,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73900,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,62000,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2964',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103088 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103088
deleted file mode 100644
index 96a9c80dd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103088
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1200,70000,,'',0,4100,,'',0,8000,,'',0,63700,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103089 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103089
deleted file mode 100644
index 4bafc3721..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103089
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75300,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103090 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103090
deleted file mode 100644
index 44c1fa49c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103090
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75700,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103091 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103091
deleted file mode 100644
index f19bacb2d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103091
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,81100,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'3011',100,60600,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103092 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103092
deleted file mode 100644
index 34e767258..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103092
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'2993',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
-'2964',1001,80400,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7600,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,80700,,'',0,12200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,9900,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,60700,,'',0,3200,,'',0,1800,,'',0,6500,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2300,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,5900,,'',0,2800,,'',0,3000,,'',0,7300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,4200,,'',0,5600,,'',0,1400,,'',0,2100,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,1600,,'',0,5500,,'',0,2500,,'',0,8300,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8100,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103093 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103093
deleted file mode 100644
index cf83becb9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103093
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2993',101,75200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61500,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103094 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103094
deleted file mode 100644
index a4b9c7114..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103094
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103095 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103095
deleted file mode 100644
index fa754beb5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103095
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,80100,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103096 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103096
deleted file mode 100644
index baa97823e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103096
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'2993',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103097 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103097
deleted file mode 100644
index 5e70332b5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103097
+++ /dev/null
@@ -1,7 +0,0 @@
-'2964',801,63500,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,63500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61600,,'',0,8500,,'',0,2500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1300,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'2964',1101,75600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80900,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
-'3011',1101,65300,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,122500,,'',0,73400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103098 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103098
deleted file mode 100644
index 5ce3c7c92..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103098
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73300,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75800,,'',0,25500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103099 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103099
deleted file mode 100644
index 845662ecd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103099
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,74700,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103101 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103101
deleted file mode 100644
index baa97823e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103101
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,74100,,'',0,16000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'2993',300,80600,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103102 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103102
deleted file mode 100644
index 845662ecd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103102
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72200,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,74700,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103103 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103103
deleted file mode 100644
index c30b52e13..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103103
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',600,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,70000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,15000,,'',0
-'2964',1801,74700,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,81600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,62800,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,6800,,'',0,2800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,14900,,'',0
-'2964',1901,74700,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,74800,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103104 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103104
deleted file mode 100644
index 33db26f23..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103104
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',600,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84800,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65800,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2964',1801,74500,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1801,81400,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1801,62600,,'',0,10700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'2964',1901,74400,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,74500,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103105 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103105
deleted file mode 100644
index d12890623..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103105
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,82400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,64400,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103107 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103107
deleted file mode 100644
index b5ec05de7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103107
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,81100,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62600,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,74000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,74000,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,62100,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
-'2964',1900,73800,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80800,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103108 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103108
deleted file mode 100644
index 5a044ecb1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103108
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,63400,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,63400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9100,,'',0,5100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61500,,'',0,8500,,'',0,2500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103110 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103110
deleted file mode 100644
index a4b9c7114..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103110
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64700,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103111 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103111
deleted file mode 100644
index 39ff4f8b6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103111
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75200,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103113 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103113
deleted file mode 100644
index e255536d1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103113
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,81000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'3011',100,60500,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103114 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103114
deleted file mode 100644
index 4aca8be86..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103114
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,93200,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,90500,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70100,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103115 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103115
deleted file mode 100644
index 0acf51713..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103115
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103116 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103116
deleted file mode 100644
index e4800fea5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103116
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,95200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'2993',1201,92500,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,72000,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103117 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103117
deleted file mode 100644
index 848d81063..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103117
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,80200,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103118 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103118
deleted file mode 100644
index a2081572f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103118
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,74000,,'',0,16000,,'',0,15900,,'',0,34100,,'',0,40000,,'',0,15000,,'',0,25000,,'',0
-'2993',300,80500,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103119 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103119
deleted file mode 100644
index 08e3839f5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103119
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',101,75200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103121 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103121
deleted file mode 100644
index 9a1b27956..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103121
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,63500,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,71300,,'',0,10300,,'',0,9000,,'',0,5200,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61000,,'',0,2500,,'',0,2300,,'',0,6100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103122 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103122
deleted file mode 100644
index 9ef986756..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103122
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,82500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,64500,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103123 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103123
deleted file mode 100644
index a0009e864..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103123
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72300,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,74800,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103125 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103125
deleted file mode 100644
index 700d06f49..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103125
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,63400,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,63400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61500,,'',0,8500,,'',0,2400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5300,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103126 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103126
deleted file mode 100644
index 80382af9a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103126
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,80200,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,80500,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,60600,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8300,,'',0,1600,,'',0,5300,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103127 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103127
deleted file mode 100644
index 2d83a3731..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103127
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,82600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,64500,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103128 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103128
deleted file mode 100644
index 848d81063..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103128
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73700,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,80200,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103129 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103129
deleted file mode 100644
index 7b187d594..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103129
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75100,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103130 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103130
deleted file mode 100644
index 8ba39ec63..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103130
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,75500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80800,,'',0,4400,0,'Orchard Pk',0,14800,,'',0,10000,,'',0,1600,0,'Orchard Pk',0,8400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,4600,0,'Orchard Pk',0,5400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,3600,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,12000,0,'Orchard Pk',0
-'3011',1101,65200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,122400,,'',0,73500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103131 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103131
deleted file mode 100644
index b75571492..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103131
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',600,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7400,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2964',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,62700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6800,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'2964',1901,74600,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,74700,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72200,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103132 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103132
deleted file mode 100644
index 4ee43f543..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103132
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1800,74200,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,74200,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,62300,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103133 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103133
deleted file mode 100644
index cfb93fccc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103133
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'2993',100,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',100,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103134 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103134
deleted file mode 100644
index 61d578f8f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103134
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103135 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103135
deleted file mode 100644
index 97f5a861e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103135
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103136 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103136
deleted file mode 100644
index edf503b61..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103136
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,81200,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62700,,'',0,11000,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,74100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,74100,,'',0,10200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,62200,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103138 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103138
deleted file mode 100644
index 7b292029e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103138
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,81900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,75800,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,11500,,'',0
-'3011',1100,70200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,113700,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103139 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103139
deleted file mode 100644
index f168203c4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103139
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',101,75300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61600,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103140 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103140
deleted file mode 100644
index c1b2e1c50..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103140
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1900,73900,,'',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,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,80900,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103141 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103141
deleted file mode 100644
index bf878a4ee..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103141
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,80100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,80400,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,60500,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8200,,'',0,1600,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103142 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103142
deleted file mode 100644
index bf3827014..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103142
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,63200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,63200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61300,,'',0,4500,,'',0,6500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5500,,'',0,1700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103143 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103143
deleted file mode 100644
index 7b187d594..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103143
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72600,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75100,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103144 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103144
deleted file mode 100644
index e514ab9fc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103144
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,63600,,'',0,7600,,'',0,4600,,'',0,7500,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7300,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71400,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8400,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103145 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103145
deleted file mode 100644
index 9128d4433..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103145
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73900,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,80400,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103146 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103146
deleted file mode 100644
index 7472d0818..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103146
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,95100,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'2993',1201,92400,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71900,,'',0,8100,,'',0,4000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103147 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103147
deleted file mode 100644
index d9cf2783c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103147
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72400,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,74900,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,21000,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103148 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103148
deleted file mode 100644
index 4784d45f6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103148
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103149 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103149
deleted file mode 100644
index b09779318..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103149
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,93300,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,90600,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70200,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103151 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103151
deleted file mode 100644
index 51624362a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103151
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,80900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'3011',100,60400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103152 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103152
deleted file mode 100644
index 964853cd9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103152
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2993',101,75400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103153 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103153
deleted file mode 100644
index 00dbd22fe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103153
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103154 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103154
deleted file mode 100644
index 434692e9f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103154
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',600,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65900,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2964',1801,74600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,81500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,62700,,'',0,10700,,'',0,6600,,'',0,2600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'2964',1901,74500,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'2993',1901,74600,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'3011',1901,72100,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103156 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103156
deleted file mode 100644
index c78c1a6ca..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103156
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,75400,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80700,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,4100,0,'Orchard Pk',0,5900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,65100,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,122300,,'',0,73500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103159 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103159
deleted file mode 100644
index ce0f8a9e5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103159
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,81300,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62700,,'',0,11100,,'',0,11100,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,74100,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,74100,,'',0,10300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,62200,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103160 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103160
deleted file mode 100644
index 97f5a861e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103160
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,64000,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103161 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103161
deleted file mode 100644
index 5f67f7cae..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103161
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103162 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103162
deleted file mode 100644
index 57cc3f853..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103162
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,70200,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103163 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103163
deleted file mode 100644
index e51a4138c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103163
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64800,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62600,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103164 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103164
deleted file mode 100644
index db12b87a8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103164
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80500,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75900,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,64100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103165 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103165
deleted file mode 100644
index 5bb83c8c2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103165
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,80000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,80300,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,60400,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8200,,'',0,1600,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103166 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103166
deleted file mode 100644
index 4784d45f6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103166
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103167 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103167
deleted file mode 100644
index 61d578f8f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103167
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64900,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62700,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103168 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103168
deleted file mode 100644
index 4784d45f6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103168
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,73800,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,80300,,'',0,21500,,'',0,19000,,'',0,30000,,'',0,20000,,'',0,32000,,'',0,10000,,'',0
-'3011',300,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,63000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,16500,,'',0,21000,,'',0,11400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103169 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103169
deleted file mode 100644
index 982228d49..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103169
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,63700,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71500,,'',0,10300,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61200,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8300,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103170 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103170
deleted file mode 100644
index 903e7e1c8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103170
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75000,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103171 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103171
deleted file mode 100644
index 5be2b2b75..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103171
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,63200,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,63200,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61300,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103172 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103172
deleted file mode 100644
index 903e7e1c8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103172
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',300,72500,,'',0,12000,,'',0,19900,,'',0,30100,,'',0,40000,,'',0,19000,,'',0,21000,,'',0
-'2993',300,75000,,'',0,25500,,'',0,15000,,'',0,30000,,'',0,20000,,'',0,36000,,'',0,10000,,'',0
-'3011',300,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,12500,,'',0,25000,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103173 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103173
deleted file mode 100644
index 1e4ed1644..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103173
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64300,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103174 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103174
deleted file mode 100644
index 710268f74..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103174
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2993',9700,74100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'3011',9700,54600,,'',0,7700,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,4900,,'',0,1000,,'',0,1800,,'',0,2000,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2300,,'',0,6400,,'',0,2600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103176 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103176
deleted file mode 100644
index 5ec5e1fa8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103176
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61400,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103177 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103177
deleted file mode 100644
index 2251f3968..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103177
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61500,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,2900,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103178 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103178
deleted file mode 100644
index 5f67f7cae..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103178
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64400,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103180 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103180
deleted file mode 100644
index 8331f42b7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103180
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64700,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62500,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103181 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103181
deleted file mode 100644
index 6b6bf50f6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103181
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80400,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75800,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103182 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103182
deleted file mode 100644
index 0bd95e2b4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103182
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103183 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103183
deleted file mode 100644
index e580d9178..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103183
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2000,80700,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,80100,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,64300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'3011',2900,70300,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103184 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103184
deleted file mode 100644
index e4c2a9937..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103184
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,63100,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,63100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61200,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103185 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103185
deleted file mode 100644
index fd5315409..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103185
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2993',101,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103186 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103186
deleted file mode 100644
index d957af06c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103186
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,63800,,'',0,7600,,'',0,4500,,'',0,7600,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71500,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61300,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103187 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103187
deleted file mode 100644
index 6fc72e8b1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103187
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61500,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103188 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103188
deleted file mode 100644
index 4ea99abda..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103188
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,80800,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'3011',100,60300,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103189 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103189
deleted file mode 100644
index 93d36e8d6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103189
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,113900,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103190 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103190
deleted file mode 100644
index cd85ad640..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103190
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,65000,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,122300,,'',0,73400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103191 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103191
deleted file mode 100644
index 5e7673b51..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103191
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61600,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103192 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103192
deleted file mode 100644
index aa1b80234..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103192
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103193 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103193
deleted file mode 100644
index 028b81eb6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103193
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1400,81400,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
-'2993',1400,83600,4,'',0,26400,4,'',0,14500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
-'3011',1400,70100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,30900,,'',0,32100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,21700,,'',0
-'3011',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103195 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103195
deleted file mode 100644
index ca00cd470..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103195
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80300,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75700,,'',0,14300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103197 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103197
deleted file mode 100644
index 0bd95e2b4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103197
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65000,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103198 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103198
deleted file mode 100644
index d4d76c3b3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103198
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,80300,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
-'2993',1401,82500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103201 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103201
deleted file mode 100644
index 295b3a830..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103201
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,63000,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,63000,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61100,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103202 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103202
deleted file mode 100644
index 66ebd4ab4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103202
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,75300,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80600,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,65000,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,122200,,'',0,73500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103203 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103203
deleted file mode 100644
index d2239f970..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103203
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1900,74100,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,81100,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103204 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103204
deleted file mode 100644
index cb956ab74..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103204
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,63900,,'',0,7600,,'',0,8500,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71600,,'',0,10400,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61400,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103205 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103205
deleted file mode 100644
index c94ba6251..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103205
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82100,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80000,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70400,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,113900,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103206 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103206
deleted file mode 100644
index ff05c5988..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103206
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1800,74300,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8400,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,74300,,'',0,10200,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11300,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,62400,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103214 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103214
deleted file mode 100644
index fb5a368ab..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103214
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'2993',100,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',100,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103216 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103216
deleted file mode 100644
index 4f8cf396b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103216
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65100,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,82000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103217 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103217
deleted file mode 100644
index 989f1ba8f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103217
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103219 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103219
deleted file mode 100644
index 52d4936e3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103219
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103220 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103220
deleted file mode 100644
index 7c32f9202..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103220
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2000,80900,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,80300,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,64500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'3011',2900,70500,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103221 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103221
deleted file mode 100644
index aa2f466a1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103221
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,62900,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,62900,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,61000,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8500,,'',0
-'2964',1001,75800,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,80100,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,60200,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103222 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103222
deleted file mode 100644
index 4736b337f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103222
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64000,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,3000,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71700,,'',0,10500,,'',0,9000,,'',0,9200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8800,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61500,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',1000,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,64900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103224 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103224
deleted file mode 100644
index bd71bb5cb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103224
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103226 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103226
deleted file mode 100644
index e3b02007b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103226
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1800,74300,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,74300,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,62400,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103227 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103227
deleted file mode 100644
index aa2cd892b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103227
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,75200,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80500,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64900,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,122100,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103230 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103230
deleted file mode 100644
index feaa8bfd1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103230
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64000,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103231 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103231
deleted file mode 100644
index 98be1635b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103231
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,94900,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1201,92200,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71700,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103232 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103232
deleted file mode 100644
index bff03eeb2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103232
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,93500,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,90800,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70300,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,4600,,'',0,25600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103233 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103233
deleted file mode 100644
index 83d7bf86f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103233
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103234 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103234
deleted file mode 100644
index 5aaefdf14..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103234
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2000,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'3011',2900,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103235 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103235
deleted file mode 100644
index 69bbd21bf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103235
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114000,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103236 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103236
deleted file mode 100644
index c744350d9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103236
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1800,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8300,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,62500,,'',0,10600,,'',0,2700,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,8300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103239 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103239
deleted file mode 100644
index 785f5d39c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103239
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80200,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75600,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103240 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103240
deleted file mode 100644
index f37d78a75..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103240
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,62800,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,62800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5100,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8700,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60900,,'',0,4500,,'',0,6500,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,8500,,'',0
-'2964',1001,75700,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,80000,,'',0,12100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,60100,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8100,,'',0,1600,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103243 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103243
deleted file mode 100644
index 76820e846..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103243
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1900,74200,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,81200,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103244 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103244
deleted file mode 100644
index 4a9375cc3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103244
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103245 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103245
deleted file mode 100644
index 483da4655..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103245
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64000,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71700,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61500,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'2964',1000,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,85600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,65000,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103246 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103246
deleted file mode 100644
index c2cd9e77c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103246
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,75100,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,4800,0,'Orchard Pk',0,2200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80400,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64800,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,122100,,'',0,73500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103248 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103248
deleted file mode 100644
index 17aea47e6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103248
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103249 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103249
deleted file mode 100644
index 5aaefdf14..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103249
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2000,81000,,'',0,10000,,'',0,4800,,'',0,14300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,80400,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,64600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,7300,,'',0,3100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'3011',2900,70600,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103250 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103250
deleted file mode 100644
index 39b5d3729..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103250
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82200,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80100,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70500,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114100,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103251 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103251
deleted file mode 100644
index 0e27235f9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103251
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103252 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103252
deleted file mode 100644
index 3f385e4e9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103252
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82300,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80200,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70600,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114100,,'',0,78000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103253 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103253
deleted file mode 100644
index 050aaa36d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103253
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,75000,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80300,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64700,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,122000,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103254 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103254
deleted file mode 100644
index 83d7bf86f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103254
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103256 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103256
deleted file mode 100644
index aeee89dff..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103256
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,74300,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2993',9701,74400,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
-'3011',9701,60400,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2400,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103257 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103257
deleted file mode 100644
index 1de3a90e2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103257
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1501,80200,,'',0,73000,,'',0
-'2964',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,3000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103258 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103258
deleted file mode 100644
index 0e27235f9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103258
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103260 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103260
deleted file mode 100644
index 17af5422a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103260
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,62800,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,62800,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,8800,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60900,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,80000,,'',0,12000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8100,,'',0,1700,,'',0,5400,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103261 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103261
deleted file mode 100644
index 83d7bf86f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103261
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62300,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103262 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103262
deleted file mode 100644
index 0e27235f9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103262
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,63900,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103263 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103263
deleted file mode 100644
index bcf7dbe1d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103263
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2993',9700,74500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
-'3011',9700,54900,,'',0,7700,,'',0,2000,,'',0,6100,,'',0,2100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,900,,'',0,900,,'',0,1800,,'',0,2000,,'',0,5700,,'',0,1600,,'',0,1800,,'',0,5600,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2400,,'',0,2600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103264 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103264
deleted file mode 100644
index 3b9607b3a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103264
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64100,,'',0,7600,,'',0,8500,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71800,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61600,,'',0,2500,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',1000,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,65000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103265 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103265
deleted file mode 100644
index 3d5ff4ada..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103265
+++ /dev/null
@@ -1,11 +0,0 @@
-'2964',2401,81900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'2993',2401,72400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,60600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2964',2501,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'3011',2501,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2964',2601,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'3011',2801,71200,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
-'3011',2900,70700,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103266 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103266
deleted file mode 100644
index 2d7cff45d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103266
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103268 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103268
deleted file mode 100644
index 4a9375cc3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103268
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65200,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,82100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,63000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103271 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103271
deleted file mode 100644
index a84a801e4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103271
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64600,,'',0,8700,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121900,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103272 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103272
deleted file mode 100644
index 8c87d6036..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103272
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,62400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103274 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103274
deleted file mode 100644
index 44652e276..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103274
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,62700,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,62700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60800,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,4500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75600,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,75900,,'',0,16100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,60000,,'',0,3200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1600,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103277 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103277
deleted file mode 100644
index ea7539013..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103277
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82400,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80300,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114200,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103278 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103278
deleted file mode 100644
index d2b61880b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103278
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64100,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71800,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61600,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,1600,,'',0,5800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,8500,,'',0
-'2964',1000,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,85800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,65100,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103279 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103279
deleted file mode 100644
index db9773944..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103279
+++ /dev/null
@@ -1,11 +0,0 @@
-'2964',2401,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'2993',2401,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
-'3011',2401,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2964',2501,94400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,102800,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'3011',2501,71600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2964',2601,73500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,71600,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'3011',2801,71200,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
-'3011',2900,70800,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103282 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103282
deleted file mode 100644
index 3e40c07f7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103282
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62200,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103283 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103283
deleted file mode 100644
index bc7a39904..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103283
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',1000,84500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',1001,251100,0,'North Rutland',0
-'2993',1000,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'2993',1001,232100,0,'Rutland Exch',0
-'3011',1000,54600,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103285 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103285
deleted file mode 100644
index 4144d53fc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103285
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70500,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103286 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103286
deleted file mode 100644
index 4b8e27d0d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103286
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1201,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103287 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103287
deleted file mode 100644
index a6c331fda..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103287
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,84300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54400,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103288 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103288
deleted file mode 100644
index fa676af8c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103288
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54500,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103289 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103289
deleted file mode 100644
index d69a9f348..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103289
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70700,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114300,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103290 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103290
deleted file mode 100644
index 4405c50f9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103290
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,92300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103291 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103291
deleted file mode 100644
index b88ef22e2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103291
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74900,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5000,0,'Orchard Pk',0,2000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80200,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64600,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121900,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103292 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103292
deleted file mode 100644
index 9b7068266..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103292
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,84400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54600,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103293 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103293
deleted file mode 100644
index 956206481..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103293
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,81800,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103294 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103294
deleted file mode 100644
index b9e140af5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103294
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,81600,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103295 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103295
deleted file mode 100644
index ec38ce5f2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103295
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80500,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103296 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103296
deleted file mode 100644
index 9ce6aec0a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103296
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64200,,'',0,7600,,'',0,8600,,'',0,3600,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7500,,'',0,7400,,'',0,2900,,'',0,7200,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71900,,'',0,10500,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8900,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',1000,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,85900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,65100,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8400,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103297 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103297
deleted file mode 100644
index b2724ed77..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103297
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,62700,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,62700,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60800,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2400,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,75900,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,55900,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103298 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103298
deleted file mode 100644
index b333ad790..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103298
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80400,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103299 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103299
deleted file mode 100644
index c711ab346..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103299
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103300 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103300
deleted file mode 100644
index cada87e9a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103300
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',1000,84800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',1001,251200,0,'North Rutland',0
-'2993',1000,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'2993',1001,232200,0,'Rutland Exch',0
-'3011',1000,54900,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103301 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103301
deleted file mode 100644
index 52410c623..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103301
+++ /dev/null
@@ -1,11 +0,0 @@
-'2964',2401,82000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'2993',2401,72500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,14100,,'',0,5900,,'',0
-'3011',2401,60700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,14300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2964',2501,94500,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,102900,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'3011',2501,71700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2964',2601,73600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,71700,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'3011',2801,71300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
-'3011',2900,70900,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103302 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103302
deleted file mode 100644
index 620afd827..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103302
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80100,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75500,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103303 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103303
deleted file mode 100644
index 265874297..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103303
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82500,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80400,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114300,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103304 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103304
deleted file mode 100644
index 9663b3377..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103304
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121800,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103305 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103305
deleted file mode 100644
index 41c34f6ee..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103305
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1501,80300,,'',0,73000,,'',0
-'2964',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,60900,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,3000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103306 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103306
deleted file mode 100644
index f53c29399..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103306
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,82200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,63100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103307 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103307
deleted file mode 100644
index 24c99384c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103307
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82600,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80500,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70800,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114400,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103308 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103308
deleted file mode 100644
index e477cd90b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103308
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74800,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,5100,0,'Orchard Pk',0,1900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80100,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64500,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121800,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103309 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103309
deleted file mode 100644
index c92f5f282..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103309
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114400,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103310 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103310
deleted file mode 100644
index c7a27787b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103310
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74700,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,80000,,'',0,4400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64400,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121700,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103312 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103312
deleted file mode 100644
index 803d23487..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103312
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64200,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,71900,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61700,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',1000,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,65200,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103313 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103313
deleted file mode 100644
index 4d80272ac..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103313
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82700,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80600,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70900,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114500,,'',0,77800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103316 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103316
deleted file mode 100644
index 4c2b3cde2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103316
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80300,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103317 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103317
deleted file mode 100644
index 84742b0e3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103317
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103319 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103319
deleted file mode 100644
index ea3c42a7f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103319
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103321 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103321
deleted file mode 100644
index 2f907d86a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103321
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,62600,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,62600,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60700,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',1001,75800,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0
-'3011',1001,55800,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,1700,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,8300,,'',0,4400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103322 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103322
deleted file mode 100644
index d920dcd25..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103322
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,84200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54300,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103323 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103323
deleted file mode 100644
index 4b8e27d0d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103323
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,94700,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1201,92000,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71500,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103324 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103324
deleted file mode 100644
index 132da8ed5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103324
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,93700,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,91000,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70600,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,39800,,'',0,4400,,'',0,8500,,'',0,8200,,'',0,8600,,'',0,21500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103325 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103325
deleted file mode 100644
index 2e5e20d70..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103325
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,3000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103326 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103326
deleted file mode 100644
index 795f76487..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103326
+++ /dev/null
@@ -1,2 +0,0 @@
-'3011',1400,121000,,'',0,73800,,'',0
-'3011',1401,63500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103327 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103327
deleted file mode 100644
index b707c7ba4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103327
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1000,84900,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3700,4,'',0,6900,4,'',0,9900,4,'',0,9900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2964',1001,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1000,91200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0
-'2993',1001,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1000,55000,4,'',0,7200,4,'',0,1800,4,'',0,6300,4,'',0,2000,4,'',0,1900,4,'',0,6100,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,1800,4,'',0,1900,4,'',0,6800,4,'',0,3000,4,'',0,7300,4,'',0,2900,4,'',0,7100,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,1900,4,'',0,1900,4,'',0,6200,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1700,4,'',0,1500,4,'',0,6600,4,'',0,4300,4,'',0,8400,4,'',0,8400,4,'',0,8500,4,'',0,4100,4,'',0,8500,4,'',0,8300,4,'',0,4500,4,'',0,8500,4,'',0
-'3011',1001,55000,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103328 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103328
deleted file mode 100644
index e42d64fae..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103328
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2501,94600,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103000,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'3011',2501,71800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2964',2601,73700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,71800,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103329 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103329
deleted file mode 100644
index b3e355da1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103329
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2500,93600,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,102100,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,80300,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2964',2600,74200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,110800,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,60400,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103331 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103331
deleted file mode 100644
index 9148970ac..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103331
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74600,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75900,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64300,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121600,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103334 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103334
deleted file mode 100644
index 6256fc0c5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103334
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82800,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80700,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71000,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114500,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103335 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103335
deleted file mode 100644
index e53fe57fe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103335
+++ /dev/null
@@ -1,2 +0,0 @@
-'3011',1400,121100,,'',0,73800,,'',0
-'3011',1401,63600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103337 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103337
deleted file mode 100644
index 84742b0e3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103337
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,62200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103340 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103340
deleted file mode 100644
index 75b616b8c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103340
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103342 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103342
deleted file mode 100644
index 2155687b7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103342
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',101,75600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,5800,,'',0,10000,,'',0,10000,,'',0,9600,,'',0
-'2993',101,75600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61800,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103343 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103343
deleted file mode 100644
index f016420ea..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103343
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75200,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55000,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103344 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103344
deleted file mode 100644
index a8a6ae741..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103344
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54300,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103346 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103346
deleted file mode 100644
index b9b69630a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103346
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74500,,'',0,7700,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,6900,,'',0,3000,,'',0,15500,,'',0,4100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75800,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,5100,0,'Orchard Pk',0,4900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64200,,'',0,8600,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121600,,'',0,73600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103347 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103347
deleted file mode 100644
index 32916a738..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103347
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,62100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103348 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103348
deleted file mode 100644
index 2c97031ec..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103348
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,93800,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,91100,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70600,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103349 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103349
deleted file mode 100644
index ac182200b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103349
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,94600,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1201,91900,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71400,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103351 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103351
deleted file mode 100644
index 31d14578e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103351
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,80000,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75400,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63500,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103354 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103354
deleted file mode 100644
index a959ddcc3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103354
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,84100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54200,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103355 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103355
deleted file mode 100644
index ed2c9266a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103355
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103357 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103357
deleted file mode 100644
index 5d96582e6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103357
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,82900,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,80800,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71100,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114600,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103359 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103359
deleted file mode 100644
index f462176ca..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103359
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65400,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,82300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,63200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103360 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103360
deleted file mode 100644
index 27acc3f7f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103360
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55100,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,1900,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103361 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103361
deleted file mode 100644
index 449676b02..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103361
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121300,,'',0,73800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103363 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103363
deleted file mode 100644
index 81ad0f523..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103363
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74300,,'',0,7500,0,'Orchard Pk',0,400,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,700,0,'Orchard Pk',0,6300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,900,0,'Orchard Pk',0,6100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,700,0,'Orchard Pk',0,2300,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75600,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121300,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103364 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103364
deleted file mode 100644
index 264ecd48f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103364
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74300,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8100,0,'Orchard Pk',0,6400,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75600,,'',0,8400,0,'Orchard Pk',0,10800,,'',0,10000,,'',0,5600,0,'Orchard Pk',0,4400,,'',0,10000,,'',0,100,0,'Orchard Pk',0,9900,,'',0,8600,0,'Orchard Pk',0,1400,,'',0,10000,,'',0,10000,,'',0,1100,0,'Orchard Pk',0,8900,,'',0,10000,,'',0,7600,0,'Orchard Pk',0,2400,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64000,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121400,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103365 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103365
deleted file mode 100644
index ad7599ddc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103365
+++ /dev/null
@@ -1,11 +0,0 @@
-'2964',801,72500,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,72400,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60500,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,1800,,'',0,5600,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2964',1101,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121300,,'',0,73700,,'',0
-'3011',1401,63900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103366 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103366
deleted file mode 100644
index cefb85e71..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103366
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74500,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,15500,,'',0,4000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75800,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,5000,0,'Orchard Pk',0,5000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64200,,'',0,8600,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121500,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103367 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103367
deleted file mode 100644
index 1d8568b79..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103367
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,83000,,'',0,7000,,'',0,2200,0,'Black Mtn',0,800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1400,0,'Black Mtn',0,5600,,'',0,3000,,'',0,7000,,'',0,1900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,6100,0,'Black Mtn',0,4400,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,80900,0,'Black Mtn',0,12600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,6900,0,'Black Mtn',0,3100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114700,,'',0,77800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103368 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103368
deleted file mode 100644
index f25873a40..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103368
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80700,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103369 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103369
deleted file mode 100644
index a604b9cb6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103369
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1101,74400,,'',0,7600,0,'Orchard Pk',0,300,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,1100,0,'Orchard Pk',0,5900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,800,0,'Orchard Pk',0,6200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1000,0,'Orchard Pk',0,6000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,800,0,'Orchard Pk',0,2200,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,8000,0,'Orchard Pk',0,6500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75700,,'',0,8300,0,'Orchard Pk',0,10900,,'',0,10000,,'',0,5500,0,'Orchard Pk',0,4500,,'',0,10000,0,'Orchard Pk',0,10000,,'',0,8500,0,'Orchard Pk',0,1500,,'',0,10000,,'',0,10000,,'',0,1000,0,'Orchard Pk',0,9000,,'',0,10000,,'',0,7500,0,'Orchard Pk',0,2500,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,64100,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121400,,'',0,73700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103370 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103370
deleted file mode 100644
index 42b136571..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103370
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,72500,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2964',1001,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2964',1101,74200,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103372 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103372
deleted file mode 100644
index 95c1cce0c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103372
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',1100,83000,,'',0,7000,,'',0,2300,0,'Black Mtn',0,700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,0,'Black Mtn',0,5500,,'',0,3000,,'',0,7000,,'',0,2000,0,'Black Mtn',0,1000,,'',0,11500,,'',0,6200,0,'Black Mtn',0,4300,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,81000,0,'Black Mtn',0,12500,,'',0,10000,0,'Black Mtn',0,10000,,'',0,8500,0,'Black Mtn',0,1500,,'',0,10000,,'',0,7000,0,'Black Mtn',0,3000,,'',0,10000,,'',0,9500,0,'Black Mtn',0,500,,'',0,10000,,'',0,10000,,'',0,2000,0,'Black Mtn',0,8000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71200,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
-'3011',1401,114700,,'',0,77900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103373 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103373
deleted file mode 100644
index 7f46b0b83..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103373
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,72100,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61900,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',1000,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54100,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1600,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103375 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103375
deleted file mode 100644
index 05bd97f9b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103375
+++ /dev/null
@@ -1,2 +0,0 @@
-'3011',1400,121200,,'',0,73700,,'',0
-'3011',1401,63700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103376 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103376
deleted file mode 100644
index aa64518ce..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103376
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64400,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,72100,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61900,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',1000,84000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54200,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103377 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103377
deleted file mode 100644
index 019c2326e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103377
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',801,72400,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60400,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55500,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,1800,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2964',1101,74100,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75400,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,63800,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103378 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103378
deleted file mode 100644
index e815bf49e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103378
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',1100,92500,4,'',0,19700,4,'',0,30000,4,'',0,22500,4,'',0,17500,4,'',0,18700,4,'',0
-'2993',1100,81200,4,'',0,22500,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,22500,4,'',0
-'2964',1401,75300,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,81500,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,22500,,'',0
-'3011',1401,64000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103379 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103379
deleted file mode 100644
index 9eb8fefa8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103379
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2500,93400,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,101900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,80100,,'',0,5100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2964',2600,74000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,110600,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,60300,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103380 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103380
deleted file mode 100644
index df73418c4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103380
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',801,72400,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60400,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55400,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,1900,,'',0,1700,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2964',1101,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103381 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103381
deleted file mode 100644
index 4862ee3e0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103381
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2501,94700,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103100,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'3011',2501,71900,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2964',2601,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61300,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103382 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103382
deleted file mode 100644
index 5ffeb20de..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103382
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',801,72400,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,72300,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60400,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75500,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55400,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,1800,,'',0,1700,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2964',1101,74000,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,14500,,'',0,10000,,'',0,10000,,'',0,11000,0,'Orchard Pk',0
-'2993',1101,75300,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,63700,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103383 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103383
deleted file mode 100644
index 0f98bc2d3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103383
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,93600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71300,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103384 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103384
deleted file mode 100644
index cff55ddd7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103384
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,64600,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72300,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,62100,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103385 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103385
deleted file mode 100644
index 01977b2a0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103385
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,72300,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,72200,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60300,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75400,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55300,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,1900,,'',0,1700,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103387 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103387
deleted file mode 100644
index 77bd03fe6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103387
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55200,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,1900,,'',0,1800,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103388 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103388
deleted file mode 100644
index 1a7b70b56..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103388
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,93100,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,101600,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75800,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103389 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103389
deleted file mode 100644
index 0c1a99728..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103389
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,94900,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103300,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103392 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103392
deleted file mode 100644
index 0ea16dc84..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103392
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',801,72300,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,72200,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60300,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',1001,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,6900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,0,'North Rutland',0
-'2993',1001,75300,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55200,,'',0,7200,,'',0,1800,,'',0,6300,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,1900,,'',0,1800,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1500,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8500,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103393 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103393
deleted file mode 100644
index 61d6dc621..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103393
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2600,73900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,110500,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,60200,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,17400,,'',0,4000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103395 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103395
deleted file mode 100644
index 27eed5d7b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103395
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2601,73800,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,71900,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61400,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103396 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103396
deleted file mode 100644
index 8392a4781..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103396
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',1001,250900,0,'North Rutland',0
-'2993',1001,231900,0,'Rutland Exch',0
-'2964',1101,73900,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'2993',1101,75200,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,63600,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103399 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103399
deleted file mode 100644
index 5f7849805..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103399
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,94500,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1201,91800,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71300,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103401 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103401
deleted file mode 100644
index f25873a40..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103401
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80700,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103403 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103403
deleted file mode 100644
index 9064e0f30..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103403
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,93000,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,101500,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103405 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103405
deleted file mode 100644
index 5174418cd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103405
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103406 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103406
deleted file mode 100644
index d95e6419f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103406
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,93900,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,91200,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70700,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103407 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103407
deleted file mode 100644
index a1ec9d677..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103407
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103408 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103408
deleted file mode 100644
index 20cf0971a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103408
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103410 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103410
deleted file mode 100644
index d679cbc6e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103410
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103411 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103411
deleted file mode 100644
index 5174418cd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103411
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,93700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71400,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103412 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103412
deleted file mode 100644
index d679cbc6e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103412
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,93800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71500,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103414 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103414
deleted file mode 100644
index afdd352cf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103414
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,75400,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,81600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,64100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103416 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103416
deleted file mode 100644
index a822ccf4c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103416
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',1001,250800,0,'North Rutland',0
-'2993',1001,231800,0,'Rutland Exch',0
-'2964',1101,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'2993',1101,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103417 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103417
deleted file mode 100644
index 577a463ea..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103417
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65500,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2993',2001,82400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,63300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103418 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103418
deleted file mode 100644
index b84ac1632..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103418
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75900,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,14400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75300,,'',0,10300,,'',0,14400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103419 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103419
deleted file mode 100644
index 293b7aaca..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103419
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1201,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103420 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103420
deleted file mode 100644
index a8442be4e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103420
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103421 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103421
deleted file mode 100644
index aff9211e9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103421
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,93900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,71600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103422 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103422
deleted file mode 100644
index 3edeffd6f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103422
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92900,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,101400,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103423 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103423
deleted file mode 100644
index 6776a4a48..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103423
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80800,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103424 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103424
deleted file mode 100644
index ac711fd5f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103424
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,81200,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103425 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103425
deleted file mode 100644
index fe85106dc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103425
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,141700,0,'Old Vernon Rd',0
-'3011',2300,143600,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103426 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103426
deleted file mode 100644
index 1e6cdde44..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103426
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,94100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
-'3011',1100,71800,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103427 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103427
deleted file mode 100644
index a1ec9d677..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103427
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95000,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103400,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103428 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103428
deleted file mode 100644
index 4604ebe76..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103428
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,94000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
-'3011',1100,71700,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103429 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103429
deleted file mode 100644
index 641b7574d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103429
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,10000,,'',0
-'2993',1100,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,,'',0,11500,,'',0
-'3011',1100,72000,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103430 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103430
deleted file mode 100644
index f60000c59..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103430
+++ /dev/null
@@ -1,8 +0,0 @@
-'2964',1001,250800,0,'North Rutland',0
-'2993',1001,231800,0,'Rutland Exch',0
-'2964',1100,83800,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,11500,4,'',0,10500,4,'',0,10000,4,'',0,10000,4,'',0,15000,4,'',0,10000,4,'',0
-'2964',1101,73800,,'',0,7900,,'',0,2100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11500,,'',0,10500,,'',0,10000,,'',0,10000,,'',0,15000,0,'Orchard Pk',0
-'2993',1100,94300,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,16000,4,'',0,11500,4,'',0
-'2993',1101,75100,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1100,72100,4,'',0,3200,4,'',0,5500,4,'',0,1500,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7100,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,8000,4,'',0,7000,4,'',0,10000,4,'',0,12000,4,'',0
-'3011',1101,63500,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103432 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103432
deleted file mode 100644
index 457eb2474..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103432
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103433 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103433
deleted file mode 100644
index 293b7aaca..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103433
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,94400,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1201,91700,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71200,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103434 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103434
deleted file mode 100644
index 0aa9c2c26..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103434
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2600,73700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,17600,,'',0,12300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,110300,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,60000,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103435 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103435
deleted file mode 100644
index 1d8209b65..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103435
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2601,74000,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,72100,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61600,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103436 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103436
deleted file mode 100644
index a8442be4e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103436
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,94000,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,91300,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70800,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103439 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103439
deleted file mode 100644
index cb8439b72..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103439
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103440 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103440
deleted file mode 100644
index 0b2984a57..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103440
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,81100,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103441 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103441
deleted file mode 100644
index d529bf66a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103441
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80900,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103444 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103444
deleted file mode 100644
index d529bf66a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103444
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,80900,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103445 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103445
deleted file mode 100644
index 116f73e17..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103445
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103446 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103446
deleted file mode 100644
index d8b858d92..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103446
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,75600,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,81800,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,64300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103447 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103447
deleted file mode 100644
index 83bf73037..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103447
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92700,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,101200,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103448 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103448
deleted file mode 100644
index cd4248f63..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103448
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,81000,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,83200,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,65700,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103450 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103450
deleted file mode 100644
index c74e5a532..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103450
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103600,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103451 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103451
deleted file mode 100644
index 2f3805e5b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103451
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103452 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103452
deleted file mode 100644
index 35de94b1b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103452
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75800,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75200,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63300,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103457 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103457
deleted file mode 100644
index 5bf0cef57..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103457
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1200,65700,,'',0,8100,,'',0,8000,,'',0,63500,,'',0,8400,,'',0,8500,,'',0,8400,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103458 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103458
deleted file mode 100644
index b8713f1b6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103458
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,94100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,91400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70900,,'',0,4100,,'',0,8000,,'',0,28000,,'',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103459 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103459
deleted file mode 100644
index c045995c9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103459
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2600,73500,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,110100,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55800,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103460 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103460
deleted file mode 100644
index 062b0057f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103460
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2993',2001,82500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,63400,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103461 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103461
deleted file mode 100644
index d0c3c68a6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103461
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,94300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1201,91600,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,71100,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103462 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103462
deleted file mode 100644
index 81153ca25..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103462
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2601,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103463 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103463
deleted file mode 100644
index 240a9bd10..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103463
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92500,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,101000,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75200,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103464 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103464
deleted file mode 100644
index def219099..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103464
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,81000,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103465 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103465
deleted file mode 100644
index 1aa18f7fc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103465
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103467 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103467
deleted file mode 100644
index 159413447..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103467
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103469 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103469
deleted file mode 100644
index d99785d14..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103469
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103470 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103470
deleted file mode 100644
index 0b2984a57..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103470
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,81100,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103471 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103471
deleted file mode 100644
index d99785d14..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103471
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82900,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73400,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61600,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103472 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103472
deleted file mode 100644
index 1eb2c00be..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103472
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2300,71400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,80800,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,52800,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'3011',3200,65700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,47300,,'',0,2700,4,'',0,4800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,800,,'',0,2700,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103473 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103473
deleted file mode 100644
index 9d4f2edcb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103473
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2600,73400,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,110000,,'',0,22800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103474 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103474
deleted file mode 100644
index 97f2b9012..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103474
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65700,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2993',2001,82600,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,14100,,'',0
-'3011',2001,63500,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,14400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103477 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103477
deleted file mode 100644
index dd8611c08..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103477
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,81200,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,83400,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,65900,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103478 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103478
deleted file mode 100644
index 666d05cbe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103478
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,101200,0,'Old Vernon Rd',0
-'3011',2301,74800,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103480 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103480
deleted file mode 100644
index 38248cd9b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103480
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,141900,0,'Old Vernon Rd',0
-'3011',2300,143700,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103481 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103481
deleted file mode 100644
index 2aa6fd3d2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103481
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,83000,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73500,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61700,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103482 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103482
deleted file mode 100644
index aa1b80234..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103482
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,81300,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,83500,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,70000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,30900,,'',0,32100,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103483 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103483
deleted file mode 100644
index 0a77b2fe1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103483
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'2993',2500,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103484 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103484
deleted file mode 100644
index 159413447..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103484
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75700,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75100,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63200,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103485 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103485
deleted file mode 100644
index c4d36776a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103485
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103486 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103486
deleted file mode 100644
index d511def95..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103486
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2993',2001,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'3011',2001,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103489 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103489
deleted file mode 100644
index aeabc12e7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103489
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1200,94200,4,'',0,7600,4,'',0,21300,4,'',0,30000,4,'',0,8000,4,'',0,4000,4,'',0,46500,4,'',0
-'2964',1201,94200,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,46500,0,'Orchard Pk',0
-'2993',1200,91500,4,'',0,3700,4,'',0,18900,4,'',0,18700,4,'',0,18300,4,'',0,4000,4,'',0,18800,4,'',0,8100,4,'',0
-'2993',1201,91500,0,'Orchard Pk',0,3700,0,'Orchard Pk',0,18900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,4000,0,'Orchard Pk',0,18800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1200,71000,4,'',0,4100,4,'',0,8000,4,'',0,28000,4,'',0,39800,4,'',0,4400,4,'',0,8400,4,'',0,8200,4,'',0,8600,4,'',0,21600,4,'',0
-'3011',1201,71000,,'',0,4100,,'',0,8000,,'',0,28000,0,'Orchard Pk',0,39800,,'',0,4400,,'',0,8400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103490 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103490
deleted file mode 100644
index d2231ca30..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103490
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,75800,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,82000,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,64500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103491 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103491
deleted file mode 100644
index 421bc9d56..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103491
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65800,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2993',2001,82700,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'3011',2001,63600,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103492 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103492
deleted file mode 100644
index 0140f8383..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103492
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103493 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103493
deleted file mode 100644
index 508327802..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103493
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103495 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103495
deleted file mode 100644
index f4496e425..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103495
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73600,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103497 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103497
deleted file mode 100644
index 49e1d70ae..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103497
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95800,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,104200,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'3011',2501,73000,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103500 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103500
deleted file mode 100644
index 0140f8383..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103500
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103501 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103501
deleted file mode 100644
index e14c03feb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103501
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,80800,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,83000,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,65500,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103502 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103502
deleted file mode 100644
index be3c789c6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103502
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2600,73300,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,105900,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55600,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103503 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103503
deleted file mode 100644
index b0764b4f6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103503
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,101100,0,'Old Vernon Rd',0
-'3011',2301,74700,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103505 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103505
deleted file mode 100644
index d35e80980..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103505
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2601,74300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,72400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61900,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103506 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103506
deleted file mode 100644
index 76a4ee850..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103506
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,141900,0,'Old Vernon Rd',0
-'3011',2300,143800,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103508 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103508
deleted file mode 100644
index 0a77b2fe1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103508
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92300,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'2993',2500,100800,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75000,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103509 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103509
deleted file mode 100644
index c4d36776a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103509
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95500,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,103900,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72700,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103510 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103510
deleted file mode 100644
index 8640c046b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103510
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2993',2001,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'3011',2001,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103511 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103511
deleted file mode 100644
index 9b001474a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103511
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95900,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,104300,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'3011',2501,73100,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103513 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103513
deleted file mode 100644
index 8e3e670b1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103513
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,83100,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,14100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61800,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103515 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103515
deleted file mode 100644
index ae6bc54b3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103515
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103516 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103516
deleted file mode 100644
index 244a62a49..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103516
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,71900,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81100,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55000,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103518 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103518
deleted file mode 100644
index 94f2e5fcf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103518
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,65900,,'',0,14300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2993',2001,82800,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'3011',2001,63700,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103519 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103519
deleted file mode 100644
index 0140f8383..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103519
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103520 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103520
deleted file mode 100644
index 54465a1e4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103520
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103521 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103521
deleted file mode 100644
index 90a9e13fe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103521
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,80700,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,82900,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,65400,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103522 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103522
deleted file mode 100644
index d7b4242f8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103522
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7600,,'',0,2500,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103523 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103523
deleted file mode 100644
index 2c5144288..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103523
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103524 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103524
deleted file mode 100644
index 2d2daf777..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103524
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,80000,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,82200,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,64700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103525 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103525
deleted file mode 100644
index 41e67426b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103525
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95600,,'',0,17200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,104000,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72800,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103526 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103526
deleted file mode 100644
index bbbb1e0e3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103526
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,80600,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,82800,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,65300,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103527 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103527
deleted file mode 100644
index fc42653b9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103527
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92200,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,44300,,'',0
-'2993',2500,100700,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'3011',2500,74900,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103528 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103528
deleted file mode 100644
index fd5bda285..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103528
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2600,73200,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,105800,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55500,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,7700,,'',0,11900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103529 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103529
deleted file mode 100644
index 0140f8383..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103529
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75600,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,75000,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,63100,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103531 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103531
deleted file mode 100644
index ae6bc54b3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103531
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,75900,,'',0,17500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,82100,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,64600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103532 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103532
deleted file mode 100644
index 2197fb449..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103532
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2993',2001,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'3011',2001,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103533 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103533
deleted file mode 100644
index 381fc7ded..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103533
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103535 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103535
deleted file mode 100644
index 9cf641f8b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103535
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,100000,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,104400,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'3011',2501,73200,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103537 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103537
deleted file mode 100644
index 35a3f8ae8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103537
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2993',2500,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'3011',2500,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103538 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103538
deleted file mode 100644
index 8c699460c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103538
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,80400,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,26500,,'',0,13500,,'',0,18700,,'',0
-'2993',1401,82600,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,34900,,'',0,32100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103539 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103539
deleted file mode 100644
index 97fb0639b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103539
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,80100,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,82300,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103540 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103540
deleted file mode 100644
index 03e27038e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103540
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103541 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103541
deleted file mode 100644
index a45617e33..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103541
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2400,71800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,54900,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2964',2600,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103542 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103542
deleted file mode 100644
index f0bfb3c40..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103542
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2401,83200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2964',2601,74400,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2993',2601,72500,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,62000,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103547 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103547
deleted file mode 100644
index 43658c109..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103547
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,100800,0,'Old Vernon Rd',0
-'3011',2301,74500,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103548 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103548
deleted file mode 100644
index 8a2312139..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103548
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,142200,0,'Old Vernon Rd',0
-'3011',2300,144000,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103550 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103550
deleted file mode 100644
index 0be46dcf4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103550
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1401,80200,,'',0,13500,,'',0,19700,,'',0,30000,,'',0,22500,,'',0,17500,,'',0,18700,,'',0
-'2993',1401,82400,,'',0,22400,,'',0,18500,,'',0,18500,,'',0,22500,,'',0,26500,,'',0
-'3011',1401,64900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,30900,,'',0,36100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103551 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103551
deleted file mode 100644
index d22287a0c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103551
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2400,71700,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,80900,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,54800,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2964',2600,73100,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,105700,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55400,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103552 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103552
deleted file mode 100644
index ec16e6a36..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103552
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2401,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2964',2601,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2993',2601,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103553 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103553
deleted file mode 100644
index e6223b734..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103553
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,70000,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2993',2001,82900,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,5900,,'',0,10000,,'',0,14300,,'',0,10100,,'',0
-'3011',2001,63800,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103554 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103554
deleted file mode 100644
index 00dbd22fe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103554
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2993',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'3011',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103556 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103556
deleted file mode 100644
index 7695fa84b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103556
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2401,83300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,14200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,62000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2964',2601,74500,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2993',2601,72600,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,62100,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103557 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103557
deleted file mode 100644
index 3eb046ebd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103557
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',1400,80500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,19700,0,'Rutland Exch',0,30000,0,'Rutland Exch',0,26500,0,'Rutland Exch',0,13500,0,'Rutland Exch',0,18700,0,'Rutland Exch',0
-'2964',1401,80500,4,'',0,13500,4,'',0,19700,4,'',0,30000,4,'',0,26500,4,'',0,13500,4,'',0,18700,4,'',0
-'2993',1400,82700,0,'Rutland Exch',0,22400,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,18500,0,'Rutland Exch',0,22500,0,'Rutland Exch',0,26500,0,'Rutland Exch',0
-'2993',1401,82700,4,'',0,22400,4,'',0,18500,4,'',0,18500,4,'',0,22500,4,'',0,26500,4,'',0
-'3011',1400,65200,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,34900,,'',0,32100,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,3000,0,'Rutland Exch',0,7000,0,'Rutland Exch',0,21700,,'',0
-'3011',1401,65200,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,34900,4,'',0,32100,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,21700,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103561 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103561
deleted file mode 100644
index 3b3b2273b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103561
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,142200,0,'Old Vernon Rd',0
-'3011',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103562 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103562
deleted file mode 100644
index 03e27038e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103562
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103563 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103563
deleted file mode 100644
index e2c86ee95..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103563
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2400,71600,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,80800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,54700,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2964',2600,73000,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,105600,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55300,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103564 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103564
deleted file mode 100644
index fbf988994..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103564
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,100800,0,'Old Vernon Rd',0
-'3011',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103565 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103565
deleted file mode 100644
index 4fbf2459d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103565
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',2401,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2964',2501,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'3011',2501,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2964',2601,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2993',2601,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103566 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103566
deleted file mode 100644
index 6f32bdd98..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103566
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,70100,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14900,,'',0,10000,,'',0
-'2993',2001,83000,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,63900,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103569 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103569
deleted file mode 100644
index f70dce4b3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103569
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,70500,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
-'3011',2300,55600,,'',0,7500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103573 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103573
deleted file mode 100644
index d61101660..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103573
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103574 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103574
deleted file mode 100644
index baa59e1a1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103574
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,94200,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9700,,'',0,10000,,'',0,19400,,'',0
-'3011',2301,55700,,'',0,7700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103575 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103575
deleted file mode 100644
index 8a80055bf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103575
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',2401,83400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,74000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,62100,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2964',2501,100200,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,104600,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'3011',2501,73400,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
-'2964',2601,74600,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2993',2601,72700,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,62200,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103576 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103576
deleted file mode 100644
index 75c7b2226..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103576
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,142300,0,'Old Vernon Rd',0
-'3011',2300,144100,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103577 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103577
deleted file mode 100644
index 4d7dc2cc2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103577
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,100700,0,'Old Vernon Rd',0
-'3011',2301,74400,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103579 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103579
deleted file mode 100644
index f18cd1515..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103579
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,70400,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
-'2993',2001,83300,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,64200,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103580 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103580
deleted file mode 100644
index c75cbfa7d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103580
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103581 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103581
deleted file mode 100644
index c75cbfa7d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103581
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75300,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,74700,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,62800,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103582 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103582
deleted file mode 100644
index 27efb9836..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103582
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,70300,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2993',2001,83200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,64100,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103584 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103584
deleted file mode 100644
index b63e2a52b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103584
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',2400,71500,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,80700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,54600,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2964',2500,91700,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2993',2500,100200,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'3011',2500,74400,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2964',2600,72900,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,105500,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55200,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103585 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103585
deleted file mode 100644
index d61101660..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103585
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103586 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103586
deleted file mode 100644
index 4b52ed399..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103586
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75400,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,74800,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,62900,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103589 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103589
deleted file mode 100644
index dd66beeca..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103589
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72700,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103590 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103590
deleted file mode 100644
index b0d53b633..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103590
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,70200,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,14800,,'',0,10000,,'',0
-'2993',2001,83100,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,64000,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,14600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,11600,,'',0,15600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103593 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103593
deleted file mode 100644
index 5ce498bbe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103593
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',2401,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2964',2501,100300,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,104700,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'3011',2501,73500,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2964',2601,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2993',2601,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103594 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103594
deleted file mode 100644
index 4ac0f67b4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103594
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,73000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103595 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103595
deleted file mode 100644
index f606e416f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103595
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',2400,71400,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,80600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,54500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'2964',2500,91600,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2993',2500,100100,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'3011',2500,74300,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'2964',2600,72800,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2993',2600,105400,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'3011',2600,55100,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103596 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103596
deleted file mode 100644
index 7e822647f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103596
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2000,75200,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,14700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,74600,,'',0,10300,,'',0,10400,,'',0,14700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,62700,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103597 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103597
deleted file mode 100644
index 817d246dc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103597
+++ /dev/null
@@ -1,12 +0,0 @@
-'2964',2001,70500,,'',0,10300,,'',0,11400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,15000,,'',0,10800,,'',0,10000,,'',0
-'2993',2001,83400,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,14800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,64300,,'',0,7200,,'',0,10400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,14200,,'',0,10600,,'',0,10400,,'',0,11100,,'',0,3700,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,11900,,'',0,8900,,'',0,15600,,'',0,11600,,'',0
-'2964',2401,83500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,74100,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,62200,,'',0,10400,,'',0,3200,,'',0,14300,,'',0,3400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
-'2964',2501,100400,,'',0,13200,,'',0,17300,,'',0,14100,,'',0,39100,,'',0
-'2993',2501,104800,,'',0,26800,,'',0,29100,,'',0,22900,,'',0
-'3011',2501,73600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,17700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
-'2964',2601,74700,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,7000,,'',0,13500,,'',0
-'2993',2601,72800,,'',0,7400,,'',0,32400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,62300,,'',0,7700,,'',0,3500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103598 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103598
deleted file mode 100644
index 4ac0f67b4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103598
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,73000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103599 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103599
deleted file mode 100644
index b549646be..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103599
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,100600,0,'Old Vernon Rd',0
-'3011',2301,74300,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103600 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103600
deleted file mode 100644
index 233b92d5a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103600
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,142400,0,'Old Vernon Rd',0
-'3011',2300,144200,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103602 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103602
deleted file mode 100644
index 1a96c52b6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103602
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,73100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103604 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103604
deleted file mode 100644
index 2e21d1325..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103604
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,70600,,'',0,10000,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10100,,'',0,29800,,'',0
-'3011',2300,55700,,'',0,7500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103607 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103607
deleted file mode 100644
index 4791f5506..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103607
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'3011',2301,55600,,'',0,7700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103608 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103608
deleted file mode 100644
index c57560210..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103608
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63100,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,3300,,'',0,7300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73300,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55000,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103609 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103609
deleted file mode 100644
index 4791f5506..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103609
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,94100,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,20700,,'',0,7400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'3011',2301,55600,,'',0,7700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103610 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103610
deleted file mode 100644
index dc478e4e7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103610
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,70700,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
-'3011',2300,55800,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103611 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103611
deleted file mode 100644
index b8015b2ab..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103611
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,70700,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,3500,,'',0,6900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,10200,,'',0,9100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,80000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,55800,,'',0,7500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7300,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9800,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103613 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103613
deleted file mode 100644
index 7e6e0eb4f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103613
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,100500,0,'Old Vernon Rd',0
-'3011',2301,74200,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103614 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103614
deleted file mode 100644
index e07b5b79d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103614
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103615 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103615
deleted file mode 100644
index e07b5b79d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103615
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103616 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103616
deleted file mode 100644
index e07b5b79d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103616
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63600,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73800,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55500,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103617 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103617
deleted file mode 100644
index 85200b9f8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103617
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103618 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103618
deleted file mode 100644
index 5b3341948..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103618
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63700,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73900,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55600,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103619 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103619
deleted file mode 100644
index 5fe3bccef..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103619
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,100500,0,'Old Vernon Rd',0
-'3011',2301,74100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103620 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103620
deleted file mode 100644
index 4ea12de21..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103620
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,142600,0,'Old Vernon Rd',0
-'3011',2300,144500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103621 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103621
deleted file mode 100644
index 63895258a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103621
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63200,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,3400,,'',0,14500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73400,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55100,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103622 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103622
deleted file mode 100644
index 854677b70..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103622
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103623 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103623
deleted file mode 100644
index 85200b9f8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103623
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73700,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55400,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103624 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103624
deleted file mode 100644
index 854677b70..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103624
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103625 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103625
deleted file mode 100644
index 457d7f6a6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103625
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,9900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103626 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103626
deleted file mode 100644
index 8fec54dba..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103626
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63900,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74100,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55800,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103627 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103627
deleted file mode 100644
index 7251e20e5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103627
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103628 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103628
deleted file mode 100644
index 8fe513eb0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103628
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64000,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55900,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103629 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103629
deleted file mode 100644
index 854677b70..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103629
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63800,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74000,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,14200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55700,,'',0,7100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103630 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103630
deleted file mode 100644
index 7251e20e5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103630
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73600,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55300,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103631 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103631
deleted file mode 100644
index 9568d20f6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103631
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64400,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60300,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103632 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103632
deleted file mode 100644
index d22485590..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103632
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,63300,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,7000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,73500,,'',0,10500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,14800,,'',0,10300,,'',0,5200,,'',0,15000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,55200,,'',0,7100,,'',0,3200,,'',0,6900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103633 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103633
deleted file mode 100644
index 3eef682bf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103633
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64400,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,60300,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103634 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103634
deleted file mode 100644
index 7e83e9833..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103634
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103636 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103636
deleted file mode 100644
index a110d72ed..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103636
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64500,,'',0,7300,,'',0,3300,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9200,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74700,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10400,,'',0
-'3011',2101,60400,,'',0,3100,,'',0,7200,,'',0,2900,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7300,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103637 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103637
deleted file mode 100644
index c02a46c34..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103637
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,65100,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,75400,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
-'3011',2101,61000,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103638 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103638
deleted file mode 100644
index 1ee1675c4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103638
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64500,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74800,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60400,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103639 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103639
deleted file mode 100644
index 418ef7b76..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103639
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,65000,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,75300,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60900,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103640 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103640
deleted file mode 100644
index 81337cc72..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103640
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64200,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,10300,,'',0,14900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74500,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60100,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,3500,,'',0,10000,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103641 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103641
deleted file mode 100644
index 067ac74bc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103641
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103642 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103642
deleted file mode 100644
index 6fcb7a18a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103642
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64300,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,10600,,'',0,14300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74600,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,5900,,'',0,15500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103643 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103643
deleted file mode 100644
index ef58445fa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103643
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,65300,,'',0,7300,,'',0,7400,,'',0,3300,,'',0,6900,,'',0,4900,,'',0,10600,,'',0,14400,,'',0,10600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10300,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,75600,,'',0,14500,,'',0,10000,,'',0,11300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10200,,'',0
-'3011',2101,61200,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,7400,,'',0,3200,,'',0,7500,,'',0,9800,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103644 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103644
deleted file mode 100644
index abba67261..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103644
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103645 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103645
deleted file mode 100644
index 488c8da91..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103645
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64900,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,75200,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60800,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103646 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103646
deleted file mode 100644
index 067ac74bc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103646
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64600,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,74900,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60500,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103647 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103647
deleted file mode 100644
index cc068cba4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103647
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103648 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103648
deleted file mode 100644
index abba67261..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103648
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64700,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,75000,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60600,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103649 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103649
deleted file mode 100644
index cc068cba4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103649
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2101,64800,,'',0,7300,,'',0,3400,,'',0,7300,,'',0,2900,,'',0,8900,,'',0,10600,,'',0,10400,,'',0,14600,,'',0,10300,,'',0,10900,,'',0,3000,,'',0,7300,,'',0,3300,,'',0,9100,,'',0,7400,,'',0,10400,,'',0,10500,,'',0,10400,,'',0,10300,,'',0
-'2993',2101,75100,,'',0,10500,,'',0,10000,,'',0,15300,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,11000,,'',0,10000,,'',0,10300,,'',0
-'3011',2101,60700,,'',0,3100,,'',0,7200,,'',0,3000,,'',0,8100,,'',0,3200,,'',0,7000,,'',0,9500,,'',0,10500,,'',0,10500,,'',0,10400,,'',0,11000,,'',0,8700,,'',0,2300,,'',0,7200,,'',0,3400,,'',0,7200,,'',0,7500,,'',0,9900,,'',0,11500,,'',0,9800,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103650 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103650
deleted file mode 100644
index f4305aafa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103650
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71100,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,2800,,'',0,6800,,'',0,3300,,'',0,14300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,80400,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,60200,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3700,0,'Old Vernon Rd',0,5400,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3300,0,'Old Vernon Rd',0,1400,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103652 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103652
deleted file mode 100644
index a487d1482..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103652
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2301,73600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,6500,0,'Old Vernon Rd',0,3600,,'',0,6400,,'',0,2500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2301,83100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2301,55000,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103653 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103653
deleted file mode 100644
index 0272f369a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103653
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71200,,'',0,3000,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,2700,,'',0,6900,,'',0,7300,,'',0,10200,,'',0,5100,,'',0,10500,,'',0,15100,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,80500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,60300,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103654 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103654
deleted file mode 100644
index 90fd7bd5d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103654
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71300,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,10400,,'',0,15200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,60400,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103655 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103655
deleted file mode 100644
index e06ec4ad4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103655
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2301,54800,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103656 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103656
deleted file mode 100644
index 865e40f27..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103656
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,94300,,'',0,10100,,'',0,8900,,'',0,22100,,'',0,24700,,'',0,3400,,'',0,9600,,'',0,10000,,'',0,19400,,'',0
-'3011',2301,55800,,'',0,7700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,9100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103657 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103657
deleted file mode 100644
index 8beb8f357..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103657
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2301,73400,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2500,0,'Old Vernon Rd',0,7600,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6600,,'',0,2900,,'',0,7100,,'',0,10400,,'',0,9000,,'',0,10500,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2301,82900,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2301,54800,,'',0,7700,,'',0,7600,,'',0,3100,0,'Old Vernon Rd',0,7500,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5600,0,'Old Vernon Rd',0,3500,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103658 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103658
deleted file mode 100644
index d77e3d6d4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103658
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2300,71400,,'',0,3000,,'',0,7000,,'',0,2700,,'',0,7100,,'',0,2500,,'',0,7600,,'',0,2300,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8100,0,'Old Vernon Rd',0,1900,,'',0,7600,,'',0,7500,,'',0,2900,,'',0,6800,,'',0,2800,,'',0,7300,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,80700,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,60500,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,9900,,'',0,10500,,'',0,10000,,'',0,14800,,'',0
-'3011',3200,65600,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103659 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103659
deleted file mode 100644
index dc1cbeb8a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103659
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,73200,,'',0,7100,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,82600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2300,54600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103660 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103660
deleted file mode 100644
index 68234586c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103660
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2300,73300,4,'',0,7100,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,2600,4,'',0,7500,4,'',0,2400,4,'',0,6500,4,'',0,2500,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7100,4,'',0,4000,4,'',0,6000,4,'',0,3600,4,'',0,7400,4,'',0,3000,4,'',0,6700,4,'',0,2800,4,'',0,7200,4,'',0,10300,4,'',0,9100,4,'',0,10400,4,'',0,11200,4,'',0,10800,4,'',0,11000,4,'',0
-'2964',2301,73300,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3000,,'',0,2600,0,'Old Vernon Rd',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,,'',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,82800,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,14000,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
-'2993',2301,82800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2300,54700,4,'',0,7700,4,'',0,7600,4,'',0,3200,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,1700,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
-'3011',2301,54700,,'',0,7700,,'',0,7600,,'',0,3200,0,'Old Vernon Rd',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,0,'Old Vernon Rd',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103661 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103661
deleted file mode 100644
index b77c3c907..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103661
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2300,71500,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,80900,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,5500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,52900,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
-'3011',3200,70600,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103662 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103662
deleted file mode 100644
index 08f2e542f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103662
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,73100,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,82500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2300,54500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103663 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103663
deleted file mode 100644
index 2186b9a79..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103663
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53000,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103664 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103664
deleted file mode 100644
index 0792dbcce..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103664
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81000,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103665 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103665
deleted file mode 100644
index ca7ce1b5a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103665
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,83600,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81300,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103666 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103666
deleted file mode 100644
index 774c7cf43..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103666
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71700,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,5100,,'',0,14400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81100,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53100,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103667 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103667
deleted file mode 100644
index f312b087b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103667
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,91100,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,84400,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103668 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103668
deleted file mode 100644
index 7ec31345a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103668
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,72900,,'',0,7100,,'',0,3000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,82400,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2300,54300,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103669 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103669
deleted file mode 100644
index fc0aa1154..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103669
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103670 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103670
deleted file mode 100644
index 9a600efaf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103670
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,72900,,'',0,7100,,'',0,2900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2300,54300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103671 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103671
deleted file mode 100644
index c6d86b076..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103671
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,91000,,'',0,10800,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62700,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103672 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103672
deleted file mode 100644
index fc0aa1154..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103672
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,83700,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81400,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,60700,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9100,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103673 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103673
deleted file mode 100644
index 98d8084ab..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103673
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81200,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103674 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103674
deleted file mode 100644
index c0cca3572..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103674
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,72800,,'',0,3100,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2800,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,82300,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2300,54200,,'',0,7700,,'',0,3600,,'',0,7200,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2800,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103675 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103675
deleted file mode 100644
index 3d4393461..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103675
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,90900,,'',0,10900,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,84300,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62600,,'',0,2800,,'',0,9600,,'',0,9600,,'',0,17500,,'',0,10000,,'',0,13100,,'',0,10000,,'',0,17100,,'',0,17700,,'',0,5300,,'',0,9200,,'',0,17400,,'',0,13700,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103676 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103676
deleted file mode 100644
index 4b586c779..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103676
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53300,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3800,0,'Old Vernon Rd',0,5300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103677 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103677
deleted file mode 100644
index 002dba665..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103677
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,72800,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,82200,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2300,54200,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103678 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103678
deleted file mode 100644
index 5d975e0ab..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103678
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,71900,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,8000,0,'Old Vernon Rd',0,2000,,'',0,7600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81300,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53300,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,1300,,'',0,6100,,'',0,2900,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,14500,,'',0,10000,,'',0,10700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103679 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103679
deleted file mode 100644
index 746c0944a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103679
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53600,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
-'3011',3200,70900,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103680 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103680
deleted file mode 100644
index 1c1a5788e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103680
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,70500,,'',0,9900,,'',0,9800,,'',0,10100,,'',0,55100,,'',0,9700,,'',0,10200,,'',0,29800,,'',0
-'3011',2300,55600,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103681 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103681
deleted file mode 100644
index 51fe39117..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103681
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,72200,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53600,,'',0,7700,,'',0,3500,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103682 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103682
deleted file mode 100644
index 3dbcdd7c6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103682
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,83800,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81500,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,72200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103683 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103683
deleted file mode 100644
index 83a6bf324..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103683
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,72100,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53500,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103684 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103684
deleted file mode 100644
index 81a0c5354..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103684
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,72000,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81400,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,5400,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53400,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103685 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103685
deleted file mode 100644
index 5f9ecb721..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103685
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2300,72400,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,81800,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,53800,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
-'3011',3200,71000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103686 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103686
deleted file mode 100644
index 2f3648a2a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103686
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2200,90500,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2964',2201,83900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2200,84100,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2993',2201,81600,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,65300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0
-'3011',2201,72300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103688 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103688
deleted file mode 100644
index 6760dead3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103688
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2300,72600,,'',0,3100,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2600,,'',0,7500,,'',0,2400,,'',0,6500,,'',0,2500,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7100,,'',0,4000,0,'Old Vernon Rd',0,6000,,'',0,3600,,'',0,7400,,'',0,3000,,'',0,6700,,'',0,2900,,'',0,7200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,82000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,14000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9500,,'',0,9400,,'',0,5500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,54000,,'',0,7700,,'',0,3600,,'',0,7100,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7800,0,'Old Vernon Rd',0,1300,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,0,'Old Vernon Rd',0,5300,,'',0,2100,,'',0,2900,,'',0,7500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103689 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103689
deleted file mode 100644
index 349a5b38f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103689
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84000,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81700,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,72400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103690 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103690
deleted file mode 100644
index 37754b24d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103690
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,90500,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,84100,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62500,,'',0,2800,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103691 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103691
deleted file mode 100644
index e9a2f22b8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103691
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84100,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81800,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103692 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103692
deleted file mode 100644
index b50d8b4e1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103692
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,90300,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83900,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62400,,'',0,2700,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103693 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103693
deleted file mode 100644
index b8191f8ce..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103693
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84100,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,72500,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103694 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103694
deleted file mode 100644
index e5ba23971..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103694
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84200,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9700,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81900,,'',0,9600,,'',0,22800,,'',0,26900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103695 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103695
deleted file mode 100644
index 43dfeb0bc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103695
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,90100,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83700,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62400,,'',0,2500,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103700 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103700
deleted file mode 100644
index 7b6f08124..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103700
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85900,,'',0,15100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83500,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62300,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103701 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103701
deleted file mode 100644
index 670288216..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103701
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,72700,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103702 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103702
deleted file mode 100644
index 58c8a66b6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103702
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84300,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,82000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9200,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103703 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103703
deleted file mode 100644
index c59add649..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103703
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85800,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,9700,,'',0,13000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62200,,'',0,2300,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103704 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103704
deleted file mode 100644
index d190b5cd0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103704
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103705 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103705
deleted file mode 100644
index 3c8461110..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103705
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84400,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,82100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17600,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103706 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103706
deleted file mode 100644
index a9fb72602..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103706
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85700,,'',0,15100,,'',0,10000,,'',0,19400,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62200,,'',0,2300,,'',0,9500,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103707 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103707
deleted file mode 100644
index a1afafdd2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103707
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85700,,'',0,15100,,'',0,10000,,'',0,19300,,'',0,5700,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,17800,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62100,,'',0,2300,,'',0,9600,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103708 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103708
deleted file mode 100644
index 60aa6de8b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103708
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61200,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103709 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103709
deleted file mode 100644
index 94ef768d4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103709
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85600,,'',0,15100,,'',0,10000,,'',0,15200,,'',0,9800,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62100,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103710 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103710
deleted file mode 100644
index e7da528f6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103710
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84500,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
-'2993',2201,82200,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9300,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13500,,'',0,17600,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103711 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103711
deleted file mode 100644
index c45e43232..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103711
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85500,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13800,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62000,,'',0,2300,,'',0,9500,,'',0,9300,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103712 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103712
deleted file mode 100644
index 3ce19f1f9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103712
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84600,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,5800,,'',0
-'2993',2201,82300,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61300,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103713 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103713
deleted file mode 100644
index ecf6eee3a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103713
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85400,,'',0,15100,,'',0,10000,,'',0,15100,,'',0,9900,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83100,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,61900,,'',0,2300,,'',0,9600,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103714 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103714
deleted file mode 100644
index aadbd77f8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103714
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17500,,'',0,17500,,'',0,5800,,'',0
-'2993',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13600,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103715 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103715
deleted file mode 100644
index ac15b066b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103715
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85400,,'',0,15100,,'',0,10000,,'',0,15000,,'',0,9900,,'',0,17000,,'',0,9800,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83000,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,61900,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103716 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103716
deleted file mode 100644
index b36e4342e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103716
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84700,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'2993',2201,82400,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61400,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13700,,'',0,10000,,'',0,17000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13600,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103717 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103717
deleted file mode 100644
index 99a484306..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103717
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84800,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'2993',2201,82500,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9400,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103718 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103718
deleted file mode 100644
index a22834a62..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103718
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85300,,'',0,15100,,'',0,10000,,'',0,14900,,'',0,10000,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,61800,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103719 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103719
deleted file mode 100644
index 26b7d14aa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103719
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17600,,'',0,17500,,'',0,9800,,'',0
-'2993',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17600,,'',0,10000,,'',0,13000,,'',0,10100,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17400,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103720 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103720
deleted file mode 100644
index d4a0463fb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103720
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85200,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,82900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,61700,,'',0,2300,,'',0,9600,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103721 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103721
deleted file mode 100644
index 24487fae8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103721
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84900,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2201,82600,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,61500,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103722 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103722
deleted file mode 100644
index 7ccd30a62..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103722
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85100,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10100,,'',0,16900,,'',0,9900,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,82800,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,61700,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103723 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103723
deleted file mode 100644
index de74ef449..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103723
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,85000,,'',0,15100,,'',0,10000,,'',0,14800,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,13900,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,61600,,'',0,2300,,'',0,9500,,'',0,9200,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13900,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103744 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103744
deleted file mode 100644
index 6caafb942..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103744
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,71400,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9701,73300,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',9701,55100,,'',0,7300,,'',0,2100,,'',0,1200,,'',0,5200,,'',0,2100,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,1900,,'',0,5700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,9000,,'',0,4700,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103745 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103745
deleted file mode 100644
index e8517f4c8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103745
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,72300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9700,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',9700,62300,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,5600,0,'Downtown',0,400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1800,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,6300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103800 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103800
deleted file mode 100644
index c5bddaef5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103800
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',100,80600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9400,,'',0,10200,,'',0,10100,,'',0
-'2993',100,80700,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',100,60200,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',1601,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103801 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103801
deleted file mode 100644
index 389288cd3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103801
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',101,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,5600,,'',0
-'2993',101,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',101,61900,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,9900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2964',1601,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,92600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,62600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,2300,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,15000,,'',0,2000,,'',0,7500,,'',0,2500,,'',0,7500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,5500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103802 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103802
deleted file mode 100644
index da8b72054..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103802
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103803 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103803
deleted file mode 100644
index e8403a107..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103803
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103804 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103804
deleted file mode 100644
index 9a75e4346..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103804
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,,'',0,6200,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103805 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103805
deleted file mode 100644
index d5907e4d4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103805
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103806 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103806
deleted file mode 100644
index 4fafdca7f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103806
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103807 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103807
deleted file mode 100644
index 9a460ac71..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103807
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103808 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103808
deleted file mode 100644
index 1b4b35075..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103808
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103809 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103809
deleted file mode 100644
index 53f3e67e2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103809
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,2300,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103810 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103810
deleted file mode 100644
index a4d1cfd38..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103810
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,60900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11100,,'',0,5900,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103811 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103811
deleted file mode 100644
index 93bb9b6fd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103811
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,6000,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103812 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103812
deleted file mode 100644
index edd82eefd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103812
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,2600,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103813 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103813
deleted file mode 100644
index a90461a23..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103813
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103814 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103814
deleted file mode 100644
index 498498d56..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103814
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103815 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103815
deleted file mode 100644
index 6b325b9ee..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103815
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1501,82100,,'',0,73100,,'',0
-'2964',1700,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,62200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103816 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103816
deleted file mode 100644
index b34b4b827..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103816
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1501,82000,,'',0,73100,,'',0
-'2964',1700,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,62100,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103817 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103817
deleted file mode 100644
index d9a366dcd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103817
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1501,80200,,'',0,73000,,'',0
-'2964',1700,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,60800,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3000,,'',0,7400,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,3000,,'',0,7900,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103818 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103818
deleted file mode 100644
index 23f2448c8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103818
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1501,81900,,'',0,73100,,'',0
-'2964',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103820 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103820
deleted file mode 100644
index 395bb33bc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103820
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,62000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3100,,'',0,7000,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103821 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103821
deleted file mode 100644
index 1e3c5625b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103821
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6600,,'',0,3100,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,3000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103824 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103824
deleted file mode 100644
index fbd763d09..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103824
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,62000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103825 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103825
deleted file mode 100644
index f5ee08b05..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103825
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61100,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,3000,,'',0,7700,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103826 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103826
deleted file mode 100644
index 64926d8b7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103826
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61200,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6700,,'',0,3000,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,3000,,'',0,7800,,'',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103827 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103827
deleted file mode 100644
index cce05e431..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103827
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61200,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103828 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103828
deleted file mode 100644
index 9d9e8b8eb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103828
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61900,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103829 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103829
deleted file mode 100644
index 333eb26d4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103829
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61300,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,7300,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10300,,'',0,3000,,'',0,7700,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103833 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103833
deleted file mode 100644
index 977c3b387..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103833
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
-'2993',1700,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61700,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6800,,'',0,2900,,'',0,7200,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103844 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103844
deleted file mode 100644
index d6acacb7c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103844
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2200,85000,,'',0,15100,,'',0,10000,,'',0,14700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17700,,'',0,17500,,'',0,9800,,'',0
-'2964',2201,85000,4,'',0,15100,4,'',0,10000,4,'',0,14700,4,'',0,10200,4,'',0,16800,4,'',0,10000,4,'',0,9600,4,'',0,14000,4,'',0,17700,4,'',0,17500,4,'',0,9800,4,'',0
-'2993',2200,82700,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'2993',2201,82700,4,'',0,9700,4,'',0,22800,4,'',0,26900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
-'3011',2200,61600,,'',0,2300,,'',0,9500,,'',0,9100,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,14000,,'',0,9300,,'',0,9300,,'',0,17500,,'',0,13700,,'',0,16900,,'',0
-'3011',2201,61600,4,'',0,2300,4,'',0,9500,4,'',0,9100,4,'',0,17700,4,'',0,10000,4,'',0,13000,4,'',0,10000,4,'',0,17100,4,'',0,14000,4,'',0,9300,4,'',0,9300,4,'',0,17500,4,'',0,13700,4,'',0,16900,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103845 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103845
deleted file mode 100644
index 62dcf1d14..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103845
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1301,94500,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103848 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103848
deleted file mode 100644
index f43c2ba3a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103848
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1300,94200,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103849 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103849
deleted file mode 100644
index d5be06937..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103849
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1300,94300,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103851 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103851
deleted file mode 100644
index 4759cb402..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103851
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1301,94600,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103852 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103852
deleted file mode 100644
index fa0d85753..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103852
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1301,94400,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103853 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103853
deleted file mode 100644
index d5be06937..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103853
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1300,94300,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103858 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103858
deleted file mode 100644
index d46266865..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103858
+++ /dev/null
@@ -1,2 +0,0 @@
-'3011',1300,94400,4,'',0,41000,4,'',0,57500,4,'',0
-'3011',1301,94400,,'',0,41000,,'',0,57500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104911 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104911
deleted file mode 100644
index 81153ca25..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104911
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2601,74100,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,9100,,'',0,12400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2601,72200,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2601,61700,,'',0,3700,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,15900,,'',0,12600,,'',0,17400,,'',0,13700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,7500,,'',0,4200,,'',0,6800,,'',0,11200,,'',0,17500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104912 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104912
deleted file mode 100644
index 7721863c3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104912
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,90400,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,84000,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62500,,'',0,2700,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13700,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104913 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104913
deleted file mode 100644
index f1954d286..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104913
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2300,142500,0,'Old Vernon Rd',0
-'3011',2300,144400,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104914 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104914
deleted file mode 100644
index 8b4ef257d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104914
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1501,81400,,'',0,73000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104916 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104916
deleted file mode 100644
index 4c3f16a36..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_104916
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1300,93800,,'',0,41000,,'',0,57500,,'',0
-'2964',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,55400,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140000 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140000
deleted file mode 100644
index cfe920f67..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140000
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,70600,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,,'',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0
-'2993',9701,75600,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'3011',9701,61600,,'',0,2100,,'',0,6400,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1000,0,'Downtown',0,1000,,'',0,6100,,'',0,2500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2300,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140001 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140001
deleted file mode 100644
index 871f2ab4f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140001
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140002 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140002
deleted file mode 100644
index 362ed7341..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140002
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,70400,,'',0,5000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2993',9701,75400,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9200,0,'Downtown',0
-'3011',9701,61400,,'',0,2100,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,6000,,'',0,2000,,'',0,1000,0,'Downtown',0,1000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5800,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1000,0,'Downtown',0,1000,,'',0,6100,,'',0,2500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,6400,,'',0,2500,0,'Downtown',0,2500,,'',0,6400,0,'Downtown',0,2400,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140003 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140003
deleted file mode 100644
index d3c6f0a52..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140003
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2993',9700,73400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'3011',9700,63500,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,900,,'',0,5100,,'',0,1900,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2500,,'',0,6400,,'',0,2600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140004 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140004
deleted file mode 100644
index bce317b22..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140004
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',9700,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2964',9701,72900,4,'',0,9000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7500,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,9800,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2993',9700,80900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9701,74800,4,'',0,10100,4,'',0,10000,4,'',0,10100,4,'',0,10100,4,'',0,10000,4,'',0,10000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0,10000,4,'',0,9800,4,'',0,10000,4,'',0
-'3011',9700,61000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
-'3011',9701,60500,4,'',0,3300,4,'',0,2100,4,'',0,5200,4,'',0,1300,4,'',0,2200,4,'',0,6100,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,2200,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,2000,4,'',0,2000,4,'',0,6200,4,'',0,2100,4,'',0,2000,4,'',0,6100,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,1700,4,'',0,5600,4,'',0,1700,4,'',0,1900,4,'',0,6000,4,'',0,1900,4,'',0,1900,4,'',0,6000,4,'',0,2100,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,8900,4,'',0,8800,4,'',0,8600,4,'',0,5000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140005 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140005
deleted file mode 100644
index 68c92951d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140005
+++ /dev/null
@@ -1,24 +0,0 @@
-'2964',2000,75100,,'',0,10000,,'',0,8800,,'',0,10300,,'',0,10600,,'',0,10400,,'',0,10700,,'',0,16400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2964',2001,70600,4,'',0,10300,4,'',0,11400,4,'',0,10600,4,'',0,10300,4,'',0,10600,4,'',0,10300,4,'',0,10000,4,'',0,9500,4,'',0,11900,4,'',0,9000,4,'',0,10700,4,'',0,15000,4,'',0,10800,4,'',0,10000,4,'',0
-'2993',2000,74500,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,14800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'2993',2001,83500,4,'',0,10100,4,'',0,10900,4,'',0,10300,4,'',0,10800,4,'',0,10200,4,'',0,14800,4,'',0,9900,4,'',0,10000,4,'',0,10300,4,'',0,10100,4,'',0
-'3011',2000,62600,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,15500,,'',0,5400,,'',0,15600,,'',0,10100,,'',0
-'3011',2001,64400,4,'',0,7200,4,'',0,10400,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,14400,4,'',0,10200,4,'',0,10600,4,'',0,10400,4,'',0,11100,4,'',0,7700,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,11900,4,'',0,8900,4,'',0,15600,4,'',0,11600,4,'',0
-'2964',2400,71300,,'',0,10000,,'',0,14300,,'',0,15000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,12100,,'',0,6500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2964',2401,83600,4,'',0,10000,4,'',0,9800,4,'',0,11100,4,'',0,10400,4,'',0,10700,4,'',0,8900,4,'',0,16300,4,'',0,9400,4,'',0,10200,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
-'2993',2400,80500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'2993',2401,74200,4,'',0,10300,4,'',0,10700,4,'',0,10400,4,'',0,14800,4,'',0,10100,4,'',0,10900,4,'',0,10200,4,'',0,9300,4,'',0,10700,4,'',0,10100,4,'',0,9900,4,'',0
-'3011',2400,54400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,3000,,'',0,7000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,11100,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
-'3011',2401,62300,4,'',0,10400,4,'',0,3200,4,'',0,14300,4,'',0,3400,4,'',0,7200,4,'',0,10300,4,'',0,10400,4,'',0,10300,4,'',0,10800,4,'',0,11400,4,'',0,7100,4,'',0,2900,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,4300,4,'',0,9400,4,'',0,15600,4,'',0,10100,4,'',0
-'2964',2500,91500,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2964',2501,100500,4,'',0,13200,4,'',0,17300,4,'',0,14100,4,'',0,39100,4,'',0
-'2993',2500,100000,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'2993',2501,104900,4,'',0,26800,4,'',0,29100,4,'',0,22900,4,'',0
-'3011',2500,74200,,'',0,9100,,'',0,9000,,'',0,13500,,'',0,17300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
-'3011',2501,73700,4,'',0,9400,4,'',0,9100,4,'',0,13400,4,'',0,17100,4,'',0,17700,4,'',0,11200,4,'',0,10000,4,'',0,9500,4,'',0,9100,4,'',0
-'2964',2600,72700,,'',0,11400,,'',0,16800,,'',0,13300,,'',0,17200,,'',0,13600,,'',0,16300,,'',0,9000,,'',0,19700,,'',0,2800,,'',0,17700,,'',0
-'2964',2601,74800,4,'',0,10000,4,'',0,19500,4,'',0,17300,4,'',0,13200,4,'',0,17200,4,'',0,9100,4,'',0,12400,4,'',0,19900,4,'',0,7000,4,'',0,13500,4,'',0
-'2993',2600,105300,,'',0,26800,,'',0,29100,,'',0,30300,,'',0
-'2993',2601,72900,4,'',0,7400,4,'',0,32400,4,'',0,23100,4,'',0,28800,4,'',0,30300,4,'',0
-'3011',2600,55000,,'',0,7500,,'',0,7900,,'',0,3700,,'',0,7700,,'',0,3700,,'',0,15900,,'',0,12400,,'',0,17600,,'',0,13400,,'',0,8000,,'',0,7700,,'',0,3500,,'',0,7600,,'',0,10700,,'',0,21300,,'',0,17500,,'',0
-'3011',2601,62400,4,'',0,7700,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,15900,4,'',0,12600,4,'',0,17400,4,'',0,13700,4,'',0,7600,4,'',0,3500,4,'',0,7900,4,'',0,7500,4,'',0,4200,4,'',0,6800,4,'',0,11200,4,'',0,17500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140006 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140006
deleted file mode 100644
index df8fc418c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140006
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',2101,63000,,'',0,2700,4,'',0,4600,,'',0,2700,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,100,,'',0,6800,4,'',0,2100,,'',0,2800,4,'',0,7800,,'',0,6800,4,'',0,3600,,'',0,6800,4,'',0,3800,,'',0,6800,4,'',0,3500,,'',0,6800,4,'',0,4100,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,500,,'',0,6800,4,'',0,500,,'',0,2800,4,'',0,6400,,'',0,2700,4,'',0,700,,'',0,6700,4,'',0,7800,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0,7900,,'',0,2500,4,'',0,7800,,'',0,2500,4,'',0
-'2993',2101,73200,,'',0,6800,4,'',0,3700,,'',0,6800,4,'',0,3200,,'',0,6800,4,'',0,4500,,'',0,6800,4,'',0,3400,,'',0,6800,4,'',0,8000,,'',0,2800,4,'',0,7500,,'',0,2800,4,'',0,2400,,'',0,6800,4,'',0,8200,,'',0,2800,4,'',0,7200,,'',0,2800,4,'',0,7600,,'',0,2600,4,'',0
-'3011',2101,54900,,'',0,6700,4,'',0,400,,'',0,2700,4,'',0,500,,'',0,6700,4,'',0,200,,'',0,2800,4,'',0,5300,,'',0,2800,4,'',0,400,,'',0,6800,4,'',0,200,,'',0,2800,4,'',0,2700,,'',0,6800,4,'',0,7700,,'',0,2800,4,'',0,7700,,'',0,2800,4,'',0,7600,,'',0,2800,4,'',0,8200,,'',0,2800,4,'',0,5900,,'',0,2300,,'',0,500,4,'',0,6300,4,'',0,400,,'',0,2800,4,'',0,600,,'',0,6800,4,'',0,500,,'',0,2700,4,'',0,800,,'',0,6700,4,'',0,3300,,'',0,6500,4,'',0,9000,,'',0,2500,4,'',0,7300,,'',0,2500,4,'',0,8000,,'',0,2500,4,'',0
-'2964',2200,93100,4,'',0,9700,4,'',0,10000,4,'',0,19500,4,'',0,9600,4,'',0,13100,4,'',0,9700,4,'',0,9600,4,'',0,17700,4,'',0,13700,4,'',0,17500,4,'',0,9800,4,'',0
-'2964',2201,82900,,'',0,11000,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,12800,,'',0,10000,,'',0,9700,,'',0,18000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2200,85300,4,'',0,9700,4,'',0,26800,4,'',0,22900,4,'',0,29400,4,'',0,20000,4,'',0,10300,4,'',0,10000,4,'',0,10000,4,'',0
-'2993',2201,80600,,'',0,9600,,'',0,22800,,'',0,22900,,'',0,29500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,63400,4,'',0,6900,4,'',0,5600,4,'',0,14300,4,'',0,12800,4,'',0,10000,4,'',0,17100,4,'',0,10000,4,'',0,13100,4,'',0,17700,4,'',0,9300,4,'',0,5200,4,'',0,17400,4,'',0,17700,4,'',0,12400,4,'',0
-'3011',2201,60000,0,'Peachland Exp',0,2300,0,'Peachland Exp',0,9000,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140007 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140007
deleted file mode 100644
index 38856242c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140007
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,71700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9700,81700,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',9700,61700,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140008 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140008
deleted file mode 100644
index 46df6aa2f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140008
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,72000,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9701,73900,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',9701,55700,,'',0,7300,,'',0,2100,,'',0,5200,,'',0,1200,,'',0,2200,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5800,,'',0,1700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8900,,'',0,4700,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140009 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140009
deleted file mode 100644
index 9ac5dadb6..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140009
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',2000,81300,4,'',0,10000,4,'',0,8800,4,'',0,10300,4,'',0,10600,4,'',0,10400,4,'',0,10700,4,'',0,12400,4,'',0,9100,4,'',0,19300,4,'',0,10500,4,'',0,10500,4,'',0,10500,4,'',0
-'2964',2001,64300,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2000,80700,4,'',0,10300,4,'',0,10400,4,'',0,10700,4,'',0,10800,4,'',0,10100,4,'',0,10900,4,'',0,9300,4,'',0,10200,4,'',0,11100,4,'',0,10000,4,'',0,9700,4,'',0
-'2993',2001,81200,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2000,64900,4,'',0,10400,4,'',0,7200,4,'',0,10100,4,'',0,10700,4,'',0,10400,4,'',0,10400,4,'',0,10100,4,'',0,11000,4,'',0,7800,4,'',0,7300,4,'',0,3100,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,11500,4,'',0,9400,4,'',0,11600,4,'',0,10100,4,'',0
-'3011',2001,62100,,'',0,3200,,'',0,10400,,'',0,7200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140010 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140010
deleted file mode 100644
index 5126b39a7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140010
+++ /dev/null
@@ -1,12 +0,0 @@
-'2964',2400,73000,4,'',0,10000,4,'',0,18300,4,'',0,11000,4,'',0,10400,4,'',0,10600,4,'',0,16900,4,'',0,5100,4,'',0,16100,4,'',0,2500,4,'',0,10800,4,'',0,10500,4,'',0,10500,4,'',0
-'2964',2401,81700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,10500,,'',0,14500,,'',0
-'2993',2400,82200,4,'',0,10700,4,'',0,10400,4,'',0,10700,4,'',0,10200,4,'',0,10800,4,'',0,10300,4,'',0,9200,4,'',0,10800,4,'',0,10100,4,'',0,10200,4,'',0
-'2993',2401,72200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2400,60100,4,'',0,10400,4,'',0,3200,4,'',0,10400,4,'',0,7000,4,'',0,3000,4,'',0,10800,4,'',0,10400,4,'',0,10400,4,'',0,14600,4,'',0,11100,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,7200,4,'',0,3200,4,'',0,8000,4,'',0,9700,4,'',0,11600,4,'',0,10100,4,'',0,10400,4,'',0
-'3011',2401,60400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,14800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'2964',2500,93700,4,'',0,17200,4,'',0,13300,4,'',0,17100,4,'',0,40300,4,'',0
-'2964',2501,94200,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2500,102200,4,'',0,22800,4,'',0,29500,4,'',0,26900,4,'',0
-'2993',2501,102600,,'',0,22800,,'',0,29100,,'',0,26900,,'',0
-'3011',2500,80400,4,'',0,5100,4,'',0,9000,4,'',0,17500,4,'',0,13300,4,'',0,17400,4,'',0,11500,4,'',0,10200,4,'',0,9300,4,'',0,8900,4,'',0
-'3011',2501,71400,,'',0,9400,,'',0,5100,,'',0,17400,,'',0,17100,,'',0,13700,,'',0,11200,,'',0,10000,,'',0,9500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140011 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140011
deleted file mode 100644
index 880414864..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140011
+++ /dev/null
@@ -1,7 +0,0 @@
-'2964',2600,74300,4,'',0,11400,4,'',0,16800,4,'',0,13300,4,'',0,17200,4,'',0,17600,4,'',0,12300,4,'',0,9000,4,'',0,19700,4,'',0,2800,4,'',0,17700,4,'',0
-'2964',2601,73300,,'',0,10000,,'',0,19500,,'',0,17300,,'',0,13200,,'',0,17200,,'',0,5100,,'',0,16400,,'',0,19900,,'',0,3000,,'',0,17500,,'',0
-'2993',2600,110900,4,'',0,22800,4,'',0,29100,4,'',0,30300,4,'',0
-'2993',2601,71400,,'',0,3400,,'',0,36400,,'',0,23100,,'',0,28800,,'',0,30300,,'',0
-'3011',2600,60500,4,'',0,3500,4,'',0,7900,4,'',0,3700,4,'',0,7700,4,'',0,7700,4,'',0,11900,4,'',0,12400,4,'',0,17600,4,'',0,17400,4,'',0,4000,4,'',0,7700,4,'',0,3500,4,'',0,7600,4,'',0,10700,4,'',0,21300,4,'',0,17500,4,'',0
-'3011',2601,60800,,'',0,3700,,'',0,7500,,'',0,3900,,'',0,7700,,'',0,11900,,'',0,16600,,'',0,13400,,'',0,17700,,'',0,7600,,'',0,3500,,'',0,7900,,'',0,3500,,'',0,8200,,'',0,6800,,'',0,11200,,'',0,13500,,'',0
-'3011',2900,63700,,'',0,7200,4,'',0,900,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,1100,,'',0,7200,4,'',0,62900,,'',0,7200,4,'',0,400,,'',0,3200,4,'',0,300,,'',0,7200,4,'',0,500,,'',0,3200,4,'',0,8500,,'',0,7200,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140012 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140012
deleted file mode 100644
index 64653db30..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140012
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,81000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,63300,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140013 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140013
deleted file mode 100644
index abcb911a2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140013
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,65600,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140014 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140014
deleted file mode 100644
index fd640542e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140014
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140015 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140015
deleted file mode 100644
index df54c50ec..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140015
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,65400,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140016 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140016
deleted file mode 100644
index b4768d772..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140016
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140017 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140017
deleted file mode 100644
index b4768d772..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140017
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,65500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140018 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140018
deleted file mode 100644
index 096078bfc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140018
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',501,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140019 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140019
deleted file mode 100644
index bb76f69fb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140019
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,75300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',501,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140020 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140020
deleted file mode 100644
index 18861aea7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140020
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',501,61900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140021 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140021
deleted file mode 100644
index 978d2392e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140021
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140022 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140022
deleted file mode 100644
index 8ae8013c8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140022
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62100,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140023 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140023
deleted file mode 100644
index 0f1fd6c24..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140023
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,75800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62200,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140024 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140024
deleted file mode 100644
index 06b11b05b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140024
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,80400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62700,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140025 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140025
deleted file mode 100644
index dff8b32b9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140025
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62800,,'',0,3000,,'',0,7200,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140026 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140026
deleted file mode 100644
index 4fe5c7864..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140026
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,63000,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140027 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140027
deleted file mode 100644
index c8bd02a17..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140027
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,63100,,'',0,7000,,'',0,3200,,'',0,7100,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140028 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140028
deleted file mode 100644
index ea5163882..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140028
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',500,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140029 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140029
deleted file mode 100644
index 6becd3685..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140029
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',500,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,61700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140030 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140030
deleted file mode 100644
index 8b251e40e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140030
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',500,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,61800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140031 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140031
deleted file mode 100644
index 45ef78000..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140031
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',500,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140032 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140032
deleted file mode 100644
index 45ef78000..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140032
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',500,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,62000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140033 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140033
deleted file mode 100644
index 8250bd373..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140033
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',500,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,62100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140034 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140034
deleted file mode 100644
index 26c69acc3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140034
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',500,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',500,62300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140035 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140035
deleted file mode 100644
index fd724b923..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140035
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',500,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,62300,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140036 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140036
deleted file mode 100644
index 69982e8eb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140036
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',500,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',500,62500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140037 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140037
deleted file mode 100644
index ddf5a1125..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140037
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,80000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',500,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',500,62600,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140038 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140038
deleted file mode 100644
index 0e95e1c8f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140038
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,80100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',500,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',500,62700,,'',0,3000,,'',0,7100,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,7200,,'',0,3000,,'',0,2800,,'',0,6900,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140039 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140039
deleted file mode 100644
index c60cdc330..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140039
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,80300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',500,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',500,62900,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,5900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140040 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140040
deleted file mode 100644
index b46048918..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140040
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,80500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'2993',500,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',500,63100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140041 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140041
deleted file mode 100644
index ff8d7941c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140041
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,80700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2993',500,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
-'3011',500,63300,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140042 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140042
deleted file mode 100644
index c9f92ef48..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140042
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,80800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2993',500,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
-'3011',500,63400,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140043 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140043
deleted file mode 100644
index 9df18198c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140043
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,70000,,'',0,4500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7200,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70200,,'',0,10200,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,8900,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140044 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140044
deleted file mode 100644
index c3b0c7f06..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140044
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,75100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',501,61600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140045 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140045
deleted file mode 100644
index e48ca20dc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140045
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,64600,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62500,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140046 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140046
deleted file mode 100644
index 6253c8975..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140046
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,64700,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64600,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62600,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1300,,'',0,1500,,'',0,1400,,'',0,5400,,'',0,1200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140047 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140047
deleted file mode 100644
index b13dc5683..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140047
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,65900,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70200,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,60000,,'',0,2500,,'',0,2300,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,6500,,'',0,2400,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140048 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140048
deleted file mode 100644
index ebc9e9746..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140048
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,64500,,'',0,10100,,'',0,8100,,'',0,7500,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7300,,'',0,7500,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,64400,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8600,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,62400,,'',0,8600,,'',0,2600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,1500,,'',0,5400,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,5200,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,8400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140049 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140049
deleted file mode 100644
index a1ea2c7eb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140049
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2993',9700,73200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0
-'3011',9700,63200,,'',0,2000,,'',0,6100,,'',0,2200,,'',0,2100,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,900,,'',0,5100,,'',0,2000,,'',0,2000,,'',0,5800,,'',0,1700,,'',0,1800,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6300,,'',0,2600,,'',0,6400,,'',0,2600,,'',0,2400,,'',0,6400,,'',0,2600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140050 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140050
deleted file mode 100644
index 69d3dd47f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140050
+++ /dev/null
@@ -1,8 +0,0 @@
-'2993',500,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',500,63000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,5900,,'',0,10000,,'',0
-'2964',600,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,85900,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,71000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7300,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1801,75600,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'2993',1801,82500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'3011',1801,63700,,'',0,10800,,'',0,6600,,'',0,2600,,'',0,6900,,'',0,2800,,'',0,6700,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,7000,,'',0,2700,,'',0,7000,,'',0,2800,,'',0,9500,,'',0,7700,,'',0,4000,,'',0,16000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140051 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140051
deleted file mode 100644
index be71a6220..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140051
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',601,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,80400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,61900,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,15000,,'',0,11000,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,3500,,'',0,7400,,'',0,3500,,'',0,15000,,'',0,11000,,'',0
-'2964',1800,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,8500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1800,73400,,'',0,10100,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11400,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1800,61400,,'',0,10600,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,2800,,'',0,6700,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,6600,,'',0,3000,,'',0,7000,,'',0,5500,,'',0,7700,,'',0,8000,,'',0,4300,,'',0,15500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140053 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140053
deleted file mode 100644
index a3559da5d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140053
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',100,81800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,81900,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,9900,,'',0
-'3011',100,61400,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'2964',800,65700,,'',0,8500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3600,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7100,,'',0,3300,,'',0,7500,,'',0,3000,,'',0,8000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,11000,,'',0
-'2993',800,70000,,'',0,10200,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,13000,,'',0
-'3011',800,55800,,'',0,6500,,'',0,2200,,'',0,6000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2200,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140054 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140054
deleted file mode 100644
index b3c25c0aa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140054
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140055 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140055
deleted file mode 100644
index 9177c4a9e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140055
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1200,93100,,'',0,7600,,'',0,21300,,'',0,30000,,'',0,8000,,'',0,4000,,'',0,46500,,'',0
-'2993',1200,90400,,'',0,3700,,'',0,18900,,'',0,18700,,'',0,18300,,'',0,4000,,'',0,18800,,'',0,8100,,'',0
-'3011',1200,70000,,'',0,4100,,'',0,8000,,'',0,27900,,'',0,35800,,'',0,8400,,'',0,8500,,'',0,8200,,'',0,4600,,'',0,25500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140056 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140056
deleted file mode 100644
index 12a829858..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140056
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,81400,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,83900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,63400,,'',0,1900,,'',0,5800,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2800,,'',0,8400,,'',0,8500,,'',0,4500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140057 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140057
deleted file mode 100644
index c4a2fbb74..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140057
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,80900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,11900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0
-'2993',500,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,9900,,'',0
-'3011',500,63500,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,7300,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,6800,,'',0,2900,,'',0,7000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140058 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140058
deleted file mode 100644
index b8e8d952c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140058
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140059 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140059
deleted file mode 100644
index 006d64d0c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140059
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140060 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140060
deleted file mode 100644
index a45c5903a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140060
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72400,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140061 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140061
deleted file mode 100644
index a45c5903a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140061
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72400,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140062 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140062
deleted file mode 100644
index 5130f0267..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140062
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72500,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140063 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140063
deleted file mode 100644
index ca0c726ef..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140063
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140064 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140064
deleted file mode 100644
index ca0c726ef..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140064
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140065 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140065
deleted file mode 100644
index 36005e527..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140065
+++ /dev/null
@@ -1,4 +0,0 @@
-'2964',2000,80800,,'',0,10000,,'',0,4800,,'',0,10300,,'',0,14600,,'',0,10400,,'',0,10700,,'',0,12400,,'',0,9100,,'',0,19300,,'',0,10500,,'',0,10500,,'',0,10500,,'',0
-'2993',2000,80200,,'',0,10300,,'',0,10400,,'',0,10700,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,9300,,'',0,10200,,'',0,11100,,'',0,10000,,'',0,9700,,'',0
-'3011',2000,64400,,'',0,10400,,'',0,7200,,'',0,10100,,'',0,10700,,'',0,10400,,'',0,10400,,'',0,10100,,'',0,11000,,'',0,7800,,'',0,3300,,'',0,7100,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11500,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
-'3011',2900,70400,,'',0,4100,,'',0,7500,,'',0,8300,,'',0,70100,,'',0,3600,,'',0,7500,,'',0,3700,,'',0,15700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140066 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140066
deleted file mode 100644
index 52d4936e3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140066
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2001,64600,,'',0,10300,,'',0,15400,,'',0,10600,,'',0,10300,,'',0,10600,,'',0,10300,,'',0,10000,,'',0,9500,,'',0,11900,,'',0,9000,,'',0,10700,,'',0,11000,,'',0,10900,,'',0,10000,,'',0
-'2993',2001,81500,,'',0,10100,,'',0,10900,,'',0,10300,,'',0,10800,,'',0,10200,,'',0,10800,,'',0,9900,,'',0,10000,,'',0,10300,,'',0,10100,,'',0
-'3011',2001,62400,,'',0,3200,,'',0,14400,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,10400,,'',0,10200,,'',0,10600,,'',0,10400,,'',0,15100,,'',0,3700,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,11900,,'',0,9000,,'',0,11600,,'',0,11600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140067 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140067
deleted file mode 100644
index 35a3f8ae8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140067
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,91900,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2993',2500,100400,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'3011',2500,74600,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140068 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140068
deleted file mode 100644
index 49c4c7871..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140068
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92000,,'',0,13200,,'',0,17300,,'',0,13100,,'',0,40300,,'',0
-'2993',2500,100500,,'',0,22800,,'',0,29500,,'',0,22900,,'',0
-'3011',2500,74700,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140069 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140069
deleted file mode 100644
index 3deab5f5c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140069
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64100,,'',0,8100,,'',0,3500,,'',0,8300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140071 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140071
deleted file mode 100644
index 5f53e0f0a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140071
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9700,81200,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',9700,61200,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,0,'Downtown',0,400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,8000,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140072 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140072
deleted file mode 100644
index 4ef940271..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140072
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,72700,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9701,74600,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',9701,60300,,'',0,3300,,'',0,2100,,'',0,5200,,'',0,1300,,'',0,2200,,'',0,6000,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,1700,,'',0,5700,,'',0,1700,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8800,,'',0,8600,,'',0,5000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140073 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140073
deleted file mode 100644
index 90e3765fa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140073
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,71900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9700,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',9700,61900,,'',0,2000,,'',0,2000,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2100,,'',0,1600,0,'Downtown',0,4400,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1900,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1600,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2400,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7900,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140074 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140074
deleted file mode 100644
index 6d0fb77e8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140074
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,71800,,'',0,9000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',9701,73700,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',9701,55500,,'',0,7300,,'',0,2100,,'',0,5200,,'',0,1200,,'',0,2200,,'',0,2000,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6200,,'',0,2100,,'',0,2000,,'',0,6100,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,1700,,'',0,5900,,'',0,1700,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8900,,'',0,8900,,'',0,4700,,'',0,9000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140077 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140077
deleted file mode 100644
index b9de1fc19..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140077
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,65000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140078 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140078
deleted file mode 100644
index 6894c3e96..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140078
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64900,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140079 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140079
deleted file mode 100644
index 17416f54e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140079
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64800,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140080 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140080
deleted file mode 100644
index aa3d8b625..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140080
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,71200,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140081 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140081
deleted file mode 100644
index 594a997a5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140081
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64000,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140082 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140082
deleted file mode 100644
index 51dc06916..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140082
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64100,,'',0,7300,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140083 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140083
deleted file mode 100644
index e58c16a72..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140083
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64100,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140084 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140084
deleted file mode 100644
index 3e8491f3d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140084
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140085 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140085
deleted file mode 100644
index 3e8491f3d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140085
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64200,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140086 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140086
deleted file mode 100644
index e12e28b75..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140086
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64300,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140087 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140087
deleted file mode 100644
index fa381f807..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140087
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64400,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140088 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140088
deleted file mode 100644
index d4062b4bb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140088
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140089 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140089
deleted file mode 100644
index b3c25c0aa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140089
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,64700,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140090 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140090
deleted file mode 100644
index 871f2ab4f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140090
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,70800,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140091 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140091
deleted file mode 100644
index daa373956..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140091
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140092 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140092
deleted file mode 100644
index daa373956..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140092
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,70700,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140093 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140093
deleted file mode 100644
index fd640542e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140093
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,65200,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140094 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140094
deleted file mode 100644
index da283bf29..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140094
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95100,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103500,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72300,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,5500,,'',0,9100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140095 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140095
deleted file mode 100644
index f508e52d2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140095
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92800,,'',0,17200,,'',0,13300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,101300,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75500,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140096 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140096
deleted file mode 100644
index e0eee860d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140096
+++ /dev/null
@@ -1 +0,0 @@
-'3011',3200,71100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,50000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140098 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140098
deleted file mode 100644
index 5e234ba45..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140098
+++ /dev/null
@@ -1,2 +0,0 @@
-'2964',2301,74700,4,'',0,7100,4,'',0,3200,4,'',0,6600,4,'',0,19500,4,'',0,9000,4,'',0,2700,4,'',0,3000,4,'',0,7000,4,'',0,10000,4,'',0,8000,4,'',0,2000,4,'',0,18000,4,'',0,9500,4,'',0,13500,4,'',0,19500,4,'',0,11200,4,'',0,10800,4,'',0,15000,4,'',0
-'2993',2301,84200,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,9500,4,'',0,18000,4,'',0,5500,4,'',0,9500,4,'',0,9500,4,'',0,9000,4,'',0,9400,4,'',0,9400,4,'',0,9500,4,'',0,12500,4,'',0,9800,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140099 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140099
deleted file mode 100644
index e73526b19..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140099
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',600,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65000,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140100 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140100
deleted file mode 100644
index 35d5377ff..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140100
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',601,83400,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'2993',601,82900,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0,16000,4,'',0,12000,4,'',0,12000,4,'',0
-'3011',601,64200,4,'',0,11100,4,'',0,15100,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,11000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7600,4,'',0,3500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,11000,4,'',0,11000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140101 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140101
deleted file mode 100644
index 6ab6443bd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140101
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,65500,4,'',0,7600,4,'',0,8600,4,'',0,3700,4,'',0,7500,4,'',0,7300,4,'',0,3700,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7000,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,2500,4,'',0,6500,4,'',0,2500,4,'',0,7000,4,'',0,3500,4,'',0,7400,4,'',0,2900,4,'',0,7000,4,'',0,3500,4,'',0,7000,4,'',0,8000,4,'',0,4400,4,'',0,14900,4,'',0,11000,4,'',0,11000,4,'',0
-'2964',801,71500,,'',0,4100,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',800,73200,4,'',0,10600,4,'',0,9000,4,'',0,9400,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,9000,4,'',0,7500,4,'',0,3000,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,4500,4,'',0,8600,4,'',0,8800,4,'',0,9000,4,'',0,9000,4,'',0,5000,4,'',0,17000,4,'',0
-'2993',801,71500,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,4500,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',800,63000,4,'',0,2600,4,'',0,6400,4,'',0,2300,4,'',0,1600,4,'',0,5500,4,'',0,1600,4,'',0,1500,4,'',0,5500,4,'',0,1400,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1500,4,'',0,1500,4,'',0,5500,4,'',0,1600,4,'',0,1700,4,'',0,5600,4,'',0,1600,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1600,4,'',0,1600,4,'',0,5600,4,'',0,1700,4,'',0,1700,4,'',0,5400,4,'',0,1700,4,'',0,1800,4,'',0,1500,4,'',0,5500,4,'',0,1500,4,'',0,1400,4,'',0,1400,4,'',0,5500,4,'',0,1400,4,'',0,1400,4,'',0,1300,4,'',0,1500,4,'',0,5500,4,'',0,1300,4,'',0,1300,4,'',0,1900,4,'',0,6000,4,'',0,2000,4,'',0,1900,4,'',0,6200,4,'',0,2300,4,'',0,6500,4,'',0,2400,4,'',0,2400,4,'',0,6500,4,'',0,8300,4,'',0,4300,4,'',0,8300,4,'',0,8500,4,'',0
-'3011',801,55500,,'',0,8500,,'',0,6300,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140102 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140102
deleted file mode 100644
index b6a7973f5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140102
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',9700,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3200,4,'',0,7000,4,'',0,3400,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2800,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
-'2964',9701,73700,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2993',9700,75300,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7200,4,'',0,3100,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,6800,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,2900,4,'',0,7000,4,'',0,3000,4,'',0,6900,4,'',0,3000,4,'',0,10000,4,'',0
-'2993',9701,73800,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
-'3011',9700,55500,4,'',0,7800,4,'',0,2100,4,'',0,6200,4,'',0,2100,4,'',0,2200,4,'',0,6100,4,'',0,2100,4,'',0,5900,4,'',0,1900,4,'',0,1900,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,1900,4,'',0,6100,4,'',0,1900,4,'',0,1900,4,'',0,5900,4,'',0,1900,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,5900,4,'',0,2000,4,'',0,2100,4,'',0,6000,4,'',0,1900,4,'',0,2100,4,'',0,6000,4,'',0,2100,4,'',0,2000,4,'',0,5900,4,'',0,900,4,'',0,900,4,'',0,1700,4,'',0,6000,4,'',0,1700,4,'',0,1600,4,'',0,1800,4,'',0,5500,4,'',0,2000,4,'',0,1900,4,'',0,6000,4,'',0,1600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2300,4,'',0,2400,4,'',0,6300,4,'',0,2600,4,'',0,6300,4,'',0,2400,4,'',0,2600,4,'',0
-'3011',9701,55800,,'',0,6000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140103 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140103
deleted file mode 100644
index 14bc7b2ef..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140103
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',2300,65900,,'',0,7300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,7000,0,'Old Vernon Rd',0,3000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
-'2964',2301,95100,4,'',0,7100,4,'',0,3000,4,'',0,8900,4,'',0,26100,4,'',0,20700,4,'',0,3400,4,'',0,9600,4,'',0,10000,4,'',0,19300,4,'',0
-'2993',2300,75500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
-'3011',2300,55000,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,3100,0,'Old Vernon Rd',0,2000,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,6700,0,'Old Vernon Rd',0,2000,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
-'3011',2301,60600,4,'',0,3700,4,'',0,7600,4,'',0,3600,4,'',0,7000,4,'',0,3400,4,'',0,7400,4,'',0,7400,4,'',0,2100,4,'',0,3000,4,'',0,7400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7800,4,'',0,1300,4,'',0,5700,4,'',0,3400,4,'',0,7400,4,'',0,3400,4,'',0,7400,4,'',0,1300,4,'',0,2100,4,'',0,6800,4,'',0,3500,4,'',0,7500,4,'',0,10000,4,'',0,10500,4,'',0,10000,4,'',0,10600,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140104 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140104
deleted file mode 100644
index b34d63829..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140104
+++ /dev/null
@@ -1,2 +0,0 @@
-'3011',1300,93500,,'',0,41000,,'',0,57500,,'',0
-'3011',1301,95400,4,'',0,45000,4,'',0,53500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140105 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140105
deleted file mode 100644
index 55c9c7261..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140105
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',801,71900,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,71900,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,55900,,'',0,8500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
-'2964',2300,141500,0,'Old Vernon Rd',0
-'3011',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140106 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140106
deleted file mode 100644
index 922744c7f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140106
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72700,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'3011',800,62500,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',2301,101600,0,'Old Vernon Rd',0
-'3011',2301,75100,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140107 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140107
deleted file mode 100644
index b5a21bbc9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140107
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',801,72000,,'',0,8100,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,71900,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60000,,'',0,4500,,'',0,6300,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2964',2300,141600,0,'Old Vernon Rd',0
-'3011',2300,143500,0,'Old Vernon Rd',0,28600,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140108 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140108
deleted file mode 100644
index 7e2088827..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140108
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',800,65000,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72700,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'3011',800,62500,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1300,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
-'2964',2301,101500,0,'Old Vernon Rd',0
-'3011',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140109 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140109
deleted file mode 100644
index e758f867d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140109
+++ /dev/null
@@ -1,5 +0,0 @@
-'2964',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72600,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'3011',800,62400,,'',0,2600,,'',0,6400,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',2301,101500,0,'Old Vernon Rd',0
-'3011',2301,75000,0,'Old Vernon Rd',0,27300,0,'Old Vernon Rd',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140111 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140111
deleted file mode 100644
index 45369fba5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140111
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,72100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,72000,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60100,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140112 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140112
deleted file mode 100644
index 7a6c65ec3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140112
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,64900,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72600,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,4500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,17000,,'',0
-'3011',800,62400,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140113 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140113
deleted file mode 100644
index d88472201..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140113
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9701,74000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7100,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,3000,0,'Downtown',0,7000,0,'Downtown',0
-'2993',9701,74100,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,6900,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3100,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,,'',0,3000,0,'Downtown',0,7000,0,'Downtown',0,9300,0,'Downtown',0
-'3011',9701,60100,,'',0,2000,,'',0,2400,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1000,0,'Downtown',0,1000,,'',0,2100,,'',0,6500,,'',0,1300,0,'Downtown',0,1200,,'',0,6500,,'',0,2500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,6500,0,'Downtown',0,2500,,'',0,2500,0,'Downtown',0,6500,,'',0,2500,0,'Downtown',0,6500,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140114 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140114
deleted file mode 100644
index bab2888f2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140114
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',9700,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,3300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
-'2993',9700,74900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3000,,'',0,10000,,'',0
-'3011',9700,55200,,'',0,7700,,'',0,2100,,'',0,6100,,'',0,2100,,'',0,2200,,'',0,6100,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,2100,,'',0,2000,,'',0,6000,,'',0,900,,'',0,900,,'',0,1800,,'',0,6000,,'',0,1700,,'',0,1600,,'',0,1800,,'',0,5500,,'',0,2000,,'',0,1900,,'',0,6000,,'',0,1600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2300,,'',0,2400,,'',0,6400,,'',0,2600,,'',0,6300,,'',0,2400,,'',0,2600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140116 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140116
deleted file mode 100644
index 1aa18f7fc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140116
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2501,95400,,'',0,17200,,'',0,13300,,'',0,18100,,'',0,39100,,'',0
-'2993',2501,103800,,'',0,26800,,'',0,25100,,'',0,26900,,'',0
-'3011',2501,72600,,'',0,9400,,'',0,9100,,'',0,13400,,'',0,17100,,'',0,13700,,'',0,15200,,'',0,10000,,'',0,9500,,'',0,5100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140117 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140117
deleted file mode 100644
index a8c58f2ff..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140117
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2500,92400,,'',0,13200,,'',0,17300,,'',0,17100,,'',0,40300,,'',0
-'2993',2500,100900,,'',0,22800,,'',0,29500,,'',0,26900,,'',0
-'3011',2500,75100,,'',0,9100,,'',0,9000,,'',0,17500,,'',0,13300,,'',0,17400,,'',0,11500,,'',0,10200,,'',0,9300,,'',0,8900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140131 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140131
deleted file mode 100644
index 331c083d1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140131
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',601,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,81400,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62800,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140132 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140132
deleted file mode 100644
index 794e8a9ab..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140132
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',601,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,81500,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,62900,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140133 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140133
deleted file mode 100644
index b50718fc4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140133
+++ /dev/null
@@ -1,15 +0,0 @@
-'2964',600,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84700,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65700,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
-'2964',1800,74400,4,'',0,10200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0,8300,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0
-'2964',1801,74400,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16700,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1800,74400,4,'',0,10300,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11200,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0
-'2993',1801,81300,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1800,62500,4,'',0,10600,4,'',0,2700,4,'',0,6600,4,'',0,2900,4,'',0,6800,4,'',0,2700,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,8000,4,'',0,4000,4,'',0,8000,4,'',0,2800,4,'',0,6700,4,'',0,2900,4,'',0,6800,4,'',0,3000,4,'',0,6600,4,'',0,3000,4,'',0,7000,4,'',0,9500,4,'',0,3700,4,'',0,8000,4,'',0,8300,4,'',0,11500,4,'',0
-'3011',1801,62500,,'',0,10700,,'',0,2600,,'',0,6600,,'',0,2900,,'',0,6800,,'',0,2700,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,8000,,'',0,4000,,'',0,8000,,'',0,2800,,'',0,6800,,'',0,2800,,'',0,6800,,'',0,3000,,'',0,6700,,'',0,3000,,'',0,6900,,'',0,9500,,'',0,3700,,'',0,8000,,'',0,12000,,'',0,10900,,'',0
-'2964',1900,74300,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,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,10000,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0
-'2964',1901,74300,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,1600,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0
-'2993',1900,81300,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0,15500,4,'',0,11500,4,'',0,11500,4,'',0,11500,4,'',0
-'2993',1901,74400,,'',0,10300,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11200,,'',0,11500,,'',0,15500,,'',0,11500,,'',0
-'3011',1900,71900,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,6100,4,'',0,3500,4,'',0,7500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7500,4,'',0,3500,4,'',0,7600,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,2000,4,'',0,2000,4,'',0,6000,4,'',0,1900,4,'',0,2000,4,'',0,7500,4,'',0,7500,4,'',0,3400,4,'',0,7500,4,'',0,3500,4,'',0,10000,4,'',0,10900,4,'',0
-'3011',1901,71900,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,6300,,'',0,11500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140134 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140134
deleted file mode 100644
index d0f6e674e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140134
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',601,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,81700,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,63000,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140135 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140135
deleted file mode 100644
index a94181649..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140135
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',600,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84600,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65600,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140136 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140136
deleted file mode 100644
index 9879c77e4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140136
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',601,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,82200,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
-'3011',601,63500,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140137 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140137
deleted file mode 100644
index c89565e43..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140137
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',600,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84400,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65400,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140138 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140138
deleted file mode 100644
index 8135ebf05..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140138
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',601,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,82700,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
-'3011',601,64000,,'',0,11100,,'',0,15100,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140139 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140139
deleted file mode 100644
index 9efd97dba..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140139
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',600,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84100,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140148 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140148
deleted file mode 100644
index 820726dd1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140148
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,62500,,'',0,10100,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,15000,,'',0,11000,,'',0
-'2993',801,62500,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,5000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60600,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140149 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140149
deleted file mode 100644
index a172892b5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140149
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1001,75400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7700,,'',0,2900,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,19000,4,'',0
-'2993',1001,75700,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,4,'',0
-'3011',1001,55700,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7900,,'',0,1800,,'',0,5500,,'',0,2100,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140150 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140150
deleted file mode 100644
index 0684ddcfd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140150
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140151 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140151
deleted file mode 100644
index d4c827fc5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140151
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,83800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54000,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140152 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140152
deleted file mode 100644
index 84c43dc37..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140152
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3100,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,72000,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61800,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',1000,83700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,65300,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3300,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1700,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8200,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140153 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140153
deleted file mode 100644
index e79838cf1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140153
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64500,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,3500,,'',0,7700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140154 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140154
deleted file mode 100644
index d756fea7d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140154
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,64900,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140155 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140155
deleted file mode 100644
index 45ef0edcc..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140155
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2900,65000,,'',0,8100,,'',0,7500,,'',0,4300,,'',0,70100,,'',0,7600,,'',0,7500,,'',0,3700,,'',0,11700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140158 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140158
deleted file mode 100644
index 83c313ead..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140158
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1201,95300,0,'Orchard Pk',0,7600,0,'Orchard Pk',0,21300,0,'Orchard Pk',0,30000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,42500,0,'Orchard Pk',0
-'2993',1201,92600,0,'Orchard Pk',0,7700,0,'Orchard Pk',0,14900,0,'Orchard Pk',0,18700,0,'Orchard Pk',0,18300,0,'Orchard Pk',0,8000,0,'Orchard Pk',0,14800,0,'Orchard Pk',0,8100,0,'Orchard Pk',0
-'3011',1201,72000,,'',0,8100,,'',0,4000,,'',0,28100,0,'Orchard Pk',0,39700,,'',0,8400,,'',0,4400,,'',0,8200,,'',0,8600,,'',0,21600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140159 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140159
deleted file mode 100644
index 03565f017..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140159
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1300,93600,,'',0,41000,,'',0,57500,,'',0
-'2964',2300,70000,,'',0,3300,,'',0,2600,,'',0,7100,,'',0,2700,,'',0,6900,,'',0,3200,,'',0,6700,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3100,,'',0,7300,,'',0,2400,,'',0,7200,,'',0,3000,,'',0,10600,,'',0,9100,,'',0,10100,,'',0,15500,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,75600,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
-'3011',2300,55100,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,2100,,'',0,7000,,'',0,7500,,'',0,3500,,'',0,10200,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140160 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140160
deleted file mode 100644
index 199756242..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140160
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1301,95100,,'',0,45000,,'',0,53500,,'',0
-'2964',2301,74600,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,6200,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9300,,'',0,10200,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'2993',2301,84100,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2301,60300,,'',0,3700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140161 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140161
deleted file mode 100644
index 2fe682f0e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140161
+++ /dev/null
@@ -1 +0,0 @@
-'2964',1700,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10100,,'',0,10100,,'',0,10000,,'',0,10200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140162 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140162
deleted file mode 100644
index 38b3c796d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140162
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',601,82900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,82400,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0
-'3011',601,63700,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7600,,'',0,3500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140163 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140163
deleted file mode 100644
index e2b875419..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140163
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',600,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84200,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65200,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140164 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140164
deleted file mode 100644
index 755768406..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140164
+++ /dev/null
@@ -1,6 +0,0 @@
-'2964',800,64300,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3300,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7000,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,11000,,'',0,15000,,'',0
-'2993',800,72000,,'',0,10600,,'',0,9000,,'',0,9400,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8600,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,61800,,'',0,2600,,'',0,6400,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
-'2964',1000,83900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,10000,,'',0
-'3011',1000,54100,,'',0,7200,,'',0,1800,,'',0,2300,,'',0,6000,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,1900,,'',0,1900,,'',0,6200,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1700,,'',0,1700,,'',0,6600,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8100,,'',0,8500,,'',0,8300,,'',0,4500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140165 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140165
deleted file mode 100644
index 2989be161..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140165
+++ /dev/null
@@ -1,2 +0,0 @@
-'3011',2800,70700,4,'',0,9500,4,'',0,4600,4,'',0,71100,4,'',0,8900,4,'',0,9400,4,'',0
-'3011',2801,71000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140166 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140166
deleted file mode 100644
index f9c5371bf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140166
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65700,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140167 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140167
deleted file mode 100644
index 729eb344a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140167
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65200,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140168 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140168
deleted file mode 100644
index 5f3018a03..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140168
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72600,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81800,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55700,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140169 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140169
deleted file mode 100644
index 6fa10fb98..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140169
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,70500,,'',0,9500,,'',0,4600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140170 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140170
deleted file mode 100644
index 508327802..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140170
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72000,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81200,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55100,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140171 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140171
deleted file mode 100644
index bccb85e81..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140171
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65500,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140172 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140172
deleted file mode 100644
index a40b41d22..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140172
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,64700,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140173 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140173
deleted file mode 100644
index 2df7f2c40..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140173
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65000,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140174 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140174
deleted file mode 100644
index b4f98b457..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140174
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,64600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140175 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140175
deleted file mode 100644
index 09be6dc2f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140175
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,64900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140176 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140176
deleted file mode 100644
index b4f98b457..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140176
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,64600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140177 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140177
deleted file mode 100644
index 84d65660b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140177
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72400,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81600,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55500,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140178 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140178
deleted file mode 100644
index 2b1d84efd..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140178
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65400,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140179 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140179
deleted file mode 100644
index fcc7f7912..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140179
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72500,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81700,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55600,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140180 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140180
deleted file mode 100644
index 44070d5f4..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140180
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,71300,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,5500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140181 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140181
deleted file mode 100644
index 3c02a5d9a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140181
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140182 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140182
deleted file mode 100644
index 3c02a5d9a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140182
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72800,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,16900,,'',0,5100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,82000,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55900,,'',0,14400,,'',0,3200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,14600,,'',0,11100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140183 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140183
deleted file mode 100644
index fb292069d..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140183
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65600,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140184 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140184
deleted file mode 100644
index 50de636fe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140184
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,70200,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140185 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140185
deleted file mode 100644
index 50de636fe..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140185
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,70200,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140186 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140186
deleted file mode 100644
index 733a23ed3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140186
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,70300,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140187 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140187
deleted file mode 100644
index 1deb5da8f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140187
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140188 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140188
deleted file mode 100644
index c68fc04f2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140188
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,70000,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140189 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140189
deleted file mode 100644
index 1deb5da8f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140189
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65900,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140190 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140190
deleted file mode 100644
index 91db04cc0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140190
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,70100,,'',0,5500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140191 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140191
deleted file mode 100644
index 978afeeaa..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140191
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,71800,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140192 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140192
deleted file mode 100644
index 66e7693b3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140192
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65300,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140193 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140193
deleted file mode 100644
index 26b4907e0..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140193
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72100,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81300,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55200,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140194 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140194
deleted file mode 100644
index 59dcc1a8f..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140194
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72200,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81400,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55300,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140195 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140195
deleted file mode 100644
index 88bef2d91..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140195
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2400,72300,,'',0,10000,,'',0,18300,,'',0,11000,,'',0,10400,,'',0,10600,,'',0,12900,,'',0,9100,,'',0,16100,,'',0,2500,,'',0,10800,,'',0,10500,,'',0,10500,,'',0
-'2993',2400,81500,,'',0,10700,,'',0,10400,,'',0,10700,,'',0,10200,,'',0,10800,,'',0,10300,,'',0,9200,,'',0,10800,,'',0,10100,,'',0,10200,,'',0
-'3011',2400,55400,,'',0,10400,,'',0,7200,,'',0,10400,,'',0,7000,,'',0,3000,,'',0,10800,,'',0,10400,,'',0,10400,,'',0,10600,,'',0,15100,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,3200,,'',0,8000,,'',0,9700,,'',0,11600,,'',0,10100,,'',0,10400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140196 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140196
deleted file mode 100644
index 1af1758c5..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140196
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65100,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140197 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140197
deleted file mode 100644
index 729eb344a..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140197
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,65200,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140198 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140198
deleted file mode 100644
index 70166a8b2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140198
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82700,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73200,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61400,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140199 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140199
deleted file mode 100644
index c27132ac2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140199
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2993',2401,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140200 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140200
deleted file mode 100644
index c27132ac2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140200
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82500,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2993',2401,73000,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61200,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,14300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140201 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140201
deleted file mode 100644
index c3496dd30..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140201
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2800,70600,,'',0,9500,,'',0,4600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140202 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140202
deleted file mode 100644
index cbcfb2cb2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140202
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82200,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2993',2401,72700,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,10900,,'',0,14200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,60900,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140203 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140203
deleted file mode 100644
index 40879b960..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140203
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82300,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2993',2401,72800,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61000,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,3200,,'',0,7200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140204 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140204
deleted file mode 100644
index a341957de..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140204
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72000,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140205 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140205
deleted file mode 100644
index 3c8f17274..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140205
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,71900,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140206 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140206
deleted file mode 100644
index b8e8d952c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140206
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,72100,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140207 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140207
deleted file mode 100644
index 63ae8a324..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140207
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140208 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140208
deleted file mode 100644
index 63ae8a324..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140208
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82800,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,16300,,'',0,5400,,'',0,10200,,'',0,14500,,'',0,10500,,'',0,10500,,'',0
-'2993',2401,73300,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,9300,,'',0,10700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61500,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,7200,,'',0,10300,,'',0,10400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,7100,,'',0,2900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,15600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140209 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140209
deleted file mode 100644
index 5948623bf..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140209
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2401,82400,,'',0,10000,,'',0,9800,,'',0,11100,,'',0,10400,,'',0,10700,,'',0,8900,,'',0,12300,,'',0,9400,,'',0,10200,,'',0,10500,,'',0,14500,,'',0,10500,,'',0
-'2993',2401,72900,,'',0,10300,,'',0,10700,,'',0,10400,,'',0,10800,,'',0,10100,,'',0,14900,,'',0,10200,,'',0,5300,,'',0,14700,,'',0,10100,,'',0,9900,,'',0
-'3011',2401,61100,,'',0,10400,,'',0,3200,,'',0,10300,,'',0,7400,,'',0,3200,,'',0,10300,,'',0,14400,,'',0,10300,,'',0,10800,,'',0,11400,,'',0,3100,,'',0,6900,,'',0,7200,,'',0,3200,,'',0,7200,,'',0,4300,,'',0,9400,,'',0,11600,,'',0,10100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140210 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140210
deleted file mode 100644
index d5d0981ae..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140210
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,71500,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140211 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140211
deleted file mode 100644
index f963ba065..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140211
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,71600,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140212 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140212
deleted file mode 100644
index 769502d58..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140212
+++ /dev/null
@@ -1 +0,0 @@
-'3011',2801,71700,,'',0,9300,,'',0,69800,,'',0,9900,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140214 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140214
deleted file mode 100644
index 47f7289f7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140214
+++ /dev/null
@@ -1,2 +0,0 @@
-'3011',2800,64500,,'',0,9500,,'',0,8600,,'',0,71100,,'',0,8900,,'',0,9400,,'',0
-'3011',2801,73200,4,'',0,9300,4,'',0,69800,4,'',0,9900,4,'',0,9500,4,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140216 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140216
deleted file mode 100644
index 6e9984528..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140216
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,64500,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,4000,,'',0,8400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72200,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,62000,,'',0,2600,,'',0,6300,,'',0,2100,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5600,,'',0,1800,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,2500,,'',0,6400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8400,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140221 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140221
deleted file mode 100644
index 7a0f2a5c2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140221
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2201,84200,,'',0,11100,,'',0,10000,,'',0,18700,,'',0,10200,,'',0,16800,,'',0,10000,,'',0,9600,,'',0,14000,,'',0,17400,,'',0,13500,,'',0,9800,,'',0
-'2993',2201,81900,,'',0,9700,,'',0,22800,,'',0,26900,,'',0,29400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',2201,72600,,'',0,9100,,'',0,13600,,'',0,10000,,'',0,17000,,'',0,10100,,'',0,13100,,'',0,18000,,'',0,9300,,'',0,9300,,'',0,13400,,'',0,17500,,'',0,12900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140222 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140222
deleted file mode 100644
index 3faaf9aa8..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140222
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',2200,90100,,'',0,11100,,'',0,10000,,'',0,19500,,'',0,9600,,'',0,13100,,'',0,9700,,'',0,9600,,'',0,17700,,'',0,13700,,'',0,17500,,'',0,9800,,'',0
-'2993',2200,83700,,'',0,9700,,'',0,26800,,'',0,22900,,'',0,29400,,'',0,20000,,'',0,10300,,'',0,10000,,'',0,10000,,'',0
-'3011',2200,62400,,'',0,2400,,'',0,9600,,'',0,9400,,'',0,17700,,'',0,10000,,'',0,13000,,'',0,10000,,'',0,17100,,'',0,13800,,'',0,9300,,'',0,9200,,'',0,17500,,'',0,13700,,'',0,16800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140233 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140233
deleted file mode 100644
index 56f6e9b7e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140233
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',200,81800,,'',0,10000,,'',0,10000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,8000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,,'',0,10300,,'',0
-'2993',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11700,,'',0,9800,,'',0,10200,,'',0,17800,,'',0
-'3011',200,73100,,'',0,2300,,'',0,7000,,'',0,2900,,'',0,6800,,'',0,10000,,'',0,18700,,'',0,12500,,'',0,9500,,'',0,2700,,'',0,6300,,'',0,3300,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,2500,,'',0,10000,,'',0,10000,,'',0,10500,,'',0,10500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140236 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140236
deleted file mode 100644
index 06a36e9b1..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140236
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',500,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,11900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',500,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',500,62500,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,,'',0,3300,,'',0,7000,,'',0,3200,,'',0,7000,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140237 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140237
deleted file mode 100644
index 49cbf798c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140237
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',501,75900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0
-'2993',501,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0,10000,,'',0
-'3011',501,62300,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2900,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140238 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140238
deleted file mode 100644
index 93bf11f24..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140238
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1301,95000,,'',0,45000,,'',0,53500,,'',0
-'2964',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3100,,'',0,10100,,'',0,6300,,'',0,2600,,'',0,2400,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,8000,,'',0,2000,,'',0,7700,,'',0,3400,,'',0,6900,,'',0,2700,,'',0,6800,,'',0,3200,,'',0,10300,,'',0,9100,,'',0,10400,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'2993',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2301,60000,,'',0,3700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140239 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140239
deleted file mode 100644
index 70cc9e555..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140239
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1000,82700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7700,,'',0,7000,,'',0,9900,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',1000,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,17000,,'',0,10000,,'',0
-'3011',1000,64600,,'',0,5900,,'',0,1900,,'',0,2100,,'',0,6000,,'',0,1900,,'',0,1900,,'',0,5900,,'',0,1900,,'',0,2800,,'',0,7000,,'',0,3200,,'',0,6900,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,5900,,'',0,1900,,'',0,2200,,'',0,5900,,'',0,1900,,'',0,1900,,'',0,5700,,'',0,1800,,'',0,2600,,'',0,8300,,'',0,8400,,'',0,8400,,'',0,4500,,'',0,8300,,'',0,8500,,'',0,4400,,'',0,8500,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140240 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140240
deleted file mode 100644
index 49e82b494..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140240
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1100,82000,,'',0,3000,,'',0,6200,0,'Black Mtn',0,800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,1400,0,'Black Mtn',0,1600,,'',0,7000,,'',0,3000,,'',0,5900,0,'Black Mtn',0,1100,,'',0,11500,,'',0,2100,0,'Black Mtn',0,8400,,'',0,10000,,'',0,10000,,'',0,11000,,'',0,10000,,'',0
-'2993',1100,75900,0,'Black Mtn',0,16600,,'',0,9900,0,'Black Mtn',0,100,,'',0,10000,,'',0,8400,0,'Black Mtn',0,1600,,'',0,10000,,'',0,2900,0,'Black Mtn',0,7100,,'',0,10000,,'',0,9400,0,'Black Mtn',0,600,,'',0,10000,,'',0,10000,,'',0,1900,0,'Black Mtn',0,8100,,'',0,10000,,'',0,12000,,'',0,15500,,'',0
-'3011',1100,70300,,'',0,3200,,'',0,1500,,'',0,5500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,3000,,'',0,10000,,'',0,16000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140241 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140241
deleted file mode 100644
index ea2cdfd4e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140241
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',600,80800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',600,84500,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0
-'3011',600,65500,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140242 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140242
deleted file mode 100644
index 20df8c1a3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140242
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',601,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'2993',601,81900,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0,12000,,'',0,16000,,'',0,12000,,'',0
-'3011',601,63300,,'',0,11100,,'',0,11100,,'',0,15000,,'',0,11000,,'',0,11000,,'',0,11000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3600,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,11000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140243 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140243
deleted file mode 100644
index 247473e2e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140243
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',100,81100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7500,,'',0,9300,,'',0,10200,,'',0,10100,,'',0
-'2993',100,81200,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'3011',100,60700,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140244 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140244
deleted file mode 100644
index 87c5e26eb..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140244
+++ /dev/null
@@ -1,9 +0,0 @@
-'2964',101,74300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3500,,'',0,9800,,'',0,10100,,'',0,10000,,'',0,9600,,'',0
-'2993',100,81400,,'',0,9800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
-'2993',101,74300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',100,60900,,'',0,3000,,'',0,7000,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0,10000,,'',0
-'3011',101,60700,,'',0,3000,,'',0,7200,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,9800,,'',0,10000,,'',0,10000,,'',0
-'2964',801,65100,,'',0,10100,,'',0,8100,,'',0,7600,,'',0,3700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3300,,'',0,7400,,'',0,2800,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,10000,,'',0,11000,,'',0,11000,,'',0
-'2993',801,65100,,'',0,10000,,'',0,8500,,'',0,9000,,'',0,9200,,'',0,9100,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,3400,,'',0,7500,,'',0,3400,,'',0,8500,,'',0,8500,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,9000,,'',0
-'3011',801,63100,,'',0,8600,,'',0,2700,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1400,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1800,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5300,,'',0,1200,,'',0,1800,,'',0,2000,,'',0,6000,,'',0,1800,,'',0,2000,,'',0,6500,,'',0,2400,,'',0,6300,,'',0,2500,,'',0,2500,,'',0,6400,,'',0,8500,,'',0,4300,,'',0,8500,,'',0,8400,,'',0
-'3011',1200,65600,,'',0,8100,,'',0,8000,,'',0,63400,,'',0,8400,,'',0,8500,,'',0,8500,,'',0,4600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140245 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140245
deleted file mode 100644
index b98f28c5e..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140245
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',801,72200,,'',0,8100,,'',0,3500,,'',0,7600,,'',0,3500,,'',0,7000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,7000,,'',0,7400,,'',0,3500,,'',0,6900,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,10000,,'',0,11000,,'',0,15000,,'',0
-'2993',801,72100,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60200,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140246 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140246
deleted file mode 100644
index d35e604f2..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140246
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',800,64800,,'',0,7600,,'',0,8600,,'',0,3700,,'',0,7500,,'',0,3200,,'',0,7700,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,7000,,'',0,3500,,'',0,7400,,'',0,2900,,'',0,7100,,'',0,3500,,'',0,7000,,'',0,8000,,'',0,4400,,'',0,10900,,'',0,15000,,'',0,11000,,'',0
-'2993',800,72500,,'',0,10600,,'',0,9000,,'',0,9300,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,7500,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,8500,,'',0,8700,,'',0,8800,,'',0,9000,,'',0,5000,,'',0,9000,,'',0,17000,,'',0
-'3011',800,62300,,'',0,2600,,'',0,6300,,'',0,2200,,'',0,1600,,'',0,5500,,'',0,1600,,'',0,1500,,'',0,1500,,'',0,5400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1700,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5700,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1700,,'',0,1700,,'',0,1400,,'',0,5700,,'',0,1800,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5400,,'',0,1400,,'',0,1400,,'',0,1500,,'',0,5500,,'',0,1300,,'',0,1300,,'',0,1900,,'',0,6000,,'',0,2000,,'',0,1900,,'',0,6200,,'',0,2300,,'',0,6500,,'',0,2400,,'',0,2400,,'',0,6500,,'',0,4400,,'',0,8300,,'',0,8300,,'',0,8500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140247 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140247
deleted file mode 100644
index 498498d56..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140247
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1601,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10400,,'',0
-'2993',1601,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1601,61300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2800,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10900,,'',0,6100,,'',0,3500,,'',0,6500,,'',0,3500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140248 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140248
deleted file mode 100644
index f42be9ad7..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140248
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1301,95000,,'',0,45000,,'',0,53500,,'',0
-'2964',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3300,,'',0,10100,,'',0,6100,,'',0,2800,,'',0,2200,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3200,,'',0,6800,,'',0,8000,,'',0,2000,,'',0,7900,,'',0,3400,,'',0,6700,,'',0,2900,,'',0,6600,,'',0,3400,,'',0,10100,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'2993',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2301,60200,,'',0,3700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140249 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140249
deleted file mode 100644
index 132f31c3b..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140249
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1300,93700,,'',0,41000,,'',0,57500,,'',0
-'2964',2300,70200,,'',0,3200,,'',0,6700,,'',0,3000,,'',0,2800,,'',0,6800,,'',0,7300,,'',0,2600,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3200,,'',0,7200,,'',0,2500,,'',0,7100,,'',0,3100,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9400,,'',0,9500,,'',0,16500,,'',0,5800,,'',0
-'3011',2300,55300,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10100,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140250 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140250
deleted file mode 100644
index f278bca74..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140250
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1301,95000,,'',0,45000,,'',0,53500,,'',0
-'2964',2301,74500,,'',0,7100,,'',0,3200,,'',0,6600,,'',0,3200,,'',0,10100,,'',0,6200,,'',0,2700,,'',0,2300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,8000,,'',0,2000,,'',0,7800,,'',0,3400,,'',0,6800,,'',0,2800,,'',0,6700,,'',0,3300,,'',0,10200,,'',0,9200,,'',0,10300,,'',0,11200,,'',0,10800,,'',0,15000,,'',0
-'2993',2301,84000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,5500,,'',0,9500,,'',0,9500,,'',0,9000,,'',0,9400,,'',0,9400,,'',0,9500,,'',0,12500,,'',0,9800,,'',0
-'3011',2301,60100,,'',0,3700,,'',0,7600,,'',0,10600,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7800,,'',0,1300,,'',0,1700,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1300,,'',0,2100,,'',0,6800,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140251 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140251
deleted file mode 100644
index 4c3f16a36..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140251
+++ /dev/null
@@ -1,4 +0,0 @@
-'3011',1300,93800,,'',0,41000,,'',0,57500,,'',0
-'2964',2300,70300,,'',0,3100,,'',0,6800,,'',0,2900,,'',0,6900,,'',0,2700,,'',0,7400,,'',0,2500,,'',0,2500,,'',0,6500,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,6900,,'',0,3100,,'',0,10000,,'',0,7600,,'',0,3300,,'',0,7100,,'',0,2600,,'',0,7000,,'',0,3200,,'',0,10400,,'',0,9100,,'',0,10300,,'',0,15300,,'',0,10800,,'',0,11000,,'',0
-'2993',2300,75700,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,18000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,5000,,'',0,9500,,'',0,9500,,'',0,9500,,'',0,16500,,'',0,9800,,'',0
-'3011',2300,55400,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,1700,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,7400,,'',0,7400,,'',0,5100,,'',0,5700,,'',0,3400,,'',0,7400,,'',0,3400,,'',0,8700,,'',0,6100,,'',0,3000,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10500,,'',0,10000,,'',0,10800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140252 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140252
deleted file mode 100644
index 78cb1724c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140252
+++ /dev/null
@@ -1,3 +0,0 @@
-'2964',1900,74000,,'',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,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,10000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0
-'2993',1900,81000,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0,15500,,'',0,11500,,'',0,11500,,'',0,11500,,'',0
-'3011',1900,71600,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140254 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140254
deleted file mode 100644
index ba4aa124c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140254
+++ /dev/null
@@ -1,8 +0,0 @@
-'2993',801,72400,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9100,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,3500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7400,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60500,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1600,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1400,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8400,,'',0,8500,,'',0,4500,,'',0
-'2993',1001,75600,,'',0,16000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,13000,,'',0,18100,0,'Rutland Exch',0
-'3011',1001,55600,,'',0,7200,,'',0,1800,,'',0,6400,,'',0,2000,,'',0,1900,,'',0,6100,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1900,,'',0,6800,,'',0,3000,,'',0,7300,,'',0,2900,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7800,,'',0,1800,,'',0,5500,,'',0,2200,,'',0,1900,,'',0,5900,,'',0,1800,,'',0,1700,,'',0,1500,,'',0,6500,,'',0,4300,,'',0,8400,,'',0,8400,,'',0,8400,,'',0,4100,,'',0,8500,,'',0,8300,,'',0,8500,,'',0,4500,0,'Orchard Pk',0
-'2993',1101,75500,,'',0,19200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,16000,0,'Orchard Pk',0
-'3011',1101,63900,,'',0,8600,,'',0,3200,,'',0,5500,,'',0,1500,,'',0,3100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,6900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,2900,,'',0,6800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
-'3011',1400,121200,,'',0,73800,,'',0
-'3011',1401,63800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,67000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140256 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140256
deleted file mode 100644
index 829174cf3..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140256
+++ /dev/null
@@ -1,2 +0,0 @@
-'2993',1700,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1700,61700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6700,,'',0,3000,,'',0,7100,,'',0,9500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10400,,'',0,3000,,'',0,7600,,'',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9500,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140258 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140258
deleted file mode 100644
index 466c94ca9..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140258
+++ /dev/null
@@ -1,2 +0,0 @@
-'2993',1101,81700,,'',0,19300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,,'',0,9400,,'',0,9900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'3011',1101,65900,,'',0,8900,,'',0,7300,,'',0,1500,,'',0,1500,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3100,,'',0,7000,,'',0,3100,,'',0,7100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7200,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2900,,'',0,6900,,'',0,2800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,4000,,'',0,7000,,'',0,10000,,'',0,12000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140259 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140259
deleted file mode 100644
index aa80b1a1c..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140259
+++ /dev/null
@@ -1,2 +0,0 @@
-'2993',801,72000,,'',0,8500,,'',0,5000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,5000,,'',0,7500,,'',0,7500,,'',0,3000,,'',0,7400,,'',0,3500,,'',0,7500,,'',0,8500,,'',0,4800,,'',0,9000,,'',0,9000,,'',0,9000,,'',0,9000,,'',0
-'3011',801,60000,,'',0,4500,,'',0,6400,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1600,,'',0,1600,,'',0,5600,,'',0,1600,,'',0,1500,,'',0,5600,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1500,,'',0,1500,,'',0,1500,,'',0,5500,,'',0,1400,,'',0,1500,,'',0,1500,,'',0,5900,,'',0,2000,,'',0,2000,,'',0,5900,,'',0,2000,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,6500,,'',0,2500,,'',0,2500,,'',0,8500,,'',0,8500,,'',0,8500,,'',0,4500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140269 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140269
deleted file mode 100644
index bca887096..000000000
--- a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140269
+++ /dev/null
@@ -1 +0,0 @@
-'3011',1900,71800,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,6100,,'',0,3500,,'',0,7500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7500,,'',0,3500,,'',0,7600,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,2000,,'',0,2000,,'',0,6000,,'',0,1900,,'',0,2000,,'',0,7500,,'',0,7500,,'',0,3400,,'',0,7500,,'',0,3500,,'',0,10000,,'',0,10900,,'',0
diff --git a/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml b/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
deleted file mode 100644
index d430e0f53..000000000
--- a/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <bool name="next_gtfs_rts_schedule_available">true</bool>
-    <bool name="next_gtfs_rts_frequency_available">false</bool>
-    <string name="next_gtfs_rts_area_min_lat">49.75194</string>
-    <string name="next_gtfs_rts_area_max_lat">50.07352</string>
-    <string name="next_gtfs_rts_area_min_lng">-119.7902</string>
-    <string name="next_gtfs_rts_area_max_lng">-119.34723</string>
-    <integer name="next_gtfs_rts_first_departure_in_sec">1719753900</integer><!-- 2024/06/30 06:25:00 PDT -->
-    <integer name="next_gtfs_rts_last_departure_in_sec">1725179580</integer><!-- 2024/09/01 01:33:00 PDT -->
-</resources>
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 8a21f43dd..87993b9db 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <integer name="gtfs_rts_db_version">20240625</integer>
+    <integer name="gtfs_rts_db_version">20240702</integer>
     <string name="gtfs_rts_authority">org.mtransit.android.ca_kelowna_regional_transit_system_bus.gtfs</string>
     <string name="gtfs_status_for_poi_authority">@string/gtfs_rts_authority</string>
     <string name="gtfs_rts_contact_us">https://www.bctransit.com/contact</string>