From 6766c2def33cfd5783ab31b52ca5491fd732ba48 Mon Sep 17 00:00:00 2001
From: MonTransit Bot <84137772+montransit@users.noreply.github.com>
Date: Mon, 2 Sep 2024 23:55:51 +0000
Subject: [PATCH] CI: September 2 update
---
.../main/play/release-notes/en-US/default.txt | 2 +-
.../res-current/raw/current_gtfs_rts_routes | 6 -
.../res-current/raw/current_gtfs_rts_stops | 70 +-
.../raw/current_gtfs_rts_trip_stops | 219 -----
.../res-current/raw/current_gtfs_rts_trips | 10 -
.../raw/current_gtfs_schedule_service_dates | 35 -
.../raw/current_gtfs_schedule_stop_103689 | 1 -
.../raw/current_gtfs_schedule_stop_103690 | 1 -
.../raw/current_gtfs_schedule_stop_103744 | 1 -
.../raw/current_gtfs_schedule_stop_103745 | 1 -
.../raw/current_gtfs_schedule_stop_140213 | 1 -
.../raw/current_gtfs_schedule_stop_140214 | 1 -
.../raw/current_gtfs_schedule_stop_140215 | 2 -
.../raw/current_gtfs_schedule_stop_140221 | 1 -
.../raw/current_gtfs_schedule_stop_140222 | 1 -
.../raw/current_gtfs_schedule_stop_146000 | 3 -
.../raw/current_gtfs_schedule_stop_146001 | 1 -
.../raw/current_gtfs_schedule_stop_146002 | 1 -
.../raw/current_gtfs_schedule_stop_146003 | 1 -
.../raw/current_gtfs_schedule_stop_146004 | 1 -
.../raw/current_gtfs_schedule_stop_146005 | 1 -
.../raw/current_gtfs_schedule_stop_146006 | 1 -
.../raw/current_gtfs_schedule_stop_146007 | 1 -
.../raw/current_gtfs_schedule_stop_146008 | 1 -
.../raw/current_gtfs_schedule_stop_146009 | 3 -
.../raw/current_gtfs_schedule_stop_146010 | 3 -
.../raw/current_gtfs_schedule_stop_146012 | 2 -
.../raw/current_gtfs_schedule_stop_146013 | 4 -
.../raw/current_gtfs_schedule_stop_146014 | 1 -
.../raw/current_gtfs_schedule_stop_146015 | 4 -
.../raw/current_gtfs_schedule_stop_146017 | 1 -
.../raw/current_gtfs_schedule_stop_146018 | 1 -
.../raw/current_gtfs_schedule_stop_146019 | 2 -
.../raw/current_gtfs_schedule_stop_146020 | 1 -
.../raw/current_gtfs_schedule_stop_146021 | 5 -
.../raw/current_gtfs_schedule_stop_146023 | 1 -
.../raw/current_gtfs_schedule_stop_146024 | 1 -
.../raw/current_gtfs_schedule_stop_146025 | 3 -
.../raw/current_gtfs_schedule_stop_146028 | 4 -
.../raw/current_gtfs_schedule_stop_146029 | 5 -
.../raw/current_gtfs_schedule_stop_146030 | 5 -
.../raw/current_gtfs_schedule_stop_146034 | 8 -
.../raw/current_gtfs_schedule_stop_146035 | 7 -
.../raw/current_gtfs_schedule_stop_146036 | 4 -
.../raw/current_gtfs_schedule_stop_146037 | 2 -
.../raw/current_gtfs_schedule_stop_146038 | 2 -
.../raw/current_gtfs_schedule_stop_146039 | 2 -
.../raw/current_gtfs_schedule_stop_146040 | 1 -
.../raw/current_gtfs_schedule_stop_146041 | 3 -
.../raw/current_gtfs_schedule_stop_146042 | 6 -
.../raw/current_gtfs_schedule_stop_146043 | 1 -
.../raw/current_gtfs_schedule_stop_146044 | 1 -
.../raw/current_gtfs_schedule_stop_146045 | 8 -
.../raw/current_gtfs_schedule_stop_146046 | 4 -
.../raw/current_gtfs_schedule_stop_146047 | 5 -
.../raw/current_gtfs_schedule_stop_146048 | 7 -
.../raw/current_gtfs_schedule_stop_146049 | 3 -
.../raw/current_gtfs_schedule_stop_146050 | 2 -
.../raw/current_gtfs_schedule_stop_146051 | 1 -
.../raw/current_gtfs_schedule_stop_146052 | 5 -
.../raw/current_gtfs_schedule_stop_146053 | 2 -
.../raw/current_gtfs_schedule_stop_146054 | 7 -
.../raw/current_gtfs_schedule_stop_146055 | 7 -
.../raw/current_gtfs_schedule_stop_146057 | 2 -
.../raw/current_gtfs_schedule_stop_146058 | 2 -
.../raw/current_gtfs_schedule_stop_146059 | 1 -
.../raw/current_gtfs_schedule_stop_146060 | 1 -
.../raw/current_gtfs_schedule_stop_146061 | 2 -
.../raw/current_gtfs_schedule_stop_146062 | 2 -
.../raw/current_gtfs_schedule_stop_146063 | 2 -
.../raw/current_gtfs_schedule_stop_146064 | 4 -
.../raw/current_gtfs_schedule_stop_146065 | 4 -
.../raw/current_gtfs_schedule_stop_146066 | 1 -
.../raw/current_gtfs_schedule_stop_146067 | 3 -
.../raw/current_gtfs_schedule_stop_146068 | 3 -
.../raw/current_gtfs_schedule_stop_146069 | 3 -
.../raw/current_gtfs_schedule_stop_146070 | 3 -
.../raw/current_gtfs_schedule_stop_146071 | 3 -
.../raw/current_gtfs_schedule_stop_146072 | 3 -
.../raw/current_gtfs_schedule_stop_146074 | 2 -
.../raw/current_gtfs_schedule_stop_146075 | 1 -
.../raw/current_gtfs_schedule_stop_146076 | 5 -
.../raw/current_gtfs_schedule_stop_146077 | 5 -
.../raw/current_gtfs_schedule_stop_146078 | 1 -
.../raw/current_gtfs_schedule_stop_146079 | 5 -
.../raw/current_gtfs_schedule_stop_146080 | 1 -
.../raw/current_gtfs_schedule_stop_146081 | 5 -
.../raw/current_gtfs_schedule_stop_146082 | 5 -
.../raw/current_gtfs_schedule_stop_146083 | 2 -
.../raw/current_gtfs_schedule_stop_146084 | 2 -
.../raw/current_gtfs_schedule_stop_146085 | 2 -
.../raw/current_gtfs_schedule_stop_146086 | 2 -
.../raw/current_gtfs_schedule_stop_146087 | 2 -
.../raw/current_gtfs_schedule_stop_146088 | 2 -
.../raw/current_gtfs_schedule_stop_146089 | 4 -
.../raw/current_gtfs_schedule_stop_146090 | 2 -
.../raw/current_gtfs_schedule_stop_146091 | 3 -
.../raw/current_gtfs_schedule_stop_146092 | 1 -
.../raw/current_gtfs_schedule_stop_146093 | 1 -
.../raw/current_gtfs_schedule_stop_146094 | 1 -
.../raw/current_gtfs_schedule_stop_146095 | 4 -
.../raw/current_gtfs_schedule_stop_146096 | 4 -
.../raw/current_gtfs_schedule_stop_146098 | 4 -
.../raw/current_gtfs_schedule_stop_146099 | 4 -
.../raw/current_gtfs_schedule_stop_146100 | 2 -
.../raw/current_gtfs_schedule_stop_146101 | 4 -
.../raw/current_gtfs_schedule_stop_146102 | 2 -
.../raw/current_gtfs_schedule_stop_146103 | 2 -
.../raw/current_gtfs_schedule_stop_146104 | 1 -
.../raw/current_gtfs_schedule_stop_146105 | 4 -
.../raw/current_gtfs_schedule_stop_146106 | 4 -
.../raw/current_gtfs_schedule_stop_146107 | 1 -
.../raw/current_gtfs_schedule_stop_146108 | 4 -
.../raw/current_gtfs_schedule_stop_146109 | 1 -
.../raw/current_gtfs_schedule_stop_146110 | 4 -
.../raw/current_gtfs_schedule_stop_146111 | 1 -
.../raw/current_gtfs_schedule_stop_146112 | 1 -
.../raw/current_gtfs_schedule_stop_146113 | 1 -
.../raw/current_gtfs_schedule_stop_146114 | 1 -
.../raw/current_gtfs_schedule_stop_146117 | 5 -
.../raw/current_gtfs_schedule_stop_146118 | 3 -
.../raw/current_gtfs_schedule_stop_146119 | 3 -
.../raw/current_gtfs_schedule_stop_146120 | 3 -
.../raw/current_gtfs_schedule_stop_146121 | 3 -
.../raw/current_gtfs_schedule_stop_146122 | 3 -
.../raw/current_gtfs_schedule_stop_146123 | 3 -
.../raw/current_gtfs_schedule_stop_146124 | 2 -
.../raw/current_gtfs_schedule_stop_146125 | 2 -
.../raw/current_gtfs_schedule_stop_146126 | 2 -
.../raw/current_gtfs_schedule_stop_146128 | 1 -
.../raw/current_gtfs_schedule_stop_146129 | 1 -
.../raw/current_gtfs_schedule_stop_146130 | 4 -
.../raw/current_gtfs_schedule_stop_146132 | 4 -
.../raw/current_gtfs_schedule_stop_146133 | 4 -
.../raw/current_gtfs_schedule_stop_146134 | 4 -
.../raw/current_gtfs_schedule_stop_146135 | 4 -
.../raw/current_gtfs_schedule_stop_146136 | 4 -
.../raw/current_gtfs_schedule_stop_146137 | 5 -
.../raw/current_gtfs_schedule_stop_146138 | 4 -
.../raw/current_gtfs_schedule_stop_146139 | 4 -
.../raw/current_gtfs_schedule_stop_146140 | 4 -
.../raw/current_gtfs_schedule_stop_146141 | 4 -
.../raw/current_gtfs_schedule_stop_146142 | 4 -
.../raw/current_gtfs_schedule_stop_146143 | 4 -
.../raw/current_gtfs_schedule_stop_146144 | 4 -
.../raw/current_gtfs_schedule_stop_146145 | 3 -
.../raw/current_gtfs_schedule_stop_146146 | 4 -
.../raw/current_gtfs_schedule_stop_146147 | 4 -
.../raw/current_gtfs_schedule_stop_146148 | 4 -
.../raw/current_gtfs_schedule_stop_146149 | 6 -
.../raw/current_gtfs_schedule_stop_146150 | 8 -
.../raw/current_gtfs_schedule_stop_146151 | 10 -
.../raw/current_gtfs_schedule_stop_146152 | 4 -
.../raw/current_gtfs_schedule_stop_146153 | 3 -
.../raw/current_gtfs_schedule_stop_146154 | 3 -
.../raw/current_gtfs_schedule_stop_146155 | 4 -
.../raw/current_gtfs_schedule_stop_146156 | 4 -
.../raw/current_gtfs_schedule_stop_146157 | 17 -
.../raw/current_gtfs_schedule_stop_146159 | 5 -
.../raw/current_gtfs_schedule_stop_146160 | 10 -
.../raw/current_gtfs_schedule_stop_146161 | 17 -
.../raw/current_gtfs_schedule_stop_146162 | 3 -
.../raw/current_gtfs_schedule_stop_146163 | 4 -
.../raw/current_gtfs_schedule_stop_146164 | 1 -
.../raw/current_gtfs_schedule_stop_146165 | 1 -
.../raw/current_gtfs_schedule_stop_146166 | 2 -
.../raw/current_gtfs_schedule_stop_146167 | 3 -
.../raw/current_gtfs_schedule_stop_146168 | 1 -
.../raw/current_gtfs_schedule_stop_146169 | 1 -
.../raw/current_gtfs_schedule_stop_146170 | 1 -
.../raw/current_gtfs_schedule_stop_146171 | 4 -
.../raw/current_gtfs_schedule_stop_146172 | 4 -
.../raw/current_gtfs_schedule_stop_146173 | 6 -
.../raw/current_gtfs_schedule_stop_146174 | 3 -
.../raw/current_gtfs_schedule_stop_146175 | 6 -
.../raw/current_gtfs_schedule_stop_146176 | 3 -
.../raw/current_gtfs_schedule_stop_146177 | 4 -
.../raw/current_gtfs_schedule_stop_146178 | 3 -
.../raw/current_gtfs_schedule_stop_146179 | 3 -
.../raw/current_gtfs_schedule_stop_146182 | 1 -
.../raw/current_gtfs_schedule_stop_146183 | 2 -
.../raw/current_gtfs_schedule_stop_146184 | 3 -
.../raw/current_gtfs_schedule_stop_146185 | 3 -
.../raw/current_gtfs_schedule_stop_146186 | 10 -
.../raw/current_gtfs_schedule_stop_146187 | 10 -
.../raw/current_gtfs_schedule_stop_146188 | 8 -
.../raw/current_gtfs_schedule_stop_146189 | 2 -
.../raw/current_gtfs_schedule_stop_146190 | 5 -
.../raw/current_gtfs_schedule_stop_146191 | 4 -
.../raw/current_gtfs_schedule_stop_146192 | 4 -
.../raw/current_gtfs_schedule_stop_146194 | 4 -
.../raw/current_gtfs_schedule_stop_146195 | 4 -
.../raw/current_gtfs_schedule_stop_146196 | 1 -
.../raw/current_gtfs_schedule_stop_146197 | 1 -
.../raw/current_gtfs_schedule_stop_146198 | 4 -
.../raw/current_gtfs_schedule_stop_146199 | 3 -
.../raw/current_gtfs_schedule_stop_146200 | 1 -
.../raw/current_gtfs_schedule_stop_146201 | 3 -
.../raw/current_gtfs_schedule_stop_146202 | 3 -
.../raw/current_gtfs_schedule_stop_146203 | 3 -
.../raw/current_gtfs_schedule_stop_146204 | 4 -
.../raw/current_gtfs_schedule_stop_146206 | 4 -
.../raw/current_gtfs_schedule_stop_146207 | 2 -
.../raw/current_gtfs_schedule_stop_146209 | 2 -
.../raw/current_gtfs_schedule_stop_146210 | 2 -
.../raw/current_gtfs_schedule_stop_146211 | 3 -
.../raw/current_gtfs_schedule_stop_146212 | 2 -
.../raw/current_gtfs_schedule_stop_146213 | 3 -
.../raw/current_gtfs_schedule_stop_146214 | 3 -
.../raw/current_gtfs_schedule_stop_146215 | 2 -
.../raw/current_gtfs_schedule_stop_146216 | 7 -
.../raw/current_gtfs_schedule_stop_146217 | 4 -
.../raw/current_gtfs_schedule_stop_146218 | 2 -
.../raw/current_gtfs_schedule_stop_146219 | 6 -
.../raw/current_gtfs_schedule_stop_146220 | 3 -
.../raw/current_gtfs_schedule_stop_146221 | 3 -
.../raw/current_gtfs_schedule_stop_146222 | 1 -
.../raw/current_gtfs_schedule_stop_146223 | 1 -
.../raw/current_gtfs_schedule_stop_146224 | 1 -
.../raw/current_gtfs_schedule_stop_146225 | 1 -
.../raw/current_gtfs_schedule_stop_146226 | 1 -
.../raw/current_gtfs_schedule_stop_146227 | 1 -
.../raw/current_gtfs_schedule_stop_146228 | 2 -
.../raw/current_gtfs_schedule_stop_146229 | 4 -
.../raw/current_gtfs_schedule_stop_146230 | 3 -
.../raw/current_gtfs_schedule_stop_146231 | 3 -
.../raw/current_gtfs_schedule_stop_146232 | 1 -
.../raw/current_gtfs_schedule_stop_146233 | 6 -
.../raw/current_gtfs_schedule_stop_146234 | 7 -
.../raw/current_gtfs_schedule_stop_146236 | 2 -
.../raw/current_gtfs_schedule_stop_146237 | 4 -
.../raw/current_gtfs_schedule_stop_146238 | 1 -
.../raw/current_gtfs_schedule_stop_146239 | 5 -
.../raw/current_gtfs_schedule_stop_146240 | 3 -
.../raw/current_gtfs_schedule_stop_146241 | 3 -
.../raw/current_gtfs_schedule_stop_146242 | 2 -
.../raw/current_gtfs_schedule_stop_146243 | 3 -
.../raw/current_gtfs_schedule_stop_146244 | 4 -
.../raw/current_gtfs_schedule_stop_146245 | 1 -
.../raw/current_gtfs_schedule_stop_146246 | 1 -
.../raw/current_gtfs_schedule_stop_146247 | 2 -
.../raw/current_gtfs_schedule_stop_146248 | 1 -
.../raw/current_gtfs_schedule_stop_146251 | 2 -
.../raw/current_gtfs_schedule_stop_146252 | 2 -
.../raw/current_gtfs_schedule_stop_146253 | 4 -
.../raw/current_gtfs_schedule_stop_146254 | 3 -
.../raw/current_gtfs_schedule_stop_146255 | 4 -
.../raw/current_gtfs_schedule_stop_146256 | 3 -
.../raw/current_gtfs_schedule_stop_146257 | 2 -
.../raw/current_gtfs_schedule_stop_146258 | 2 -
.../raw/current_gtfs_schedule_stop_146259 | 2 -
.../raw/current_gtfs_schedule_stop_146260 | 2 -
.../raw/current_gtfs_schedule_stop_146261 | 2 -
.../raw/current_gtfs_schedule_stop_146262 | 2 -
.../raw/current_gtfs_schedule_stop_146263 | 2 -
.../raw/current_gtfs_schedule_stop_146264 | 2 -
.../raw/current_gtfs_schedule_stop_146265 | 8 -
.../raw/current_gtfs_schedule_stop_146266 | 4 -
.../raw/current_gtfs_schedule_stop_146267 | 3 -
.../raw/current_gtfs_schedule_stop_146268 | 4 -
.../raw/current_gtfs_schedule_stop_146269 | 4 -
.../raw/current_gtfs_schedule_stop_146270 | 4 -
.../raw/current_gtfs_schedule_stop_146271 | 3 -
.../raw/current_gtfs_schedule_stop_146273 | 4 -
.../raw/current_gtfs_schedule_stop_146274 | 3 -
.../raw/current_gtfs_schedule_stop_146275 | 1 -
.../raw/current_gtfs_schedule_stop_146276 | 1 -
.../raw/current_gtfs_schedule_stop_146277 | 1 -
.../raw/current_gtfs_schedule_stop_146278 | 1 -
.../raw/current_gtfs_schedule_stop_146279 | 1 -
.../raw/current_gtfs_schedule_stop_146280 | 2 -
.../raw/current_gtfs_schedule_stop_146281 | 4 -
.../raw/current_gtfs_schedule_stop_146282 | 3 -
.../raw/current_gtfs_schedule_stop_146283 | 3 -
.../raw/current_gtfs_schedule_stop_146284 | 1 -
.../raw/current_gtfs_schedule_stop_146285 | 2 -
.../raw/current_gtfs_schedule_stop_146286 | 2 -
.../raw/current_gtfs_schedule_stop_146287 | 2 -
.../raw/current_gtfs_schedule_stop_146288 | 2 -
.../raw/current_gtfs_schedule_stop_146289 | 2 -
.../raw/current_gtfs_schedule_stop_146290 | 2 -
.../raw/current_gtfs_schedule_stop_146291 | 1 -
.../raw/current_gtfs_schedule_stop_146292 | 2 -
.../raw/current_gtfs_schedule_stop_146293 | 2 -
.../raw/current_gtfs_schedule_stop_146294 | 1 -
.../raw/current_gtfs_schedule_stop_146295 | 1 -
.../raw/current_gtfs_schedule_stop_146296 | 1 -
.../raw/current_gtfs_schedule_stop_146305 | 1 -
.../raw/current_gtfs_schedule_stop_146311 | 2 -
.../raw/current_gtfs_schedule_stop_146312 | 2 -
.../raw/current_gtfs_schedule_stop_146313 | 2 -
.../raw/current_gtfs_schedule_stop_146314 | 2 -
.../raw/current_gtfs_schedule_stop_146315 | 2 -
.../raw/current_gtfs_schedule_stop_146316 | 3 -
.../raw/current_gtfs_schedule_stop_146318 | 7 -
.../raw/current_gtfs_schedule_stop_146322 | 2 -
.../raw/current_gtfs_schedule_stop_146323 | 4 -
.../raw/current_gtfs_schedule_stop_146324 | 1 -
.../raw/current_gtfs_schedule_stop_146325 | 1 -
.../raw/current_gtfs_schedule_stop_146326 | 1 -
.../raw/current_gtfs_schedule_stop_146327 | 1 -
.../raw/current_gtfs_schedule_stop_146328 | 1 -
.../raw/current_gtfs_schedule_stop_146329 | 1 -
.../raw/current_gtfs_schedule_stop_146330 | 1 -
.../raw/current_gtfs_schedule_stop_146331 | 1 -
.../raw/current_gtfs_schedule_stop_146332 | 1 -
.../raw/current_gtfs_schedule_stop_146333 | 1 -
.../raw/current_gtfs_schedule_stop_146334 | 3 -
.../raw/current_gtfs_schedule_stop_146335 | 3 -
.../raw/current_gtfs_schedule_stop_146336 | 6 -
.../raw/current_gtfs_schedule_stop_146337 | 3 -
.../raw/current_gtfs_schedule_stop_146338 | 3 -
.../raw/current_gtfs_schedule_stop_146339 | 3 -
.../raw/current_gtfs_schedule_stop_146340 | 3 -
.../raw/current_gtfs_schedule_stop_146341 | 3 -
.../raw/current_gtfs_schedule_stop_146342 | 4 -
.../raw/current_gtfs_schedule_stop_146343 | 3 -
.../raw/current_gtfs_schedule_stop_146344 | 1 -
.../raw/current_gtfs_schedule_stop_146345 | 1 -
.../raw/current_gtfs_schedule_stop_146346 | 1 -
.../raw/current_gtfs_schedule_stop_146347 | 1 -
.../raw/current_gtfs_schedule_stop_146348 | 1 -
.../raw/current_gtfs_schedule_stop_146349 | 1 -
.../raw/current_gtfs_schedule_stop_146350 | 1 -
.../raw/current_gtfs_schedule_stop_146351 | 1 -
.../raw/current_gtfs_schedule_stop_146352 | 1 -
.../raw/current_gtfs_schedule_stop_146353 | 1 -
.../raw/current_gtfs_schedule_stop_146354 | 1 -
.../raw/current_gtfs_schedule_stop_146360 | 3 -
.../raw/current_gtfs_schedule_stop_146361 | 2 -
.../raw/current_gtfs_schedule_stop_146362 | 3 -
.../raw/current_gtfs_schedule_stop_146363 | 1 -
.../raw/current_gtfs_schedule_stop_146365 | 3 -
.../raw/current_gtfs_schedule_stop_146367 | 4 -
.../raw/current_gtfs_schedule_stop_146368 | 3 -
.../raw/current_gtfs_schedule_stop_146369 | 3 -
.../raw/current_gtfs_schedule_stop_146370 | 1 -
.../raw/current_gtfs_schedule_stop_148000 | 1 -
.../raw/current_gtfs_schedule_stop_149000 | 1 -
.../raw/current_gtfs_schedule_stop_149001 | 1 -
.../raw/current_gtfs_schedule_stop_149002 | 2 -
.../values/current_gtfs_rts_values_gen.xml | 10 +-
.../main/res-next/raw/next_gtfs_rts_routes | 15 +
.../src/main/res-next/raw/next_gtfs_rts_stops | 359 +++++++
.../res-next/raw/next_gtfs_rts_trip_stops | 919 ++++++++++++++++++
.../src/main/res-next/raw/next_gtfs_rts_trips | 28 +
.../raw/next_gtfs_schedule_service_dates | 101 ++
.../raw/next_gtfs_schedule_stop_103689 | 1 +
.../raw/next_gtfs_schedule_stop_103690 | 1 +
.../raw/next_gtfs_schedule_stop_103744 | 1 +
.../raw/next_gtfs_schedule_stop_103745 | 1 +
.../raw/next_gtfs_schedule_stop_140213 | 1 +
.../raw/next_gtfs_schedule_stop_140214 | 1 +
.../raw/next_gtfs_schedule_stop_140215 | 2 +
.../raw/next_gtfs_schedule_stop_140221 | 1 +
.../raw/next_gtfs_schedule_stop_140222 | 1 +
.../raw/next_gtfs_schedule_stop_146000 | 6 +
.../raw/next_gtfs_schedule_stop_146001 | 2 +
.../raw/next_gtfs_schedule_stop_146002 | 2 +
.../raw/next_gtfs_schedule_stop_146003 | 2 +
.../raw/next_gtfs_schedule_stop_146004 | 2 +
.../raw/next_gtfs_schedule_stop_146005 | 2 +
.../raw/next_gtfs_schedule_stop_146006 | 2 +
.../raw/next_gtfs_schedule_stop_146007 | 2 +
.../raw/next_gtfs_schedule_stop_146008 | 2 +
.../raw/next_gtfs_schedule_stop_146009 | 6 +
.../raw/next_gtfs_schedule_stop_146010 | 6 +
.../raw/next_gtfs_schedule_stop_146012 | 4 +
.../raw/next_gtfs_schedule_stop_146013 | 6 +
.../raw/next_gtfs_schedule_stop_146014 | 2 +
.../raw/next_gtfs_schedule_stop_146015 | 6 +
.../raw/next_gtfs_schedule_stop_146016 | 1 +
.../raw/next_gtfs_schedule_stop_146017 | 2 +
.../raw/next_gtfs_schedule_stop_146018 | 2 +
.../raw/next_gtfs_schedule_stop_146019 | 4 +
.../raw/next_gtfs_schedule_stop_146020 | 2 +
.../raw/next_gtfs_schedule_stop_146021 | 8 +
.../raw/next_gtfs_schedule_stop_146022 | 1 +
.../raw/next_gtfs_schedule_stop_146023 | 2 +
.../raw/next_gtfs_schedule_stop_146024 | 3 +
.../raw/next_gtfs_schedule_stop_146025 | 7 +
.../raw/next_gtfs_schedule_stop_146028 | 8 +
.../raw/next_gtfs_schedule_stop_146029 | 9 +
.../raw/next_gtfs_schedule_stop_146030 | 9 +
.../raw/next_gtfs_schedule_stop_146031 | 1 +
.../raw/next_gtfs_schedule_stop_146032 | 1 +
.../raw/next_gtfs_schedule_stop_146033 | 1 +
.../raw/next_gtfs_schedule_stop_146034 | 12 +
.../raw/next_gtfs_schedule_stop_146035 | 11 +
.../raw/next_gtfs_schedule_stop_146036 | 6 +
.../raw/next_gtfs_schedule_stop_146037 | 4 +
.../raw/next_gtfs_schedule_stop_146038 | 4 +
.../raw/next_gtfs_schedule_stop_146039 | 4 +
.../raw/next_gtfs_schedule_stop_146040 | 3 +
.../raw/next_gtfs_schedule_stop_146041 | 4 +
.../raw/next_gtfs_schedule_stop_146042 | 11 +
.../raw/next_gtfs_schedule_stop_146043 | 2 +
.../raw/next_gtfs_schedule_stop_146044 | 2 +
.../raw/next_gtfs_schedule_stop_146045 | 12 +
.../raw/next_gtfs_schedule_stop_146046 | 7 +
.../raw/next_gtfs_schedule_stop_146047 | 9 +
.../raw/next_gtfs_schedule_stop_146048 | 10 +
.../raw/next_gtfs_schedule_stop_146049 | 8 +
.../raw/next_gtfs_schedule_stop_146050 | 5 +
.../raw/next_gtfs_schedule_stop_146051 | 4 +
.../raw/next_gtfs_schedule_stop_146052 | 10 +
.../raw/next_gtfs_schedule_stop_146053 | 3 +
.../raw/next_gtfs_schedule_stop_146054 | 9 +
.../raw/next_gtfs_schedule_stop_146055 | 9 +
.../raw/next_gtfs_schedule_stop_146057 | 3 +
.../raw/next_gtfs_schedule_stop_146058 | 5 +
.../raw/next_gtfs_schedule_stop_146059 | 2 +
.../raw/next_gtfs_schedule_stop_146060 | 2 +
.../raw/next_gtfs_schedule_stop_146061 | 5 +
.../raw/next_gtfs_schedule_stop_146062 | 3 +
.../raw/next_gtfs_schedule_stop_146063 | 3 +
.../raw/next_gtfs_schedule_stop_146064 | 6 +
.../raw/next_gtfs_schedule_stop_146065 | 8 +
.../raw/next_gtfs_schedule_stop_146066 | 2 +
.../raw/next_gtfs_schedule_stop_146067 | 6 +
.../raw/next_gtfs_schedule_stop_146068 | 5 +
.../raw/next_gtfs_schedule_stop_146069 | 6 +
.../raw/next_gtfs_schedule_stop_146070 | 6 +
.../raw/next_gtfs_schedule_stop_146071 | 5 +
.../raw/next_gtfs_schedule_stop_146072 | 4 +
.../raw/next_gtfs_schedule_stop_146074 | 5 +
.../raw/next_gtfs_schedule_stop_146075 | 3 +
.../raw/next_gtfs_schedule_stop_146076 | 10 +
.../raw/next_gtfs_schedule_stop_146077 | 10 +
.../raw/next_gtfs_schedule_stop_146078 | 3 +
.../raw/next_gtfs_schedule_stop_146079 | 10 +
.../raw/next_gtfs_schedule_stop_146080 | 3 +
.../raw/next_gtfs_schedule_stop_146081 | 10 +
.../raw/next_gtfs_schedule_stop_146082 | 10 +
.../raw/next_gtfs_schedule_stop_146083 | 6 +
.../raw/next_gtfs_schedule_stop_146084 | 6 +
.../raw/next_gtfs_schedule_stop_146085 | 6 +
.../raw/next_gtfs_schedule_stop_146086 | 6 +
.../raw/next_gtfs_schedule_stop_146087 | 6 +
.../raw/next_gtfs_schedule_stop_146088 | 3 +
.../raw/next_gtfs_schedule_stop_146089 | 10 +
.../raw/next_gtfs_schedule_stop_146090 | 3 +
.../raw/next_gtfs_schedule_stop_146091 | 4 +
.../raw/next_gtfs_schedule_stop_146092 | 2 +
.../raw/next_gtfs_schedule_stop_146093 | 2 +
.../raw/next_gtfs_schedule_stop_146094 | 2 +
.../raw/next_gtfs_schedule_stop_146095 | 6 +
.../raw/next_gtfs_schedule_stop_146096 | 6 +
.../raw/next_gtfs_schedule_stop_146098 | 6 +
.../raw/next_gtfs_schedule_stop_146099 | 7 +
.../raw/next_gtfs_schedule_stop_146100 | 5 +
.../raw/next_gtfs_schedule_stop_146101 | 6 +
.../raw/next_gtfs_schedule_stop_146102 | 5 +
.../raw/next_gtfs_schedule_stop_146103 | 5 +
.../raw/next_gtfs_schedule_stop_146104 | 2 +
.../raw/next_gtfs_schedule_stop_146105 | 8 +
.../raw/next_gtfs_schedule_stop_146106 | 8 +
.../raw/next_gtfs_schedule_stop_146107 | 4 +
.../raw/next_gtfs_schedule_stop_146108 | 10 +
.../raw/next_gtfs_schedule_stop_146109 | 4 +
.../raw/next_gtfs_schedule_stop_146110 | 9 +
.../raw/next_gtfs_schedule_stop_146111 | 2 +
.../raw/next_gtfs_schedule_stop_146112 | 2 +
.../raw/next_gtfs_schedule_stop_146113 | 2 +
.../raw/next_gtfs_schedule_stop_146114 | 2 +
.../raw/next_gtfs_schedule_stop_146115 | 2 +
.../raw/next_gtfs_schedule_stop_146116 | 2 +
.../raw/next_gtfs_schedule_stop_146117 | 12 +
.../raw/next_gtfs_schedule_stop_146118 | 4 +
.../raw/next_gtfs_schedule_stop_146119 | 4 +
.../raw/next_gtfs_schedule_stop_146120 | 4 +
.../raw/next_gtfs_schedule_stop_146121 | 4 +
.../raw/next_gtfs_schedule_stop_146122 | 4 +
.../raw/next_gtfs_schedule_stop_146123 | 4 +
.../raw/next_gtfs_schedule_stop_146124 | 4 +
.../raw/next_gtfs_schedule_stop_146125 | 4 +
.../raw/next_gtfs_schedule_stop_146126 | 4 +
.../raw/next_gtfs_schedule_stop_146127 | 2 +
.../raw/next_gtfs_schedule_stop_146128 | 2 +
.../raw/next_gtfs_schedule_stop_146129 | 2 +
.../raw/next_gtfs_schedule_stop_146130 | 7 +
.../raw/next_gtfs_schedule_stop_146132 | 7 +
.../raw/next_gtfs_schedule_stop_146133 | 7 +
.../raw/next_gtfs_schedule_stop_146134 | 7 +
.../raw/next_gtfs_schedule_stop_146135 | 8 +
.../raw/next_gtfs_schedule_stop_146136 | 7 +
.../raw/next_gtfs_schedule_stop_146137 | 10 +
.../raw/next_gtfs_schedule_stop_146138 | 7 +
.../raw/next_gtfs_schedule_stop_146139 | 8 +
.../raw/next_gtfs_schedule_stop_146140 | 7 +
.../raw/next_gtfs_schedule_stop_146141 | 8 +
.../raw/next_gtfs_schedule_stop_146142 | 8 +
.../raw/next_gtfs_schedule_stop_146143 | 7 +
.../raw/next_gtfs_schedule_stop_146144 | 8 +
.../raw/next_gtfs_schedule_stop_146145 | 7 +
.../raw/next_gtfs_schedule_stop_146146 | 8 +
.../raw/next_gtfs_schedule_stop_146147 | 7 +
.../raw/next_gtfs_schedule_stop_146148 | 7 +
.../raw/next_gtfs_schedule_stop_146149 | 8 +
.../raw/next_gtfs_schedule_stop_146150 | 12 +
.../raw/next_gtfs_schedule_stop_146151 | 14 +
.../raw/next_gtfs_schedule_stop_146152 | 7 +
.../raw/next_gtfs_schedule_stop_146153 | 6 +
.../raw/next_gtfs_schedule_stop_146154 | 7 +
.../raw/next_gtfs_schedule_stop_146155 | 8 +
.../raw/next_gtfs_schedule_stop_146156 | 7 +
.../raw/next_gtfs_schedule_stop_146157 | 26 +
.../raw/next_gtfs_schedule_stop_146159 | 8 +
.../raw/next_gtfs_schedule_stop_146160 | 14 +
.../raw/next_gtfs_schedule_stop_146161 | 31 +
.../raw/next_gtfs_schedule_stop_146162 | 4 +
.../raw/next_gtfs_schedule_stop_146163 | 8 +
.../raw/next_gtfs_schedule_stop_146164 | 2 +
.../raw/next_gtfs_schedule_stop_146165 | 2 +
.../raw/next_gtfs_schedule_stop_146166 | 5 +
.../raw/next_gtfs_schedule_stop_146167 | 7 +
.../raw/next_gtfs_schedule_stop_146168 | 2 +
.../raw/next_gtfs_schedule_stop_146169 | 2 +
.../raw/next_gtfs_schedule_stop_146170 | 2 +
.../raw/next_gtfs_schedule_stop_146171 | 6 +
.../raw/next_gtfs_schedule_stop_146172 | 8 +
.../raw/next_gtfs_schedule_stop_146173 | 10 +
.../raw/next_gtfs_schedule_stop_146174 | 6 +
.../raw/next_gtfs_schedule_stop_146175 | 10 +
.../raw/next_gtfs_schedule_stop_146176 | 6 +
.../raw/next_gtfs_schedule_stop_146177 | 8 +
.../raw/next_gtfs_schedule_stop_146178 | 5 +
.../raw/next_gtfs_schedule_stop_146179 | 5 +
.../raw/next_gtfs_schedule_stop_146182 | 3 +
.../raw/next_gtfs_schedule_stop_146183 | 3 +
.../raw/next_gtfs_schedule_stop_146184 | 7 +
.../raw/next_gtfs_schedule_stop_146185 | 7 +
.../raw/next_gtfs_schedule_stop_146186 | 14 +
.../raw/next_gtfs_schedule_stop_146187 | 14 +
.../raw/next_gtfs_schedule_stop_146188 | 12 +
.../raw/next_gtfs_schedule_stop_146189 | 4 +
.../raw/next_gtfs_schedule_stop_146190 | 12 +
.../raw/next_gtfs_schedule_stop_146191 | 9 +
.../raw/next_gtfs_schedule_stop_146192 | 9 +
.../raw/next_gtfs_schedule_stop_146194 | 6 +
.../raw/next_gtfs_schedule_stop_146195 | 6 +
.../raw/next_gtfs_schedule_stop_146196 | 2 +
.../raw/next_gtfs_schedule_stop_146197 | 2 +
.../raw/next_gtfs_schedule_stop_146198 | 10 +
.../raw/next_gtfs_schedule_stop_146199 | 5 +
.../raw/next_gtfs_schedule_stop_146200 | 2 +
.../raw/next_gtfs_schedule_stop_146201 | 6 +
.../raw/next_gtfs_schedule_stop_146202 | 4 +
.../raw/next_gtfs_schedule_stop_146203 | 4 +
.../raw/next_gtfs_schedule_stop_146204 | 8 +
.../raw/next_gtfs_schedule_stop_146205 | 2 +
.../raw/next_gtfs_schedule_stop_146206 | 8 +
.../raw/next_gtfs_schedule_stop_146207 | 4 +
.../raw/next_gtfs_schedule_stop_146208 | 2 +
.../raw/next_gtfs_schedule_stop_146209 | 4 +
.../raw/next_gtfs_schedule_stop_146210 | 4 +
.../raw/next_gtfs_schedule_stop_146211 | 7 +
.../raw/next_gtfs_schedule_stop_146212 | 4 +
.../raw/next_gtfs_schedule_stop_146213 | 4 +
.../raw/next_gtfs_schedule_stop_146214 | 4 +
.../raw/next_gtfs_schedule_stop_146215 | 6 +
.../raw/next_gtfs_schedule_stop_146216 | 11 +
.../raw/next_gtfs_schedule_stop_146217 | 6 +
.../raw/next_gtfs_schedule_stop_146218 | 4 +
.../raw/next_gtfs_schedule_stop_146219 | 12 +
.../raw/next_gtfs_schedule_stop_146220 | 6 +
.../raw/next_gtfs_schedule_stop_146221 | 6 +
.../raw/next_gtfs_schedule_stop_146222 | 2 +
.../raw/next_gtfs_schedule_stop_146223 | 2 +
.../raw/next_gtfs_schedule_stop_146224 | 2 +
.../raw/next_gtfs_schedule_stop_146225 | 2 +
.../raw/next_gtfs_schedule_stop_146226 | 2 +
.../raw/next_gtfs_schedule_stop_146227 | 2 +
.../raw/next_gtfs_schedule_stop_146228 | 5 +
.../raw/next_gtfs_schedule_stop_146229 | 7 +
.../raw/next_gtfs_schedule_stop_146230 | 6 +
.../raw/next_gtfs_schedule_stop_146231 | 5 +
.../raw/next_gtfs_schedule_stop_146232 | 2 +
.../raw/next_gtfs_schedule_stop_146233 | 12 +
.../raw/next_gtfs_schedule_stop_146234 | 13 +
.../raw/next_gtfs_schedule_stop_146236 | 5 +
.../raw/next_gtfs_schedule_stop_146237 | 9 +
.../raw/next_gtfs_schedule_stop_146238 | 3 +
.../raw/next_gtfs_schedule_stop_146239 | 8 +
.../raw/next_gtfs_schedule_stop_146240 | 4 +
.../raw/next_gtfs_schedule_stop_146241 | 4 +
.../raw/next_gtfs_schedule_stop_146242 | 4 +
.../raw/next_gtfs_schedule_stop_146243 | 5 +
.../raw/next_gtfs_schedule_stop_146244 | 8 +
.../raw/next_gtfs_schedule_stop_146245 | 3 +
.../raw/next_gtfs_schedule_stop_146246 | 3 +
.../raw/next_gtfs_schedule_stop_146247 | 5 +
.../raw/next_gtfs_schedule_stop_146248 | 2 +
.../raw/next_gtfs_schedule_stop_146250 | 2 +
.../raw/next_gtfs_schedule_stop_146251 | 4 +
.../raw/next_gtfs_schedule_stop_146252 | 4 +
.../raw/next_gtfs_schedule_stop_146253 | 7 +
.../raw/next_gtfs_schedule_stop_146254 | 4 +
.../raw/next_gtfs_schedule_stop_146255 | 8 +
.../raw/next_gtfs_schedule_stop_146256 | 4 +
.../raw/next_gtfs_schedule_stop_146257 | 6 +
.../raw/next_gtfs_schedule_stop_146258 | 6 +
.../raw/next_gtfs_schedule_stop_146259 | 4 +
.../raw/next_gtfs_schedule_stop_146260 | 4 +
.../raw/next_gtfs_schedule_stop_146261 | 4 +
.../raw/next_gtfs_schedule_stop_146262 | 4 +
.../raw/next_gtfs_schedule_stop_146263 | 4 +
.../raw/next_gtfs_schedule_stop_146264 | 4 +
.../raw/next_gtfs_schedule_stop_146265 | 12 +
.../raw/next_gtfs_schedule_stop_146266 | 8 +
.../raw/next_gtfs_schedule_stop_146267 | 6 +
.../raw/next_gtfs_schedule_stop_146268 | 6 +
.../raw/next_gtfs_schedule_stop_146269 | 10 +
.../raw/next_gtfs_schedule_stop_146270 | 8 +
.../raw/next_gtfs_schedule_stop_146271 | 4 +
.../raw/next_gtfs_schedule_stop_146273 | 8 +
.../raw/next_gtfs_schedule_stop_146274 | 4 +
.../raw/next_gtfs_schedule_stop_146275 | 2 +
.../raw/next_gtfs_schedule_stop_146276 | 2 +
.../raw/next_gtfs_schedule_stop_146277 | 2 +
.../raw/next_gtfs_schedule_stop_146278 | 2 +
.../raw/next_gtfs_schedule_stop_146279 | 2 +
.../raw/next_gtfs_schedule_stop_146280 | 4 +
.../raw/next_gtfs_schedule_stop_146281 | 8 +
.../raw/next_gtfs_schedule_stop_146282 | 4 +
.../raw/next_gtfs_schedule_stop_146283 | 4 +
.../raw/next_gtfs_schedule_stop_146284 | 2 +
.../raw/next_gtfs_schedule_stop_146285 | 4 +
.../raw/next_gtfs_schedule_stop_146286 | 3 +
.../raw/next_gtfs_schedule_stop_146287 | 4 +
.../raw/next_gtfs_schedule_stop_146288 | 4 +
.../raw/next_gtfs_schedule_stop_146289 | 3 +
.../raw/next_gtfs_schedule_stop_146290 | 4 +
.../raw/next_gtfs_schedule_stop_146291 | 1 +
.../raw/next_gtfs_schedule_stop_146292 | 2 +
.../raw/next_gtfs_schedule_stop_146293 | 2 +
.../raw/next_gtfs_schedule_stop_146294 | 1 +
.../raw/next_gtfs_schedule_stop_146295 | 1 +
.../raw/next_gtfs_schedule_stop_146296 | 1 +
.../raw/next_gtfs_schedule_stop_146297} | 2 +-
.../raw/next_gtfs_schedule_stop_146298} | 2 +-
.../raw/next_gtfs_schedule_stop_146299} | 2 +-
.../raw/next_gtfs_schedule_stop_146300} | 2 +-
.../raw/next_gtfs_schedule_stop_146301} | 2 +-
.../raw/next_gtfs_schedule_stop_146302} | 2 +-
.../raw/next_gtfs_schedule_stop_146303} | 2 +-
.../raw/next_gtfs_schedule_stop_146304} | 2 +-
.../raw/next_gtfs_schedule_stop_146305 | 1 +
.../raw/next_gtfs_schedule_stop_146306} | 2 +-
.../raw/next_gtfs_schedule_stop_146307} | 2 +-
.../raw/next_gtfs_schedule_stop_146308} | 2 +-
.../raw/next_gtfs_schedule_stop_146309} | 2 +-
.../raw/next_gtfs_schedule_stop_146310} | 2 +-
.../raw/next_gtfs_schedule_stop_146311 | 2 +
.../raw/next_gtfs_schedule_stop_146312 | 2 +
.../raw/next_gtfs_schedule_stop_146313 | 2 +
.../raw/next_gtfs_schedule_stop_146314 | 2 +
.../raw/next_gtfs_schedule_stop_146315 | 2 +
.../raw/next_gtfs_schedule_stop_146316 | 3 +
.../raw/next_gtfs_schedule_stop_146318 | 13 +
.../raw/next_gtfs_schedule_stop_146322 | 2 +
.../raw/next_gtfs_schedule_stop_146323 | 8 +
.../raw/next_gtfs_schedule_stop_146324 | 2 +
.../raw/next_gtfs_schedule_stop_146325 | 2 +
.../raw/next_gtfs_schedule_stop_146326 | 1 +
.../raw/next_gtfs_schedule_stop_146327 | 1 +
.../raw/next_gtfs_schedule_stop_146328 | 1 +
.../raw/next_gtfs_schedule_stop_146329 | 1 +
.../raw/next_gtfs_schedule_stop_146330 | 1 +
.../raw/next_gtfs_schedule_stop_146331 | 1 +
.../raw/next_gtfs_schedule_stop_146332 | 1 +
.../raw/next_gtfs_schedule_stop_146333 | 1 +
.../raw/next_gtfs_schedule_stop_146334 | 3 +
.../raw/next_gtfs_schedule_stop_146335 | 3 +
.../raw/next_gtfs_schedule_stop_146336 | 6 +
.../raw/next_gtfs_schedule_stop_146337 | 3 +
.../raw/next_gtfs_schedule_stop_146338 | 3 +
.../raw/next_gtfs_schedule_stop_146339 | 3 +
.../raw/next_gtfs_schedule_stop_146340 | 3 +
.../raw/next_gtfs_schedule_stop_146341 | 3 +
.../raw/next_gtfs_schedule_stop_146342 | 7 +
.../raw/next_gtfs_schedule_stop_146343 | 3 +
.../raw/next_gtfs_schedule_stop_146344 | 1 +
.../raw/next_gtfs_schedule_stop_146345 | 1 +
.../raw/next_gtfs_schedule_stop_146346 | 1 +
.../raw/next_gtfs_schedule_stop_146347 | 1 +
.../raw/next_gtfs_schedule_stop_146348 | 1 +
.../raw/next_gtfs_schedule_stop_146349 | 1 +
.../raw/next_gtfs_schedule_stop_146350 | 1 +
.../raw/next_gtfs_schedule_stop_146351 | 1 +
.../raw/next_gtfs_schedule_stop_146352 | 1 +
.../raw/next_gtfs_schedule_stop_146353 | 1 +
.../raw/next_gtfs_schedule_stop_146354 | 1 +
.../raw/next_gtfs_schedule_stop_146360 | 6 +
.../raw/next_gtfs_schedule_stop_146361 | 5 +
.../raw/next_gtfs_schedule_stop_146362 | 6 +
.../raw/next_gtfs_schedule_stop_146363 | 3 +
.../raw/next_gtfs_schedule_stop_146365 | 4 +
.../raw/next_gtfs_schedule_stop_146367 | 8 +
.../raw/next_gtfs_schedule_stop_146368 | 4 +
.../raw/next_gtfs_schedule_stop_146369 | 4 +
.../raw/next_gtfs_schedule_stop_146370 | 2 +
.../raw/next_gtfs_schedule_stop_148000 | 1 +
.../raw/next_gtfs_schedule_stop_149000 | 1 +
.../raw/next_gtfs_schedule_stop_149001 | 1 +
.../raw/next_gtfs_schedule_stop_149002 | 2 +
.../values/next_gtfs_rts_values_gen.xml | 11 +
.../src/main/res/values/gtfs_rts_values.xml | 2 +-
708 files changed, 3164 insertions(+), 1317 deletions(-)
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140213
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140215
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146291
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146292
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146293
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146294
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146295
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146296
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146305
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146311
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146312
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146313
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146314
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146315
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146316
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146322
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146326
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146327
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146328
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146329
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146330
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146331
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146332
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146333
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146334
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146335
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146336
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146337
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146338
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146339
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146340
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146341
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146343
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146344
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146345
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146346
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146347
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146348
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146349
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146350
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146351
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146352
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146353
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146354
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_148000
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149000
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149001
delete mode 100644 app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149002
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_rts_routes
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_rts_stops
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_rts_trips
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103689
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103690
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103744
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103745
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140213
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140214
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140215
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140221
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140222
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146000
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146001
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146002
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146003
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146004
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146005
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146006
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146007
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146008
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146009
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146010
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146012
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146013
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146014
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146015
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146016
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146017
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146018
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146019
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146020
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146021
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146022
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146023
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146024
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146025
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146028
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146029
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146030
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146031
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146032
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146033
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146034
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146035
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146036
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146037
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146038
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146039
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146040
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146041
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146042
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146043
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146044
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146045
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146046
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146047
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146048
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146049
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146050
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146051
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146052
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146053
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146054
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146055
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146057
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146058
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146059
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146060
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146061
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146062
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146063
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146064
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146065
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146066
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146067
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146068
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146069
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146070
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146071
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146072
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146074
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146075
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146076
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146077
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146078
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146079
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146080
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146081
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146082
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146083
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146084
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146085
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146086
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146087
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146088
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146089
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146090
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146091
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146092
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146093
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146094
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146095
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146096
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146098
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146099
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146100
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146101
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146102
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146103
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146104
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146105
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146106
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146107
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146108
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146109
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146110
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146111
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146112
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146113
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146114
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146115
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146116
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146117
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146118
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146119
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146120
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146121
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146122
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146123
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146124
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146125
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146126
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146127
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146128
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146129
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146130
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146132
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146133
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146134
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146135
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146136
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146137
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146138
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146139
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146140
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146141
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146142
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146143
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146144
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146145
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146146
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146147
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146148
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146149
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146150
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146151
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146152
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146153
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146154
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146155
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146156
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146157
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146159
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146160
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146161
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146162
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146163
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146164
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146165
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146166
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146167
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146168
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146169
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146170
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146171
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146172
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146173
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146174
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146175
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146176
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146177
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146178
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146179
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146182
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146183
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146184
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146185
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146186
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146187
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146188
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146189
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146190
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146191
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146192
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146194
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146195
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146196
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146197
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146198
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146199
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146200
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146201
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146202
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146203
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146204
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146205
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146206
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146207
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146208
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146209
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146210
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146211
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146212
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146213
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146214
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146215
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146216
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146217
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146218
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146219
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146220
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146221
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146222
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146223
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146224
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146225
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146226
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146227
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146228
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146229
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146230
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146231
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146232
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146233
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146234
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146236
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146237
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146238
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146239
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146240
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146241
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146242
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146243
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146244
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146245
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146246
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146247
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146248
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146250
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146251
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146252
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146253
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146254
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146255
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146256
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146257
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146258
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146259
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146260
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146261
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146262
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146263
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146264
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146265
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146266
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146267
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146268
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146269
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146270
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146271
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146273
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146274
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146275
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146276
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146277
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146278
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146279
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146280
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146281
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146282
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146283
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146284
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146285
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146286
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146287
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146288
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146289
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146290
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146291
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146292
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146293
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146294
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146295
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146296
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146297 => res-next/raw/next_gtfs_schedule_stop_146297} (51%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146298 => res-next/raw/next_gtfs_schedule_stop_146298} (54%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146299 => res-next/raw/next_gtfs_schedule_stop_146299} (51%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146300 => res-next/raw/next_gtfs_schedule_stop_146300} (54%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146301 => res-next/raw/next_gtfs_schedule_stop_146301} (54%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146304 => res-next/raw/next_gtfs_schedule_stop_146302} (51%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146303 => res-next/raw/next_gtfs_schedule_stop_146303} (54%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146306 => res-next/raw/next_gtfs_schedule_stop_146304} (51%)
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146305
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146307 => res-next/raw/next_gtfs_schedule_stop_146306} (51%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146302 => res-next/raw/next_gtfs_schedule_stop_146307} (51%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146308 => res-next/raw/next_gtfs_schedule_stop_146308} (54%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146309 => res-next/raw/next_gtfs_schedule_stop_146309} (51%)
rename app-android/src/main/{res-current/raw/current_gtfs_schedule_stop_146310 => res-next/raw/next_gtfs_schedule_stop_146310} (54%)
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146311
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146312
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146313
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146314
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146315
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146316
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146318
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146322
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146323
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146324
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146325
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146326
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146327
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146328
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146329
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146330
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146331
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146332
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146333
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146334
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146335
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146336
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146337
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146338
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146339
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146340
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146341
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146342
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146343
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146344
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146345
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146346
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146347
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146348
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146349
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146350
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146351
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146352
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146353
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146354
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146360
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146361
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146362
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146363
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146365
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146367
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146368
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146369
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146370
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_148000
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149000
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149001
create mode 100644 app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149002
create mode 100644 app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
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 45460e14..a4674e0f 100644
--- a/app-android/src/main/play/release-notes/en-US/default.txt
+++ b/app-android/src/main/play/release-notes/en-US/default.txt
@@ -1 +1 @@
-Schedule from August 11, 2024 to September 2, 2024.
+Schedule from August 31, 2024 to October 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 29f9b88a..d49a5020 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
@@ -4,12 +4,6 @@
4,'4','West Side / Duncan East','00AEEF',52,3
5,'5','Main Street','FCAF17',53,3
10,'10','Naramata / Penticton','00AA47',1567,3
-11,'11','West Bench','ED1D8F',1568,3
15,'15','Night Route','8177B7',1572,3
16,'16','Lake To Lake','49176B',1573,3
-20,'20','Okanagan Falls / Penticton','B2BB1E',1598,3
-21,'21','OK Falls Local','4F6F19',1599,3
30,'30','Penticton / Summerland','77AF99',1629,3
-40,'40','Osoyoos / Penticton','E270AB',1660,3
-41,'41','Osoyoos Local','5D87A1',1661,3
-70,'70','Kelowna / Penticton','F49A5D',1753,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 015add74..32d29190 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,12 +1,3 @@
-103689,'103689','13th St & Lk',49.78264,-119.72333,0,1448730435
-103690,'103690','13th St & Lk',49.78270,-119.72310,0,1448730457
-103744,'103744','Hwy 97 Onramp @ Westside Rd',49.88180,-119.53653,0,1448731267
-103745,'103745','Hwy 97 Offramp @ Sneena',49.88074,-119.53497,0,1448731268
-140213,'140213','Westbank Exch',49.82830,-119.63061,0,1452331079
-140214,'140214','Westbank Exch',49.82972,-119.63041,0,1452331080
-140215,'140215','Queensway Exch (Kelowna)',49.88713,-119.49494,0,1452331081
-140221,'140221','Beach & 4th St (Peachland)',49.77475,-119.73523,0,1452331108
-140222,'140222','Beach & 4th St (Peachland)',49.77471,-119.73500,0,1452331109
146000,'146000','Gov & Okanagan',49.47824,-119.57500,0,1452507869
146001,'146001','Pineview & Corry',49.46900,-119.57630,0,1452507870
146002,'146002','Pineview & Taber',49.46930,-119.57371,0,1452507871
@@ -279,67 +270,12 @@
146288,'146288','Johnson & Cordy',49.57201,-119.62989,0,1452510047
146289,'146289','Prairie Vly @ Atkinson',49.60296,-119.66794,0,1452510048
146290,'146290','Wharton @ Kelly',49.60097,-119.67987,0,1452510070
-146291,'146291','7th Ave & Cedar',49.34688,-119.57512,0,1452510071
-146292,'146292','7th Ave & Hody Dr',49.34679,-119.56956,0,1452510072
-146293,'146293','7th Ave & Birch',49.34684,-119.56941,0,1452510073
-146294,'146294','Cedar St & 9th Ave',49.34482,-119.57559,0,1452510074
-146295,'146295','Main & 11th Ave',49.34278,-119.57161,0,1452510075
-146296,'146296','Main & 10th Ave',49.34394,-119.57156,0,1452510076
-146297,'146297','Eastside & 6th Ave',49.34757,-119.56736,0,1452510077
-146298,'146298','Eastside & 6th Ave',49.34757,-119.56747,0,1452510078
-146299,'146299','Eastside & 6th Ave',49.35282,-119.56656,0,1452510079
-146300,'146300','Eastside & 6th Ave',49.35271,-119.56666,0,1452510752
-146301,'146301','Eastside & Philpott',49.37313,-119.56475,0,1452510753
-146302,'146302','Eastside & Philpott',49.37293,-119.56471,0,1452510754
-146303,'146303','Eastside & Panorama Cres',49.37474,-119.56390,0,1452510755
-146304,'146304','Eastside & Panorama Cres',49.37481,-119.56374,0,1452510756
-146305,'146305','Eastside & Carmel Cres',49.37690,-119.56191,0,1452510757
-146306,'146306','Eastside & Carmel Cres',49.37705,-119.56166,0,1452510758
-146307,'146307','Eastside & McLean Crk',49.38089,-119.56049,0,1452510759
-146308,'146308','Eastside & Devon',49.38103,-119.56062,0,1452510760
-146309,'146309','Eastside & Highland Dr',49.39808,-119.56502,0,1452510761
-146310,'146310','Eastside & Highland Dr',49.39801,-119.56514,0,1452510783
-146311,'146311','Sunnybrook & Highland',49.39908,-119.56000,0,1452510784
-146312,'146312','Heritage Blvd & Vintage Blvd',49.39836,-119.55532,0,1452510785
-146313,'146313','Heritage Blvd & One Quail Pl',49.39613,-119.55380,0,1452510786
-146314,'146314','Heritage Blvd & One Quail Pl',49.39615,-119.55369,0,1452510787
-146315,'146315','Heritage Blvd & Heritage Hls',49.39407,-119.55282,0,1452510788
-146316,'146316','Main & 89th St',49.03288,-119.46877,0,1452510789
146318,'146318','Penticton Plz',49.48407,-119.58683,0,1452510791
-146322,'146322','Kaleden: Lakehill & Linden',49.39070,-119.59682,0,1452510816
146323,'146323','S Main & Caravilla Ests',49.46035,-119.57825,0,1452510817
146324,'146324','Cambie & Westminster',49.50083,-119.58379,0,1452510818
146325,'146325','Skaha Lk Rd & Grn',49.46394,-119.58773,0,1452510819
-146326,'146326','92 Ave & Jubilee',49.03862,-119.47338,0,1452510820
-146327,'146327','Main & Cottonwood Dr',49.02910,-119.44867,0,1452510821
-146328,'146328','Cottonwood Dr & Cottonwood Pk',49.03158,-119.44801,0,1452510822
-146329,'146329','Quince Ln & Gravenstein Dr',49.03831,-119.46805,0,1452510823
-146330,'146330','Gravenstein & Jonagold Pl',49.03565,-119.46627,0,1452510845
-146331,'146331','Nighthawk & 62 Ave',49.02532,-119.47150,0,1452510846
-146332,'146332','89 St & 97 St',49.02001,-119.46884,0,1452510847
-146333,'146333','Winnipeg & Wade',49.49628,-119.59447,0,1452510848
-146334,'146334','Bartlett Dr & Russett Dr',49.49488,-119.62285,0,1452510849
-146335,'146335','Bartlett Dr & Valiant Dr',49.49566,-119.62858,0,1452510850
-146336,'146336','Sandstone Cres & Sandpiper Ln',49.50398,-119.63725,0,1452510851
-146337,'146337','W Bench Dr & Bartlett Dr',49.49721,-119.62974,0,1452510852
-146338,'146338','W Bench Dr & Newton',49.50250,-119.63033,0,1452510853
-146339,'146339','W Bench Dr & Jonathan Dr',49.50692,-119.62956,0,1452510854
-146340,'146340','Hyslop & W Bench',49.50881,-119.62672,0,1452510876
-146341,'146341','Sage Mesa Dr & Pine Hls Dr',49.51568,-119.62250,0,1452510877
146342,'146342','S Main 2575 Blk',49.46876,-119.58097,0,1452510878
-146343,'146343','OK Falls Post Office',49.34554,-119.57686,0,1452510879
-146344,'146344','Willow & 12th Ave',49.34217,-119.57293,0,1452510880
-146345,'146345','11th Ave & Cedar',49.34302,-119.57553,0,1452510881
-146346,'146346','Birch & 9th Ave',49.34508,-119.57014,0,1452510882
-146347,'146347','10th Ave & Maple',49.34390,-119.56880,0,1452510883
-146348,'146348','McLean Crk & Walnut Cres',49.34241,-119.56549,0,1452510884
-146349,'146349','McLean Crk & Cherry Cres',49.34110,-119.56458,0,1452510885
-146350,'146350','Mallory Cres Loop',49.33908,-119.55873,0,1452510907
-146351,'146351','McLean Crk & Cherry Cres',49.34085,-119.56464,0,1452510908
-146352,'146352','McLean Crk & Walnut Cres',49.34238,-119.56560,0,1452510909
-146353,'146353','10th Ave & Maple',49.34380,-119.56881,0,1452510910
-146354,'146354','Birch & 9th Ave',49.34472,-119.57033,0,1452510911
-146360,'146360','Skaha Lk & Galt',49.46969,-119.58396,0,1452510938
+146360,'146360','Skaha Lk & Galt',49.46963,-119.58401,0,1452510938
146361,'146361','Skaha Lk & Galt',49.46850,-119.58493,0,1452510939
146362,'146362','Skaha Lk & Kinney',49.47132,-119.58292,0,1452510940
146363,'146363','Skaha Lk & Brandon',49.46625,-119.58596,0,1452510941
@@ -348,7 +284,3 @@
146368,'146368','Westminster @ Wylie',49.49611,-119.61234,0,1452510946
146369,'146369','Westminster @ Burnaby',49.49692,-119.60866,0,1452510947
146370,'146370','176 Jermyn',49.49159,-119.58567,0,1452510969
-148000,'148000','Peach Orchard @ Rosedale',49.60466,-119.67653,0,1452567451
-149000,'149000','Kootenay St @ Co-Op Ave',49.17985,-119.55237,0,1452597242
-149001,'149001','Kootenay St & Co-Op Ave',49.17982,-119.55270,0,1452597243
-149002,'149002','Oliver Hosp',49.18361,-119.53894,0,1452597244
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 f6d6af46..7fea73f2 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
@@ -420,41 +420,6 @@
1001,146188,24,0
1001,146150,25,0
1001,146161,26,1
-1100,146336,1,0
-1100,146337,2,0
-1100,146338,3,0
-1100,146339,4,0
-1100,146340,5,0
-1100,146341,6,0
-1100,146368,7,0
-1100,146369,8,0
-1100,146171,9,0
-1100,146265,10,0
-1100,146217,11,0
-1100,146036,12,0
-1100,146333,13,0
-1100,146053,14,0
-1100,146062,15,0
-1100,146063,16,0
-1100,146057,17,0
-1100,146159,18,0
-1100,146188,19,0
-1100,146150,20,0
-1100,146157,21,1
-1101,146157,1,0
-1101,146151,2,0
-1101,146187,3,0
-1101,146186,4,0
-1101,146160,5,0
-1101,146055,6,0
-1101,146054,7,0
-1101,146034,8,0
-1101,146035,9,0
-1101,146216,10,0
-1101,146265,11,0
-1101,146334,12,0
-1101,146335,13,0
-1101,146336,14,1
1500,146234,1,0
1500,146066,2,0
1500,146163,3,0
@@ -650,66 +615,6 @@
1601,146182,34,0
1601,146040,35,0
1601,146215,36,1
-2000,146292,1,0
-2000,146297,2,0
-2000,146299,3,0
-2000,146302,4,0
-2000,146304,5,0
-2000,146306,6,0
-2000,146307,7,0
-2000,146311,8,0
-2000,146312,9,0
-2000,146313,10,0
-2000,146315,11,0
-2000,146314,12,0
-2000,146309,13,0
-2000,146271,14,0
-2000,146254,15,0
-2000,146274,16,0
-2000,146098,17,0
-2000,146268,18,0
-2000,146360,19,0
-2000,146362,20,0
-2000,146157,21,1
-2001,146157,1,0
-2001,146237,2,0
-2001,146342,3,0
-2001,146099,4,0
-2001,146273,5,0
-2001,146255,6,0
-2001,146323,7,0
-2001,146270,8,0
-2001,146311,9,0
-2001,146312,10,0
-2001,146313,11,0
-2001,146315,12,0
-2001,146314,13,0
-2001,146310,14,0
-2001,146308,15,0
-2001,146305,16,0
-2001,146303,17,0
-2001,146301,18,0
-2001,146300,19,0
-2001,146298,20,0
-2001,146293,21,1
-2100,146293,1,0
-2100,146354,2,0
-2100,146296,3,0
-2100,146295,4,0
-2100,146344,5,0
-2100,146345,6,0
-2100,146294,7,0
-2100,146343,8,0
-2100,146291,9,0
-2100,146353,10,0
-2100,146352,11,0
-2100,146351,12,0
-2100,146350,13,0
-2100,146349,14,0
-2100,146348,15,0
-2100,146347,16,0
-2100,146346,17,0
-2100,146292,18,1
3000,146161,1,0
3000,146244,2,0
3000,146105,3,0
@@ -761,127 +666,3 @@
3001,146000,21,0
3001,146153,22,0
3001,146161,23,1
-4000,146316,1,0
-4000,149000,2,0
-4000,149002,3,0
-4000,146343,4,0
-4000,146322,5,0
-4000,146233,6,0
-4000,146161,7,0
-4000,146147,8,0
-4000,146030,9,0
-4000,146048,10,0
-4000,146045,11,1
-4001,146047,1,0
-4001,146034,2,0
-4001,146029,3,0
-4001,146148,4,0
-4001,146157,5,0
-4001,146234,6,0
-4001,146322,7,0
-4001,146343,8,0
-4001,149002,9,0
-4001,149001,10,0
-4001,146316,11,1
-4100,146328,1,0
-4100,146327,2,0
-4100,146332,3,0
-4100,146331,4,0
-4100,146330,5,0
-4100,146329,6,0
-4100,146326,7,0
-4100,146316,8,1
-7000,146156,1,0
-7000,146229,2,0
-7000,146342,3,0
-7000,146099,4,0
-7000,146273,5,0
-7000,146255,6,0
-7000,146323,7,0
-7000,146270,8,0
-7000,146089,9,0
-7000,146184,10,0
-7000,146185,11,0
-7000,146069,12,0
-7000,146070,13,0
-7000,146067,14,0
-7000,146230,15,0
-7000,146233,16,0
-7000,146163,17,0
-7000,146177,18,0
-7000,146065,19,0
-7000,146151,20,0
-7000,146187,21,0
-7000,146186,22,0
-7000,146160,23,0
-7000,146190,24,0
-7000,146211,25,0
-7000,146144,26,0
-7000,146142,27,0
-7000,146141,28,0
-7000,146139,29,0
-7000,146137,30,0
-7000,146135,31,0
-7000,146367,32,0
-7000,146201,33,0
-7000,146047,34,0
-7000,146034,35,0
-7000,146035,36,0
-7000,146216,37,0
-7000,146266,38,0
-7000,146172,39,0
-7000,146221,40,0
-7000,146267,41,0
-7000,146220,42,0
-7000,146289,43,0
-7000,148000,44,0
-7000,140222,45,0
-7000,103690,46,0
-7000,140213,47,0
-7000,103745,48,0
-7000,140215,49,1
-7001,140215,1,0
-7001,103744,2,0
-7001,140214,3,0
-7001,103689,4,0
-7001,140221,5,0
-7001,146243,6,0
-7001,146286,7,0
-7001,146368,8,0
-7001,146369,9,0
-7001,146171,10,0
-7001,146217,11,0
-7001,146036,12,0
-7001,146048,13,0
-7001,146045,14,0
-7001,146130,15,0
-7001,146132,16,0
-7001,146133,17,0
-7001,146134,18,0
-7001,146136,19,0
-7001,146138,20,0
-7001,146140,21,0
-7001,146143,22,0
-7001,146110,23,0
-7001,146191,24,0
-7001,146192,25,0
-7001,146159,26,0
-7001,146188,27,0
-7001,146150,28,0
-7001,146152,29,0
-7001,146199,30,0
-7001,146178,31,0
-7001,146179,32,0
-7001,146234,33,0
-7001,146231,34,0
-7001,146068,35,0
-7001,146071,36,0
-7001,146183,37,0
-7001,146090,38,0
-7001,146088,39,0
-7001,146271,40,0
-7001,146254,41,0
-7001,146274,42,0
-7001,146098,43,0
-7001,146268,44,1
-7001,146161,45,1
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 4ba78020..5edbed22 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
@@ -10,19 +10,9 @@
501,0,'Peachtree',5
1001,0,'Cherry Ln',10
1000,0,'Naramata',10
-1100,0,'Cherry Ln',11
-1101,0,'West Bench',11
1500,0,'Downtown',15
1501,0,'Peachtree',15
1600,0,'Okanagan Lk',16
1601,0,'Skaha Lk',16
-2001,0,'Heritage Hls / Okanagan Falls',20
-2000,0,'Heritage Hls / Penticton',20
-2100,0,'OK Falls Local',21
3001,0,'Penticton',30
3000,0,'Summerland',30
-4001,0,'Osoyoos',40
-4000,0,'Penticton',40
-4100,0,'Osoyooos Local',41
-7000,0,'Kelowna',70
-7001,0,'South Main',70
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 81aa6435..3e2c709b 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,38 +1,3 @@
-'2919',20240811,1
-'1798',20240812,1
-'1799',20240812,1
-'1798',20240813,1
-'1799',20240813,1
-'1798',20240814,1
-'1799',20240814,1
-'1798',20240815,1
-'1799',20240815,1
-'1579',20240816,1
-'1798',20240816,1
-'1803',20240817,1
-'2919',20240818,1
-'1798',20240819,1
-'1799',20240819,1
-'1798',20240820,1
-'1799',20240820,1
-'1798',20240821,1
-'1799',20240821,1
-'1798',20240822,1
-'1799',20240822,1
-'1579',20240823,1
-'1798',20240823,1
-'1803',20240824,1
-'2919',20240825,1
-'1798',20240826,1
-'1799',20240826,1
-'1798',20240827,1
-'1799',20240827,1
-'1798',20240828,1
-'1799',20240828,1
-'1798',20240829,1
-'1799',20240829,1
-'1579',20240830,1
-'1798',20240830,1
'1803',20240831,1
'2919',20240901,1
'2919',20240902,1
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
deleted file mode 100644
index 4f4b4625..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103689
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',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
deleted file mode 100644
index 40911284..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103690
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7000,95700,,'',0,66600,,'',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
deleted file mode 100644
index e9972a8c..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103744
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',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
deleted file mode 100644
index 06f627b1..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_103745
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140213 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140213
deleted file mode 100644
index 5a5d4764..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140213
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',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
deleted file mode 100644
index 4d918368..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140214
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140215 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140215
deleted file mode 100644
index e391474d..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140215
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
-'1798',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',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
deleted file mode 100644
index db9fd528..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140221
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',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
deleted file mode 100644
index 839a0355..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_140222
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7000,95500,,'',0,66600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146000
index 6b976be1..e0f9be85 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146000
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146000
@@ -1,6 +1,3 @@
-'1798',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146001 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146001
index 364404f9..8975def6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146001
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146001
@@ -1,2 +1 @@
-'1798',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146002
index 094c81c6..654f8b66 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146002
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146002
@@ -1,2 +1 @@
-'1798',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146003 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146003
index 094c81c6..654f8b66 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146003
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146003
@@ -1,2 +1 @@
-'1798',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146004 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146004
index 094c81c6..654f8b66 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146004
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146004
@@ -1,2 +1 @@
-'1798',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146005 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146005
index cd700af2..ffc47e18 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146005
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146005
@@ -1,2 +1 @@
-'1798',101,81500,,'',0
'1803',101,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146006 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146006
index cd700af2..ffc47e18 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146006
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146006
@@ -1,2 +1 @@
-'1798',101,81500,,'',0
'1803',101,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146007 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146007
index cd700af2..ffc47e18 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146007
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146007
@@ -1,2 +1 @@
-'1798',101,81500,,'',0
'1803',101,81500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146008 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146008
index 730ec3c6..0f8e34b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146008
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146008
@@ -1,2 +1 @@
-'1798',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146009 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146009
index 69082af9..fdf7dc37 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146009
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146009
@@ -1,6 +1,3 @@
-'1798',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
'1803',100,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'1798',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,80200,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
'1803',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146010 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146010
index 8a1d9460..6642bb78 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146010
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146010
@@ -1,6 +1,3 @@
-'1798',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
'1803',100,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'1798',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,80200,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
'1803',3000,90800,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146012 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146012
index 5a4b8202..dfba1890 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146012
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146012
@@ -1,4 +1,2 @@
-'1798',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,194600,,'',0,16400,,'',0
'1803',1501,194600,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146013 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146013
index ae8af9fc..5d8271a5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146013
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146013
@@ -1,6 +1,2 @@
-'1798',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164800,,'',0
-'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164800,,'',0
'1803',1000,80900,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146014 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146014
index 132c7693..7c6ee249 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146014
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146014
@@ -1,2 +1 @@
-'1798',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146015 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146015
index 16294bf7..d34c4d6a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146015
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146015
@@ -1,6 +1,2 @@
-'1798',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
'1803',301,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
-'1579',1001,174600,,'',0
-'1798',1001,74400,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'1799',1001,174600,,'',0
'1803',1001,91000,,'',0,42900,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146017 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146017
index 97ffbe0d..50fbf406 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146017
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146017
@@ -1,2 +1 @@
-'1798',101,81300,,'',0
'1803',101,81300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146018 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146018
index 7ca5be34..2f6f043c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146018
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146018
@@ -1,2 +1 @@
-'1798',101,81600,,'',0
'1803',101,81600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146019 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146019
index a7c1693f..dda249c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146019
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146019
@@ -1,4 +1,2 @@
-'1798',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,200700,,'',0,12400,,'',0
'1803',1500,200700,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146020 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146020
index 4f6d3fa8..6e329abd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146020
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146020
@@ -1,2 +1 @@
-'1798',101,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,85300,,'',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_146021 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146021
index f89bb286..5db69adb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146021
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146021
@@ -1,8 +1,3 @@
-'1798',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1579',1001,174800,,'',0
-'1798',1001,74600,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'1799',1001,174800,,'',0
'1803',1001,91200,,'',0,42900,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146023 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146023
index 1f6e70c9..36aeb580 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146023
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146023
@@ -1,2 +1 @@
-'1798',300,71100,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,91100,,'',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_146024 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146024
index 8885ab28..6679b431 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146024
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146024
@@ -1,3 +1,2 @@
-'1798',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
'1803',301,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
'2919',1601,92700,,'',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_146025 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146025
index 47d40f5c..eb78c3e8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146025
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146025
@@ -1,7 +1,4 @@
-'1798',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,81900,0,'School Spcl',0
'1803',300,81900,0,'School Spcl',0
-'1798',500,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
'1803',500,93900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146028 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146028
index 35fc9199..003e25fa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146028
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146028
@@ -1,8 +1,4 @@
-'1798',300,80400,0,'School Spcl',0
'1803',300,80400,0,'School Spcl',0
-'1798',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146029 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146029
index 5647658a..c52999af 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146029
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146029
@@ -1,9 +1,4 @@
-'1798',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,194400,,'',0,16400,,'',0
'1803',1501,194400,,'',0,16400,,'',0
-'1798',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,84800,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'1798',4001,94800,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146030 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146030
index f7880792..38f5124d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146030
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146030
@@ -1,9 +1,4 @@
-'1798',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1798',1500,200900,,'',0,12400,,'',0
'1803',1500,200900,,'',0,12400,,'',0
-'1798',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91400,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'1798',4000,83500,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146034 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146034
index 85fb423a..bdce58cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146034
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146034
@@ -1,12 +1,4 @@
-'1798',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1101,181400,,'',0
-'1798',1101,124100,,'',0
-'1799',1101,181400,,'',0
-'1798',1501,194000,,'',0,16400,,'',0
'1803',1501,194000,,'',0,16400,,'',0
'2919',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',4001,94300,,'',0,60000,,'',0
-'1798',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146035 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146035
index 58751ca8..09a8ab2d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146035
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146035
@@ -1,11 +1,4 @@
-'1798',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1101,181400,,'',0
-'1798',1101,124100,,'',0
-'1799',1101,181400,,'',0
-'1798',1501,194100,,'',0,16400,,'',0
'1803',1501,194100,,'',0,16400,,'',0
'2919',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146036 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146036
index a9119276..1cc8554c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146036
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146036
@@ -1,6 +1,2 @@
-'1798',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1100,95800,,'',0,34700,,'',0
-'1798',1500,201300,,'',0,12400,,'',0
'1803',1500,201300,,'',0,12400,,'',0
-'1798',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146037 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146037
index 5df7b26f..1ed1243c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146037
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146037
@@ -1,4 +1,2 @@
-'1798',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,200800,,'',0,12400,,'',0
'1803',1500,200800,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146038 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146038
index 6f487da4..0e4230cb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146038
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146038
@@ -1,4 +1,2 @@
-'1798',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,200700,,'',0,12400,,'',0
'1803',1500,200700,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146039 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146039
index 71bd5e5b..496f94fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146039
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146039
@@ -1,4 +1,2 @@
-'1798',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,194500,,'',0,16400,,'',0
'1803',1501,194500,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146040 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146040
index 0794c92e..31537e5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146040
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146040
@@ -1,3 +1,2 @@
-'1798',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1601,94800,,'',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_146041 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146041
index 0b070bd9..f691ea83 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146041
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146041
@@ -1,4 +1 @@
-'1579',1000,171000,,'',0
-'1798',1000,71100,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'1799',1000,171000,,'',0
'1803',1000,83100,,'',0,47200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146042 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146042
index f20f8258..cf155dd4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146042
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146042
@@ -1,11 +1,5 @@
-'1798',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
'1803',301,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
-'1798',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
'1803',400,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
-'1579',1001,174900,,'',0
-'1798',1001,74700,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'1799',1001,174900,,'',0
'1803',1001,91300,,'',0,42900,,'',0,40700,,'',0
'2919',1601,92900,,'',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_146043 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146043
index 3893b77d..afba7b48 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146043
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146043
@@ -1,2 +1 @@
-'1798',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
'1803',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146044 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146044
index 4a857fc4..838de779 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146044
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146044
@@ -1,2 +1 @@
-'1798',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84200,,'',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_146045 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146045
index 75a8a07a..cef6b1f2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146045
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146045
@@ -1,12 +1,4 @@
-'1798',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164700,,'',0
-'1798',1000,64800,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164700,,'',0
'1803',1000,80800,,'',0,43200,,'',0,40700,,'',0
-'1798',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
'1803',1500,185000,0,'Peachtree',0,16400,4,'',0,12400,4,'',0
-'1798',4000,84500,4,'',0,55500,4,'',0
-'1798',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146046 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146046
index 8592487b..fb81930f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146046
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146046
@@ -1,7 +1,3 @@
-'1798',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,174900,,'',0
-'1798',1001,74700,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'1799',1001,174900,,'',0
'1803',1001,91300,,'',0,42900,,'',0,40700,,'',0
'2919',1601,92900,,'',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_146047 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146047
index 2c0a51fb..bdce58cd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146047
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146047
@@ -1,9 +1,4 @@
-'1798',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,194000,,'',0,16400,,'',0
'1803',1501,194000,,'',0,16400,,'',0
'2919',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',4001,94300,,'',0,60000,,'',0
-'1798',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146048 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146048
index 7140a2ef..8ec3b457 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146048
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146048
@@ -1,10 +1,3 @@
-'1798',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164700,,'',0
-'1798',1000,64800,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164700,,'',0
'1803',1000,80800,,'',0,43200,,'',0,40700,,'',0
-'1798',1500,201400,,'',0,12400,,'',0
'1803',1500,201400,,'',0,12400,,'',0
-'1798',4000,84400,,'',0,51500,,'',0
-'1798',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146049 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146049
index fed19119..6362ec6e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146049
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146049
@@ -1,7 +1,4 @@
-'1798',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',500,74200,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,7000,4,'',0,3000,4,'',0
-'1798',501,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
'1803',500,94200,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
'1803',501,94200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',500,131200,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_146050 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146050
index 29aeb761..c6293e5b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146050
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146050
@@ -1,5 +1,3 @@
-'1798',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
'1803',201,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',501,74600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,94600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,121600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146051 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146051
index 404215b8..83686fc9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146051
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146051
@@ -1,4 +1,3 @@
-'1798',501,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,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
'2919',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1601,92900,,'',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_146052 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146052
index a884cfd6..952d4761 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146052
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146052
@@ -1,10 +1,5 @@
-'1798',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',501,64800,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,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
'2919',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175000,,'',0
-'1798',1001,74800,,'',0,16600,,'',0,11700,,'',0,31200,,'',0
-'1799',1001,175000,,'',0
'1803',1001,91400,,'',0,42900,,'',0,40700,,'',0
'2919',1601,93000,,'',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_146053 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146053
index 9c85e9b4..6d0998a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146053
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146053
@@ -1,3 +1 @@
-'1798',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1100,95900,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146054 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146054
index 968c1499..f26fc08e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146054
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146054
@@ -1,9 +1,2 @@
-'1798',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
'1803',401,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
-'1579',1000,164600,,'',0
-'1798',1000,64700,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164600,,'',0
'1803',1000,80700,,'',0,43200,,'',0,40700,,'',0
-'1579',1101,181300,,'',0
-'1798',1101,124000,,'',0
-'1799',1101,181300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146055 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146055
index baaaa611..c343590f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146055
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146055
@@ -1,9 +1,2 @@
-'1798',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
'1803',401,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
-'1579',1000,164500,,'',0
-'1798',1000,64700,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'1799',1000,164500,,'',0
'1803',1000,80700,,'',0,43100,,'',0,40700,,'',0
-'1579',1101,181200,,'',0
-'1798',1101,123900,,'',0
-'1799',1101,181200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146057 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146057
index f764d910..6b60be98 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146057
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146057
@@ -1,3 +1 @@
-'1798',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1100,100100,,'',0,30700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146058 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146058
index ff0105b7..a4770315 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146058
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146058
@@ -1,5 +1,3 @@
-'1798',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'1798',501,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146059 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146059
index 2c42074a..78c3f693 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146059
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146059
@@ -1,2 +1 @@
-'1798',101,82100,,'',0
'1803',101,82100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146060 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146060
index e055c4de..58c0d22c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146060
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146060
@@ -1,2 +1 @@
-'1798',101,82300,,'',0
'1803',101,82300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146061 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146061
index ff0105b7..a4770315 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146061
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146061
@@ -1,5 +1,3 @@
-'1798',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'1798',501,70600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146062 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146062
index 9c85e9b4..6d0998a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146062
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146062
@@ -1,3 +1 @@
-'1798',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1100,95900,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146063 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146063
index 43d9b8be..b19e93ea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146063
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146063
@@ -1,3 +1 @@
-'1798',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1100,100000,,'',0,30700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146064 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146064
index b8a98836..af137ca9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146064
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146064
@@ -1,6 +1,2 @@
-'1798',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
'1803',401,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
-'1579',1000,164400,,'',0
-'1798',1000,64600,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'1799',1000,164400,,'',0
'1803',1000,80600,,'',0,43100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146065 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146065
index 0214bceb..ecd3a3ea 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146065
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146065
@@ -1,8 +1,4 @@
-'1798',100,82800,,'',0
'1803',100,82800,,'',0
-'1798',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,195900,,'',0,16400,,'',0
'1803',1500,195900,,'',0,16400,,'',0
'2919',1600,95800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'1798',7000,60100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146066 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146066
index 47758cb4..e9204857 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146066
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146066
@@ -1,2 +1 @@
-'1798',1500,195700,,'',0,16400,,'',0
'1803',1500,195700,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146067 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146067
index 9ee53d02..c5da029a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146067
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146067
@@ -1,6 +1,3 @@
-'1798',500,71300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'1803',500,91300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'2919',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',7000,55700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146068 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146068
index a2fa04b5..695e6970 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146068
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146068
@@ -1,5 +1,2 @@
-'1798',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'1798',7001,182300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146069 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146069
index 6e2cdbd1..56075f5d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146069
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146069
@@ -1,6 +1,3 @@
-'1798',500,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'1803',500,91100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'2919',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',7000,55700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146070 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146070
index 145cae09..c85ccb87 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146070
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146070
@@ -1,6 +1,3 @@
-'1798',500,71200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'1803',500,91200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'2919',500,124200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',7000,55700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146071 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146071
index 973f96d1..d9010f62 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146071
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146071
@@ -1,5 +1,2 @@
-'1798',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
-'1798',7001,182400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146072 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146072
index 463d100e..c3233a71 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146072
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146072
@@ -1,4 +1 @@
-'1579',1001,172000,,'',0
-'1798',1001,71800,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,172000,,'',0
'1803',1001,84200,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146074 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146074
index c09605fc..aa187d77 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146074
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146074
@@ -1,5 +1,3 @@
-'1798',300,81700,0,'School Spcl',0
'1803',300,81700,0,'School Spcl',0
-'1798',500,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
'1803',500,93700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146075 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146075
index c638b8c6..155c884f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146075
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146075
@@ -1,3 +1,2 @@
-'1798',500,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
'1803',500,93600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146076 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146076
index e595c455..b21bf944 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146076
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146076
@@ -1,10 +1,5 @@
-'1798',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',501,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175100,,'',0
-'1798',1001,74900,,'',0,16600,,'',0,11700,,'',0,31300,,'',0
-'1799',1001,175100,,'',0
'1803',1001,91500,,'',0,43000,,'',0,40600,,'',0
'2919',1601,93100,,'',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_146077 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146077
index c3f88c58..c9b2ddb5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146077
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146077
@@ -1,10 +1,5 @@
-'1798',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',501,65000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175200,,'',0
-'1798',1001,75000,,'',0,16600,,'',0,11700,,'',0,31300,,'',0
-'1799',1001,175200,,'',0
'1803',1001,91600,,'',0,43000,,'',0,40600,,'',0
'2919',1601,93100,,'',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_146078 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146078
index 80691f1e..67bd8fe7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146078
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146078
@@ -1,3 +1,2 @@
-'1798',500,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
'1803',500,93500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146079 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146079
index d8dce681..0cd6a993 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146079
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146079
@@ -1,10 +1,5 @@
-'1798',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',501,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175200,,'',0
-'1798',1001,75000,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'1799',1001,175200,,'',0
'1803',1001,91600,,'',0,43100,,'',0,40500,,'',0
'2919',1601,93200,,'',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_146080 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146080
index 80691f1e..67bd8fe7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146080
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146080
@@ -1,3 +1,2 @@
-'1798',500,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
'1803',500,93500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146081 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146081
index 65059bfa..f79f59f3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146081
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146081
@@ -1,10 +1,5 @@
-'1798',501,65200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175400,,'',0
-'1798',1001,75200,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'1799',1001,175400,,'',0
'1803',1001,91800,,'',0,43100,,'',0,40500,,'',0
-'1798',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,93300,,'',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_146082 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146082
index 1e3cfc50..3c4146c3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146082
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146082
@@ -1,10 +1,5 @@
-'1798',501,65300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175500,,'',0
-'1798',1001,75200,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'1799',1001,175500,,'',0
'1803',1001,91900,,'',0,43100,,'',0,40500,,'',0
-'1798',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,93300,,'',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_146083 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146083
index 1de87fc3..2004fcc9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146083
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146083
@@ -1,6 +1,4 @@
-'1798',500,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
'1803',500,93200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90200,,'',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_146084 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146084
index 1de87fc3..2004fcc9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146084
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146084
@@ -1,6 +1,4 @@
-'1798',500,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
'1803',500,93200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90200,,'',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_146085 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146085
index 164e8d3c..85963b40 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146085
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146085
@@ -1,6 +1,4 @@
-'1798',501,65400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,93400,,'',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_146086 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146086
index 69200420..1e370b21 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146086
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146086
@@ -1,6 +1,4 @@
-'1798',500,73100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',500,93100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90100,,'',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_146087 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146087
index c8716016..b4d380de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146087
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146087
@@ -1,6 +1,4 @@
-'1798',501,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190300,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,93500,,'',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_146088 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146088
index c3006f6f..09884cbc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146088
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146088
@@ -1,3 +1 @@
-'1798',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
-'1798',7001,182600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146089 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146089
index 50c61e21..f6661c1b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146089
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146089
@@ -1,10 +1,6 @@
-'1798',500,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
-'1798',501,70900,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,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
'1803',500,90900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'1803',501,90900,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
'2919',500,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',501,123900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
-'1798',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146090 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146090
index 016635e4..abdf26c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146090
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146090
@@ -1,3 +1 @@
-'1798',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'1798',7001,182500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146091 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146091
index 58b8a0e5..2a5dbfa9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146091
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146091
@@ -1,4 +1 @@
-'1579',1000,171100,,'',0
-'1798',1000,71200,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'1799',1000,171100,,'',0
'1803',1000,83200,,'',0,47200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146092 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146092
index 651835e3..bc74f0ce 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146092
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146092
@@ -1,2 +1 @@
-'1798',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,80200,,'',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_146093 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146093
index 4dbbc069..80955afa 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146093
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146093
@@ -1,2 +1 @@
-'1798',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,80100,,'',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_146094 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146094
index 20762765..689b98b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146094
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146094
@@ -1,2 +1 @@
-'1798',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,80000,,'',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_146095 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146095
index ae44c274..c698ee8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146095
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146095
@@ -1,6 +1,2 @@
-'1798',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164800,,'',0
-'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164800,,'',0
'1803',1000,80900,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146096 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146096
index 49d644ae..d0141ecd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146096
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146096
@@ -1,6 +1,2 @@
-'1798',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164800,,'',0
-'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164800,,'',0
'1803',1000,80900,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146098 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146098
index 0f197ab1..8f5fd149 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146098
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146098
@@ -1,6 +1,2 @@
-'1798',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'1798',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
-'1798',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'1798',7001,183200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146099 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146099
index bc2b5e0a..7ddad079 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146099
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146099
@@ -1,7 +1,3 @@
-'1798',101,82000,,'',0
'1803',101,82000,,'',0
-'1798',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'1798',7000,55300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146100 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146100
index aadf0e85..5a18b157 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146100
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146100
@@ -1,5 +1,3 @@
-'1798',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90400,,'',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_146101 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146101
index e65e92f8..2db7e148 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146101
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146101
@@ -1,6 +1,2 @@
-'1798',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1579',1000,164900,,'',0
-'1798',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164900,,'',0
'1803',1000,81000,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146102 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146102
index 5ae178f7..563aa879 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146102
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146102
@@ -1,5 +1,3 @@
-'1798',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90600,,'',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_146103 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146103
index 5ae178f7..563aa879 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146103
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146103
@@ -1,5 +1,3 @@
-'1798',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90600,,'',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_146104 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146104
index e730512f..a6e7442d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146104
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146104
@@ -1,2 +1 @@
-'1798',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,75800,,'',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_146105 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146105
index c77f4704..30dd6479 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146105
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146105
@@ -1,8 +1,4 @@
-'1798',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'1798',101,81100,,'',0
'1803',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
'1803',101,81100,,'',0
-'1798',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
'1803',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146106 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146106
index 3d0477b6..c30b9bf9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146106
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146106
@@ -1,8 +1,4 @@
-'1798',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'1798',101,81200,,'',0
'1803',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
'1803',101,81200,,'',0
-'1798',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
'1803',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146107 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146107
index 23c6d79e..6cd8f0d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146107
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146107
@@ -1,2 +1 @@
-'1798',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84900,,'',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_146108 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146108
index 1160c01a..6297c6f3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146108
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146108
@@ -1,8 +1,4 @@
-'1798',300,81400,0,'School Spcl',0
'1803',300,81400,0,'School Spcl',0
-'1798',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',401,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1798',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146109 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146109
index 23c6d79e..6cd8f0d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146109
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146109
@@ -1,2 +1 @@
-'1798',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84900,,'',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_146110 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146110
index e6711fc8..1402effe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146110
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146110
@@ -1,7 +1,3 @@
-'1798',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',401,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1798',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'1798',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146111 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146111
index 43d6b9ad..7462a966 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146111
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146111
@@ -1,2 +1 @@
-'1798',101,81800,,'',0
'1803',101,81800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146112 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146112
index 6fb058c9..b5a61fd8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146112
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146112
@@ -1,2 +1 @@
-'1798',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,75700,,'',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_146113 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146113
index 2a0023cb..94c5ee51 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146113
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146113
@@ -1,2 +1 @@
-'1798',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,85100,,'',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_146114 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146114
index 57fb615c..d49d161f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146114
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146114
@@ -1,2 +1 @@
-'1798',200,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,85000,,'',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_146117 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146117
index ad3766fb..050106b3 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146117
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146117
@@ -1,10 +1,5 @@
-'1798',300,81100,0,'School Spcl',0
'1803',300,81100,0,'School Spcl',0
-'1798',400,72800,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,11000,4,'',0
-'1798',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',400,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,11000,4,'',0
'1803',401,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1798',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,185800,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146118 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146118
index 534a102c..6629d620 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146118
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146118
@@ -1,4 +1 @@
-'1579',1001,173400,,'',0
-'1798',1001,73200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,173400,,'',0
'1803',1001,85600,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146119 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146119
index 14555ca4..901f1ab9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146119
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146119
@@ -1,4 +1 @@
-'1579',1000,170200,,'',0
-'1798',1000,70300,,'',0,12000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,170200,,'',0
'1803',1000,82300,,'',0,43200,,'',0,44700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146120 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146120
index 534a102c..6629d620 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146120
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146120
@@ -1,4 +1 @@
-'1579',1001,173400,,'',0
-'1798',1001,73200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,173400,,'',0
'1803',1001,85600,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146121 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146121
index 14555ca4..901f1ab9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146121
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146121
@@ -1,4 +1 @@
-'1579',1000,170200,,'',0
-'1798',1000,70300,,'',0,12000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,170200,,'',0
'1803',1000,82300,,'',0,43200,,'',0,44700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146122 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146122
index b267e06f..3174b711 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146122
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146122
@@ -1,4 +1 @@
-'1579',1000,165800,,'',0
-'1798',1000,65900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,165800,,'',0
'1803',1000,81900,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146123 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146123
index 57d2e386..0c8b67c1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146123
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146123
@@ -1,4 +1 @@
-'1579',1001,173600,,'',0
-'1798',1001,73400,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,173600,,'',0
'1803',1001,85800,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146124 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146124
index 39d9fcc9..435e6afb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146124
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146124
@@ -1,4 +1,2 @@
-'1798',300,81000,0,'School Spcl',0
'1803',300,81000,0,'School Spcl',0
-'1798',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146125 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146125
index 8c932836..564875a9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146125
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146125
@@ -1,4 +1,2 @@
-'1798',300,80900,0,'School Spcl',0
'1803',300,80900,0,'School Spcl',0
-'1798',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146126 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146126
index 5346ae5d..57677dbb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146126
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146126
@@ -1,4 +1,2 @@
-'1798',300,80800,0,'School Spcl',0
'1803',300,80800,0,'School Spcl',0
-'1798',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128
index e730512f..a6e7442d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146128
@@ -1,2 +1 @@
-'1798',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,75800,,'',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_146129 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146129
index e70f9662..441874a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146129
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146129
@@ -1,2 +1 @@
-'1798',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
'1803',300,91000,,'',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_146130 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146130
index 132a2a37..d5258b43 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146130
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146130
@@ -1,7 +1,3 @@
-'1798',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
'1803',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'1798',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146132 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146132
index a0fc2d05..1b58e8da 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146132
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146132
@@ -1,7 +1,3 @@
-'1798',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
'1803',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'1798',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146133 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146133
index 05f63575..a75e1992 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146133
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146133
@@ -1,7 +1,3 @@
-'1798',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
'1803',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'1798',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146134 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146134
index af6a18fa..705bf7d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146134
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146134
@@ -1,7 +1,3 @@
-'1798',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
'1803',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'1798',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146135 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146135
index 6ff1ea2d..657d7d95 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146135
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146135
@@ -1,8 +1,4 @@
-'1798',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
'1803',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
'2919',1600,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146136 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146136
index d1909336..705bf7d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146136
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146136
@@ -1,7 +1,3 @@
-'1798',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
'1803',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'1798',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146137 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146137
index fb0eb636..86e905de 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146137
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146137
@@ -1,10 +1,5 @@
-'1798',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,75900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,81600,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
'1803',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
'2919',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146138 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146138
index 6b735342..d006fc03 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146138
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146138
@@ -1,7 +1,3 @@
-'1798',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
'1803',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'1798',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146139 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146139
index e1a9030a..5f9c8e5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146139
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146139
@@ -1,8 +1,4 @@
-'1798',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,81500,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
'1803',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
'2919',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146140 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146140
index 3d918311..d006fc03 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146140
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146140
@@ -1,7 +1,3 @@
-'1798',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
'1803',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'1798',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146141 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146141
index 53191d56..a662c608 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146141
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146141
@@ -1,8 +1,4 @@
-'1798',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
'1803',300,81500,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146142 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146142
index ec8abb5a..529a6b0f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146142
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146142
@@ -1,8 +1,4 @@
-'1798',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,81400,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146143 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146143
index a6b5cf77..cf90403a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146143
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146143
@@ -1,7 +1,3 @@
-'1798',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
'1803',1500,185300,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
-'1798',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146144 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146144
index 546b3e93..84ac1790 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146144
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146144
@@ -1,8 +1,4 @@
-'1798',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,81400,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146145 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146145
index 549e0127..cf65482f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146145
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146145
@@ -1,7 +1,4 @@
-'1798',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1600,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
'1803',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146146 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146146
index 9fbc1eaa..7bca9e98 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146146
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146146
@@ -1,8 +1,4 @@
-'1798',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,185400,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146147 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146147
index ae805448..760b04ff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146147
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146147
@@ -1,7 +1,3 @@
-'1798',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
'1803',100,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
-'1798',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,80300,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
'1803',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'1798',4000,82800,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146148 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146148
index ddf0ab1d..cdfccff0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146148
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146148
@@ -1,7 +1,3 @@
-'1798',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,85400,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'1798',4001,95400,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146149 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146149
index c40e1535..b8e6bd99 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146149
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146149
@@ -1,8 +1,2 @@
-'1579',1000,171200,4,'',0
-'1579',1001,171900,,'',0
-'1798',1000,71300,4,'',0,12000,4,'',0,12000,4,'',0,35200,4,'',0
-'1798',1001,71700,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1000,171200,4,'',0
-'1799',1001,171900,,'',0
'1803',1000,83300,4,'',0,47200,4,'',0,40700,4,'',0
'1803',1001,84100,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146150 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146150
index b2e14310..43334236 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146150
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146150
@@ -1,12 +1,4 @@
-'1798',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175800,,'',0
-'1798',1001,75500,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'1799',1001,175800,,'',0
'1803',1001,92200,,'',0,43100,,'',0,40500,,'',0
-'1798',1100,100600,,'',0,30700,,'',0
-'1798',1501,195100,,'',0,16400,,'',0
'1803',1501,195100,,'',0,16400,,'',0
-'1798',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146151 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146151
index 0baec359..f7c33f84 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146151
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146151
@@ -1,14 +1,4 @@
-'1798',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1579',1000,163800,,'',0
-'1798',1000,64100,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'1799',1000,163800,,'',0
'1803',1000,80100,,'',0,43000,,'',0,40700,,'',0
-'1579',1101,180500,,'',0
-'1798',1101,123200,,'',0
-'1799',1101,180500,,'',0
-'1798',1500,200100,,'',0,12400,,'',0
'1803',1500,200100,,'',0,12400,,'',0
-'1798',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146152 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146152
index 8359b3c4..98c94c2e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146152
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146152
@@ -1,7 +1,3 @@
-'1798',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,195100,,'',0,16400,,'',0
'1803',1501,195100,,'',0,16400,,'',0
-'1798',7001,181900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146153 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146153
index 6b976be1..e0f9be85 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146153
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146153
@@ -1,6 +1,3 @@
-'1798',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146154 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146154
index 592b9960..5d4d63f1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146154
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146154
@@ -1,7 +1,4 @@
-'1798',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,81800,0,'School Spcl',0
'1803',300,81800,0,'School Spcl',0
-'1798',500,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
'1803',500,93900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146155 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146155
index 95624144..030ee253 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146155
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146155
@@ -1,8 +1,4 @@
-'1798',300,80500,0,'School Spcl',0
'1803',300,80500,0,'School Spcl',0
-'1798',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146156 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146156
index 50c774d4..2e266cc2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146156
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146156
@@ -1,7 +1,3 @@
-'1798',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'1798',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,55100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146157 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146157
index 6e0d08fe..d4050d09 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146157
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146157
@@ -1,26 +1,9 @@
-'1798',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,81000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',201,73000,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
'1803',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,83000,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
-'1798',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1798',401,70000,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
'1803',400,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',401,90000,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
-'1579',1100,184400,4,'',0
-'1579',1101,180500,,'',0
-'1798',1100,100800,4,'',0,30700,4,'',0
-'1798',1101,93000,,'',0,30200,,'',0
-'1799',1100,184200,4,'',0
-'1799',1101,180500,,'',0
-'1798',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,195200,,'',0,16400,,'',0
'1803',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,195200,,'',0,16400,,'',0
'2919',1601,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
-'1798',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'1798',4001,100100,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146159 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146159
index 4639cb23..4f290f41 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146159
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146159
@@ -1,8 +1,3 @@
-'1798',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1100,100300,,'',0,30700,,'',0
-'1798',1501,194900,,'',0,16400,,'',0
'1803',1501,194900,,'',0,16400,,'',0
-'1798',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146160 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146160
index f84fc751..ecea79ed 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146160
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146160
@@ -1,14 +1,4 @@
-'1798',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1579',1000,164000,,'',0
-'1798',1000,64300,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'1799',1000,164000,,'',0
'1803',1000,80300,,'',0,43000,,'',0,40700,,'',0
-'1579',1101,180700,,'',0
-'1798',1101,123400,,'',0
-'1799',1101,180700,,'',0
-'1798',1500,200300,,'',0,12400,,'',0
'1803',1500,200300,,'',0,12400,,'',0
-'1798',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146161 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146161
index fdaf0777..a4bb9307 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146161
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146161
@@ -1,31 +1,14 @@
-'1798',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'1798',101,81000,,'',0
'1803',100,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
'1803',101,81000,,'',0
-'1798',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,80000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',500,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
-'1798',501,70000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',500,93000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',501,123000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,163700,,'',0
-'1579',1001,175900,4,'',0
-'1798',1000,64000,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'1798',1001,75600,4,'',0,16700,4,'',0,11700,4,'',0,31400,4,'',0
-'1799',1000,163700,,'',0
-'1799',1001,175900,4,'',0
'1803',1000,80000,,'',0,43000,,'',0,40700,,'',0
'1803',1001,92300,4,'',0,43100,4,'',0,40500,4,'',0
-'1798',1500,200000,,'',0,12400,,'',0
-'1798',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,200000,,'',0,12400,,'',0
'1803',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
-'1798',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
-'1798',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
'1803',3000,90500,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
'1803',3001,90000,4,'',0,21000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
-'1798',4000,82500,,'',0,51500,,'',0
-'1798',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146162 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146162
index f08b5c60..98e8053d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146162
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146162
@@ -1,4 +1 @@
-'1579',1001,174000,,'',0
-'1798',1001,73800,,'',0,16400,,'',0,11900,,'',0,31200,,'',0
-'1799',1001,174000,,'',0
'1803',1001,90200,,'',0,43100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146163 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146163
index ac19b260..0876c1e9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146163
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146163
@@ -1,8 +1,4 @@
-'1798',100,82500,,'',0
'1803',100,82500,,'',0
-'1798',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,195800,,'',0,16400,,'',0
'1803',1500,195800,,'',0,16400,,'',0
'2919',1600,95500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'1798',7000,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146164 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146164
index 0b2d5374..677a01b0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146164
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146164
@@ -1,2 +1 @@
-'1798',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
'1803',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146165 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146165
index dd1b6ec1..1e4db058 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146165
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146165
@@ -1,2 +1 @@
-'1798',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
'1803',301,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146166 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146166
index 5cf528ff..5ef932dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146166
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146166
@@ -1,5 +1,3 @@
-'1798',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',500,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
'1803',500,94100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,131100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146167 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146167
index 372e358e..0e169e58 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146167
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146167
@@ -1,7 +1,4 @@
-'1798',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,81900,0,'School Spcl',0
'1803',300,81900,0,'School Spcl',0
-'1798',500,74000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',500,94000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,131000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146168 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146168
index d50d8f9b..e62d45df 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146168
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146168
@@ -1,2 +1 @@
-'1798',101,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,85100,,'',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_146169 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146169
index cab20c88..baf23a4a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146169
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146169
@@ -1,2 +1 @@
-'1798',101,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,85200,,'',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_146170 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146170
index d542d5c4..7278e03f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146170
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146170
@@ -1,2 +1 @@
-'1798',101,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,85000,,'',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_146171 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146171
index 24bd31e7..26b320dc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146171
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146171
@@ -1,6 +1,2 @@
-'1798',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1100,183700,,'',0
-'1798',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
'1803',3001,84600,,'',0,21100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
-'1798',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146172 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146172
index 949cbceb..288cc692 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146172
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146172
@@ -1,8 +1,4 @@
-'1798',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'2919',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'1798',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146173 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146173
index 61569000..1d85e903 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146173
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146173
@@ -1,10 +1,4 @@
-'1798',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
'1803',401,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
-'1579',1000,164300,,'',0
-'1798',1000,64500,,'',0,16000,,'',0,12000,,'',0,31100,,'',0
-'1799',1000,164300,,'',0
'1803',1000,80500,,'',0,43100,,'',0,40700,,'',0
-'1798',1500,200600,,'',0,12400,,'',0
'1803',1500,200600,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146174 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146174
index dc0dd9a1..8904218d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146174
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146174
@@ -1,6 +1,3 @@
-'1798',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1501,194700,,'',0,16400,,'',0
'1803',1501,194700,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146175 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146175
index 8489c072..05e94317 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146175
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146175
@@ -1,10 +1,4 @@
-'1798',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',401,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1579',1000,164200,,'',0
-'1798',1000,64500,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'1799',1000,164200,,'',0
'1803',1000,80500,,'',0,43000,,'',0,40700,,'',0
-'1798',1500,200600,,'',0,12400,,'',0
'1803',1500,200600,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146176 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146176
index 2fe868c0..c34e8289 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146176
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146176
@@ -1,6 +1,3 @@
-'1798',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1501,194700,,'',0,16400,,'',0
'1803',1501,194700,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146177 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146177
index 1a70e4f6..9e745bb6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146177
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146177
@@ -1,8 +1,4 @@
-'1798',100,82700,,'',0
'1803',100,82700,,'',0
-'1798',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,195800,,'',0,16400,,'',0
'1803',1500,195800,,'',0,16400,,'',0
'2919',1600,95700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'1798',7000,60100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146178 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146178
index aec9e0ab..bc794b27 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146178
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146178
@@ -1,5 +1,2 @@
-'1798',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,195400,,'',0,16400,,'',0
'1803',1501,195400,,'',0,16400,,'',0
-'1798',7001,182100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146179 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146179
index adf08643..fa05b9e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146179
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146179
@@ -1,5 +1,2 @@
-'1798',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,195500,,'',0,16400,,'',0
'1803',1501,195500,,'',0,16400,,'',0
-'1798',7001,182100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146182 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146182
index f85c0312..f08817d4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146182
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146182
@@ -1,3 +1,2 @@
-'1798',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1601,94700,,'',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_146183 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146183
index 016635e4..abdf26c4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146183
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146183
@@ -1,3 +1 @@
-'1798',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
-'1798',7001,182500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146184 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146184
index 65eb92be..f78821f2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146184
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146184
@@ -1,7 +1,4 @@
-'1798',500,71000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'1803',500,91000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'2919',500,124000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,55600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146185 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146185
index a06de6e5..b9da260e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146185
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146185
@@ -1,7 +1,4 @@
-'1798',500,71100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'1803',500,91100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'2919',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,55600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146186 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146186
index 76bc5ff7..643b2454 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146186
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146186
@@ -1,14 +1,4 @@
-'1798',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1579',1000,163900,,'',0
-'1798',1000,64200,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'1799',1000,163900,,'',0
'1803',1000,80200,,'',0,43000,,'',0,40700,,'',0
-'1579',1101,180600,,'',0
-'1798',1101,123300,,'',0
-'1799',1101,180600,,'',0
-'1798',1500,200300,,'',0,12400,,'',0
'1803',1500,200300,,'',0,12400,,'',0
-'1798',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146187 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146187
index bee0dff9..994150ab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146187
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146187
@@ -1,14 +1,4 @@
-'1798',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1579',1000,163900,,'',0
-'1798',1000,64200,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'1799',1000,163900,,'',0
'1803',1000,80200,,'',0,43000,,'',0,40700,,'',0
-'1579',1101,180600,,'',0
-'1798',1101,123300,,'',0
-'1799',1101,180600,,'',0
-'1798',1500,200200,,'',0,12400,,'',0
'1803',1500,200200,,'',0,12400,,'',0
-'1798',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146188 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146188
index edaa81d4..4b4244e0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146188
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146188
@@ -1,12 +1,4 @@
-'1798',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175700,,'',0
-'1798',1001,75400,,'',0,16700,,'',0,11700,,'',0,31400,,'',0
-'1799',1001,175700,,'',0
'1803',1001,92100,,'',0,43100,,'',0,40500,,'',0
-'1798',1100,100400,,'',0,30700,,'',0
-'1798',1501,195000,,'',0,16400,,'',0
'1803',1501,195000,,'',0,16400,,'',0
-'1798',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146189 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146189
index b3c3d6aa..6563423f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146189
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146189
@@ -1,4 +1,2 @@
-'1798',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,194800,,'',0,16400,,'',0
'1803',1501,194800,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146190 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146190
index e1d8db42..8711ca25 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146190
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146190
@@ -1,10 +1,5 @@
-'1798',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,85200,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'1798',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146191 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146191
index cab50d36..ececb71a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146191
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146191
@@ -1,7 +1,3 @@
-'1798',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',401,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1798',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'1798',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146192 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146192
index b2cf6b2d..90cd371b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146192
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146192
@@ -1,7 +1,3 @@
-'1798',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',401,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1798',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91100,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'1798',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146194 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146194
index 91973606..2c38f644 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146194
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146194
@@ -1,6 +1,2 @@
-'1798',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164900,,'',0
-'1798',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164900,,'',0
'1803',1000,81000,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146195 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146195
index 7eab47ef..3b983666 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146195
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146195
@@ -1,6 +1,2 @@
-'1798',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164900,,'',0
-'1798',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164900,,'',0
'1803',1000,81000,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146196 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146196
index 2a0023cb..94c5ee51 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146196
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146196
@@ -1,2 +1 @@
-'1798',200,65100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,85100,,'',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_146197 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146197
index 6fb058c9..b5a61fd8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146197
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146197
@@ -1,2 +1 @@
-'1798',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,75700,,'',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_146198 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146198
index 681da584..9a615ee5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146198
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146198
@@ -1,8 +1,4 @@
-'1798',300,81200,0,'School Spcl',0
'1803',300,81200,0,'School Spcl',0
-'1798',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',401,82900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1798',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146199 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146199
index 2d005d57..bc794b27 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146199
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146199
@@ -1,5 +1,2 @@
-'1798',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,195400,,'',0,16400,,'',0
'1803',1501,195400,,'',0,16400,,'',0
-'1798',7001,182000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146200 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146200
index a8400c06..b792d0f4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146200
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146200
@@ -1,2 +1 @@
-'1798',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,75600,,'',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_146201 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146201
index d7e895cd..dc971636 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146201
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146201
@@ -1,6 +1,3 @@
-'1798',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
'1803',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
'2919',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146202 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146202
index d16a486b..38082a4e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146202
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146202
@@ -1,4 +1 @@
-'1579',1001,172100,,'',0
-'1798',1001,71900,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,172100,,'',0
'1803',1001,84300,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146203 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146203
index 5df8e3da..f3843dd5 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146203
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146203
@@ -1,4 +1 @@
-'1579',1001,172200,,'',0
-'1798',1001,72000,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,172200,,'',0
'1803',1001,84400,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146204 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146204
index 20c159e1..7cfb8306 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146204
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146204
@@ -1,8 +1,4 @@
-'1798',300,80300,0,'School Spcl',0
'1803',300,80300,0,'School Spcl',0
-'1798',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,185500,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146206 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146206
index a3278383..4670ff98 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146206
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146206
@@ -1,8 +1,4 @@
-'1798',300,80600,0,'School Spcl',0
'1803',300,80600,0,'School Spcl',0
-'1798',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,185700,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146207 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146207
index 1c80cb1b..21232e22 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146207
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146207
@@ -1,4 +1,2 @@
-'1798',300,80700,0,'School Spcl',0
'1803',300,80700,0,'School Spcl',0
-'1798',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209
index 39d9fcc9..435e6afb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146209
@@ -1,4 +1,2 @@
-'1798',300,81000,0,'School Spcl',0
'1803',300,81000,0,'School Spcl',0
-'1798',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146210 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146210
index 1c80cb1b..21232e22 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146210
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146210
@@ -1,4 +1,2 @@
-'1798',300,80700,0,'School Spcl',0
'1803',300,80700,0,'School Spcl',0
-'1798',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146211 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146211
index 8a135848..6a664800 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146211
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146211
@@ -1,5 +1,2 @@
-'1798',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
-'1798',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146212 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146212
index 224d0a73..b1af2574 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146212
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146212
@@ -1,4 +1,2 @@
-'1798',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,200800,,'',0,12400,,'',0
'1803',1500,200800,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146213 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146213
index 3b8a5b55..e35a47e2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146213
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146213
@@ -1,4 +1 @@
-'1579',1000,170900,,'',0
-'1798',1000,71000,,'',0,12000,,'',0,12000,,'',0,35200,,'',0
-'1799',1000,170900,,'',0
'1803',1000,83000,,'',0,47200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146214 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146214
index c8aa8b08..4cfcfffc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146214
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146214
@@ -1,4 +1 @@
-'1579',1001,172400,,'',0
-'1798',1001,72200,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,172400,,'',0
'1803',1001,84600,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146215 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146215
index e2ef0dbd..97cd2725 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146215
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146215
@@ -1,5 +1,3 @@
-'1798',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,64800,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
'1803',300,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84800,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
'2919',1600,94900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146216 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146216
index efd54e91..9d2d35fb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146216
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146216
@@ -1,11 +1,4 @@
-'1798',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1101,181500,,'',0
-'1798',1101,124200,,'',0
-'1799',1101,181500,,'',0
-'1798',1501,194100,,'',0,16400,,'',0
'1803',1501,194100,,'',0,16400,,'',0
'2919',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146217 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146217
index 6222be14..83eb6edc 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146217
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146217
@@ -1,6 +1,2 @@
-'1798',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1100,95700,,'',0,34700,,'',0
-'1798',1500,201200,,'',0,12400,,'',0
'1803',1500,201200,,'',0,12400,,'',0
-'1798',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146218 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146218
index a3495083..a4c67170 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146218
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146218
@@ -1,4 +1,2 @@
-'1798',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,194500,,'',0,16400,,'',0
'1803',1501,194500,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146219 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146219
index 4581fdd8..829dca92 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146219
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146219
@@ -1,12 +1,6 @@
-'1798',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
-'1798',501,65100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1001,175300,,'',0
-'1798',1001,75100,,'',0,16600,,'',0,11700,,'',0,31400,,'',0
-'1799',1001,175300,,'',0
'1803',1001,91700,,'',0,43100,,'',0,40500,,'',0
'2919',1601,93200,,'',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_146220 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146220
index 92ba74ca..dbc81da7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146220
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146220
@@ -1,6 +1,3 @@
-'1798',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1600,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'1798',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146221 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146221
index e7fa95d9..56c8d5ba 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146221
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146221
@@ -1,6 +1,3 @@
-'1798',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
'1803',3000,91500,,'',0,21100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
-'1798',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146222 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146222
index 0a18aab5..dc2c0463 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146222
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146222
@@ -1,2 +1 @@
-'1798',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146223 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146223
index d7b78fcc..d790ffe2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146223
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146223
@@ -1,2 +1 @@
-'1798',401,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84400,,'',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_146224 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146224
index 325a19bb..f0bada65 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146224
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146224
@@ -1,2 +1 @@
-'1798',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84300,,'',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_146225 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146225
index b2596d74..02ad052c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146225
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146225
@@ -1,2 +1 @@
-'1798',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146226 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146226
index 325a19bb..f0bada65 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146226
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146226
@@ -1,2 +1 @@
-'1798',401,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84300,,'',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_146227 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146227
index 7209c9d2..b0c69b15 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146227
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146227
@@ -1,2 +1 @@
-'1798',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146228 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146228
index 2097d076..3e984a5c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146228
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146228
@@ -1,5 +1,3 @@
-'1798',300,82100,4,'',0
-'1798',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
'1803',300,82100,4,'',0
'1803',301,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
'2919',1601,92500,,'',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_146229 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146229
index aff5a2c2..87e3118c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146229
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146229
@@ -1,7 +1,3 @@
-'1798',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
-'1798',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
'1803',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,55100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146230 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146230
index 93db1ed6..178950cf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146230
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146230
@@ -1,6 +1,3 @@
-'1798',500,71300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'1803',500,91300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
'2919',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',7000,55800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146231 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146231
index 128e4a0d..7fdce955 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146231
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146231
@@ -1,5 +1,2 @@
-'1798',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
-'1798',7001,182300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146232 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146232
index 79a04754..d42e7a95 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146232
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146232
@@ -1,2 +1 @@
-'1798',300,65100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,85100,,'',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_146233 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146233
index 014dd5e6..ea47e14d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146233
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146233
@@ -1,12 +1,6 @@
-'1798',100,82400,,'',0
-'1798',101,82400,4,'',0
'1803',100,82400,,'',0
'1803',101,82400,4,'',0
-'1798',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',500,72200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
'1803',500,92200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
'2919',500,125200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1600,95400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
-'1798',4000,82000,,'',0,51500,,'',0
-'1798',7000,55900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146234 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146234
index 7477a18c..ff248d0e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146234
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146234
@@ -1,13 +1,6 @@
-'1798',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'1798',101,61600,4,'',0,10000,4,'',0,20000,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
'1803',100,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',101,91600,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
-'1798',501,70500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
-'1798',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
'1803',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
'1803',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
-'1798',4001,100600,,'',0,60000,,'',0
-'1798',7001,182200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146236 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146236
index e958fb99..4cd1e43a 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146236
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146236
@@ -1,5 +1,3 @@
-'1798',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',501,70400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146237 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146237
index c19f6ff3..ad218a9c 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146237
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146237
@@ -1,9 +1,5 @@
-'1798',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',501,70200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146238 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146238
index d05fd691..b7ea1308 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146238
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146238
@@ -1,3 +1,2 @@
-'1798',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
'1803',501,85600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
'2919',501,122600,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146239 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146239
index 6e6889a2..e4ba7770 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146239
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146239
@@ -1,8 +1,3 @@
-'1798',300,71600,4,'',0,20000,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
-'1798',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',300,91600,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
'1803',301,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1579',1000,164900,,'',0
-'1798',1000,65000,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164900,,'',0
'1803',1000,81000,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146240 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146240
index d93efe97..fca4df8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146240
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146240
@@ -1,4 +1 @@
-'1579',1001,172800,,'',0
-'1798',1001,72600,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,172800,,'',0
'1803',1001,85000,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146241 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146241
index d93efe97..fca4df8b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146241
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146241
@@ -1,4 +1 @@
-'1579',1001,172800,,'',0
-'1798',1001,72600,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,172800,,'',0
'1803',1001,85000,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146242 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146242
index df19a015..375194c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146242
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146242
@@ -1,4 +1,2 @@
-'1798',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'1798',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
'1803',3000,93800,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
'1803',3001,81600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146243 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146243
index 4a206fd8..4d9b45d7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146243
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146243
@@ -1,5 +1,2 @@
-'1798',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
-'1798',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
'1803',3000,94000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
'1803',3001,81800,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'1798',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146244 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146244
index c77f4704..30dd6479 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146244
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146244
@@ -1,8 +1,4 @@
-'1798',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
-'1798',101,81100,,'',0
'1803',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
'1803',101,81100,,'',0
-'1798',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
'1803',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146245 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146245
index cfdf9f6b..813cdf96 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146245
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146245
@@ -1,3 +1,2 @@
-'1798',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1600,91600,,'',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_146246 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146246
index 882da513..ec911b79 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146246
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146246
@@ -1,3 +1,2 @@
-'1798',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1600,91700,,'',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_146247 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146247
index 35d0cf15..e3202bdf 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146247
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146247
@@ -1,5 +1,3 @@
-'1798',100,64800,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
-'1798',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84800,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
'1803',101,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1600,91700,,'',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_146248 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146248
index d1e5cb76..18e90432 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146248
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146248
@@ -1,2 +1 @@
-'1798',101,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',101,84900,,'',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_146251 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146251
index 5346ae5d..57677dbb 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146251
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146251
@@ -1,4 +1,2 @@
-'1798',300,80800,0,'School Spcl',0
'1803',300,80800,0,'School Spcl',0
-'1798',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
'1803',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146252 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146252
index 57cbdc34..c96195ae 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146252
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146252
@@ -1,4 +1,2 @@
-'1798',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,194600,,'',0,16400,,'',0
'1803',1501,194600,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146253 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146253
index 5d4fc03a..1f249573 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146253
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146253
@@ -1,7 +1,3 @@
-'1798',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164800,,'',0
-'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164800,,'',0
'1803',1000,80900,,'',0,43200,,'',0,40700,,'',0
'2919',1601,92300,,'',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_146254 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146254
index 75abc046..c5f174c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146254
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146254
@@ -1,4 +1 @@
-'1798',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'1798',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
-'1798',7001,183000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146255 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146255
index 14ad1209..cc2aec86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146255
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146255
@@ -1,8 +1,4 @@
-'1798',501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'1798',7000,55400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146256 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146256
index b2a0e68c..b79fe43e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146256
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146256
@@ -1,4 +1 @@
-'1579',1000,165000,,'',0
-'1798',1000,65100,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,165000,,'',0
'1803',1000,81100,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146257 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146257
index 69200420..1e370b21 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146257
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146257
@@ -1,6 +1,4 @@
-'1798',500,73100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',500,93100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
'2919',1600,90100,,'',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_146258 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146258
index 63c63a97..f4ec7124 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146258
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146258
@@ -1,6 +1,4 @@
-'1798',501,65500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',501,85500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190400,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,93500,,'',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_146259 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146259
index 3f578204..8dcf7153 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146259
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146259
@@ -1,4 +1,2 @@
-'1798',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1798',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91200,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146260 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146260
index ac7dd358..d217cf5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146260
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146260
@@ -1,4 +1,2 @@
-'1798',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,85000,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146261 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146261
index 30b4bcd1..f92b2a89 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146261
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146261
@@ -1,4 +1,2 @@
-'1798',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1798',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146262 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146262
index dc0b582c..10539c71 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146262
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146262
@@ -1,4 +1,2 @@
-'1798',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146263 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146263
index c7275815..2cd28fd8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146263
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146263
@@ -1,4 +1,2 @@
-'1798',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146264 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146264
index 30b4bcd1..f92b2a89 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146264
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146264
@@ -1,4 +1,2 @@
-'1798',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1798',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146265 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146265
index b44d0506..467e9a30 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146265
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146265
@@ -1,12 +1,4 @@
-'1798',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',201,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',401,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1100,183800,,'',0
-'1579',1101,181500,,'',0
-'1798',1101,124200,,'',0
-'1799',1101,181500,,'',0
-'1798',1501,194200,,'',0,16400,,'',0
'1803',1501,194200,,'',0,16400,,'',0
-'1798',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,84700,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146266 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146266
index 408478ad..7b2ffc4d 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146266
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146266
@@ -1,8 +1,4 @@
-'1798',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'2919',1600,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'1798',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146267 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146267
index 19008db1..37e44880 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146267
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146267
@@ -1,6 +1,3 @@
-'1798',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'2919',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
-'1798',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146268 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146268
index 2178cc43..52d25553 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146268
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146268
@@ -1,6 +1,2 @@
-'1798',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
'1803',100,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
-'1798',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
-'1798',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'1798',7001,183400,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146269 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146269
index 5902fa0b..ef6ec2c2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146269
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146269
@@ -1,8 +1,4 @@
-'1798',300,81200,0,'School Spcl',0
'1803',300,81200,0,'School Spcl',0
-'1798',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',401,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1798',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
-'1798',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
'1803',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146270 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146270
index 5042ca94..81380639 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146270
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146270
@@ -1,8 +1,4 @@
-'1798',501,70900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'1798',7000,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146271 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146271
index 599fa85a..ec14c9b9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146271
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146271
@@ -1,4 +1 @@
-'1798',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
-'1798',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'1798',7001,182800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146273 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146273
index a8bc69d0..a0b3e09f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146273
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146273
@@ -1,8 +1,4 @@
-'1798',501,70700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'1798',7000,55300,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146274 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146274
index 3e9cbe53..c5f174c0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146274
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146274
@@ -1,4 +1 @@
-'1798',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
-'1798',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
-'1798',7001,183100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146275 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146275
index f51ebf7f..77965e61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146275
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146275
@@ -1,2 +1 @@
-'1798',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,85200,,'',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_146276 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146276
index f51ebf7f..77965e61 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146276
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146276
@@ -1,2 +1 @@
-'1798',200,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,85200,,'',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_146277 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146277
index b12e4dcd..bdca668b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146277
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146277
@@ -1,2 +1 @@
-'1798',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,75500,,'',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_146278 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146278
index b12e4dcd..bdca668b 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146278
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146278
@@ -1,2 +1 @@
-'1798',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',201,75500,,'',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_146279 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146279
index ed1db4b4..97543fff 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146279
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146279
@@ -1,2 +1 @@
-'1798',200,65300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,85300,,'',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_146280 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146280
index 79d080c4..459ffaab 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146280
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146280
@@ -1,4 +1,2 @@
-'1798',200,65400,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
-'1798',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',200,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
'1803',201,75400,,'',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_146281 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146281
index d18d96ed..407b08b1 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146281
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146281
@@ -1,8 +1,4 @@
-'1798',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
'1803',400,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
-'1798',1500,201100,,'',0,12400,,'',0
'1803',1500,201100,,'',0,12400,,'',0
-'1798',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
'1803',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146282 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146282
index aec69a7b..868da7d2 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146282
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146282
@@ -1,4 +1 @@
-'1579',1001,172700,,'',0
-'1798',1001,72500,,'',0,12400,,'',0,15900,,'',0,31200,,'',0
-'1799',1001,172700,,'',0
'1803',1001,84900,,'',0,47100,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146283 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146283
index 838aa4fa..720d90a7 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146283
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146283
@@ -1,4 +1 @@
-'1579',1000,165200,,'',0
-'1798',1000,65300,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,165200,,'',0
'1803',1000,81300,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146284 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146284
index bb6cd975..19fce29f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146284
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146284
@@ -1,2 +1 @@
-'1798',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
'1803',3001,82000,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146285 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146285
index 06eb5984..c86f5f71 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146285
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146285
@@ -1,4 +1,2 @@
-'1798',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'1798',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
'1803',3000,93200,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
'1803',3001,82400,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146286 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146286
index 2cdee29a..2f256ff4 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146286
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146286
@@ -1,3 +1 @@
-'1798',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
'1803',3001,82600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
-'1798',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146287 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146287
index 7481fec2..79ebc534 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146287
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146287
@@ -1,4 +1,2 @@
-'1798',3000,113800,,'',0,61000,,'',0
-'1798',3001,73300,,'',0,79000,,'',0
'1803',3000,113800,,'',0,61000,,'',0
'1803',3001,83300,,'',0,69000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146288 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146288
index 0053d843..e0b96569 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146288
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146288
@@ -1,4 +1,2 @@
-'1798',3000,113900,,'',0,61000,,'',0
-'1798',3001,73400,,'',0,79000,,'',0
'1803',3000,113900,,'',0,61000,,'',0
'1803',3001,83400,,'',0,69000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146289 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146289
index b6b068d7..398f2098 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146289
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146289
@@ -1,3 +1 @@
-'1798',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
'1803',3000,93000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
-'1798',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146290 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146290
index f026b997..63000536 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146290
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146290
@@ -1,4 +1,2 @@
-'1798',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
-'1798',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
'1803',3000,93600,,'',0,700,4,'',0,20700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
'1803',3001,81500,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146291 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146291
deleted file mode 100644
index 91676be0..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146291
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146292 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146292
deleted file mode 100644
index ea035cde..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146292
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
-'1798',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146293 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146293
deleted file mode 100644
index ccabb8a4..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146293
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
-'1798',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146294 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146294
deleted file mode 100644
index bcc7e114..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146294
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146295 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146295
deleted file mode 100644
index 4b737a9f..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146295
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146296 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146296
deleted file mode 100644
index 545d9b18..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146296
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146305 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146305
deleted file mode 100644
index b596bf78..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146305
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146311 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146311
deleted file mode 100644
index 3e2db8ab..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146311
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'1798',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146312 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146312
deleted file mode 100644
index 59e186f1..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146312
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'1798',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146313 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146313
deleted file mode 100644
index a54fe5f7..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146313
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'1798',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146314 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146314
deleted file mode 100644
index fa328221..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146314
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'1798',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146315 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146315
deleted file mode 100644
index 87dae96e..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146315
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
-'1798',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146316 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146316
deleted file mode 100644
index 09e48c90..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146316
+++ /dev/null
@@ -1,3 +0,0 @@
-'1798',4000,71500,,'',0,51500,,'',0
-'1798',4001,111500,4,'',0,60000,4,'',0
-'1798',4100,71500,4,'',0,51500,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146318 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146318
index 91a2a825..8e338e34 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146318
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146318
@@ -1,13 +1,6 @@
-'1798',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
'1803',401,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
-'1798',500,73300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',500,93300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',500,130300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1579',1000,164100,,'',0
-'1798',1000,64400,,'',0,16000,,'',0,12000,,'',0,31000,,'',0
-'1799',1000,164100,,'',0
'1803',1000,80400,,'',0,43000,,'',0,40700,,'',0
-'1798',1500,200500,,'',0,12400,,'',0
'1803',1500,200500,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146322 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146322
deleted file mode 100644
index 694323ef..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146322
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',4000,81000,,'',0,51500,,'',0
-'1798',4001,101600,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146323 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146323
index 14ad1209..cc2aec86 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146323
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146323
@@ -1,8 +1,4 @@
-'1798',501,70800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'1798',7000,55400,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146324 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146324
index 3167f554..af1d7c5f 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146324
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146324
@@ -1,2 +1 @@
-'1798',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,91400,,'',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_146325 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146325
index a3e0e083..dac90d32 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146325
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146325
@@ -1,2 +1 @@
-'1798',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84500,,'',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_146326 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146326
deleted file mode 100644
index 216d5789..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146326
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4100,71000,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146327 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146327
deleted file mode 100644
index 25e1cefa..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146327
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4100,64900,,'',0,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146328 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146328
deleted file mode 100644
index c042b441..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146328
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4100,64500,,'',0,55500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146329 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146329
deleted file mode 100644
index 877ee607..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146329
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4100,70700,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146330 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146330
deleted file mode 100644
index 142c9946..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146330
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4100,70500,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146331 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146331
deleted file mode 100644
index 977ed718..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146331
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4100,70100,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146332 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146332
deleted file mode 100644
index db0586a2..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146332
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4100,70000,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146333 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146333
deleted file mode 100644
index 66b64770..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146333
+++ /dev/null
@@ -1 +0,0 @@
-'1798',1100,95800,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146334 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146334
deleted file mode 100644
index 7557a6d4..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146334
+++ /dev/null
@@ -1,3 +0,0 @@
-'1579',1101,181900,,'',0
-'1798',1101,93900,,'',0,30700,,'',0
-'1799',1101,181900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146335 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146335
deleted file mode 100644
index 85c3c49f..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146335
+++ /dev/null
@@ -1,3 +0,0 @@
-'1579',1101,182000,,'',0
-'1798',1101,94000,,'',0,30700,,'',0
-'1799',1101,182000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146336 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146336
deleted file mode 100644
index a13b20aa..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146336
+++ /dev/null
@@ -1,6 +0,0 @@
-'1579',1100,182200,,'',0
-'1579',1101,182200,4,'',0
-'1798',1100,94200,,'',0,30700,,'',0
-'1798',1101,94200,4,'',0,30700,4,'',0
-'1799',1100,182200,,'',0
-'1799',1101,182200,4,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146337 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146337
deleted file mode 100644
index 4b0ca190..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146337
+++ /dev/null
@@ -1,3 +0,0 @@
-'1579',1100,182600,,'',0
-'1798',1100,94600,,'',0,30700,,'',0
-'1799',1100,182600,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146338 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146338
deleted file mode 100644
index 1e581fc1..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146338
+++ /dev/null
@@ -1,3 +0,0 @@
-'1579',1100,182800,,'',0
-'1798',1100,94800,,'',0,30700,,'',0
-'1799',1100,182800,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146339 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146339
deleted file mode 100644
index 8563cd6d..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146339
+++ /dev/null
@@ -1,3 +0,0 @@
-'1579',1100,182900,,'',0
-'1798',1100,94900,,'',0,30700,,'',0
-'1799',1100,182900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146340 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146340
deleted file mode 100644
index 8563cd6d..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146340
+++ /dev/null
@@ -1,3 +0,0 @@
-'1579',1100,182900,,'',0
-'1798',1100,94900,,'',0,30700,,'',0
-'1799',1100,182900,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146341 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146341
deleted file mode 100644
index 7c0eadf2..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146341
+++ /dev/null
@@ -1,3 +0,0 @@
-'1579',1100,183100,,'',0
-'1798',1100,95100,,'',0,30700,,'',0
-'1799',1100,183100,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146342 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146342
index 1fa00944..b2a23962 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146342
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146342
@@ -1,7 +1,3 @@
-'1798',101,81900,,'',0
'1803',101,81900,,'',0
-'1798',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'1803',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
'2919',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
-'1798',7000,55200,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146343 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146343
deleted file mode 100644
index 3b4024b1..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146343
+++ /dev/null
@@ -1,3 +0,0 @@
-'1798',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
-'1798',4000,80000,,'',0,51500,,'',0
-'1798',4001,102600,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146344 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146344
deleted file mode 100644
index 4f99e504..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146344
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146345 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146345
deleted file mode 100644
index 05eabb89..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146345
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146346 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146346
deleted file mode 100644
index 4831ae96..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146346
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146347 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146347
deleted file mode 100644
index 00b5ef96..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146347
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146348 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146348
deleted file mode 100644
index 6c8eaf61..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146348
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146349 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146349
deleted file mode 100644
index 47e233a1..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146349
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146350 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146350
deleted file mode 100644
index fa9b797a..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146350
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146351 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146351
deleted file mode 100644
index 39e6a705..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146351
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146352 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146352
deleted file mode 100644
index c254cc3a..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146352
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146353 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146353
deleted file mode 100644
index 76791a3e..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146353
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146354 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146354
deleted file mode 100644
index 288e03f8..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146354
+++ /dev/null
@@ -1 +0,0 @@
-'1798',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146360 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146360
index f2328350..58306dbe 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146360
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146360
@@ -1,6 +1,3 @@
-'1798',500,72600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',500,92600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',500,125600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'1798',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146361 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146361
index 0d59253e..59d7b61e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146361
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146361
@@ -1,5 +1,3 @@
-'1798',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',501,70300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'1803',501,90300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
'2919',501,123300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146362 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146362
index 3032e163..1c1570fd 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146362
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146362
@@ -1,6 +1,3 @@
-'1798',500,72700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',500,92700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',500,125700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
'1803',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
-'1798',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146363 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146363
index 380de22e..071dba55 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146363
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146363
@@ -1,3 +1,2 @@
-'1798',500,72400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'1803',500,92400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
'2919',500,125400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146365 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146365
index 81cc0f92..42de42c6 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146365
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146365
@@ -1,4 +1 @@
-'1579',1000,164800,,'',0
-'1798',1000,64900,,'',0,16000,,'',0,12000,,'',0,31200,,'',0
-'1799',1000,164800,,'',0
'1803',1000,80900,,'',0,43200,,'',0,40700,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146367 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146367
index 5072ae5d..97fbea80 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146367
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146367
@@ -1,8 +1,4 @@
-'1798',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',100,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
'1803',300,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
'1803',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
'2919',1600,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
-'1798',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146368 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146368
index ae29adef..9fe21213 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146368
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146368
@@ -1,4 +1 @@
-'1579',1100,183600,,'',0
-'1798',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'1798',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146369 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146369
index b5456707..9fe21213 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146369
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146369
@@ -1,4 +1 @@
-'1579',1100,183700,,'',0
-'1798',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
'1803',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
-'1798',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146370 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146370
index ba3b81c8..5cbf5a5e 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146370
+++ b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146370
@@ -1,2 +1 @@
-'1798',300,81700,0,'School Spcl',0
'1803',300,81700,0,'School Spcl',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_148000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_148000
deleted file mode 100644
index 15caa2b1..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_148000
+++ /dev/null
@@ -1 +0,0 @@
-'1798',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149000 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149000
deleted file mode 100644
index 101fa4c4..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149000
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4000,73300,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149001 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149001
deleted file mode 100644
index 1b6d12c8..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149001
+++ /dev/null
@@ -1 +0,0 @@
-'1798',4001,105000,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149002 b/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149002
deleted file mode 100644
index 6ce67b37..00000000
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_149002
+++ /dev/null
@@ -1,2 +0,0 @@
-'1798',4000,73800,,'',0,51500,,'',0
-'1798',4001,104600,,'',0,60000,,'',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 b3d2320e..c36580f2 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
@@ -2,10 +2,10 @@
true
false
- 49.02001
- 49.88713
- -119.73523
- -119.44801
- 1723392000
+ 49.45303
+ 49.603
+ -119.68352
+ -119.5527
+ 1725116040
1725328800
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
new file mode 100644
index 00000000..29f9b88a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_routes
@@ -0,0 +1,15 @@
+1,'1','Okanagan Lake / Wiltse','004B8D',49,3
+2,'2','West Side / Penticton Ave','8CC63F',50,3
+3,'3','Uplands / Skaha Lake','F37421',51,3
+4,'4','West Side / Duncan East','00AEEF',52,3
+5,'5','Main Street','FCAF17',53,3
+10,'10','Naramata / Penticton','00AA47',1567,3
+11,'11','West Bench','ED1D8F',1568,3
+15,'15','Night Route','8177B7',1572,3
+16,'16','Lake To Lake','49176B',1573,3
+20,'20','Okanagan Falls / Penticton','B2BB1E',1598,3
+21,'21','OK Falls Local','4F6F19',1599,3
+30,'30','Penticton / Summerland','77AF99',1629,3
+40,'40','Osoyoos / Penticton','E270AB',1660,3
+41,'41','Osoyoos Local','5D87A1',1661,3
+70,'70','Kelowna / Penticton','F49A5D',1753,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
new file mode 100644
index 00000000..5180c05f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_stops
@@ -0,0 +1,359 @@
+103689,'103689','13th St & Lk',49.78264,-119.72333,0,1448730435
+103690,'103690','13th St & Lk',49.78270,-119.72310,0,1448730457
+103744,'103744','Hwy 97 Onramp @ Westside Rd',49.88180,-119.53653,0,1448731267
+103745,'103745','Hwy 97 Offramp @ Sneena',49.88074,-119.53497,0,1448731268
+140213,'140213','Westbank Exch',49.82830,-119.63061,0,1452331079
+140214,'140214','Westbank Exch',49.82972,-119.63041,0,1452331080
+140215,'140215','Queensway Exch (Kelowna)',49.88713,-119.49494,0,1452331081
+140221,'140221','Beach & 4th St (Peachland)',49.77475,-119.73523,0,1452331108
+140222,'140222','Beach & 4th St (Peachland)',49.77471,-119.73500,0,1452331109
+146000,'146000','Gov & Okanagan',49.47824,-119.57500,0,1452507869
+146001,'146001','Pineview & Corry',49.46900,-119.57630,0,1452507870
+146002,'146002','Pineview & Taber',49.46930,-119.57371,0,1452507871
+146003,'146003','Dartmouth & Balsam',49.47000,-119.57117,0,1452507872
+146004,'146004','Dartmouth & Wiltse',49.47111,-119.57111,0,1452507873
+146005,'146005','Stevens & Wiltse',49.47445,-119.56531,0,1452507874
+146006,'146006','Stevens & Stevens',49.47290,-119.56679,0,1452507875
+146007,'146007','Wiltse Blvd & Wiltse Dr',49.47150,-119.56870,0,1452507876
+146008,'146008','Dartmouth & Dartmouth',49.47676,-119.56916,0,1452507877
+146009,'146009','Gov & Warren',49.47657,-119.57419,0,1452507878
+146010,'146010','Gov & Okanagan',49.47825,-119.57474,0,1452507900
+146012,'146012','Conklin & Fairview',49.48646,-119.59216,0,1452507902
+146013,'146013','Ellis & Westminster',49.50120,-119.59049,0,1452507903
+146014,'146014','Middle Bench Rd S & Andrew',49.49837,-119.57411,0,1452507904
+146015,'146015','Vancouver & Cambie',49.50319,-119.58532,0,1452507905
+146016,'146016','Lakeshore & Front',49.50265,-119.59167,0,1452507906
+146017,'146017','Dartmouth & Wiltse',49.47216,-119.57115,0,1452507907
+146018,'146018','Pineview & Dartmouth',49.46965,-119.57153,0,1452507908
+146019,'146019','Conklin & Fairview',49.48657,-119.59214,0,1452507909
+146020,'146020','Winnipeg & Churchill',49.50088,-119.59681,0,1452507931
+146021,'146021','Winnipeg & Westminster',49.49943,-119.59600,0,1452507932
+146022,'146022','Lakeshore & Main',49.50259,-119.59384,0,1452507933
+146023,'146023','Ellis & Nanaimo',49.49925,-119.59051,0,1452507934
+146024,'146024','Nanaimo & Ellis',49.49907,-119.59092,0,1452507935
+146025,'146025','Main & Wade',49.49738,-119.59163,0,1452507936
+146028,'146028','MacCleave & Carmi',49.48377,-119.57292,0,1452507939
+146029,'146029','Duncan & Hwy 97 (OK College)',49.48662,-119.60401,0,1452507940
+146030,'146030','Duncan & Hwy 97 (OK College)',49.48706,-119.60439,0,1452507962
+146031,'146031','Lakeshore & Power',49.50139,-119.60512,0,1452507963
+146032,'146032','Lakeshore 380 Blk',49.50178,-119.59999,0,1452507964
+146033,'146033','Lakeshore & Winnipeg',49.50205,-119.59782,0,1452507965
+146034,'146034','Wade & Winnipeg',49.49650,-119.59483,0,1452507966
+146035,'146035','Wade & Tennis',49.49612,-119.59651,0,1452507967
+146036,'146036','Wade & Haynes',49.49588,-119.59715,0,1452507968
+146037,'146037','Conklin & Moosejaw',49.48783,-119.59902,0,1452507969
+146038,'146038','Conklin & Argyle',49.48723,-119.59573,0,1452507970
+146039,'146039','Conklin & Moosejaw',49.48767,-119.59882,0,1452507971
+146040,'146040','Skaha Lk Rd & Beach',49.45403,-119.59065,0,1452507993
+146041,'146041','Naramata & Lower Debeck',49.59115,-119.57893,0,1452507994
+146042,'146042','Winnipeg & Wade',49.49667,-119.59461,0,1452507995
+146043,'146043','Winnipeg & Wade',49.49683,-119.59450,0,1452507996
+146044,'146044','Winnipeg & Nanaimo',49.49810,-119.59516,0,1452507997
+146045,'146045','Wade & Martin',49.49691,-119.59225,0,1452507998
+146046,'146046','Wade & Martin',49.49677,-119.59296,0,1452507999
+146047,'146047','Wade & Martin',49.49684,-119.59314,0,1452508000
+146048,'146048','Wade & Winnipeg',49.49655,-119.59402,0,1452508001
+146049,'146049','Martin & Lakeshore',49.50213,-119.59551,0,1452508002
+146050,'146050','Martin & Nanaimo',49.49839,-119.59365,0,1452508024
+146051,'146051','Martin & Wade',49.49626,-119.59256,0,1452508025
+146052,'146052','Martin & Orchard',49.49469,-119.59170,0,1452508026
+146053,'146053','Winnipeg & Orchard',49.49440,-119.59343,0,1452508027
+146054,'146054','Winnipeg & Orchard',49.49443,-119.59329,0,1452508028
+146055,'146055','Winnipeg & Eckhardt',49.49267,-119.59237,0,1452508029
+146057,'146057','Fairview & Conklin',49.48657,-119.59155,0,1452508031
+146058,'146058','Grn & Eraut',49.46378,-119.58260,0,1452508032
+146059,'146059','Grn & Eraut',49.46400,-119.58201,0,1452508033
+146060,'146060','Grn & Wilson',49.46332,-119.58688,0,1452508055
+146061,'146061','Grn & Wilson',49.46317,-119.58747,0,1452508056
+146062,'146062','Winnipeg & Eckhardt',49.49192,-119.59214,0,1452508057
+146063,'146063','Winnipeg & Fairview',49.48935,-119.59083,0,1452508058
+146064,'146064','Winnipeg & Fairview',49.48961,-119.59077,0,1452508059
+146065,'146065','Kinney & McGraw',49.47120,-119.58895,0,1452508060
+146066,'146066','Skaha Lk Rd & Grn',49.46369,-119.58751,0,1452508061
+146067,'146067','Skaha Lk Rd Before Waterford',49.46021,-119.58844,0,1452508062
+146068,'146068','Skaha Lk Rd After Waterford',49.46009,-119.58862,0,1452508063
+146069,'146069','Skaha Lk Rd & Yorkton',49.45689,-119.58729,0,1452508064
+146070,'146070','Skaha Lk Rd & Guelph',49.45844,-119.58785,0,1452508086
+146071,'146071','Skaha Lk Rd & Guelph',49.45810,-119.58795,0,1452508087
+146072,'146072','Ellis & 5th St',49.59541,-119.59724,0,1452508088
+146074,'146074','Main & Eckhardt',49.49222,-119.58897,0,1452508090
+146075,'146075','Main & Jermyn',49.49019,-119.58797,0,1452508091
+146076,'146076','Main & Jermyn (Library)',49.49071,-119.58842,0,1452508092
+146077,'146077','Main & Nelson',49.48856,-119.58757,0,1452508093
+146078,'146078','Main & Nelson',49.48871,-119.58743,0,1452508094
+146079,'146079','Main & Penticton',49.48671,-119.58694,0,1452508095
+146080,'146080','Main & Penticton',49.48702,-119.58686,0,1452508117
+146081,'146081','Main & Carmi',49.48305,-119.58581,0,1452508118
+146082,'146082','Main & Granby',49.48146,-119.58517,0,1452508119
+146083,'146083','Main & Granby',49.48147,-119.58501,0,1452508120
+146084,'146084','Main & Rosetown',49.47927,-119.58425,0,1452508121
+146085,'146085','Main & Rosetown',49.47933,-119.58445,0,1452508122
+146086,'146086','Main & Okanagan',49.47769,-119.58375,0,1452508123
+146087,'146087','Main & Okanagan',49.47756,-119.58384,0,1452508124
+146088,'146088','Yorkton & S Main',49.45662,-119.57898,0,1452508125
+146089,'146089','Yorkton & S Main',49.45672,-119.57941,0,1452508126
+146090,'146090','Yorkton & Wilson',49.45653,-119.58308,0,1452508148
+146091,'146091','Robinson & Salting',49.59681,-119.59052,0,1452508149
+146092,'146092','Eckhardt & Main',49.49311,-119.58915,0,1452508150
+146093,'146093','Eckhardt & Braid',49.49375,-119.58663,0,1452508151
+146094,'146094','Eckhardt & Haywood',49.49454,-119.58265,0,1452508152
+146095,'146095','Cambie & Guernsey',49.50280,-119.58367,0,1452508153
+146096,'146096','Vancouver & Abbott',49.50305,-119.58735,0,1452508154
+146098,'146098','S Main & Grn',49.46593,-119.57983,0,1452508156
+146099,'146099','S Main & Grn',49.46613,-119.58008,0,1452508157
+146100,'146100','Manitoba & Duncan',49.48397,-119.58172,0,1452508830
+146101,'146101','Johnson & Truro',49.49764,-119.57566,0,1452508831
+146102,'146102','Carmi & Leir',49.48259,-119.57950,0,1452508832
+146103,'146103','Carmi & Balfour (Penticton Hosp)',49.48258,-119.57812,0,1452508833
+146104,'146104','Forestbrook & Kilwinning',49.49244,-119.57708,0,1452508834
+146105,'146105','Warren 200 Blk',49.47548,-119.57992,0,1452508835
+146106,'146106','Warren & Camrose',49.47590,-119.57584,0,1452508836
+146107,'146107','Duncan & Church',49.48537,-119.57460,0,1452508837
+146108,'146108','Duncan & Church',49.48538,-119.57518,0,1452508838
+146109,'146109','Duncan & King',49.48501,-119.57709,0,1452508839
+146110,'146110','Duncan & Gov',49.48488,-119.57858,0,1452508861
+146111,'146111','Pineview & Dafoe',49.46910,-119.57701,0,1452508862
+146112,'146112','Penticton Ave & Kensington',49.48913,-119.57350,0,1452508863
+146113,'146113','Edgewood & Penticton Ave',49.48943,-119.57063,0,1452508864
+146114,'146114','Edgewood & Kensington',49.48707,-119.57099,0,1452508865
+146115,'146115','Ridgedale & Columbia',49.48761,-119.55980,0,1452508866
+146116,'146116','Ridgedale & Charles',49.48968,-119.55361,0,1452508867
+146117,'146117','Duncan & Columbia',49.48675,-119.55990,0,1452508868
+146118,'146118','Naramata & Todd',49.53251,-119.56195,0,1452508869
+146119,'146119','Naramata & Poplar Grv',49.53350,-119.56204,0,1452508870
+146120,'146120','Naramata & Olhausen',49.53615,-119.56278,0,1452508892
+146121,'146121','Naramata & Olhausen',49.53623,-119.56279,0,1452508893
+146122,'146122','Naramata & Evans',49.52425,-119.55834,0,1452508894
+146123,'146123','Naramata & Evans',49.52427,-119.55868,0,1452508895
+146124,'146124','Cleland 120 Blk',49.48586,-119.55409,0,1452508896
+146125,'146125','Cleland & McLean',49.48434,-119.55270,0,1452508897
+146126,'146126','Cleland & Dewdney',49.48240,-119.55294,0,1452508898
+146127,'146127','Duncan & Ridgedale',49.49114,-119.54959,0,1452508899
+146128,'146128','Kilwinning & Nelson Ave',49.49050,-119.57519,0,1452508900
+146129,'146129','Wade & Van Horne',49.49739,-119.58969,0,1452508901
+146130,'146130','Wade & Ellis',49.49726,-119.58995,0,1452508923
+146132,'146132','Wade & Braid',49.49726,-119.58741,0,1452508925
+146133,'146133','Gov & Burns',49.49655,-119.58460,0,1452508926
+146134,'146134','Gov & White',49.49576,-119.58280,0,1452508927
+146135,'146135','Gov & White',49.49562,-119.58234,0,1452508928
+146136,'146136','Gov & Gahan',49.49366,-119.58120,0,1452508929
+146137,'146137','Gov & Forestbrook',49.49197,-119.58025,0,1452508930
+146138,'146138','Gov & Forestbrook',49.49143,-119.58026,0,1452508931
+146139,'146139','Gov & Edmonton Ave',49.49057,-119.57978,0,1452508932
+146140,'146140','Gov & Nelson',49.48907,-119.57946,0,1452508954
+146141,'146141','Gov & Edna',49.48862,-119.57916,0,1452508955
+146142,'146142','Gov & Municipal',49.48654,-119.57843,0,1452508956
+146143,'146143','Gov & Bennett',49.48675,-119.57868,0,1452508957
+146144,'146144','Gov & Duncan',49.48552,-119.57810,0,1452508958
+146145,'146145','Gov Farside Carmi',49.48351,-119.57744,0,1452508959
+146146,'146146','Gov & Duncan',49.48424,-119.57786,0,1452508960
+146147,'146147','Gov''t & Carmi (Penticton Hosp)',49.48230,-119.57623,0,1452508961
+146148,'146148','Gov''t & Carmi (Penticton Hosp)',49.48229,-119.57656,0,1452508962
+146149,'146149','Robinson & 3rd St',49.59775,-119.60072,0,1452508963
+146150,'146150','Atkinson & Okanagan',49.47657,-119.58768,0,1452508985
+146151,'146151','Atkinson & Warren',49.47462,-119.58686,0,1452508986
+146152,'146152','Atkinson Before Warren',49.47470,-119.58705,0,1452508987
+146153,'146153','Gov & Warren',49.47651,-119.57442,0,1452508988
+146154,'146154','Main & Padmore',49.49595,-119.59091,0,1452508989
+146155,'146155','MacCleave & Steward',49.48393,-119.56896,0,1452508990
+146156,'146156','Dawson & Braelyn',49.47346,-119.57926,0,1452508991
+146157,'146157','Cherry Ln Shopping Ctr',49.47372,-119.58583,0,1452508992
+146159,'146159','Atkinson & Huth',49.48119,-119.58920,0,1452508994
+146160,'146160','Atkinson & Phoenix',49.48139,-119.58912,0,1452509016
+146161,'146161','Warren & Atkinson (Cherry Ln)',49.47439,-119.58613,0,1452509017
+146162,'146162','Upper Bench & McMillan',49.51197,-119.56438,0,1452509018
+146163,'146163','McGraw & Brandon',49.46638,-119.58810,0,1452509019
+146164,'146164','Westminster & Grandview',49.50057,-119.57993,0,1452509020
+146165,'146165','Westminster & Middle Bench Rd S',49.50055,-119.57431,0,1452509021
+146166,'146166','Main & Westminster',49.50059,-119.59334,0,1452509022
+146167,'146167','Main & Nanaimo',49.49912,-119.59255,0,1452509023
+146168,'146168','Churchill 600 Blk',49.50039,-119.60310,0,1452509024
+146169,'146169','Churchill & Lakeview',49.50069,-119.59990,0,1452509025
+146170,'146170','Churchill & Power',49.50025,-119.60624,0,1452509047
+146171,'146171','Power & Westminster',49.49706,-119.60519,0,1452509048
+146172,'146172','Power & Westminster',49.49720,-119.60512,0,1452509049
+146173,'146173','Calgary & Fairview',49.48590,-119.59126,0,1452509050
+146174,'146174','Calgary & Fairview',49.48579,-119.59089,0,1452509051
+146175,'146175','Calgary & Main',49.48586,-119.58775,0,1452509052
+146176,'146176','Calgary & Main',49.48575,-119.58768,0,1452509053
+146177,'146177','McGraw & McGraw',49.46925,-119.58908,0,1452509054
+146178,'146178','McGraw & McCulloch',49.46944,-119.58928,0,1452509055
+146179,'146179','McGraw & McKenzie',49.46689,-119.58842,0,1452509056
+146182,'146182','Skaha Lk Rd & Yorkton',49.45606,-119.58730,0,1452509080
+146183,'146183','Yorkton & Skaha Lk Rd',49.45650,-119.58671,0,1452509081
+146184,'146184','Yorkton & Wilson',49.45665,-119.58409,0,1452509082
+146185,'146185','Yorkton & Skaha Lk',49.45661,-119.58631,0,1452509083
+146186,'146186','Atkinson & Ind',49.47895,-119.58832,0,1452509084
+146187,'146187','Atkinson & Okanagan',49.47716,-119.58768,0,1452509085
+146188,'146188','Atkinson & Ind',49.47898,-119.58848,0,1452509086
+146189,'146189','Penticton Plz',49.48384,-119.58698,0,1452509087
+146190,'146190','Duncan & Main',49.48378,-119.58502,0,1452509109
+146191,'146191','Duncan & Manitoba',49.48429,-119.58234,0,1452509110
+146192,'146192','Duncan & Main (Plz)',49.48392,-119.58500,0,1452509111
+146194,'146194','Farrell & Johnson',49.49826,-119.58239,0,1452509113
+146195,'146195','Johnson & Walden',49.49772,-119.58122,0,1452509114
+146196,'146196','Penticton Ave & Debeck',49.48985,-119.56885,0,1452509115
+146197,'146197','Penticton Ave & Debeck',49.48999,-119.56885,0,1452509116
+146198,'146198','Duncan & Pine',49.48659,-119.56529,0,1452509117
+146199,'146199','McGraw & Kinney',49.47084,-119.58978,0,1452509118
+146200,'146200','Penticton Ave & McPherson',49.49037,-119.56507,0,1452509791
+146201,'146201','Wade & Ellis',49.49732,-119.59098,0,1452509792
+146202,'146202','Ellis & 8th St',49.59532,-119.59346,0,1452509793
+146203,'146203','Lower Debeck & Rushberry',49.59101,-119.58867,0,1452509794
+146204,'146204','Carmi & Halifax (Health Unit)',49.48254,-119.57511,0,1452509795
+146205,'146205','Ridgedale & Kendall',49.48722,-119.56800,0,1452509796
+146206,'146206','MacCleave & Pine',49.48427,-119.56434,0,1452509797
+146207,'146207','Carmi & Columbia',49.48284,-119.55911,0,1452509798
+146208,'146208','Duncan & Wellington',49.48802,-119.55601,0,1452509799
+146209,'146209','Allison & Cleland',49.48637,-119.55621,0,1452509800
+146210,'146210','Columbia & MacCleave',49.48347,-119.55977,0,1452509822
+146211,'146211','Duncan & Manitoba',49.48430,-119.58151,0,1452509823
+146212,'146212','Moosejaw & Douglas',49.48687,-119.59997,0,1452509824
+146213,'146213','Arawana & Naramata',49.58737,-119.58002,0,1452509825
+146214,'146214','Naramata & Arawana',49.58732,-119.58024,0,1452509826
+146215,'146215','Skaha Lk Rd & Channel',49.45303,-119.59638,0,1452509827
+146216,'146216','Wade & Maurice',49.49522,-119.60060,0,1452509828
+146217,'146217','Wade & Caribou',49.49493,-119.60150,0,1452509829
+146218,'146218','Moosejaw & Douglas',49.48643,-119.59983,0,1452509830
+146219,'146219','Main & Calgary (Penticton Plz)',49.48496,-119.58642,0,1452509831
+146220,'146220','Westminster & Wylie',49.49602,-119.61326,0,1452509853
+146221,'146221','Westminster & Power',49.49752,-119.60646,0,1452509854
+146222,'146222','Westminster & Maple',49.49829,-119.60236,0,1452509855
+146223,'146223','Westminster & Maple',49.49836,-119.60246,0,1452509856
+146224,'146224','Westminster & Lakeview',49.49916,-119.59878,0,1452509857
+146225,'146225','Westminster & Haynes',49.49909,-119.59876,0,1452509858
+146226,'146226','Westminster & Winnipeg',49.49955,-119.59705,0,1452509859
+146227,'146227','Grandview & Lower Bench',49.50377,-119.57999,0,1452509860
+146228,'146228','Abbott & Guernsey',49.50202,-119.58786,0,1452509861
+146229,'146229','Dawson & Main',49.47298,-119.58110,0,1452509862
+146230,'146230','Skaha Lk Rd After Waterford',49.46152,-119.58839,0,1452509884
+146231,'146231','Skaha Lk Rd Before Waterford',49.46196,-119.58850,0,1452509885
+146232,'146232','Grn & Paris',49.46293,-119.59058,0,1452509886
+146233,'146233','Peachtree Sq',49.46376,-119.58849,0,1452509887
+146234,'146234','Peachtree Sq',49.46381,-119.58879,0,1452509888
+146236,'146236','Skaha Lk Rd & Brandon',49.46638,-119.58626,0,1452509890
+146237,'146237','Skaha Lk Rd & Kinney',49.47139,-119.58320,0,1452509891
+146238,'146238','Main & McDougall',49.47417,-119.58284,0,1452509892
+146239,'146239','Johnson & Haven Hl',49.49773,-119.57978,0,1452509893
+146240,'146240','Debeck & Juniper',49.58929,-119.57261,0,1452509915
+146241,'146241','Arawana & Debeck',49.58765,-119.57495,0,1452509916
+146242,'146242','Victoria Rd N @ Jubilee',49.60285,-119.68352,0,1452509917
+146243,'146243','Rosedale @ Jubilee Rd E',49.60300,-119.67786,0,1452509918
+146244,'146244','Warren & Main',49.47551,-119.58211,0,1452509919
+146245,'146245','Riverside & Eckhardt',49.49595,-119.61599,0,1452509920
+146246,'146246','Riverside & Burnaby',49.49830,-119.61394,0,1452509921
+146247,'146247','Riverside & Dynes',49.49924,-119.61237,0,1452509922
+146248,'146248','Churchill & Sydney',49.50028,-119.60921,0,1452509923
+146250,'146250','Lakeshore & Sydney',49.50139,-119.60930,0,1452509946
+146251,'146251','Carmi & Bracewell',49.48216,-119.55467,0,1452509947
+146252,'146252','Conklin & Argyle',49.48700,-119.59518,0,1452509948
+146253,'146253','Vancouver & Van Horne',49.50305,-119.58979,0,1452509949
+146254,'146254','S Main 3080 Blk',49.46236,-119.57870,0,1452509950
+146255,'146255','S Main 3090 Blk',49.46228,-119.57885,0,1452509951
+146256,'146256','Johnson & Hudson',49.49670,-119.56739,0,1452509952
+146257,'146257','Main & Warren',49.47632,-119.58329,0,1452509953
+146258,'146258','Main & Warren',49.47635,-119.58345,0,1452509954
+146259,'146259','Duncan & Fairview',49.48351,-119.59472,0,1452509955
+146260,'146260','Duncan & Fairview',49.48342,-119.59509,0,1452509977
+146261,'146261','Duncan & Hastings',49.48441,-119.59723,0,1452509978
+146262,'146262','Duncan & Moosejaw',49.48571,-119.59965,0,1452509979
+146263,'146263','Duncan & Hastings',49.48468,-119.59774,0,1452509980
+146264,'146264','Duncan & Moosejaw',49.48549,-119.59868,0,1452509981
+146265,'146265','Vees & Wade',49.49418,-119.60285,0,1452509982
+146266,'146266','Power & Wade',49.49552,-119.60324,0,1452509983
+146267,'146267','Westminster & Burnaby',49.49692,-119.60917,0,1452509984
+146268,'146268','S Main & Pineview',49.46882,-119.58079,0,1452509985
+146269,'146269','Duncan & Ridgedale',49.48649,-119.56893,0,1452509986
+146270,'146270','S Main & Yorkton',49.45717,-119.57855,0,1452510008
+146271,'146271','S Main 3410 Blk',49.45943,-119.57780,0,1452510009
+146273,'146273','S Main 2910 Blk (Seniors'' Ctr)',49.46408,-119.57943,0,1452510011
+146274,'146274','S Main 2930 Blk (Seniors'' Ctr)',49.46409,-119.57926,0,1452510012
+146275,'146275','Penticton Ave & McPherson',49.49041,-119.56404,0,1452510013
+146276,'146276','Penticton Ave 1410 Blk',49.48984,-119.56262,0,1452510014
+146277,'146277','Penticton Ave 1410 Blk',49.48986,-119.56243,0,1452510015
+146278,'146278','Penticton Ave 1520 Blk',49.48915,-119.55837,0,1452510016
+146279,'146279','Penticton Ave 1480 Blk',49.48881,-119.55958,0,1452510017
+146280,'146280','Penticton Ave 1660 Blk',49.49036,-119.55474,0,1452510039
+146281,'146281','Hwy 97 @ Eckhardt (King''s Pk)',49.49192,-119.60341,0,1452510040
+146282,'146282','Juniper 3360 Blk',49.58589,-119.57047,0,1452510041
+146283,'146283','McMillan & N Upper Bench',49.51202,-119.56299,0,1452510042
+146284,'146284','Wharton @ Kelly',49.60086,-119.67986,0,1452510043
+146285,'146285','Summerland Health Ctr',49.60163,-119.66895,0,1452510044
+146286,'146286','Prairie Vly',49.60268,-119.66647,0,1452510045
+146287,'146287','May @ Nixon',49.57309,-119.62498,0,1452510046
+146288,'146288','Johnson & Cordy',49.57201,-119.62989,0,1452510047
+146289,'146289','Prairie Vly @ Atkinson',49.60296,-119.66794,0,1452510048
+146290,'146290','Wharton @ Kelly',49.60097,-119.67987,0,1452510070
+146291,'146291','7th Ave & Cedar',49.34688,-119.57512,0,1452510071
+146292,'146292','7th Ave & Hody Dr',49.34679,-119.56956,0,1452510072
+146293,'146293','7th Ave & Birch',49.34684,-119.56941,0,1452510073
+146294,'146294','Cedar St & 9th Ave',49.34482,-119.57559,0,1452510074
+146295,'146295','Main & 11th Ave',49.34278,-119.57161,0,1452510075
+146296,'146296','Main & 10th Ave',49.34394,-119.57156,0,1452510076
+146297,'146297','Eastside & 6th Ave',49.34757,-119.56736,0,1452510077
+146298,'146298','Eastside & 6th Ave',49.34757,-119.56747,0,1452510078
+146299,'146299','Eastside & 6th Ave',49.35282,-119.56656,0,1452510079
+146300,'146300','Eastside & 6th Ave',49.35271,-119.56666,0,1452510752
+146301,'146301','Eastside & Philpott',49.37313,-119.56475,0,1452510753
+146302,'146302','Eastside & Philpott',49.37293,-119.56471,0,1452510754
+146303,'146303','Eastside & Panorama Cres',49.37474,-119.56390,0,1452510755
+146304,'146304','Eastside & Panorama Cres',49.37481,-119.56374,0,1452510756
+146305,'146305','Eastside & Carmel Cres',49.37690,-119.56191,0,1452510757
+146306,'146306','Eastside & Carmel Cres',49.37705,-119.56166,0,1452510758
+146307,'146307','Eastside & McLean Crk',49.38089,-119.56049,0,1452510759
+146308,'146308','Eastside & Devon',49.38103,-119.56062,0,1452510760
+146309,'146309','Eastside & Highland Dr',49.39808,-119.56502,0,1452510761
+146310,'146310','Eastside & Highland Dr',49.39801,-119.56514,0,1452510783
+146311,'146311','Sunnybrook & Highland',49.39908,-119.56000,0,1452510784
+146312,'146312','Heritage Blvd & Vintage Blvd',49.39836,-119.55532,0,1452510785
+146313,'146313','Heritage Blvd & One Quail Pl',49.39613,-119.55380,0,1452510786
+146314,'146314','Heritage Blvd & One Quail Pl',49.39615,-119.55369,0,1452510787
+146315,'146315','Heritage Blvd & Heritage Hls',49.39407,-119.55282,0,1452510788
+146316,'146316','Main & 89th St',49.03288,-119.46877,0,1452510789
+146318,'146318','Penticton Plz',49.48407,-119.58683,0,1452510791
+146322,'146322','Kaleden: Lakehill & Linden',49.39070,-119.59682,0,1452510816
+146323,'146323','S Main & Caravilla Ests',49.46035,-119.57825,0,1452510817
+146324,'146324','Cambie & Westminster',49.50083,-119.58379,0,1452510818
+146325,'146325','Skaha Lk Rd & Grn',49.46394,-119.58773,0,1452510819
+146326,'146326','92 Ave & Jubilee',49.03862,-119.47338,0,1452510820
+146327,'146327','Main & Cottonwood Dr',49.02910,-119.44867,0,1452510821
+146328,'146328','Cottonwood Dr & Cottonwood Pk',49.03158,-119.44801,0,1452510822
+146329,'146329','Quince Ln & Gravenstein Dr',49.03831,-119.46805,0,1452510823
+146330,'146330','Gravenstein & Jonagold Pl',49.03565,-119.46627,0,1452510845
+146331,'146331','Nighthawk & 62 Ave',49.02532,-119.47150,0,1452510846
+146332,'146332','89 St & 97 St',49.02001,-119.46884,0,1452510847
+146333,'146333','Winnipeg & Wade',49.49628,-119.59447,0,1452510848
+146334,'146334','Bartlett Dr & Russett Dr',49.49488,-119.62285,0,1452510849
+146335,'146335','Bartlett Dr & Valiant Dr',49.49566,-119.62858,0,1452510850
+146336,'146336','Sandstone Cres & Sandpiper Ln',49.50398,-119.63725,0,1452510851
+146337,'146337','W Bench Dr & Bartlett Dr',49.49721,-119.62974,0,1452510852
+146338,'146338','W Bench Dr & Newton',49.50250,-119.63033,0,1452510853
+146339,'146339','W Bench Dr & Jonathan Dr',49.50692,-119.62956,0,1452510854
+146340,'146340','Hyslop & W Bench',49.50881,-119.62672,0,1452510876
+146341,'146341','Sage Mesa Dr & Pine Hls Dr',49.51568,-119.62250,0,1452510877
+146342,'146342','S Main 2575 Blk',49.46876,-119.58097,0,1452510878
+146343,'146343','OK Falls Post Office',49.34554,-119.57686,0,1452510879
+146344,'146344','Willow & 12th Ave',49.34217,-119.57293,0,1452510880
+146345,'146345','11th Ave & Cedar',49.34302,-119.57553,0,1452510881
+146346,'146346','Birch & 9th Ave',49.34508,-119.57014,0,1452510882
+146347,'146347','10th Ave & Maple',49.34390,-119.56880,0,1452510883
+146348,'146348','McLean Crk & Walnut Cres',49.34241,-119.56549,0,1452510884
+146349,'146349','McLean Crk & Cherry Cres',49.34110,-119.56458,0,1452510885
+146350,'146350','Mallory Cres Loop',49.33908,-119.55873,0,1452510907
+146351,'146351','McLean Crk & Cherry Cres',49.34085,-119.56464,0,1452510908
+146352,'146352','McLean Crk & Walnut Cres',49.34238,-119.56560,0,1452510909
+146353,'146353','10th Ave & Maple',49.34380,-119.56881,0,1452510910
+146354,'146354','Birch & 9th Ave',49.34472,-119.57033,0,1452510911
+146360,'146360','Skaha Lk & Galt',49.46963,-119.58401,0,1452510938
+146361,'146361','Skaha Lk & Galt',49.46850,-119.58493,0,1452510939
+146362,'146362','Skaha Lk & Kinney',49.47132,-119.58292,0,1452510940
+146363,'146363','Skaha Lk & Brandon',49.46625,-119.58596,0,1452510941
+146365,'146365','Vancouver & Abbott',49.50317,-119.58836,0,1452510943
+146367,'146367','Gov @ Papineau',49.49709,-119.58616,0,1452510945
+146368,'146368','Westminster @ Wylie',49.49611,-119.61234,0,1452510946
+146369,'146369','Westminster @ Burnaby',49.49692,-119.60866,0,1452510947
+146370,'146370','176 Jermyn',49.49159,-119.58567,0,1452510969
+148000,'148000','Peach Orchard @ Rosedale',49.60466,-119.67653,0,1452567451
+149000,'149000','Kootenay St @ Co-Op Ave',49.17985,-119.55237,0,1452597242
+149001,'149001','Kootenay St & Co-Op Ave',49.17982,-119.55270,0,1452597243
+149002,'149002','Oliver Hosp',49.18361,-119.53894,0,1452597244
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
new file mode 100644
index 00000000..ee8ca224
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_trip_stops
@@ -0,0 +1,919 @@
+100,146233,1,0
+100,146163,2,0
+100,146177,3,0
+100,146065,4,0
+100,146234,5,0
+100,146061,6,0
+100,146058,7,0
+100,146098,8,0
+100,146268,9,0
+100,146001,10,0
+100,146002,11,0
+100,146003,12,0
+100,146004,13,0
+100,146008,14,0
+100,146156,15,0
+100,146229,16,0
+100,146161,17,0
+100,146244,18,0
+100,146105,19,0
+100,146106,20,0
+100,146009,21,0
+100,146010,22,0
+100,146147,23,0
+100,146145,24,0
+100,146144,25,0
+100,146142,26,0
+100,146141,27,0
+100,146139,28,0
+100,146137,29,0
+100,146135,30,0
+100,146367,31,0
+100,146201,32,0
+100,146047,33,0
+100,146034,34,0
+100,146035,35,0
+100,146216,36,0
+100,146266,37,0
+100,146172,38,0
+100,146221,39,0
+100,146267,40,0
+100,146220,41,0
+100,146245,42,0
+100,146246,43,0
+100,146247,44,1
+101,146247,1,0
+101,146248,2,0
+101,146170,3,0
+101,146168,4,0
+101,146169,5,0
+101,146020,6,0
+101,146021,7,0
+101,146042,8,0
+101,146045,9,0
+101,146130,10,0
+101,146132,11,0
+101,146133,12,0
+101,146134,13,0
+101,146136,14,0
+101,146138,15,0
+101,146140,16,0
+101,146143,17,0
+101,146146,18,0
+101,146148,19,0
+101,146000,20,0
+101,146153,21,0
+101,146156,22,0
+101,146229,23,0
+101,146157,24,0
+101,146161,25,0
+101,146244,26,0
+101,146105,27,0
+101,146106,28,0
+101,146017,29,0
+101,146005,30,0
+101,146006,31,0
+101,146007,32,0
+101,146018,33,0
+101,146111,34,0
+101,146342,35,0
+101,146099,36,0
+101,146059,37,0
+101,146060,38,0
+101,146233,39,1
+101,146199,40,0
+101,146178,41,0
+101,146179,42,0
+101,146234,43,1
+200,146157,1,0
+200,146151,2,0
+200,146187,3,0
+200,146186,4,0
+200,146160,5,0
+200,146318,6,0
+200,146175,7,0
+200,146173,8,0
+200,146019,9,0
+200,146038,10,0
+200,146037,11,0
+200,146212,12,0
+200,146030,13,0
+200,146281,14,0
+200,146217,15,0
+200,146036,16,0
+200,146048,17,0
+200,146046,18,0
+200,146052,19,0
+200,146076,20,0
+200,146077,21,0
+200,146079,22,0
+200,146219,23,0
+200,146190,24,0
+200,146211,25,0
+200,146109,26,0
+200,146107,27,0
+200,146114,28,0
+200,146113,29,0
+200,146196,30,0
+200,146275,31,0
+200,146276,32,0
+200,146279,33,0
+200,146280,34,1
+201,146280,1,0
+201,146278,2,0
+201,146277,3,0
+201,146200,4,0
+201,146197,5,0
+201,146112,6,0
+201,146128,7,0
+201,146104,8,0
+201,146137,9,0
+201,146094,10,0
+201,146093,11,0
+201,146092,12,0
+201,146154,13,0
+201,146025,14,0
+201,146167,15,0
+201,146166,16,0
+201,146049,17,0
+201,146050,18,0
+201,146047,19,0
+201,146034,20,0
+201,146035,21,0
+201,146216,22,0
+201,146265,23,0
+201,146029,24,0
+201,146218,25,0
+201,146039,26,0
+201,146252,27,0
+201,146012,28,0
+201,146174,29,0
+201,146176,30,0
+201,146189,31,0
+201,146159,32,0
+201,146188,33,0
+201,146150,34,0
+201,146152,35,0
+201,146157,36,1
+300,146215,1,0
+300,146232,2,0
+300,146233,3,0
+300,146163,4,0
+300,146177,5,0
+300,146065,6,0
+300,146161,7,0
+300,146244,8,0
+300,146105,9,0
+300,146106,10,0
+300,146009,11,0
+300,146010,12,0
+300,146147,13,0
+300,146204,14,0
+300,146028,15,0
+300,146155,16,0
+300,146206,17,0
+300,146210,18,0
+300,146207,19,0
+300,146251,20,0
+300,146126,21,0
+300,146125,22,0
+300,146124,23,0
+300,146209,24,0
+300,146117,25,0
+300,146198,26,0
+300,146269,27,0
+300,146108,28,0
+300,146145,29,0
+300,146144,30,0
+300,146142,31,0
+300,146141,32,0
+300,146139,33,0
+300,146137,34,0
+300,146370,35,0
+300,146074,36,0
+300,146154,37,0
+300,146025,38,0
+300,146167,39,0
+300,146228,40,1
+300,146135,41,0
+300,146367,42,0
+300,146129,43,0
+300,146023,44,0
+300,146013,45,0
+300,146253,46,0
+300,146096,47,0
+300,146095,48,0
+300,146324,49,0
+300,146194,50,0
+300,146195,51,0
+300,146239,52,1
+301,146239,1,0
+301,146101,2,0
+301,146014,3,0
+301,146165,4,0
+301,146164,5,0
+301,146227,6,0
+301,146015,7,0
+301,146228,8,0
+301,146024,9,0
+301,146042,10,0
+301,146045,11,0
+301,146130,12,0
+301,146132,13,0
+301,146133,14,0
+301,146134,15,0
+301,146136,16,0
+301,146138,17,0
+301,146140,18,0
+301,146143,19,0
+301,146146,20,0
+301,146148,21,0
+301,146000,22,0
+301,146153,23,0
+301,146156,24,0
+301,146229,25,0
+301,146157,26,0
+301,146237,27,0
+301,146361,28,0
+301,146236,29,0
+301,146325,30,0
+301,146231,31,0
+301,146068,32,0
+301,146071,33,0
+301,146182,34,0
+301,146040,35,0
+301,146215,36,1
+400,146157,1,0
+400,146151,2,0
+400,146187,3,0
+400,146186,4,0
+400,146160,5,0
+400,146259,6,0
+400,146261,7,0
+400,146264,8,0
+400,146030,9,0
+400,146281,10,0
+400,146266,11,0
+400,146172,12,0
+400,146222,13,0
+400,146225,14,0
+400,146021,15,0
+400,146042,16,0
+400,146053,17,0
+400,146062,18,0
+400,146063,19,0
+400,146057,20,0
+400,146174,21,0
+400,146176,22,0
+400,146219,23,0
+400,146190,24,0
+400,146100,25,0
+400,146102,26,0
+400,146103,27,0
+400,146204,28,0
+400,146028,29,0
+400,146155,30,0
+400,146206,31,0
+400,146210,32,0
+400,146207,33,0
+400,146251,34,0
+400,146126,35,0
+400,146125,36,0
+400,146124,37,0
+400,146209,38,0
+400,146117,39,1
+401,146117,1,0
+401,146198,2,0
+401,146269,3,0
+401,146108,4,0
+401,146110,5,0
+401,146191,6,0
+401,146192,7,0
+401,146318,8,0
+401,146175,9,0
+401,146173,10,0
+401,146064,11,0
+401,146055,12,0
+401,146054,13,0
+401,146043,14,0
+401,146044,15,0
+401,146226,16,0
+401,146224,17,0
+401,146223,18,0
+401,146171,19,0
+401,146265,20,0
+401,146029,21,0
+401,146262,22,0
+401,146263,23,0
+401,146260,24,0
+401,146159,25,0
+401,146188,26,0
+401,146150,27,0
+401,146152,28,0
+401,146157,29,1
+500,146089,1,0
+500,146184,2,0
+500,146185,3,0
+500,146069,4,0
+500,146070,5,0
+500,146067,6,0
+500,146230,7,0
+500,146233,8,0
+500,146363,9,0
+500,146360,10,0
+500,146362,11,0
+500,146161,12,0
+500,146257,13,0
+500,146086,14,0
+500,146084,15,0
+500,146083,16,0
+500,146190,17,0
+500,146211,18,0
+500,146109,19,0
+500,146107,20,0
+500,146205,21,0
+500,146115,22,0
+500,146116,23,0
+500,146127,24,0
+500,146208,25,0
+500,146117,26,0
+500,146198,27,0
+500,146269,28,0
+500,146108,29,0
+500,146110,30,0
+500,146191,31,0
+500,146192,32,0
+500,146318,33,0
+500,146080,34,0
+500,146078,35,0
+500,146075,36,0
+500,146074,37,0
+500,146154,38,0
+500,146025,39,0
+500,146167,40,0
+500,146166,41,0
+500,146049,42,1
+501,146049,1,0
+501,146050,2,0
+501,146051,3,0
+501,146052,4,0
+501,146076,5,0
+501,146077,6,0
+501,146079,7,0
+501,146219,8,0
+501,146190,9,0
+501,146211,10,0
+501,146109,11,0
+501,146107,12,0
+501,146205,13,0
+501,146115,14,0
+501,146116,15,0
+501,146127,16,0
+501,146208,17,0
+501,146117,18,0
+501,146198,19,0
+501,146269,20,0
+501,146108,21,0
+501,146110,22,0
+501,146191,23,0
+501,146192,24,0
+501,146081,25,0
+501,146082,26,0
+501,146085,27,0
+501,146087,28,0
+501,146258,29,0
+501,146238,30,0
+501,146161,31,0
+501,146237,32,0
+501,146361,33,0
+501,146236,34,0
+501,146234,35,0
+501,146061,36,0
+501,146058,37,0
+501,146273,38,0
+501,146255,39,0
+501,146323,40,0
+501,146270,41,0
+501,146089,42,1
+1000,146161,1,0
+1000,146151,2,0
+1000,146187,3,0
+1000,146186,4,0
+1000,146160,5,0
+1000,146318,6,0
+1000,146175,7,0
+1000,146173,8,0
+1000,146064,9,0
+1000,146055,10,0
+1000,146054,11,0
+1000,146048,12,0
+1000,146045,13,0
+1000,146013,14,0
+1000,146253,15,0
+1000,146365,16,0
+1000,146096,17,0
+1000,146095,18,0
+1000,146194,19,0
+1000,146195,20,0
+1000,146239,21,0
+1000,146101,22,0
+1000,146256,23,0
+1000,146283,24,0
+1000,146122,25,0
+1000,146119,26,0
+1000,146121,27,0
+1000,146213,28,0
+1000,146041,29,0
+1000,146091,30,0
+1000,146149,31,1
+1001,146149,1,0
+1001,146072,2,0
+1001,146202,3,0
+1001,146203,4,0
+1001,146214,5,0
+1001,146282,6,0
+1001,146240,7,0
+1001,146241,8,0
+1001,146120,9,0
+1001,146118,10,0
+1001,146123,11,0
+1001,146162,12,0
+1001,146015,13,0
+1001,146021,14,0
+1001,146042,15,0
+1001,146046,16,0
+1001,146052,17,0
+1001,146076,18,0
+1001,146077,19,0
+1001,146079,20,0
+1001,146219,21,0
+1001,146081,22,0
+1001,146082,23,0
+1001,146188,24,0
+1001,146150,25,0
+1001,146161,26,1
+1100,146336,1,0
+1100,146337,2,0
+1100,146338,3,0
+1100,146339,4,0
+1100,146340,5,0
+1100,146341,6,0
+1100,146368,7,0
+1100,146369,8,0
+1100,146171,9,0
+1100,146265,10,0
+1100,146217,11,0
+1100,146036,12,0
+1100,146333,13,0
+1100,146053,14,0
+1100,146062,15,0
+1100,146063,16,0
+1100,146057,17,0
+1100,146159,18,0
+1100,146188,19,0
+1100,146150,20,0
+1100,146157,21,1
+1101,146157,1,0
+1101,146151,2,0
+1101,146187,3,0
+1101,146186,4,0
+1101,146160,5,0
+1101,146055,6,0
+1101,146054,7,0
+1101,146034,8,0
+1101,146035,9,0
+1101,146216,10,0
+1101,146265,11,0
+1101,146334,12,0
+1101,146335,13,0
+1101,146336,14,1
+1500,146234,1,0
+1500,146066,2,0
+1500,146163,3,0
+1500,146177,4,0
+1500,146065,5,0
+1500,146161,6,0
+1500,146151,7,0
+1500,146187,8,0
+1500,146186,9,0
+1500,146160,10,0
+1500,146318,11,0
+1500,146175,12,0
+1500,146173,13,0
+1500,146019,14,0
+1500,146038,15,0
+1500,146037,16,0
+1500,146212,17,0
+1500,146030,18,0
+1500,146281,19,0
+1500,146217,20,0
+1500,146036,21,0
+1500,146048,22,0
+1500,146045,23,0
+1500,146130,24,0
+1500,146132,25,0
+1500,146133,26,0
+1500,146134,27,0
+1500,146136,28,0
+1500,146138,29,0
+1500,146140,30,0
+1500,146143,31,0
+1500,146146,32,0
+1500,146204,33,0
+1500,146028,34,0
+1500,146155,35,0
+1500,146206,36,0
+1500,146117,37,0
+1500,146198,38,0
+1500,146269,39,0
+1500,146108,40,0
+1500,146110,41,0
+1500,146191,42,0
+1500,146192,43,0
+1500,146081,44,0
+1500,146082,45,0
+1500,146085,46,0
+1500,146087,47,0
+1500,146258,48,0
+1500,146157,49,0
+1500,146237,50,0
+1500,146342,51,0
+1500,146099,52,0
+1500,146273,53,0
+1500,146255,54,0
+1500,146323,55,0
+1500,146270,56,0
+1500,146089,57,0
+1500,146184,58,0
+1500,146185,59,0
+1500,146069,60,0
+1500,146070,61,0
+1500,146067,62,0
+1500,146230,63,0
+1501,146047,1,0
+1501,146034,2,0
+1501,146035,3,0
+1501,146216,4,0
+1501,146265,5,0
+1501,146029,6,0
+1501,146218,7,0
+1501,146039,8,0
+1501,146252,9,0
+1501,146012,10,0
+1501,146174,11,0
+1501,146176,12,0
+1501,146189,13,0
+1501,146159,14,0
+1501,146188,15,0
+1501,146150,16,0
+1501,146152,17,0
+1501,146157,18,0
+1501,146199,19,0
+1501,146178,20,0
+1501,146179,21,0
+1501,146234,22,0
+1501,146231,23,0
+1501,146068,24,0
+1501,146071,25,0
+1501,146183,26,0
+1501,146090,27,0
+1501,146088,28,0
+1501,146271,29,0
+1501,146254,30,0
+1501,146274,31,0
+1501,146098,32,0
+1501,146268,33,0
+1501,146360,34,0
+1501,146362,35,0
+1501,146161,36,0
+1501,146257,37,0
+1501,146086,38,0
+1501,146084,39,0
+1501,146083,40,0
+1501,146190,41,0
+1501,146100,42,0
+1501,146102,43,0
+1501,146103,44,0
+1501,146204,45,0
+1501,146028,46,0
+1501,146155,47,0
+1501,146206,48,0
+1501,146117,49,0
+1501,146198,50,0
+1501,146269,51,0
+1501,146108,52,0
+1501,146144,53,0
+1501,146142,54,0
+1501,146141,55,0
+1501,146139,56,0
+1501,146137,57,0
+1501,146135,58,0
+1501,146367,59,0
+1501,146201,60,0
+1600,146215,1,0
+1600,146233,2,0
+1600,146163,3,0
+1600,146177,4,0
+1600,146065,5,0
+1600,146161,6,0
+1600,146257,7,0
+1600,146086,8,0
+1600,146084,9,0
+1600,146083,10,0
+1600,146190,11,0
+1600,146100,12,0
+1600,146102,13,0
+1600,146103,14,0
+1600,146145,15,0
+1600,146144,16,0
+1600,146142,17,0
+1600,146141,18,0
+1600,146139,19,0
+1600,146137,20,0
+1600,146135,21,0
+1600,146367,22,0
+1600,146201,23,0
+1600,146047,24,0
+1600,146034,25,0
+1600,146035,26,0
+1600,146216,27,0
+1600,146266,28,0
+1600,146172,29,0
+1600,146221,30,0
+1600,146267,31,0
+1600,146220,32,0
+1600,146245,33,0
+1600,146246,34,0
+1600,146247,35,0
+1600,146250,36,1
+1601,146250,1,0
+1601,146031,2,0
+1601,146032,3,0
+1601,146033,4,0
+1601,146022,5,0
+1601,146016,6,0
+1601,146253,7,0
+1601,146228,8,0
+1601,146024,9,0
+1601,146042,10,0
+1601,146046,11,0
+1601,146051,12,0
+1601,146052,13,0
+1601,146076,14,0
+1601,146077,15,0
+1601,146079,16,0
+1601,146219,17,0
+1601,146081,18,0
+1601,146082,19,0
+1601,146085,20,0
+1601,146087,21,0
+1601,146258,22,0
+1601,146157,23,0
+1601,146237,24,0
+1601,146342,25,0
+1601,146099,26,0
+1601,146273,27,0
+1601,146255,28,0
+1601,146323,29,0
+1601,146270,30,0
+1601,146089,31,0
+1601,146184,32,0
+1601,146185,33,0
+1601,146182,34,0
+1601,146040,35,0
+1601,146215,36,1
+2000,146292,1,0
+2000,146297,2,0
+2000,146299,3,0
+2000,146302,4,0
+2000,146304,5,0
+2000,146306,6,0
+2000,146307,7,0
+2000,146311,8,0
+2000,146312,9,0
+2000,146313,10,0
+2000,146315,11,0
+2000,146314,12,0
+2000,146309,13,0
+2000,146271,14,0
+2000,146254,15,0
+2000,146274,16,0
+2000,146098,17,0
+2000,146268,18,0
+2000,146360,19,0
+2000,146362,20,0
+2000,146157,21,1
+2001,146157,1,0
+2001,146237,2,0
+2001,146342,3,0
+2001,146099,4,0
+2001,146273,5,0
+2001,146255,6,0
+2001,146323,7,0
+2001,146270,8,0
+2001,146311,9,0
+2001,146312,10,0
+2001,146313,11,0
+2001,146315,12,0
+2001,146314,13,0
+2001,146310,14,0
+2001,146308,15,0
+2001,146305,16,0
+2001,146303,17,0
+2001,146301,18,0
+2001,146300,19,0
+2001,146298,20,0
+2001,146293,21,1
+2100,146293,1,0
+2100,146354,2,0
+2100,146296,3,0
+2100,146295,4,0
+2100,146344,5,0
+2100,146345,6,0
+2100,146294,7,0
+2100,146343,8,0
+2100,146291,9,0
+2100,146353,10,0
+2100,146352,11,0
+2100,146351,12,0
+2100,146350,13,0
+2100,146349,14,0
+2100,146348,15,0
+2100,146347,16,0
+2100,146346,17,0
+2100,146292,18,1
+3000,146161,1,0
+3000,146244,2,0
+3000,146105,3,0
+3000,146106,4,0
+3000,146009,5,0
+3000,146010,6,0
+3000,146147,7,0
+3000,146145,8,0
+3000,146110,9,0
+3000,146191,10,0
+3000,146192,11,0
+3000,146259,12,0
+3000,146261,13,0
+3000,146264,14,0
+3000,146030,15,0
+3000,146281,16,0
+3000,146266,17,0
+3000,146172,18,0
+3000,146221,19,0
+3000,146267,20,0
+3000,146220,21,0
+3000,146287,22,0
+3000,146288,23,0
+3000,146289,24,0
+3000,146285,25,0
+3000,146290,26,0
+3000,146242,27,0
+3000,146243,28,0
+3001,146290,1,0
+3001,146242,2,0
+3001,146243,3,0
+3001,146284,4,0
+3001,146285,5,0
+3001,146286,6,0
+3001,146287,7,0
+3001,146288,8,0
+3001,146368,9,0
+3001,146369,10,0
+3001,146171,11,0
+3001,146265,12,0
+3001,146029,13,0
+3001,146262,14,0
+3001,146263,15,0
+3001,146260,16,0
+3001,146190,17,0
+3001,146211,18,0
+3001,146146,19,0
+3001,146148,20,0
+3001,146000,21,0
+3001,146153,22,0
+3001,146161,23,1
+4000,146316,1,0
+4000,149000,2,0
+4000,149002,3,0
+4000,146343,4,0
+4000,146322,5,0
+4000,146233,6,0
+4000,146161,7,0
+4000,146147,8,0
+4000,146030,9,0
+4000,146048,10,0
+4000,146045,11,1
+4001,146047,1,0
+4001,146034,2,0
+4001,146029,3,0
+4001,146148,4,0
+4001,146157,5,0
+4001,146234,6,0
+4001,146322,7,0
+4001,146343,8,0
+4001,149002,9,0
+4001,149001,10,0
+4001,146316,11,1
+4100,146328,1,0
+4100,146327,2,0
+4100,146332,3,0
+4100,146331,4,0
+4100,146330,5,0
+4100,146329,6,0
+4100,146326,7,0
+4100,146316,8,1
+7000,146156,1,0
+7000,146229,2,0
+7000,146342,3,0
+7000,146099,4,0
+7000,146273,5,0
+7000,146255,6,0
+7000,146323,7,0
+7000,146270,8,0
+7000,146089,9,0
+7000,146184,10,0
+7000,146185,11,0
+7000,146069,12,0
+7000,146070,13,0
+7000,146067,14,0
+7000,146230,15,0
+7000,146233,16,0
+7000,146163,17,0
+7000,146177,18,0
+7000,146065,19,0
+7000,146151,20,0
+7000,146187,21,0
+7000,146186,22,0
+7000,146160,23,0
+7000,146190,24,0
+7000,146211,25,0
+7000,146144,26,0
+7000,146142,27,0
+7000,146141,28,0
+7000,146139,29,0
+7000,146137,30,0
+7000,146135,31,0
+7000,146367,32,0
+7000,146201,33,0
+7000,146047,34,0
+7000,146034,35,0
+7000,146035,36,0
+7000,146216,37,0
+7000,146266,38,0
+7000,146172,39,0
+7000,146221,40,0
+7000,146267,41,0
+7000,146220,42,0
+7000,146289,43,0
+7000,148000,44,0
+7000,140222,45,0
+7000,103690,46,0
+7000,140213,47,0
+7000,103745,48,0
+7000,140215,49,1
+7001,140215,1,0
+7001,103744,2,0
+7001,140214,3,0
+7001,103689,4,0
+7001,140221,5,0
+7001,146243,6,0
+7001,146286,7,0
+7001,146368,8,0
+7001,146369,9,0
+7001,146171,10,0
+7001,146217,11,0
+7001,146036,12,0
+7001,146048,13,0
+7001,146045,14,0
+7001,146130,15,0
+7001,146132,16,0
+7001,146133,17,0
+7001,146134,18,0
+7001,146136,19,0
+7001,146138,20,0
+7001,146140,21,0
+7001,146143,22,0
+7001,146110,23,0
+7001,146191,24,0
+7001,146192,25,0
+7001,146159,26,0
+7001,146188,27,0
+7001,146150,28,0
+7001,146152,29,0
+7001,146199,30,0
+7001,146178,31,0
+7001,146179,32,0
+7001,146234,33,0
+7001,146231,34,0
+7001,146068,35,0
+7001,146071,36,0
+7001,146183,37,0
+7001,146090,38,0
+7001,146088,39,0
+7001,146271,40,0
+7001,146254,41,0
+7001,146274,42,0
+7001,146098,43,0
+7001,146268,44,1
+7001,146161,45,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
new file mode 100644
index 00000000..4ba78020
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_rts_trips
@@ -0,0 +1,28 @@
+100,0,'Downtown',1
+101,0,'Peachtree',1
+201,0,'Cherry Ln',2
+200,0,'Downtown',2
+300,0,'Downtown',3
+301,0,'Peachtree',3
+401,0,'Cherry Ln',4
+400,0,'Downtown',4
+500,0,'Downtown',5
+501,0,'Peachtree',5
+1001,0,'Cherry Ln',10
+1000,0,'Naramata',10
+1100,0,'Cherry Ln',11
+1101,0,'West Bench',11
+1500,0,'Downtown',15
+1501,0,'Peachtree',15
+1600,0,'Okanagan Lk',16
+1601,0,'Skaha Lk',16
+2001,0,'Heritage Hls / Okanagan Falls',20
+2000,0,'Heritage Hls / Penticton',20
+2100,0,'OK Falls Local',21
+3001,0,'Penticton',30
+3000,0,'Summerland',30
+4001,0,'Osoyoos',40
+4000,0,'Penticton',40
+4100,0,'Osoyooos Local',41
+7000,0,'Kelowna',70
+7001,0,'South Main',70
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
new file mode 100644
index 00000000..a4d65cde
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_service_dates
@@ -0,0 +1,101 @@
+'3409',20240903,1
+'3412',20240903,1
+'3409',20240904,1
+'3412',20240904,1
+'3409',20240905,1
+'3412',20240905,1
+'3409',20240906,1
+'3416',20240906,1
+'3041',20240907,1
+'3418',20240908,1
+'3409',20240909,1
+'3412',20240909,1
+'3409',20240910,1
+'3412',20240910,1
+'3409',20240911,1
+'3412',20240911,1
+'3409',20240912,1
+'3412',20240912,1
+'3409',20240913,1
+'3416',20240913,1
+'3041',20240914,1
+'3418',20240915,1
+'3409',20240916,1
+'3412',20240916,1
+'3409',20240917,1
+'3412',20240917,1
+'3409',20240918,1
+'3412',20240918,1
+'3409',20240919,1
+'3412',20240919,1
+'3409',20240920,1
+'3416',20240920,1
+'3041',20240921,1
+'3418',20240922,1
+'3409',20240923,1
+'3412',20240923,1
+'3409',20240924,1
+'3412',20240924,1
+'3409',20240925,1
+'3412',20240925,1
+'3409',20240926,1
+'3412',20240926,1
+'3409',20240927,1
+'3416',20240927,1
+'3041',20240928,1
+'3418',20240929,1
+'3409',20240930,1
+'3412',20240930,1
+'3409',20241001,1
+'3412',20241001,1
+'3409',20241002,1
+'3412',20241002,1
+'3409',20241003,1
+'3412',20241003,1
+'3409',20241004,1
+'3416',20241004,1
+'3041',20241005,1
+'3418',20241006,1
+'3409',20241007,1
+'3412',20241007,1
+'3409',20241008,1
+'3412',20241008,1
+'3409',20241009,1
+'3412',20241009,1
+'3409',20241010,1
+'3412',20241010,1
+'3409',20241011,1
+'3416',20241011,1
+'3041',20241012,1
+'3418',20241013,1
+'3418',20241014,1
+'3409',20241015,1
+'3412',20241015,1
+'3409',20241016,1
+'3412',20241016,1
+'3409',20241017,1
+'3412',20241017,1
+'3409',20241018,1
+'3416',20241018,1
+'3041',20241019,1
+'3418',20241020,1
+'3409',20241021,1
+'3412',20241021,1
+'3409',20241022,1
+'3412',20241022,1
+'3409',20241023,1
+'3412',20241023,1
+'3409',20241024,1
+'3412',20241024,1
+'3409',20241025,1
+'3416',20241025,1
+'3041',20241026,1
+'3418',20241027,1
+'3409',20241028,1
+'3412',20241028,1
+'3409',20241029,1
+'3412',20241029,1
+'3409',20241030,1
+'3412',20241030,1
+'3409',20241031,1
+'3412',20241031,1
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
new file mode 100644
index 00000000..a2445f8a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103689
@@ -0,0 +1 @@
+'3409',7001,80600,0,'Cherry Ln',0,62000,0,'Cherry Ln',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
new file mode 100644
index 00000000..e84051ff
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103690
@@ -0,0 +1 @@
+'3409',7000,95700,,'',0,66600,,'',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
new file mode 100644
index 00000000..7fcc9588
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103744
@@ -0,0 +1 @@
+'3409',7001,74600,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',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
new file mode 100644
index 00000000..51476bac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_103745
@@ -0,0 +1 @@
+'3409',7000,71700,,'',0,30400,,'',0,32200,,'',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140213 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140213
new file mode 100644
index 00000000..77f5cb3b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140213
@@ -0,0 +1 @@
+'3409',7000,65900,,'',0,34700,,'',0,32100,,'',0,30600,,'',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
new file mode 100644
index 00000000..5a9d9439
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140214
@@ -0,0 +1 @@
+'3409',7001,75900,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140215 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140215
new file mode 100644
index 00000000..b75585d6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140215
@@ -0,0 +1,2 @@
+'3409',7000,72500,4,'',0,30300,4,'',0,32200,4,'',0,30500,4,'',0
+'3409',7001,74000,0,'Cherry Ln',0,30000,0,'Cherry Ln',0,36000,0,'Cherry Ln',0,31000,,'',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
new file mode 100644
index 00000000..584b39b8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140221
@@ -0,0 +1 @@
+'3409',7001,80700,0,'Cherry Ln',0,62000,0,'Cherry Ln',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
new file mode 100644
index 00000000..5448d471
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_140222
@@ -0,0 +1 @@
+'3409',7000,95500,,'',0,66600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146000 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146000
new file mode 100644
index 00000000..3ee857c0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146000
@@ -0,0 +1,6 @@
+'3041',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146001 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146001
new file mode 100644
index 00000000..c9b999ca
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146001
@@ -0,0 +1,2 @@
+'3041',100,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,62000,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146002 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146002
new file mode 100644
index 00000000..10984697
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146002
@@ -0,0 +1,2 @@
+'3041',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146003 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146003
new file mode 100644
index 00000000..10984697
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146003
@@ -0,0 +1,2 @@
+'3041',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146004 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146004
new file mode 100644
index 00000000..10984697
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146004
@@ -0,0 +1,2 @@
+'3041',100,92100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,62100,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146005 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146005
new file mode 100644
index 00000000..642533b4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146005
@@ -0,0 +1,2 @@
+'3041',101,81500,,'',0
+'3409',101,81500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146006 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146006
new file mode 100644
index 00000000..642533b4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146006
@@ -0,0 +1,2 @@
+'3041',101,81500,,'',0
+'3409',101,81500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146007 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146007
new file mode 100644
index 00000000..642533b4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146007
@@ -0,0 +1,2 @@
+'3041',101,81500,,'',0
+'3409',101,81500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146008 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146008
new file mode 100644
index 00000000..d726db68
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146008
@@ -0,0 +1,2 @@
+'3041',100,92200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,62200,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146009 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146009
new file mode 100644
index 00000000..b9d93dac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146009
@@ -0,0 +1,6 @@
+'3041',100,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3409',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3041',300,80200,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146010 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146010
new file mode 100644
index 00000000..4a1bc466
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146010
@@ -0,0 +1,6 @@
+'3041',100,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3409',100,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3041',300,80200,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,90800,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',3000,80800,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146012 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146012
new file mode 100644
index 00000000..173c202e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146012
@@ -0,0 +1,4 @@
+'3041',201,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,194600,,'',0,16400,,'',0
+'3409',1501,194600,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146013 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146013
new file mode 100644
index 00000000..0970e6a5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146013
@@ -0,0 +1,6 @@
+'3041',300,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71200,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164800,,'',0
+'3416',1000,164800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146014 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146014
new file mode 100644
index 00000000..18c049b4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146014
@@ -0,0 +1,2 @@
+'3041',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146015 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146015
new file mode 100644
index 00000000..b91a09a1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146015
@@ -0,0 +1,6 @@
+'3041',301,92000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3409',301,72000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3041',1001,91000,,'',0,42900,,'',0,40700,,'',0
+'3409',1001,74400,,'',0,16600,,'',0,42900,,'',0
+'3412',1001,174600,,'',0
+'3416',1001,174600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146016 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146016
new file mode 100644
index 00000000..98b3d6e9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146016
@@ -0,0 +1 @@
+'3418',1601,92200,,'',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-next/raw/next_gtfs_schedule_stop_146017 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146017
new file mode 100644
index 00000000..c92a3d5a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146017
@@ -0,0 +1,2 @@
+'3041',101,81300,,'',0
+'3409',101,81300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146018 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146018
new file mode 100644
index 00000000..db78e9f3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146018
@@ -0,0 +1,2 @@
+'3041',101,81600,,'',0
+'3409',101,81600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146019 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146019
new file mode 100644
index 00000000..5cf31595
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146019
@@ -0,0 +1,4 @@
+'3041',200,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,200700,,'',0,12400,,'',0
+'3409',1500,200700,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146020 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146020
new file mode 100644
index 00000000..7486254a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146020
@@ -0,0 +1,2 @@
+'3041',101,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,65300,,'',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-next/raw/next_gtfs_schedule_stop_146021 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146021
new file mode 100644
index 00000000..6115cda4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146021
@@ -0,0 +1,8 @@
+'3041',101,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1001,91200,,'',0,42900,,'',0,40700,,'',0
+'3409',1001,74600,,'',0,16600,,'',0,42900,,'',0
+'3412',1001,174800,,'',0
+'3416',1001,174800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146022 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146022
new file mode 100644
index 00000000..dc7a9310
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146022
@@ -0,0 +1 @@
+'3418',1601,92100,,'',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-next/raw/next_gtfs_schedule_stop_146023 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146023
new file mode 100644
index 00000000..5279186c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146023
@@ -0,0 +1,2 @@
+'3041',300,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71100,,'',0,20000,,'',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-next/raw/next_gtfs_schedule_stop_146024 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146024
new file mode 100644
index 00000000..437bc6ba
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146024
@@ -0,0 +1,3 @@
+'3041',301,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3409',301,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3418',1601,92700,,'',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-next/raw/next_gtfs_schedule_stop_146025 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146025
new file mode 100644
index 00000000..9e307fe9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146025
@@ -0,0 +1,7 @@
+'3041',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',300,81900,0,'School Spcl',0
+'3409',300,81900,0,'School Spcl',0
+'3041',500,93900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146028 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146028
new file mode 100644
index 00000000..128ea3c7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146028
@@ -0,0 +1,8 @@
+'3041',300,80400,0,'School Spcl',0
+'3409',300,80400,0,'School Spcl',0
+'3041',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146029 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146029
new file mode 100644
index 00000000..4c564388
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146029
@@ -0,0 +1,9 @@
+'3041',201,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,194400,,'',0,16400,,'',0
+'3409',1501,194400,,'',0,16400,,'',0
+'3041',3001,84800,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,74800,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',4001,94800,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146030 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146030
new file mode 100644
index 00000000..c23b66b7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146030
@@ -0,0 +1,9 @@
+'3041',200,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1500,200900,,'',0,12400,,'',0
+'3409',1500,200900,,'',0,12400,,'',0
+'3041',3000,91400,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81400,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',4000,83500,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146031 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146031
new file mode 100644
index 00000000..0790274a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146031
@@ -0,0 +1 @@
+'3418',1601,91900,,'',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-next/raw/next_gtfs_schedule_stop_146032 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146032
new file mode 100644
index 00000000..81d76373
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146032
@@ -0,0 +1 @@
+'3418',1601,92000,,'',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-next/raw/next_gtfs_schedule_stop_146033 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146033
new file mode 100644
index 00000000..81d76373
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146033
@@ -0,0 +1 @@
+'3418',1601,92000,,'',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-next/raw/next_gtfs_schedule_stop_146034 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146034
new file mode 100644
index 00000000..cbd3d15f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146034
@@ -0,0 +1,12 @@
+'3041',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',1101,124100,,'',0
+'3412',1101,181400,,'',0
+'3416',1101,181400,,'',0
+'3041',1501,194000,,'',0,16400,,'',0
+'3409',1501,194000,,'',0,16400,,'',0
+'3418',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',4001,94300,,'',0,60000,,'',0
+'3409',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146035 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146035
new file mode 100644
index 00000000..2144a4fe
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146035
@@ -0,0 +1,11 @@
+'3041',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',1101,124100,,'',0
+'3412',1101,181400,,'',0
+'3416',1101,181400,,'',0
+'3041',1501,194100,,'',0,16400,,'',0
+'3409',1501,194100,,'',0,16400,,'',0
+'3418',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,61300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146036 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146036
new file mode 100644
index 00000000..c234b339
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146036
@@ -0,0 +1,6 @@
+'3041',200,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',1100,95800,,'',0,34700,,'',0
+'3041',1500,201300,,'',0,12400,,'',0
+'3409',1500,201300,,'',0,12400,,'',0
+'3409',7001,84400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146037 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146037
new file mode 100644
index 00000000..ffa11d62
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146037
@@ -0,0 +1,4 @@
+'3041',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,200800,,'',0,12400,,'',0
+'3409',1500,200800,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146038 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146038
new file mode 100644
index 00000000..c96e6626
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146038
@@ -0,0 +1,4 @@
+'3041',200,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,200700,,'',0,12400,,'',0
+'3409',1500,200700,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146039 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146039
new file mode 100644
index 00000000..1177a864
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146039
@@ -0,0 +1,4 @@
+'3041',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,194500,,'',0,16400,,'',0
+'3409',1501,194500,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146040 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146040
new file mode 100644
index 00000000..8f446455
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146040
@@ -0,0 +1,3 @@
+'3041',301,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1601,94800,,'',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-next/raw/next_gtfs_schedule_stop_146041 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146041
new file mode 100644
index 00000000..74b1102a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146041
@@ -0,0 +1,4 @@
+'3041',1000,83100,,'',0,47200,,'',0,40700,,'',0
+'3409',1000,71100,,'',0,12000,,'',0,47200,,'',0
+'3412',1000,171000,,'',0
+'3416',1000,171000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146042 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146042
new file mode 100644
index 00000000..ab5dc947
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146042
@@ -0,0 +1,11 @@
+'3041',101,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'3409',301,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,4,'',0
+'3041',400,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
+'3409',400,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0,1000,,'',0
+'3041',1001,91300,,'',0,42900,,'',0,40700,,'',0
+'3409',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3412',1001,174900,,'',0
+'3416',1001,174900,,'',0
+'3418',1601,92900,,'',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-next/raw/next_gtfs_schedule_stop_146043 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146043
new file mode 100644
index 00000000..bb6ea07f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146043
@@ -0,0 +1,2 @@
+'3041',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
+'3409',401,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146044 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146044
new file mode 100644
index 00000000..868a7f29
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146044
@@ -0,0 +1,2 @@
+'3041',401,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64200,,'',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-next/raw/next_gtfs_schedule_stop_146045 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146045
new file mode 100644
index 00000000..72a0a463
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146045
@@ -0,0 +1,12 @@
+'3041',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,80800,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164700,,'',0
+'3416',1000,164700,,'',0
+'3041',1500,185000,0,'Peachtree',0,16400,4,'',0,12400,4,'',0
+'3409',1500,185000,0,'Cherry Ln',0,16400,4,'',0,12400,4,'',0
+'3409',4000,84500,4,'',0,55500,4,'',0
+'3409',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146046 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146046
new file mode 100644
index 00000000..1ad0d6c0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146046
@@ -0,0 +1,7 @@
+'3041',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,91300,,'',0,42900,,'',0,40700,,'',0
+'3409',1001,74700,,'',0,16600,,'',0,42900,,'',0
+'3412',1001,174900,,'',0
+'3416',1001,174900,,'',0
+'3418',1601,92900,,'',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-next/raw/next_gtfs_schedule_stop_146047 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146047
new file mode 100644
index 00000000..c9a4adc6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146047
@@ -0,0 +1,9 @@
+'3041',100,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',201,81300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,194000,,'',0,16400,,'',0
+'3409',1501,194000,,'',0,16400,,'',0
+'3418',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',4001,94300,,'',0,60000,,'',0
+'3409',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146048 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146048
new file mode 100644
index 00000000..b77a39df
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146048
@@ -0,0 +1,10 @@
+'3041',200,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,80800,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,64800,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164700,,'',0
+'3416',1000,164700,,'',0
+'3041',1500,201400,,'',0,12400,,'',0
+'3409',1500,201400,,'',0,12400,,'',0
+'3409',4000,84400,,'',0,51500,,'',0
+'3409',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146049 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146049
new file mode 100644
index 00000000..f0009448
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146049
@@ -0,0 +1,8 @@
+'3041',201,80600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',500,94200,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
+'3041',501,94200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',500,74200,4,'',0,7400,4,'',0,2600,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,7300,4,'',0,2700,4,'',0,7000,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3409',501,74200,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',500,131200,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3418',501,121200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146050 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146050
new file mode 100644
index 00000000..ff055140
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146050
@@ -0,0 +1,5 @@
+'3041',201,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3041',501,94600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,74600,,'',0,7400,,'',0,2600,,'',0,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,'School Spcl',0,3100,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,121600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146051 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146051
new file mode 100644
index 00000000..b214520f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146051
@@ -0,0 +1,4 @@
+'3041',501,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
+'3409',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,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,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1601,92900,,'',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-next/raw/next_gtfs_schedule_stop_146052 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146052
new file mode 100644
index 00000000..903863db
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146052
@@ -0,0 +1,10 @@
+'3041',200,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',501,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
+'3409',501,64800,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,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,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,121800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,91400,,'',0,42900,,'',0,40700,,'',0
+'3409',1001,74800,,'',0,16600,,'',0,42900,,'',0
+'3412',1001,175000,,'',0
+'3416',1001,175000,,'',0
+'3418',1601,93000,,'',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-next/raw/next_gtfs_schedule_stop_146053 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146053
new file mode 100644
index 00000000..457d60c3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146053
@@ -0,0 +1,3 @@
+'3041',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',1100,95900,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146054 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146054
new file mode 100644
index 00000000..77cca922
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146054
@@ -0,0 +1,9 @@
+'3041',401,84100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
+'3409',401,74100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10600,0,'Downtown Only',0
+'3041',1000,80700,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,64700,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164600,,'',0
+'3416',1000,164600,,'',0
+'3409',1101,124000,,'',0
+'3412',1101,181300,,'',0
+'3416',1101,181300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146055 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146055
new file mode 100644
index 00000000..3c1600f3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146055
@@ -0,0 +1,9 @@
+'3041',401,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
+'3409',401,74000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10700,0,'Downtown Only',0
+'3041',1000,80700,,'',0,43100,,'',0,40700,,'',0
+'3409',1000,64700,,'',0,16000,,'',0,43100,,'',0
+'3412',1000,164500,,'',0
+'3416',1000,164500,,'',0
+'3409',1101,123900,,'',0
+'3412',1101,181200,,'',0
+'3416',1101,181200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146057 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146057
new file mode 100644
index 00000000..94043aa5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146057
@@ -0,0 +1,3 @@
+'3041',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',1100,100100,,'',0,30700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146058 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146058
new file mode 100644
index 00000000..7e89a898
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146058
@@ -0,0 +1,5 @@
+'3041',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3041',501,90600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146059 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146059
new file mode 100644
index 00000000..2010809f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146059
@@ -0,0 +1,2 @@
+'3041',101,82100,,'',0
+'3409',101,82100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146060 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146060
new file mode 100644
index 00000000..b3f27719
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146060
@@ -0,0 +1,2 @@
+'3041',101,82300,,'',0
+'3409',101,82300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146061 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146061
new file mode 100644
index 00000000..7e89a898
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146061
@@ -0,0 +1,5 @@
+'3041',100,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,61700,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3041',501,90600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70600,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146062 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146062
new file mode 100644
index 00000000..457d60c3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146062
@@ -0,0 +1,3 @@
+'3041',400,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',1100,95900,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146063 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146063
new file mode 100644
index 00000000..b0fae8aa
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146063
@@ -0,0 +1,3 @@
+'3041',400,81600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',1100,100000,,'',0,30700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146064 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146064
new file mode 100644
index 00000000..8bf25018
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146064
@@ -0,0 +1,6 @@
+'3041',401,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3409',401,73800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3041',1000,80600,,'',0,43100,,'',0,40700,,'',0
+'3409',1000,64600,,'',0,16000,,'',0,43100,,'',0
+'3412',1000,164400,,'',0
+'3416',1000,164400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146065 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146065
new file mode 100644
index 00000000..206034f2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146065
@@ -0,0 +1,8 @@
+'3041',100,82800,,'',0
+'3409',100,82800,,'',0
+'3041',300,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,65700,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,195900,,'',0,16400,,'',0
+'3409',1500,195900,,'',0,16400,,'',0
+'3418',1600,95700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3409',7000,60100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146066 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146066
new file mode 100644
index 00000000..23cb3567
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146066
@@ -0,0 +1,2 @@
+'3041',1500,195700,,'',0,16400,,'',0
+'3409',1500,195700,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146067 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146067
new file mode 100644
index 00000000..21809f0d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146067
@@ -0,0 +1,6 @@
+'3041',500,91300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3409',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,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,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3418',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',7000,55700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146068 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146068
new file mode 100644
index 00000000..47b4f511
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146068
@@ -0,0 +1,5 @@
+'3041',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3409',7001,182300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146069 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146069
new file mode 100644
index 00000000..57a68c62
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146069
@@ -0,0 +1,6 @@
+'3041',500,91100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3409',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,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,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3418',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',7000,55700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146070 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146070
new file mode 100644
index 00000000..905a6d8d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146070
@@ -0,0 +1,6 @@
+'3041',500,91200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3409',500,71200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,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,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3418',500,124200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,191100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',7000,55700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146071 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146071
new file mode 100644
index 00000000..6113c1fb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146071
@@ -0,0 +1,5 @@
+'3041',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,191600,0,'Downtown',0,12400,0,'Downtown',0
+'3409',7001,182400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146072 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146072
new file mode 100644
index 00000000..f7e5afb4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146072
@@ -0,0 +1,4 @@
+'3041',1001,84200,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,71800,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,172000,,'',0
+'3416',1001,172000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146074 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146074
new file mode 100644
index 00000000..5541296d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146074
@@ -0,0 +1,5 @@
+'3041',300,81700,0,'School Spcl',0
+'3409',300,81700,0,'School Spcl',0
+'3041',500,93700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73700,,'',0,7800,0,'School Spcl',0,2200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146075 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146075
new file mode 100644
index 00000000..9f0bafee
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146075
@@ -0,0 +1,3 @@
+'3041',500,93600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73600,,'',0,7900,0,'School Spcl',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,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146076 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146076
new file mode 100644
index 00000000..6d90bf22
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146076
@@ -0,0 +1,10 @@
+'3041',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',501,85000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,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,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,91500,,'',0,43000,,'',0,40600,,'',0
+'3409',1001,74900,,'',0,16600,,'',0,43000,,'',0
+'3412',1001,175100,,'',0
+'3416',1001,175100,,'',0
+'3418',1601,93100,,'',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-next/raw/next_gtfs_schedule_stop_146077 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146077
new file mode 100644
index 00000000..2e45e2c3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146077
@@ -0,0 +1,10 @@
+'3041',200,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',501,85000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65000,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,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,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,91600,,'',0,43000,,'',0,40600,,'',0
+'3409',1001,75000,,'',0,16600,,'',0,43000,,'',0
+'3412',1001,175200,,'',0
+'3416',1001,175200,,'',0
+'3418',1601,93100,,'',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-next/raw/next_gtfs_schedule_stop_146078 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146078
new file mode 100644
index 00000000..6cdec107
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146078
@@ -0,0 +1,3 @@
+'3041',500,93500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73500,,'',0,7900,0,'School Spcl',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,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146079 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146079
new file mode 100644
index 00000000..bf5ded69
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146079
@@ -0,0 +1,10 @@
+'3041',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',501,85100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,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,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,91600,,'',0,43100,,'',0,40500,,'',0
+'3409',1001,75000,,'',0,16600,,'',0,43100,,'',0
+'3412',1001,175200,,'',0
+'3416',1001,175200,,'',0
+'3418',1601,93200,,'',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-next/raw/next_gtfs_schedule_stop_146080 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146080
new file mode 100644
index 00000000..6cdec107
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146080
@@ -0,0 +1,3 @@
+'3041',500,93500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73500,,'',0,7900,0,'School Spcl',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,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146081 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146081
new file mode 100644
index 00000000..a7a60d46
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146081
@@ -0,0 +1,10 @@
+'3041',501,85200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65200,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,91800,,'',0,43100,,'',0,40500,,'',0
+'3409',1001,75200,,'',0,16600,,'',0,43100,,'',0
+'3412',1001,175400,,'',0
+'3416',1001,175400,,'',0
+'3041',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,93300,,'',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-next/raw/next_gtfs_schedule_stop_146082 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146082
new file mode 100644
index 00000000..5b16636a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146082
@@ -0,0 +1,10 @@
+'3041',501,85300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65300,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,91900,,'',0,43100,,'',0,40500,,'',0
+'3409',1001,75200,,'',0,16700,,'',0,43100,,'',0
+'3412',1001,175500,,'',0
+'3416',1001,175500,,'',0
+'3041',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,93300,,'',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-next/raw/next_gtfs_schedule_stop_146083 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146083
new file mode 100644
index 00000000..9990463d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146083
@@ -0,0 +1,6 @@
+'3041',500,93200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73200,,'',0,6900,0,'School Spcl',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,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90200,,'',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-next/raw/next_gtfs_schedule_stop_146084 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146084
new file mode 100644
index 00000000..9990463d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146084
@@ -0,0 +1,6 @@
+'3041',500,93200,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73200,,'',0,6900,0,'School Spcl',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,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192700,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90200,,'',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-next/raw/next_gtfs_schedule_stop_146085 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146085
new file mode 100644
index 00000000..d1489726
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146085
@@ -0,0 +1,6 @@
+'3041',501,85400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65400,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,190200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190200,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,93400,,'',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-next/raw/next_gtfs_schedule_stop_146086 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146086
new file mode 100644
index 00000000..de2e003c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146086
@@ -0,0 +1,6 @@
+'3041',500,93100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90100,,'',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-next/raw/next_gtfs_schedule_stop_146087 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146087
new file mode 100644
index 00000000..38f4af0b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146087
@@ -0,0 +1,6 @@
+'3041',501,85500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8000,0,'School Spcl',0,2000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,190300,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190300,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,93500,,'',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-next/raw/next_gtfs_schedule_stop_146088 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146088
new file mode 100644
index 00000000..4de9087d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146088
@@ -0,0 +1,3 @@
+'3041',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,191800,0,'Downtown',0,12400,0,'Downtown',0
+'3409',7001,182600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146089 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146089
new file mode 100644
index 00000000..a8266430
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146089
@@ -0,0 +1,10 @@
+'3041',500,90900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3041',501,90900,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
+'3409',500,70900,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,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,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3409',501,70900,4,'',0,3000,4,'',0,7000,4,'',0,3400,4,'',0,6600,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,4000,4,'',0,6000,4,'',0,3300,4,'',0,6700,4,'',0,3000,4,'',0,7000,4,'',0,3000,4,'',0
+'3418',500,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',501,123900,4,'',0,10000,4,'',0,10000,4,'',0,10000,4,'',0
+'3041',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,55500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146090 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146090
new file mode 100644
index 00000000..84df8dfe
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146090
@@ -0,0 +1,3 @@
+'3041',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3409',7001,182500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146091 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146091
new file mode 100644
index 00000000..182c0f07
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146091
@@ -0,0 +1,4 @@
+'3041',1000,83200,,'',0,47200,,'',0,40700,,'',0
+'3409',1000,71200,,'',0,12000,,'',0,47200,,'',0
+'3412',1000,171100,,'',0
+'3416',1000,171100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146092 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146092
new file mode 100644
index 00000000..bee513b4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146092
@@ -0,0 +1,2 @@
+'3041',201,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146093 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146093
new file mode 100644
index 00000000..cffb1aa7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146093
@@ -0,0 +1,2 @@
+'3041',201,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146094 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146094
new file mode 100644
index 00000000..e1391e04
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146094
@@ -0,0 +1,2 @@
+'3041',201,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146095 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146095
new file mode 100644
index 00000000..02f08443
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146095
@@ -0,0 +1,6 @@
+'3041',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164800,,'',0
+'3416',1000,164800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146096 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146096
new file mode 100644
index 00000000..67b15157
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146096
@@ -0,0 +1,6 @@
+'3041',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164800,,'',0
+'3416',1000,164800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146098 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146098
new file mode 100644
index 00000000..06a91bf4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146098
@@ -0,0 +1,6 @@
+'3041',100,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,61800,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3041',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192100,0,'Downtown',0,12400,0,'Downtown',0
+'3409',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3409',7001,183200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146099 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146099
new file mode 100644
index 00000000..86dcda3c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146099
@@ -0,0 +1,7 @@
+'3041',101,82000,,'',0
+'3409',101,82000,,'',0
+'3041',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',7000,55300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146100 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146100
new file mode 100644
index 00000000..408a6b2d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146100
@@ -0,0 +1,5 @@
+'3041',400,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90400,,'',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-next/raw/next_gtfs_schedule_stop_146101 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146101
new file mode 100644
index 00000000..5c878f02
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146101
@@ -0,0 +1,6 @@
+'3041',301,91700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',301,71700,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164900,,'',0
+'3416',1000,164900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146102 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146102
new file mode 100644
index 00000000..371340d0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146102
@@ -0,0 +1,5 @@
+'3041',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90500,,'',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-next/raw/next_gtfs_schedule_stop_146103 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146103
new file mode 100644
index 00000000..371340d0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146103
@@ -0,0 +1,5 @@
+'3041',400,82000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192900,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90500,,'',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-next/raw/next_gtfs_schedule_stop_146104 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146104
new file mode 100644
index 00000000..591bf9a0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146104
@@ -0,0 +1,2 @@
+'3041',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146105 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146105
new file mode 100644
index 00000000..357e6f5d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146105
@@ -0,0 +1,8 @@
+'3041',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3041',101,81100,,'',0
+'3409',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3409',101,81100,,'',0
+'3041',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146106 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146106
new file mode 100644
index 00000000..607fde97
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146106
@@ -0,0 +1,8 @@
+'3041',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3041',101,81200,,'',0
+'3409',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3409',101,81200,,'',0
+'3041',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,90700,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',3000,80700,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146107 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146107
new file mode 100644
index 00000000..49978c84
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146107
@@ -0,0 +1,4 @@
+'3041',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',500,80300,0,'School Spcl',0
+'3409',501,152100,0,'School Spcl',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146108 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146108
new file mode 100644
index 00000000..42781b23
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146108
@@ -0,0 +1,10 @@
+'3041',300,81400,0,'School Spcl',0
+'3409',300,81400,0,'School Spcl',0
+'3041',401,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',500,81100,0,'School Spcl',0
+'3409',501,153000,0,'School Spcl',0
+'3041',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146109 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146109
new file mode 100644
index 00000000..49978c84
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146109
@@ -0,0 +1,4 @@
+'3041',200,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',500,80300,0,'School Spcl',0
+'3409',501,152100,0,'School Spcl',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146110 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146110
new file mode 100644
index 00000000..0c009855
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146110
@@ -0,0 +1,9 @@
+'3041',401,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',401,73100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',500,81200,0,'School Spcl',0
+'3409',501,153100,0,'School Spcl',0
+'3041',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',7001,85000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146111 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146111
new file mode 100644
index 00000000..62f9b131
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146111
@@ -0,0 +1,2 @@
+'3041',101,81800,,'',0
+'3409',101,81800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146112 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146112
new file mode 100644
index 00000000..e393a2e1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146112
@@ -0,0 +1,2 @@
+'3041',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146113 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146113
new file mode 100644
index 00000000..9b3b05af
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146113
@@ -0,0 +1,2 @@
+'3041',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,65100,,'',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-next/raw/next_gtfs_schedule_stop_146114 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146114
new file mode 100644
index 00000000..9c7945c7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146114
@@ -0,0 +1,2 @@
+'3041',200,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,65000,,'',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-next/raw/next_gtfs_schedule_stop_146115 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146115
new file mode 100644
index 00000000..5b694b10
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146115
@@ -0,0 +1,2 @@
+'3409',500,80500,0,'School Spcl',0
+'3409',501,152300,0,'School Spcl',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146116 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146116
new file mode 100644
index 00000000..c2ad5874
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146116
@@ -0,0 +1,2 @@
+'3409',500,80500,0,'School Spcl',0
+'3409',501,152400,0,'School Spcl',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146117 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146117
new file mode 100644
index 00000000..fb48fc61
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146117
@@ -0,0 +1,12 @@
+'3041',300,81100,0,'School Spcl',0
+'3409',300,81100,0,'School Spcl',0
+'3041',400,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,11000,4,'',0
+'3041',401,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',400,72800,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,11000,4,'',0
+'3409',401,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',500,80900,0,'School Spcl',0
+'3409',501,152800,0,'School Spcl',0
+'3041',1500,185800,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,185800,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146118 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146118
new file mode 100644
index 00000000..a6cae81c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146118
@@ -0,0 +1,4 @@
+'3041',1001,85600,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,73200,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,173400,,'',0
+'3416',1001,173400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146119 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146119
new file mode 100644
index 00000000..aa45db5a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146119
@@ -0,0 +1,4 @@
+'3041',1000,82300,,'',0,43200,,'',0,44700,,'',0
+'3409',1000,70300,,'',0,12000,,'',0,43200,,'',0
+'3412',1000,170200,,'',0
+'3416',1000,170200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146120 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146120
new file mode 100644
index 00000000..a6cae81c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146120
@@ -0,0 +1,4 @@
+'3041',1001,85600,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,73200,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,173400,,'',0
+'3416',1001,173400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146121 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146121
new file mode 100644
index 00000000..aa45db5a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146121
@@ -0,0 +1,4 @@
+'3041',1000,82300,,'',0,43200,,'',0,44700,,'',0
+'3409',1000,70300,,'',0,12000,,'',0,43200,,'',0
+'3412',1000,170200,,'',0
+'3416',1000,170200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146122 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146122
new file mode 100644
index 00000000..58858db0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146122
@@ -0,0 +1,4 @@
+'3041',1000,81900,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,65900,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,165800,,'',0
+'3416',1000,165800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146123 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146123
new file mode 100644
index 00000000..4619e309
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146123
@@ -0,0 +1,4 @@
+'3041',1001,85800,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,73400,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,173600,,'',0
+'3416',1001,173600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146124 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146124
new file mode 100644
index 00000000..b21b530f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146124
@@ -0,0 +1,4 @@
+'3041',300,81000,0,'School Spcl',0
+'3409',300,81000,0,'School Spcl',0
+'3041',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146125 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146125
new file mode 100644
index 00000000..f2f74aec
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146125
@@ -0,0 +1,4 @@
+'3041',300,80900,0,'School Spcl',0
+'3409',300,80900,0,'School Spcl',0
+'3041',400,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146126 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146126
new file mode 100644
index 00000000..3cfae99b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146126
@@ -0,0 +1,4 @@
+'3041',300,80800,0,'School Spcl',0
+'3409',300,80800,0,'School Spcl',0
+'3041',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146127 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146127
new file mode 100644
index 00000000..7db7e9e2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146127
@@ -0,0 +1,2 @@
+'3409',500,80600,0,'School Spcl',0
+'3409',501,152500,0,'School Spcl',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146128 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146128
new file mode 100644
index 00000000..591bf9a0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146128
@@ -0,0 +1,2 @@
+'3041',201,75800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,65800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146129 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146129
new file mode 100644
index 00000000..096acbf3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146129
@@ -0,0 +1,2 @@
+'3041',300,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146130 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146130
new file mode 100644
index 00000000..f20767db
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146130
@@ -0,0 +1,7 @@
+'3041',101,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',7001,84500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146132 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146132
new file mode 100644
index 00000000..173a52f9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146132
@@ -0,0 +1,7 @@
+'3041',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185000,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',1500,185000,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146133 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146133
new file mode 100644
index 00000000..6b89d836
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146133
@@ -0,0 +1,7 @@
+'3041',101,90100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146134 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146134
new file mode 100644
index 00000000..56ddfeee
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146134
@@ -0,0 +1,7 @@
+'3041',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',7001,84600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146135 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146135
new file mode 100644
index 00000000..783c17d6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146135
@@ -0,0 +1,8 @@
+'3041',100,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',300,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'3409',1501,193700,0,'Downtown',0,16400,0,'Downtown',0
+'3418',1600,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,61000,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146136 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146136
new file mode 100644
index 00000000..3f325bbc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146136
@@ -0,0 +1,7 @@
+'3041',101,90200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185100,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',1500,185100,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146137 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146137
new file mode 100644
index 00000000..6dcd7401
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146137
@@ -0,0 +1,10 @@
+'3041',100,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',201,75900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,65900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',300,81600,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70700,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3409',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3418',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146138 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146138
new file mode 100644
index 00000000..faa9321a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146138
@@ -0,0 +1,7 @@
+'3041',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',7001,84700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146139 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146139
new file mode 100644
index 00000000..33d672e2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146139
@@ -0,0 +1,8 @@
+'3041',100,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',300,81500,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3409',1501,193600,0,'Downtown',0,16400,0,'Downtown',0
+'3418',1600,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,60900,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146140 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146140
new file mode 100644
index 00000000..750c678d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146140
@@ -0,0 +1,7 @@
+'3041',101,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185200,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',1500,185200,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',7001,84800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146141 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146141
new file mode 100644
index 00000000..a73cf1a5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146141
@@ -0,0 +1,8 @@
+'3041',100,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',300,81500,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70600,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,,'',0
+'3041',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,60800,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146142 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146142
new file mode 100644
index 00000000..a5fe9c4e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146142
@@ -0,0 +1,8 @@
+'3041',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',300,81400,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70500,,'',0,10900,0,'School Spcl',0,9100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146143 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146143
new file mode 100644
index 00000000..dc0993c5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146143
@@ -0,0 +1,7 @@
+'3041',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185300,0,'Peachtree',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',1500,185300,0,'Cherry Ln',0,16400,0,'Peachtree',0,12400,0,'Peachtree',0
+'3409',7001,84900,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146144 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146144
new file mode 100644
index 00000000..b9937711
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146144
@@ -0,0 +1,8 @@
+'3041',100,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',300,81400,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70400,,'',0,11000,0,'School Spcl',0,9000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,193500,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,60700,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146145 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146145
new file mode 100644
index 00000000..cb55a03d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146145
@@ -0,0 +1,7 @@
+'3041',100,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',300,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70400,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1600,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146146 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146146
new file mode 100644
index 00000000..71775481
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146146
@@ -0,0 +1,8 @@
+'3041',101,90400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,185400,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,185400,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146147 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146147
new file mode 100644
index 00000000..8d84c241
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146147
@@ -0,0 +1,7 @@
+'3041',100,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3409',100,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,4,'',0
+'3041',300,80300,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70300,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,90900,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',3000,80900,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',4000,82800,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146148 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146148
new file mode 100644
index 00000000..75d8db58
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146148
@@ -0,0 +1,7 @@
+'3041',101,90500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3001,85400,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,75400,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',4001,95400,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146149 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146149
new file mode 100644
index 00000000..57e864b5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146149
@@ -0,0 +1,8 @@
+'3041',1000,83300,4,'',0,47200,4,'',0,40700,4,'',0
+'3041',1001,84100,,'',0,47100,,'',0,40700,,'',0
+'3409',1000,71300,4,'',0,12000,4,'',0,47200,4,'',0
+'3409',1001,71700,,'',0,12400,,'',0,47100,,'',0
+'3412',1000,171200,4,'',0
+'3412',1001,171900,,'',0
+'3416',1000,171200,4,'',0
+'3416',1001,171900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146150 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146150
new file mode 100644
index 00000000..822d4cf2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146150
@@ -0,0 +1,12 @@
+'3041',201,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,92200,,'',0,43100,,'',0,40500,,'',0
+'3409',1001,75500,,'',0,16700,,'',0,43100,,'',0
+'3412',1001,175800,,'',0
+'3416',1001,175800,,'',0
+'3409',1100,100600,,'',0,30700,,'',0
+'3041',1501,195100,,'',0,16400,,'',0
+'3409',1501,195100,,'',0,16400,,'',0
+'3409',7001,85600,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146151 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146151
new file mode 100644
index 00000000..26fa89fc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146151
@@ -0,0 +1,14 @@
+'3041',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1000,80100,,'',0,43000,,'',0,40700,,'',0
+'3409',1000,64100,,'',0,16000,,'',0,43000,,'',0
+'3412',1000,163800,,'',0
+'3416',1000,163800,,'',0
+'3409',1101,123200,,'',0
+'3412',1101,180500,,'',0
+'3416',1101,180500,,'',0
+'3041',1500,200100,,'',0,12400,,'',0
+'3409',1500,200100,,'',0,12400,,'',0
+'3409',7000,60300,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146152 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146152
new file mode 100644
index 00000000..10977b1e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146152
@@ -0,0 +1,7 @@
+'3041',201,82800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,72800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,85700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,195100,,'',0,16400,,'',0
+'3409',1501,195100,,'',0,16400,,'',0
+'3409',7001,181900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146153 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146153
new file mode 100644
index 00000000..3ee857c0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146153
@@ -0,0 +1,6 @@
+'3041',101,90600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,70600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3001,85600,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,75600,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146154 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146154
new file mode 100644
index 00000000..8314f405
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146154
@@ -0,0 +1,7 @@
+'3041',201,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',300,81800,0,'School Spcl',0
+'3409',300,81800,0,'School Spcl',0
+'3041',500,93900,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73900,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146155 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146155
new file mode 100644
index 00000000..8395f11f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146155
@@ -0,0 +1,8 @@
+'3041',300,80500,0,'School Spcl',0
+'3409',300,80500,0,'School Spcl',0
+'3041',400,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1500,185600,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,185600,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,193100,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146156 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146156
new file mode 100644
index 00000000..c25078ee
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146156
@@ -0,0 +1,7 @@
+'3041',100,92400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3041',101,90700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,62400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',101,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,55100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146157 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146157
new file mode 100644
index 00000000..bd33f884
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146157
@@ -0,0 +1,26 @@
+'3041',101,81000,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,61200,,'',0,10000,,'',0,9800,,'',0,10200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',200,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',201,83000,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
+'3409',200,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,73000,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
+'3041',301,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,80000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',401,90000,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
+'3409',400,70000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',401,70000,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
+'3409',1100,100800,4,'',0,30700,4,'',0
+'3409',1101,93000,,'',0,30200,,'',0
+'3412',1100,184200,4,'',0
+'3412',1101,180500,,'',0
+'3416',1100,184400,4,'',0
+'3416',1101,180500,,'',0
+'3041',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,195200,,'',0,16400,,'',0
+'3409',1500,190500,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,195200,,'',0,16400,,'',0
+'3418',1601,94200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',2000,75400,4,'',0,17000,4,'',0,30000,4,'',0,42800,4,'',0,17000,4,'',0
+'3409',2001,64100,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',4001,100100,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146159 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146159
new file mode 100644
index 00000000..f76b7fe8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146159
@@ -0,0 +1,8 @@
+'3041',201,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,65000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',1100,100300,,'',0,30700,,'',0
+'3041',1501,194900,,'',0,16400,,'',0
+'3409',1501,194900,,'',0,16400,,'',0
+'3409',7001,85400,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146160 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146160
new file mode 100644
index 00000000..6d5d550d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146160
@@ -0,0 +1,14 @@
+'3041',200,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,80200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1000,80300,,'',0,43000,,'',0,40700,,'',0
+'3409',1000,64300,,'',0,16000,,'',0,43000,,'',0
+'3412',1000,164000,,'',0
+'3416',1000,164000,,'',0
+'3409',1101,123400,,'',0
+'3412',1101,180700,,'',0
+'3416',1101,180700,,'',0
+'3041',1500,200300,,'',0,12400,,'',0
+'3409',1500,200300,,'',0,12400,,'',0
+'3409',7000,60500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146161 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146161
new file mode 100644
index 00000000..defd5938
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146161
@@ -0,0 +1,31 @@
+'3041',100,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3041',101,81000,,'',0
+'3409',100,63000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3409',101,81000,,'',0
+'3041',300,80000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70000,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',500,93000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3041',501,90000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73000,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70000,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',501,123000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,80000,,'',0,43000,,'',0,40700,,'',0
+'3041',1001,92300,4,'',0,43100,4,'',0,40500,4,'',0
+'3409',1000,64000,,'',0,16000,,'',0,43000,,'',0
+'3409',1001,75600,4,'',0,16700,4,'',0,43100,4,'',0
+'3412',1000,163700,,'',0
+'3412',1001,175900,4,'',0
+'3416',1000,163700,,'',0
+'3416',1001,175900,4,'',0
+'3041',1500,200000,,'',0,12400,,'',0
+'3041',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,200000,,'',0,12400,,'',0
+'3409',1501,192500,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,4,'',0
+'3041',3000,90500,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3041',3001,90000,4,'',0,21000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'3409',3000,80500,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',3001,80000,4,'',0,31000,4,'',0,14500,4,'',0,29500,4,'',0,17000,4,'',0
+'3409',4000,82500,,'',0,51500,,'',0
+'3409',7001,85700,4,'',0,29600,4,'',0,36500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146162 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146162
new file mode 100644
index 00000000..15ea0927
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146162
@@ -0,0 +1,4 @@
+'3041',1001,90200,,'',0,43100,,'',0,40700,,'',0
+'3409',1001,73800,,'',0,16400,,'',0,43100,,'',0
+'3412',1001,174000,,'',0
+'3416',1001,174000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146163 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146163
new file mode 100644
index 00000000..415fdfc9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146163
@@ -0,0 +1,8 @@
+'3041',100,82500,,'',0
+'3409',100,82500,,'',0
+'3041',300,85400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,65400,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,195800,,'',0,16400,,'',0
+'3409',1500,195800,,'',0,16400,,'',0
+'3418',1600,95400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3409',7000,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146164 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146164
new file mode 100644
index 00000000..d6c113f7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146164
@@ -0,0 +1,2 @@
+'3041',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3409',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146165 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146165
new file mode 100644
index 00000000..aa46de83
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146165
@@ -0,0 +1,2 @@
+'3041',301,91800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3409',301,71800,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146166 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146166
new file mode 100644
index 00000000..5907938d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146166
@@ -0,0 +1,5 @@
+'3041',201,80500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,70500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',500,94100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,74100,,'',0,7500,0,'School Spcl',0,2500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,131100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146167 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146167
new file mode 100644
index 00000000..d802173b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146167
@@ -0,0 +1,7 @@
+'3041',201,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',300,81900,0,'School Spcl',0
+'3409',300,81900,0,'School Spcl',0
+'3041',500,94000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,74000,,'',0,7600,0,'School Spcl',0,2400,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,131000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146168 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146168
new file mode 100644
index 00000000..df90ebcd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146168
@@ -0,0 +1,2 @@
+'3041',101,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,65100,,'',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-next/raw/next_gtfs_schedule_stop_146169 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146169
new file mode 100644
index 00000000..742ad562
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146169
@@ -0,0 +1,2 @@
+'3041',101,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,65200,,'',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-next/raw/next_gtfs_schedule_stop_146170 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146170
new file mode 100644
index 00000000..a6115120
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146170
@@ -0,0 +1,2 @@
+'3041',101,85000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,65000,,'',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-next/raw/next_gtfs_schedule_stop_146171 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146171
new file mode 100644
index 00000000..73e8a558
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146171
@@ -0,0 +1,6 @@
+'3041',401,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3416',1100,183700,,'',0
+'3041',3001,84600,,'',0,21100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'3409',3001,74600,,'',0,31100,,'',0,18500,,'',0,29400,,'',0,17100,,'',0
+'3409',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146172 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146172
new file mode 100644
index 00000000..c9a3af5b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146172
@@ -0,0 +1,8 @@
+'3041',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,81000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,71000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3418',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146173 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146173
new file mode 100644
index 00000000..ad8aa52d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146173
@@ -0,0 +1,10 @@
+'3041',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,83600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3409',401,73600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10800,0,'Downtown Only',0
+'3041',1000,80500,,'',0,43100,,'',0,40700,,'',0
+'3409',1000,64500,,'',0,16000,,'',0,43100,,'',0
+'3412',1000,164300,,'',0
+'3416',1000,164300,,'',0
+'3041',1500,200600,,'',0,12400,,'',0
+'3409',1500,200600,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146174 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146174
new file mode 100644
index 00000000..7c09dce0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146174
@@ -0,0 +1,6 @@
+'3041',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,81700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1501,194700,,'',0,16400,,'',0
+'3409',1501,194700,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146175 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146175
new file mode 100644
index 00000000..d0c50bea
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146175
@@ -0,0 +1,10 @@
+'3041',200,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,83400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',401,73400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3041',1000,80500,,'',0,43000,,'',0,40700,,'',0
+'3409',1000,64500,,'',0,16000,,'',0,43000,,'',0
+'3412',1000,164200,,'',0
+'3416',1000,164200,,'',0
+'3041',1500,200600,,'',0,12400,,'',0
+'3409',1500,200600,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146176 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146176
new file mode 100644
index 00000000..a884b8ff
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146176
@@ -0,0 +1,6 @@
+'3041',201,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1501,194700,,'',0,16400,,'',0
+'3409',1501,194700,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146177 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146177
new file mode 100644
index 00000000..714e3078
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146177
@@ -0,0 +1,8 @@
+'3041',100,82700,,'',0
+'3409',100,82700,,'',0
+'3041',300,85500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,65500,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,195800,,'',0,16400,,'',0
+'3409',1500,195800,,'',0,16400,,'',0
+'3418',1600,95500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3409',7000,60100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146178 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146178
new file mode 100644
index 00000000..28906cb1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146178
@@ -0,0 +1,5 @@
+'3041',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,195400,,'',0,16400,,'',0
+'3409',1501,195400,,'',0,16400,,'',0
+'3409',7001,182100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146179 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146179
new file mode 100644
index 00000000..49b3f638
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146179
@@ -0,0 +1,5 @@
+'3041',101,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,61500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,195500,,'',0,16400,,'',0
+'3409',1501,195500,,'',0,16400,,'',0
+'3409',7001,182100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146182 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146182
new file mode 100644
index 00000000..9b00655a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146182
@@ -0,0 +1,3 @@
+'3041',301,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1601,94700,,'',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-next/raw/next_gtfs_schedule_stop_146183 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146183
new file mode 100644
index 00000000..84df8dfe
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146183
@@ -0,0 +1,3 @@
+'3041',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,191700,0,'Downtown',0,12400,0,'Downtown',0
+'3409',7001,182500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146184 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146184
new file mode 100644
index 00000000..6c88d0b9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146184
@@ -0,0 +1,7 @@
+'3041',500,91000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3409',500,71000,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,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,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3418',500,124000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,55600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146185 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146185
new file mode 100644
index 00000000..dc287665
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146185
@@ -0,0 +1,7 @@
+'3041',500,91100,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3409',500,71100,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,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,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3418',500,124100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,191000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,55600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146186 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146186
new file mode 100644
index 00000000..2b0747a1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146186
@@ -0,0 +1,14 @@
+'3041',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1000,80200,,'',0,43000,,'',0,40700,,'',0
+'3409',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3412',1000,163900,,'',0
+'3416',1000,163900,,'',0
+'3409',1101,123300,,'',0
+'3412',1101,180600,,'',0
+'3416',1101,180600,,'',0
+'3041',1500,200300,,'',0,12400,,'',0
+'3409',1500,200300,,'',0,12400,,'',0
+'3409',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146187 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146187
new file mode 100644
index 00000000..cb94101b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146187
@@ -0,0 +1,14 @@
+'3041',200,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,80100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1000,80200,,'',0,43000,,'',0,40700,,'',0
+'3409',1000,64200,,'',0,16000,,'',0,43000,,'',0
+'3412',1000,163900,,'',0
+'3416',1000,163900,,'',0
+'3409',1101,123300,,'',0
+'3412',1101,180600,,'',0
+'3416',1101,180600,,'',0
+'3041',1500,200200,,'',0,12400,,'',0
+'3409',1500,200200,,'',0,12400,,'',0
+'3409',7000,60400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146188 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146188
new file mode 100644
index 00000000..ff8ed371
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146188
@@ -0,0 +1,12 @@
+'3041',201,82600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,72600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,65200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,92100,,'',0,43100,,'',0,40500,,'',0
+'3409',1001,75400,,'',0,16700,,'',0,43100,,'',0
+'3412',1001,175700,,'',0
+'3416',1001,175700,,'',0
+'3409',1100,100400,,'',0,30700,,'',0
+'3041',1501,195000,,'',0,16400,,'',0
+'3409',1501,195000,,'',0,16400,,'',0
+'3409',7001,85500,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146189 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146189
new file mode 100644
index 00000000..1a3c72dc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146189
@@ -0,0 +1,4 @@
+'3041',201,82200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,72200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,194800,,'',0,16400,,'',0
+'3409',1501,194800,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146190 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146190
new file mode 100644
index 00000000..a28de31e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146190
@@ -0,0 +1,12 @@
+'3041',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',500,80200,0,'School Spcl',0
+'3409',501,151900,0,'School Spcl',0
+'3041',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192800,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3001,85200,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,75200,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146191 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146191
new file mode 100644
index 00000000..a215e416
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146191
@@ -0,0 +1,9 @@
+'3041',401,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',500,81300,0,'School Spcl',0
+'3409',501,153200,0,'School Spcl',0
+'3041',1500,190000,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190000,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',3000,91000,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81000,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',7001,85100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146192 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146192
new file mode 100644
index 00000000..d235bdd8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146192
@@ -0,0 +1,9 @@
+'3041',401,83200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',401,73200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',500,81300,0,'School Spcl',0
+'3409',501,153200,0,'School Spcl',0
+'3041',1500,190100,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190100,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',3000,91100,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81100,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',7001,85200,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146194 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146194
new file mode 100644
index 00000000..bac6caeb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146194
@@ -0,0 +1,6 @@
+'3041',300,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71500,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164900,,'',0
+'3416',1000,164900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146195 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146195
new file mode 100644
index 00000000..d4afced7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146195
@@ -0,0 +1,6 @@
+'3041',300,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164900,,'',0
+'3416',1000,164900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146196 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146196
new file mode 100644
index 00000000..9b3b05af
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146196
@@ -0,0 +1,2 @@
+'3041',200,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,65100,,'',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-next/raw/next_gtfs_schedule_stop_146197 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146197
new file mode 100644
index 00000000..e393a2e1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146197
@@ -0,0 +1,2 @@
+'3041',201,75700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,65700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146198 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146198
new file mode 100644
index 00000000..68d8320b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146198
@@ -0,0 +1,10 @@
+'3041',300,81200,0,'School Spcl',0
+'3409',300,81200,0,'School Spcl',0
+'3041',401,82900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',401,72900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',500,81000,0,'School Spcl',0
+'3409',501,152900,0,'School Spcl',0
+'3041',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,193300,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146199 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146199
new file mode 100644
index 00000000..6f3d2788
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146199
@@ -0,0 +1,5 @@
+'3041',101,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,61400,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,195400,,'',0,16400,,'',0
+'3409',1501,195400,,'',0,16400,,'',0
+'3409',7001,182000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146200 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146200
new file mode 100644
index 00000000..74dde637
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146200
@@ -0,0 +1,2 @@
+'3041',201,75600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,65600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146201 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146201
new file mode 100644
index 00000000..beb5a4e4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146201
@@ -0,0 +1,6 @@
+'3041',100,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'3409',1501,194000,0,'Downtown',0,16400,0,'Downtown',0
+'3418',1600,91100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,61200,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146202 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146202
new file mode 100644
index 00000000..97a75d4b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146202
@@ -0,0 +1,4 @@
+'3041',1001,84300,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,71900,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,172100,,'',0
+'3416',1001,172100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146203 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146203
new file mode 100644
index 00000000..3150be7b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146203
@@ -0,0 +1,4 @@
+'3041',1001,84400,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,72000,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,172200,,'',0
+'3416',1001,172200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146204 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146204
new file mode 100644
index 00000000..5e8d437d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146204
@@ -0,0 +1,8 @@
+'3041',300,80300,0,'School Spcl',0
+'3409',300,80300,0,'School Spcl',0
+'3041',400,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1500,185500,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,185500,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,193000,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146205 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146205
new file mode 100644
index 00000000..00cbcbe8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146205
@@ -0,0 +1,2 @@
+'3409',500,80400,0,'School Spcl',0
+'3409',501,152200,0,'School Spcl',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146206 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146206
new file mode 100644
index 00000000..edc8b630
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146206
@@ -0,0 +1,8 @@
+'3041',300,80600,0,'School Spcl',0
+'3409',300,80600,0,'School Spcl',0
+'3041',400,82300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',1500,185700,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,185700,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,193200,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146207 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146207
new file mode 100644
index 00000000..3d463b24
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146207
@@ -0,0 +1,4 @@
+'3041',300,80700,0,'School Spcl',0
+'3409',300,80700,0,'School Spcl',0
+'3041',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146208 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146208
new file mode 100644
index 00000000..0a7292e9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146208
@@ -0,0 +1,2 @@
+'3409',500,80800,0,'School Spcl',0
+'3409',501,152700,0,'School Spcl',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146209 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146209
new file mode 100644
index 00000000..b21b530f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146209
@@ -0,0 +1,4 @@
+'3041',300,81000,0,'School Spcl',0
+'3409',300,81000,0,'School Spcl',0
+'3041',400,82700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146210 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146210
new file mode 100644
index 00000000..3d463b24
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146210
@@ -0,0 +1,4 @@
+'3041',300,80700,0,'School Spcl',0
+'3409',300,80700,0,'School Spcl',0
+'3041',400,82400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146211 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146211
new file mode 100644
index 00000000..3121cf6c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146211
@@ -0,0 +1,7 @@
+'3041',200,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',500,80200,0,'School Spcl',0
+'3409',501,152000,0,'School Spcl',0
+'3041',3001,85300,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,75300,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',7000,60600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146212 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146212
new file mode 100644
index 00000000..c3607df5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146212
@@ -0,0 +1,4 @@
+'3041',200,83700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,200800,,'',0,12400,,'',0
+'3409',1500,200800,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146213 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146213
new file mode 100644
index 00000000..66ed93e2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146213
@@ -0,0 +1,4 @@
+'3041',1000,83000,,'',0,47200,,'',0,40700,,'',0
+'3409',1000,71000,,'',0,12000,,'',0,47200,,'',0
+'3412',1000,170900,,'',0
+'3416',1000,170900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146214 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146214
new file mode 100644
index 00000000..eb8f55eb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146214
@@ -0,0 +1,4 @@
+'3041',1001,84600,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,72200,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,172400,,'',0
+'3416',1001,172400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146215 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146215
new file mode 100644
index 00000000..a7eacaf2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146215
@@ -0,0 +1,6 @@
+'3041',300,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,84800,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
+'3409',300,64800,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64800,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
+'3418',1600,94900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3418',1601,94900,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
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146216 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146216
new file mode 100644
index 00000000..4244041d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146216
@@ -0,0 +1,11 @@
+'3041',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',201,81400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',1101,124200,,'',0
+'3412',1101,181500,,'',0
+'3416',1101,181500,,'',0
+'3041',1501,194100,,'',0,16400,,'',0
+'3409',1501,194100,,'',0,16400,,'',0
+'3418',1600,91200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146217 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146217
new file mode 100644
index 00000000..42ad8861
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146217
@@ -0,0 +1,6 @@
+'3041',200,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',1100,95700,,'',0,34700,,'',0
+'3041',1500,201200,,'',0,12400,,'',0
+'3409',1500,201200,,'',0,12400,,'',0
+'3409',7001,84300,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146218 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146218
new file mode 100644
index 00000000..741ef5e8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146218
@@ -0,0 +1,4 @@
+'3041',201,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,194500,,'',0,16400,,'',0
+'3409',1501,194500,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146219 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146219
new file mode 100644
index 00000000..a28535d8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146219
@@ -0,0 +1,12 @@
+'3041',200,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,81800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,71800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3041',501,85100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65100,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,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,'School Spcl',0,3200,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1001,91700,,'',0,43100,,'',0,40500,,'',0
+'3409',1001,75100,,'',0,16600,,'',0,43100,,'',0
+'3412',1001,175300,,'',0
+'3416',1001,175300,,'',0
+'3418',1601,93200,,'',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-next/raw/next_gtfs_schedule_stop_146220 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146220
new file mode 100644
index 00000000..fd25272f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146220
@@ -0,0 +1,6 @@
+'3041',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1600,91500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',7000,61600,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146221 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146221
new file mode 100644
index 00000000..501bcef8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146221
@@ -0,0 +1,6 @@
+'3041',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,91500,,'',0,21100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'3409',3000,81500,,'',0,31100,,'',0,18400,,'',0,29500,,'',0,13100,,'',0
+'3409',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146222 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146222
new file mode 100644
index 00000000..fca5a132
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146222
@@ -0,0 +1,2 @@
+'3041',400,81100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,71100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146223 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146223
new file mode 100644
index 00000000..6ac1b970
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146223
@@ -0,0 +1,2 @@
+'3041',401,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64400,,'',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-next/raw/next_gtfs_schedule_stop_146224 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146224
new file mode 100644
index 00000000..f8463bb3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146224
@@ -0,0 +1,2 @@
+'3041',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64300,,'',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-next/raw/next_gtfs_schedule_stop_146225 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146225
new file mode 100644
index 00000000..a9834258
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146225
@@ -0,0 +1,2 @@
+'3041',400,81200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,71200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146226 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146226
new file mode 100644
index 00000000..f8463bb3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146226
@@ -0,0 +1,2 @@
+'3041',401,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64300,,'',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-next/raw/next_gtfs_schedule_stop_146227 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146227
new file mode 100644
index 00000000..50548863
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146227
@@ -0,0 +1,2 @@
+'3041',301,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',301,71900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146228 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146228
new file mode 100644
index 00000000..280136b6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146228
@@ -0,0 +1,5 @@
+'3041',300,82100,4,'',0
+'3041',301,82100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3409',300,82100,4,'',0
+'3409',301,72100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Downtown Only',0
+'3418',1601,92500,,'',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-next/raw/next_gtfs_schedule_stop_146229 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146229
new file mode 100644
index 00000000..83616549
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146229
@@ -0,0 +1,7 @@
+'3041',100,92500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'3041',101,90800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,62500,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9900,0,'Hosp Only',0
+'3409',101,70800,,'',0,9900,,'',0,10100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',301,83800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,63800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,55100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146230 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146230
new file mode 100644
index 00000000..3d7855b4
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146230
@@ -0,0 +1,6 @@
+'3041',500,91300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3409',500,71300,,'',0,3000,0,'School Spcl',0,7000,,'',0,3400,,'',0,6600,,'',0,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,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,0,'Peachtree',0
+'3418',500,124300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,191200,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',7000,55800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146231 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146231
new file mode 100644
index 00000000..58b2bbf3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146231
@@ -0,0 +1,5 @@
+'3041',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,191500,0,'Downtown',0,12400,0,'Downtown',0
+'3409',7001,182300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146232 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146232
new file mode 100644
index 00000000..10bd618b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146232
@@ -0,0 +1,2 @@
+'3041',300,85100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,65100,,'',0,10000,0,'School Spcl',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-next/raw/next_gtfs_schedule_stop_146233 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146233
new file mode 100644
index 00000000..f59cf50d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146233
@@ -0,0 +1,12 @@
+'3041',100,82400,,'',0
+'3041',101,82400,4,'',0
+'3409',100,82400,,'',0
+'3409',101,82400,4,'',0
+'3041',300,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,65200,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',500,92200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
+'3409',500,72200,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,2300,4,'',0
+'3418',500,125200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1600,95200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Cherry Ln',0
+'3409',4000,82000,,'',0,51500,,'',0
+'3409',7000,55900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146234 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146234
new file mode 100644
index 00000000..45105bfb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146234
@@ -0,0 +1,13 @@
+'3041',100,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3041',101,91600,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
+'3409',100,61600,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',101,61600,4,'',0,10000,4,'',0,20000,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
+'3041',501,90500,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70500,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'3041',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'3409',1500,191300,4,'',0,4300,,'',0,8100,4,'',0,8300,,'',0,8000,4,'',0
+'3409',1501,191400,0,'Downtown',0,4200,4,'',0,8200,0,'Downtown',0,8200,4,'',0
+'3409',4001,100600,,'',0,60000,,'',0
+'3409',7001,182200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146236 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146236
new file mode 100644
index 00000000..f848030a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146236
@@ -0,0 +1,5 @@
+'3041',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',501,90400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70400,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146237 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146237
new file mode 100644
index 00000000..53663724
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146237
@@ -0,0 +1,9 @@
+'3041',301,84300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',501,90200,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70200,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190600,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',2001,64200,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146238 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146238
new file mode 100644
index 00000000..92d7c37c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146238
@@ -0,0 +1,3 @@
+'3041',501,85600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3409',501,65600,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2900,,'',0,500,,'',0,2100,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,3600,0,'School Spcl',0,400,0,'School Spcl',0,1500,,'',0,4500,,'',0,2800,,'',0,500,,'',0,2200,,'',0,4500,,'',0,2500,,'',0,500,,'',0,2500,,'',0,4500,,'',0,2500,,'',0,500,,'',0
+'3418',501,122600,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0,9500,,'',0,500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146239 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146239
new file mode 100644
index 00000000..797dbd44
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146239
@@ -0,0 +1,8 @@
+'3041',300,91600,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
+'3041',301,91600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',300,71600,4,'',0,20000,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
+'3409',301,71600,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1000,81000,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,65000,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164900,,'',0
+'3416',1000,164900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146240 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146240
new file mode 100644
index 00000000..96c6e873
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146240
@@ -0,0 +1,4 @@
+'3041',1001,85000,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,172800,,'',0
+'3416',1001,172800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146241 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146241
new file mode 100644
index 00000000..96c6e873
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146241
@@ -0,0 +1,4 @@
+'3041',1001,85000,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,72600,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,172800,,'',0
+'3416',1001,172800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146242 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146242
new file mode 100644
index 00000000..26a9b714
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146242
@@ -0,0 +1,4 @@
+'3041',3000,93800,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3041',3001,81600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3409',3000,83800,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3409',3001,71600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146243 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146243
new file mode 100644
index 00000000..f0f8a3fc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146243
@@ -0,0 +1,5 @@
+'3041',3000,94000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3041',3001,81800,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3409',3000,84000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,17400,,'',0
+'3409',3001,71800,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3409',7001,82700,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146244 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146244
new file mode 100644
index 00000000..357e6f5d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146244
@@ -0,0 +1,8 @@
+'3041',100,83100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3041',101,81100,,'',0
+'3409',100,63100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,9700,0,'Hosp Only',0
+'3409',101,81100,,'',0
+'3041',300,80100,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70100,,'',0,10000,0,'School Spcl',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,90600,,'',0,21000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
+'3409',3000,80600,,'',0,31000,,'',0,18500,,'',0,25500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146245 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146245
new file mode 100644
index 00000000..c4e34879
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146245
@@ -0,0 +1,3 @@
+'3041',100,84700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1600,91600,,'',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-next/raw/next_gtfs_schedule_stop_146246 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146246
new file mode 100644
index 00000000..1993224b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146246
@@ -0,0 +1,3 @@
+'3041',100,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1600,91700,,'',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-next/raw/next_gtfs_schedule_stop_146247 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146247
new file mode 100644
index 00000000..f15909bc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146247
@@ -0,0 +1,5 @@
+'3041',100,84800,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
+'3041',101,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64800,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
+'3409',101,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1600,91700,,'',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-next/raw/next_gtfs_schedule_stop_146248 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146248
new file mode 100644
index 00000000..25ef7cab
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146248
@@ -0,0 +1,2 @@
+'3041',101,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',101,64900,,'',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-next/raw/next_gtfs_schedule_stop_146250 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146250
new file mode 100644
index 00000000..1304d104
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146250
@@ -0,0 +1,2 @@
+'3418',1600,91800,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
+'3418',1601,91800,,'',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-next/raw/next_gtfs_schedule_stop_146251 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146251
new file mode 100644
index 00000000..3cfae99b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146251
@@ -0,0 +1,4 @@
+'3041',300,80800,0,'School Spcl',0
+'3409',300,80800,0,'School Spcl',0
+'3041',400,82500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
+'3409',400,72500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146252 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146252
new file mode 100644
index 00000000..26aca4e5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146252
@@ -0,0 +1,4 @@
+'3041',201,81900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,194600,,'',0,16400,,'',0
+'3409',1501,194600,,'',0,16400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146253 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146253
new file mode 100644
index 00000000..cbd74289
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146253
@@ -0,0 +1,7 @@
+'3041',300,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71300,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164800,,'',0
+'3416',1000,164800,,'',0
+'3418',1601,92300,,'',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-next/raw/next_gtfs_schedule_stop_146254 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146254
new file mode 100644
index 00000000..32e98be2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146254
@@ -0,0 +1,4 @@
+'3041',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3409',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3409',7001,183000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146255 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146255
new file mode 100644
index 00000000..5f9b8f9f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146255
@@ -0,0 +1,8 @@
+'3041',501,90800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',7000,55400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146256 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146256
new file mode 100644
index 00000000..a24e27b1
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146256
@@ -0,0 +1,4 @@
+'3041',1000,81100,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,65100,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,165000,,'',0
+'3416',1000,165000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146257 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146257
new file mode 100644
index 00000000..de2e003c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146257
@@ -0,0 +1,6 @@
+'3041',500,93100,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73100,,'',0,7000,0,'School Spcl',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130100,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192600,0,'Downtown',0,12400,0,'Downtown',0
+'3418',1600,90100,,'',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-next/raw/next_gtfs_schedule_stop_146258 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146258
new file mode 100644
index 00000000..57d770e9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146258
@@ -0,0 +1,6 @@
+'3041',501,85500,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',501,65500,,'',0,7000,,'',0,3000,,'',0,7400,,'',0,2600,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,8100,0,'School Spcl',0,1900,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',501,122500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,190400,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190400,0,'Cherry Ln',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,93500,,'',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-next/raw/next_gtfs_schedule_stop_146259 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146259
new file mode 100644
index 00000000..0d5e32f8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146259
@@ -0,0 +1,4 @@
+'3041',400,80300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',3000,91200,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81200,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146260 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146260
new file mode 100644
index 00000000..c001c3d5
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146260
@@ -0,0 +1,4 @@
+'3041',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3001,85000,,'',0,25000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,75000,,'',0,35000,,'',0,14500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146261 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146261
new file mode 100644
index 00000000..a0df7556
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146261
@@ -0,0 +1,4 @@
+'3041',400,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146262 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146262
new file mode 100644
index 00000000..f1a6df96
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146262
@@ -0,0 +1,4 @@
+'3041',401,84800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146263 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146263
new file mode 100644
index 00000000..2282c01f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146263
@@ -0,0 +1,4 @@
+'3041',401,84900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3001,84900,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,74900,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146264 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146264
new file mode 100644
index 00000000..a0df7556
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146264
@@ -0,0 +1,4 @@
+'3041',400,80400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',3000,91300,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81300,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146265 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146265
new file mode 100644
index 00000000..00604270
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146265
@@ -0,0 +1,12 @@
+'3041',201,81500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,71500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',401,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',1101,124200,,'',0
+'3412',1101,181500,,'',0
+'3416',1100,183800,,'',0
+'3416',1101,181500,,'',0
+'3041',1501,194200,,'',0,16400,,'',0
+'3409',1501,194200,,'',0,16400,,'',0
+'3041',3001,84700,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,74700,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146266 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146266
new file mode 100644
index 00000000..e98e8131
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146266
@@ -0,0 +1,8 @@
+'3041',100,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,80900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3418',1600,91300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',7000,61400,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146267 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146267
new file mode 100644
index 00000000..3b15fe70
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146267
@@ -0,0 +1,6 @@
+'3041',100,84600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3418',1600,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',3000,91600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',7000,61500,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146268 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146268
new file mode 100644
index 00000000..b4096bdf
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146268
@@ -0,0 +1,6 @@
+'3041',100,91900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3409',100,61900,,'',0,10000,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Hosp Only',0
+'3041',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192200,0,'Downtown',0,12400,0,'Downtown',0
+'3409',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3409',7001,183400,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146269 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146269
new file mode 100644
index 00000000..37f77838
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146269
@@ -0,0 +1,10 @@
+'3041',300,81200,0,'School Spcl',0
+'3409',300,81200,0,'School Spcl',0
+'3041',401,83000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',401,73000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',500,81000,0,'School Spcl',0
+'3409',501,152900,0,'School Spcl',0
+'3041',1500,185900,0,'Peachtree',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3041',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1500,185900,0,'Cherry Ln',0,16400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1501,193400,0,'Downtown',0,12400,0,'Downtown',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146270 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146270
new file mode 100644
index 00000000..877937ef
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146270
@@ -0,0 +1,8 @@
+'3041',501,90900,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70900,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190900,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',7000,55500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146271 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146271
new file mode 100644
index 00000000..9c8c37fd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146271
@@ -0,0 +1,4 @@
+'3041',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,191900,0,'Downtown',0,12400,0,'Downtown',0
+'3409',2000,75000,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3409',7001,182800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146273 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146273
new file mode 100644
index 00000000..d3eea9ee
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146273
@@ -0,0 +1,8 @@
+'3041',501,90700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70700,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',7000,55300,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146274 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146274
new file mode 100644
index 00000000..4397a256
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146274
@@ -0,0 +1,4 @@
+'3041',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192000,0,'Downtown',0,12400,0,'Downtown',0
+'3409',2000,75100,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
+'3409',7001,183100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146275 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146275
new file mode 100644
index 00000000..88f16685
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146275
@@ -0,0 +1,2 @@
+'3041',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,65200,,'',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-next/raw/next_gtfs_schedule_stop_146276 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146276
new file mode 100644
index 00000000..88f16685
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146276
@@ -0,0 +1,2 @@
+'3041',200,85200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,65200,,'',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-next/raw/next_gtfs_schedule_stop_146277 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146277
new file mode 100644
index 00000000..2d7a6858
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146277
@@ -0,0 +1,2 @@
+'3041',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146278 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146278
new file mode 100644
index 00000000..2d7a6858
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146278
@@ -0,0 +1,2 @@
+'3041',201,75500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',201,65500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146279 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146279
new file mode 100644
index 00000000..08513fec
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146279
@@ -0,0 +1,2 @@
+'3041',200,85300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,65300,,'',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-next/raw/next_gtfs_schedule_stop_146280 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146280
new file mode 100644
index 00000000..ae05a86b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146280
@@ -0,0 +1,4 @@
+'3041',200,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
+'3041',201,75400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,65400,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
+'3409',201,65400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146281 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146281
new file mode 100644
index 00000000..ea704f9e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146281
@@ -0,0 +1,8 @@
+'3041',200,84000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,64000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',400,80700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3409',400,70700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,0,'Downtown Only',0
+'3041',1500,201100,,'',0,12400,,'',0
+'3409',1500,201100,,'',0,12400,,'',0
+'3041',3000,91500,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
+'3409',3000,81500,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146282 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146282
new file mode 100644
index 00000000..45917657
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146282
@@ -0,0 +1,4 @@
+'3041',1001,84900,,'',0,47100,,'',0,40700,,'',0
+'3409',1001,72500,,'',0,12400,,'',0,47100,,'',0
+'3412',1001,172700,,'',0
+'3416',1001,172700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146283 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146283
new file mode 100644
index 00000000..6cd1a350
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146283
@@ -0,0 +1,4 @@
+'3041',1000,81300,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,65300,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,165200,,'',0
+'3416',1000,165200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146284 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146284
new file mode 100644
index 00000000..a7f4ee93
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146284
@@ -0,0 +1,2 @@
+'3041',3001,82000,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3409',3001,72000,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146285 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146285
new file mode 100644
index 00000000..c4a41c5b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146285
@@ -0,0 +1,4 @@
+'3041',3000,93200,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3041',3001,82400,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3409',3000,83200,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3409',3001,72400,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146286 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146286
new file mode 100644
index 00000000..d9c1fdb2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146286
@@ -0,0 +1,3 @@
+'3041',3001,82600,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3409',3001,72600,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3409',7001,82800,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,32500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146287 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146287
new file mode 100644
index 00000000..5e6de544
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146287
@@ -0,0 +1,4 @@
+'3041',3000,113800,,'',0,61000,,'',0
+'3041',3001,83300,,'',0,69000,,'',0
+'3409',3000,113800,,'',0,61000,,'',0
+'3409',3001,73300,,'',0,79000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146288 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146288
new file mode 100644
index 00000000..f9b2b7e8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146288
@@ -0,0 +1,4 @@
+'3041',3000,113900,,'',0,61000,,'',0
+'3041',3001,83400,,'',0,69000,,'',0
+'3409',3000,113900,,'',0,61000,,'',0
+'3409',3001,73400,,'',0,79000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146289 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146289
new file mode 100644
index 00000000..91f1cc87
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146289
@@ -0,0 +1,3 @@
+'3041',3000,93000,,'',0,21400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3409',3000,83000,,'',0,31400,,'',0,18100,,'',0,29500,,'',0,13400,,'',0
+'3409',7000,63200,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146290 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146290
new file mode 100644
index 00000000..9afa08d0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146290
@@ -0,0 +1,4 @@
+'3041',3000,93600,,'',0,700,4,'',0,20700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
+'3041',3001,81500,,'',0,21500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
+'3409',3000,83600,,'',0,700,4,'',0,30700,,'',0,700,4,'',0,17400,,'',0,700,4,'',0,28800,,'',0,700,4,'',0,16700,,'',0,700,4,'',0
+'3409',3001,71500,,'',0,31500,,'',0,18500,,'',0,29000,,'',0,13500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146291 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146291
new file mode 100644
index 00000000..41c5574d
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146291
@@ -0,0 +1 @@
+'3409',2100,71800,,'',0,13000,,'',0,30000,,'',0,46700,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146292 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146292
new file mode 100644
index 00000000..870c9d01
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146292
@@ -0,0 +1,2 @@
+'3409',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3409',2100,72000,4,'',0,13000,4,'',0,30000,4,'',0,47200,4,'',0,13000,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146293 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146293
new file mode 100644
index 00000000..9825c49e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146293
@@ -0,0 +1,2 @@
+'3409',2001,70600,4,'',0,12400,4,'',0,30300,4,'',0,47500,4,'',0,13000,4,'',0
+'3409',2100,70900,,'',0,12600,,'',0,30000,,'',0,47300,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146294 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146294
new file mode 100644
index 00000000..85b43898
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146294
@@ -0,0 +1 @@
+'3409',2100,71400,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146295 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146295
new file mode 100644
index 00000000..71db1e66
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146295
@@ -0,0 +1 @@
+'3409',2100,71100,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146296 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146296
new file mode 100644
index 00000000..71a500ac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146296
@@ -0,0 +1 @@
+'3409',2100,71000,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146297 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146297
similarity index 51%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146297
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146297
index 5539dbef..62af3778 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146297
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146297
@@ -1 +1 @@
-'1798',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3409',2000,72000,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146298 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146298
similarity index 54%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146298
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146298
index c3bf41f9..15dd5dc9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146298
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146298
@@ -1 +1 @@
-'1798',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3409',2001,70600,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146299 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146299
similarity index 51%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146299
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146299
index e4ede5c1..c352b801 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146299
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146299
@@ -1 +1 @@
-'1798',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
+'3409',2000,72100,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,13000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146300 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146300
similarity index 54%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146300
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146300
index ecfc9f78..b9a00c53 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146300
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146300
@@ -1 +1 @@
-'1798',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3409',2001,70400,0,'Okanagan Falls',0,12400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146301 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146301
similarity index 54%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146301
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146301
index da563ade..2faad2b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146301
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146301
@@ -1 +1 @@
-'1798',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3409',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146304 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146302
similarity index 51%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146304
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146302
index 0a65f497..066194d9 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146304
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146302
@@ -1 +1 @@
-'1798',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3409',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146303 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146303
similarity index 54%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146303
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146303
index da563ade..2faad2b8 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146303
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146303
@@ -1 +1 @@
-'1798',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
+'3409',2001,65900,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146306 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146304
similarity index 51%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146306
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146304
index 0a65f497..1898a0a0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146306
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146304
@@ -1 +1 @@
-'1798',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3409',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146305 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146305
new file mode 100644
index 00000000..7c979e8c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146305
@@ -0,0 +1 @@
+'3409',2001,65800,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,47500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146307 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146306
similarity index 51%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146307
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146306
index ce13cd3b..1898a0a0 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146307
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146306
@@ -1 +1 @@
-'1798',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3409',2000,72600,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146302 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146307
similarity index 51%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146302
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146307
index f3d4c0be..2a0e4126 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146302
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146307
@@ -1 +1 @@
-'1798',2000,72500,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
+'3409',2000,72700,0,'Heritage Hls',0,13000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,47700,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146308 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146308
similarity index 54%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146308
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146308
index d4818156..c4126300 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146308
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146308
@@ -1 +1 @@
-'1798',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',2001,65700,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30300,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146309 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146309
similarity index 51%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146309
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146309
index 6b4574cf..4d0d8f93 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146309
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146309
@@ -1 +1 @@
-'1798',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
+'3409',2000,73800,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42900,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146310 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146310
similarity index 54%
rename from app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146310
rename to app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146310
index 696bb1a1..c4b96982 100644
--- a/app-android/src/main/res-current/raw/current_gtfs_schedule_stop_146310
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146310
@@ -1 +1 @@
-'1798',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',2001,65400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,30200,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146311 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146311
new file mode 100644
index 00000000..bf793986
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146311
@@ -0,0 +1,2 @@
+'3409',2000,73300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3409',2001,111400,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146312 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146312
new file mode 100644
index 00000000..b0f903e0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146312
@@ -0,0 +1,2 @@
+'3409',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3409',2001,111500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146313 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146313
new file mode 100644
index 00000000..9d34d257
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146313
@@ -0,0 +1,2 @@
+'3409',2000,73400,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3409',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146314 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146314
new file mode 100644
index 00000000..aebf7034
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146314
@@ -0,0 +1,2 @@
+'3409',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3409',2001,111700,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146315 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146315
new file mode 100644
index 00000000..ce93eaab
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146315
@@ -0,0 +1,2 @@
+'3409',2000,73500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0
+'3409',2001,111600,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146316 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146316
new file mode 100644
index 00000000..4f464450
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146316
@@ -0,0 +1,3 @@
+'3409',4000,71500,,'',0,51500,,'',0
+'3409',4001,111500,4,'',0,60000,4,'',0
+'3409',4100,71500,4,'',0,51500,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146318 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146318
new file mode 100644
index 00000000..2a5238b6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146318
@@ -0,0 +1,13 @@
+'3041',200,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',200,63300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',401,83300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3409',401,73300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,11000,0,'Downtown Only',0
+'3041',500,93300,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',500,73300,,'',0,10000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7300,,'',0,2700,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',500,130300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1000,80400,,'',0,43000,,'',0,40700,,'',0
+'3409',1000,64400,,'',0,16000,,'',0,43000,,'',0
+'3412',1000,164100,,'',0
+'3416',1000,164100,,'',0
+'3041',1500,200500,,'',0,12400,,'',0
+'3409',1500,200500,,'',0,12400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146322 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146322
new file mode 100644
index 00000000..3a6b7d19
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146322
@@ -0,0 +1,2 @@
+'3409',4000,81000,,'',0,51500,,'',0
+'3409',4001,101600,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146323 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146323
new file mode 100644
index 00000000..5f9b8f9f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146323
@@ -0,0 +1,8 @@
+'3041',501,90800,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70800,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123800,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190800,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',2001,64400,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',7000,55400,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146324 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146324
new file mode 100644
index 00000000..10231f7a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146324
@@ -0,0 +1,2 @@
+'3041',300,91400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,71400,,'',0,20000,,'',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-next/raw/next_gtfs_schedule_stop_146325 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146325
new file mode 100644
index 00000000..33ad6d5a
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146325
@@ -0,0 +1,2 @@
+'3041',301,84500,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64500,,'',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-next/raw/next_gtfs_schedule_stop_146326 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146326
new file mode 100644
index 00000000..cadd25fd
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146326
@@ -0,0 +1 @@
+'3409',4100,71000,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146327 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146327
new file mode 100644
index 00000000..4893e00f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146327
@@ -0,0 +1 @@
+'3409',4100,64900,,'',0,55500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146328 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146328
new file mode 100644
index 00000000..1d4cc579
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146328
@@ -0,0 +1 @@
+'3409',4100,64500,,'',0,55500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146329 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146329
new file mode 100644
index 00000000..51e45b55
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146329
@@ -0,0 +1 @@
+'3409',4100,70700,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146330 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146330
new file mode 100644
index 00000000..42c00e58
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146330
@@ -0,0 +1 @@
+'3409',4100,70500,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146331 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146331
new file mode 100644
index 00000000..807c0fe3
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146331
@@ -0,0 +1 @@
+'3409',4100,70100,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146332 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146332
new file mode 100644
index 00000000..5c70ee15
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146332
@@ -0,0 +1 @@
+'3409',4100,70000,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146333 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146333
new file mode 100644
index 00000000..39d5f85c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146333
@@ -0,0 +1 @@
+'3409',1100,95800,,'',0,34700,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146334 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146334
new file mode 100644
index 00000000..6271c84c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146334
@@ -0,0 +1,3 @@
+'3409',1101,93900,,'',0,30700,,'',0
+'3412',1101,181900,,'',0
+'3416',1101,181900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146335 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146335
new file mode 100644
index 00000000..2cf04f18
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146335
@@ -0,0 +1,3 @@
+'3409',1101,94000,,'',0,30700,,'',0
+'3412',1101,182000,,'',0
+'3416',1101,182000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146336 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146336
new file mode 100644
index 00000000..6f800bf6
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146336
@@ -0,0 +1,6 @@
+'3409',1100,94200,,'',0,30700,,'',0
+'3409',1101,94200,4,'',0,30700,4,'',0
+'3412',1100,182200,,'',0
+'3412',1101,182200,4,'',0
+'3416',1100,182200,,'',0
+'3416',1101,182200,4,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146337 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146337
new file mode 100644
index 00000000..3a4acbc8
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146337
@@ -0,0 +1,3 @@
+'3409',1100,94600,,'',0,30700,,'',0
+'3412',1100,182600,,'',0
+'3416',1100,182600,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146338 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146338
new file mode 100644
index 00000000..bc71fea2
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146338
@@ -0,0 +1,3 @@
+'3409',1100,94800,,'',0,30700,,'',0
+'3412',1100,182800,,'',0
+'3416',1100,182800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146339 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146339
new file mode 100644
index 00000000..9a44cc84
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146339
@@ -0,0 +1,3 @@
+'3409',1100,94900,,'',0,30700,,'',0
+'3412',1100,182900,,'',0
+'3416',1100,182900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146340 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146340
new file mode 100644
index 00000000..9a44cc84
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146340
@@ -0,0 +1,3 @@
+'3409',1100,94900,,'',0,30700,,'',0
+'3412',1100,182900,,'',0
+'3416',1100,182900,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146341 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146341
new file mode 100644
index 00000000..220c8201
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146341
@@ -0,0 +1,3 @@
+'3409',1100,95100,,'',0,30700,,'',0
+'3412',1100,183100,,'',0
+'3416',1100,183100,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146342 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146342
new file mode 100644
index 00000000..8f2b1eab
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146342
@@ -0,0 +1,7 @@
+'3041',101,81900,,'',0
+'3409',101,81900,,'',0
+'3041',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3409',1500,190700,0,'Peachtree',0,12400,0,'Peachtree',0,12300,0,'Peachtree',0
+'3418',1601,94400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',2001,64300,0,'Okanagan Falls',0,16400,0,'Okanagan Falls',0,29500,0,'Heritage Hls',0,43500,0,'Heritage Hls',0,17000,0,'Heritage Hls',0
+'3409',7000,55200,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146343 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146343
new file mode 100644
index 00000000..b380382f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146343
@@ -0,0 +1,3 @@
+'3409',2100,71500,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
+'3409',4000,80000,,'',0,51500,,'',0
+'3409',4001,102600,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146344 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146344
new file mode 100644
index 00000000..a998340f
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146344
@@ -0,0 +1 @@
+'3409',2100,71100,,'',0,13100,,'',0,30000,,'',0,46800,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146345 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146345
new file mode 100644
index 00000000..e412e4d9
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146345
@@ -0,0 +1 @@
+'3409',2100,71200,,'',0,13000,,'',0,30000,,'',0,46900,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146346 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146346
new file mode 100644
index 00000000..7ed22495
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146346
@@ -0,0 +1 @@
+'3409',2100,84000,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146347 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146347
new file mode 100644
index 00000000..bda9d723
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146347
@@ -0,0 +1 @@
+'3409',2100,84000,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146348 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146348
new file mode 100644
index 00000000..477c55e7
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146348
@@ -0,0 +1 @@
+'3409',2100,83900,,'',0,30000,,'',0,48200,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146349 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146349
new file mode 100644
index 00000000..59f26001
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146349
@@ -0,0 +1 @@
+'3409',2100,83900,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146350 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146350
new file mode 100644
index 00000000..0305331b
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146350
@@ -0,0 +1 @@
+'3409',2100,83800,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146351 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146351
new file mode 100644
index 00000000..1c582871
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146351
@@ -0,0 +1 @@
+'3409',2100,83700,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146352 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146352
new file mode 100644
index 00000000..638fecac
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146352
@@ -0,0 +1 @@
+'3409',2100,83700,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146353 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146353
new file mode 100644
index 00000000..b847a453
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146353
@@ -0,0 +1 @@
+'3409',2100,83600,,'',0,30000,,'',0,48100,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146354 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146354
new file mode 100644
index 00000000..36a25267
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146354
@@ -0,0 +1 @@
+'3409',2100,83600,,'',0,30000,,'',0,48000,,'',0,13000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146360 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146360
new file mode 100644
index 00000000..0d26b43e
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146360
@@ -0,0 +1,6 @@
+'3041',500,92600,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',500,72600,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',500,125600,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3409',2000,75200,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146361 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146361
new file mode 100644
index 00000000..5efc0955
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146361
@@ -0,0 +1,5 @@
+'3041',301,84400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',301,64400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',501,90300,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3409',501,70300,,'',0,3000,,'',0,7000,,'',0,3400,,'',0,6600,,'',0,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,'School Spcl',0,6000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0
+'3418',501,123300,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146362 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146362
new file mode 100644
index 00000000..3d8f4ccc
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146362
@@ -0,0 +1,6 @@
+'3041',500,92700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',500,72700,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,7300,,'',0,2700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',500,125700,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3409',1501,192300,0,'Downtown',0,12400,0,'Downtown',0
+'3409',2000,75300,0,'Heritage Hls',0,17000,0,'Heritage Hls',0,30000,0,'Heritage Hls',0,42800,0,'Penticton',0,17000,0,'Penticton',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146363 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146363
new file mode 100644
index 00000000..a44cb0a0
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146363
@@ -0,0 +1,3 @@
+'3041',500,92400,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3409',500,72400,,'',0,3000,0,'School Spcl',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0,3300,,'',0,6700,,'',0,3000,,'',0,7000,,'',0,3000,,'',0,7000,,'',0
+'3418',500,125400,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146365 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146365
new file mode 100644
index 00000000..3c346084
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146365
@@ -0,0 +1,4 @@
+'3041',1000,80900,,'',0,43200,,'',0,40700,,'',0
+'3409',1000,64900,,'',0,16000,,'',0,43200,,'',0
+'3412',1000,164800,,'',0
+'3416',1000,164800,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146367 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146367
new file mode 100644
index 00000000..0be0700c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146367
@@ -0,0 +1,8 @@
+'3041',100,84200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',100,64200,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',300,90900,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',300,70900,,'',0,20000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3041',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'3409',1501,193800,0,'Downtown',0,16400,0,'Downtown',0
+'3418',1600,91000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0,10000,,'',0
+'3409',7000,61100,,'',0,30500,,'',0,32400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146368 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146368
new file mode 100644
index 00000000..af315d8c
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146368
@@ -0,0 +1,4 @@
+'3416',1100,183600,,'',0
+'3041',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',7001,84000,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146369 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146369
new file mode 100644
index 00000000..06fee469
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146369
@@ -0,0 +1,4 @@
+'3416',1100,183700,,'',0
+'3041',3001,84600,,'',0,21000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',3001,74600,,'',0,31000,,'',0,18500,,'',0,29500,,'',0,17000,,'',0
+'3409',7001,84100,0,'Cherry Ln',0,29600,0,'Cherry Ln',0,36500,0,'Cherry Ln',0,30500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146370 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146370
new file mode 100644
index 00000000..834b2716
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_146370
@@ -0,0 +1,2 @@
+'3041',300,81700,0,'School Spcl',0
+'3409',300,81700,0,'School Spcl',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_148000 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_148000
new file mode 100644
index 00000000..accc5954
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_148000
@@ -0,0 +1 @@
+'3409',7000,63300,,'',0,30400,,'',0,36400,,'',0,30000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149000 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149000
new file mode 100644
index 00000000..d89fb194
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149000
@@ -0,0 +1 @@
+'3409',4000,73300,,'',0,51500,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149001 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149001
new file mode 100644
index 00000000..a5181d59
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149001
@@ -0,0 +1 @@
+'3409',4001,105000,,'',0,60000,,'',0
diff --git a/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149002 b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149002
new file mode 100644
index 00000000..56be3dcb
--- /dev/null
+++ b/app-android/src/main/res-next/raw/next_gtfs_schedule_stop_149002
@@ -0,0 +1,2 @@
+'3409',4000,73800,,'',0,51500,,'',0
+'3409',4001,104600,,'',0,60000,,'',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
new file mode 100644
index 00000000..fefa05fb
--- /dev/null
+++ b/app-android/src/main/res-next/values/next_gtfs_rts_values_gen.xml
@@ -0,0 +1,11 @@
+
+
+ true
+ false
+ 49.02001
+ 49.88713
+ -119.73523
+ -119.44801
+ 1725367860
+ 1730437200
+
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 16ae04a5..73a018d0 100644
--- 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 @@
- 20240813
+ 20240902
org.mtransit.android.ca_south_okanagan_similkameen_transit_system_bus.gtfs
@string/gtfs_rts_authority
https://www.bctransit.com/contact