Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/com/conveyal/gtfs/GTFSFeed.java
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,17 @@ else if (feedId == null || feedId.isEmpty()) {
fares = null; // free memory

new Pattern.Loader(this).loadTable(zip);
new RouteNetwork.Loader(this).loadTable(zip);
// Route must be loaded before RouteNetwork because RouteNetwork references Route.
new Route.Loader(this).loadTable(zip);
new RouteNetwork.Loader(this).loadTable(zip);
if (!route_networks.isEmpty()) {
Route.mergeRouteNetworks(routes, route_networks);
}
new ShapePoint.Loader(this).loadTable(zip);
new StopArea.Loader(this).loadTable(zip);
// Stop and Area must be loaded before StopArea because StopArea references both of them.
new Stop.Loader(this).loadTable(zip);
new Area.Loader(this).loadTable(zip);
new StopArea.Loader(this).loadTable(zip);
if (!stop_areas.isEmpty()) {
Stop.mergeStopAreas(stops, stop_areas);
}
Expand All @@ -201,7 +204,6 @@ else if (feedId == null || feedId.isEmpty()) {
new StopTime.Loader(this).loadTable(zip); // comment out this line for quick testing using NL feed

// Fares v2.
new Area.Loader(this).loadTable(zip);
new TimeFrame.Loader(this).loadTable(zip);
new Network.Loader(this).loadTable(zip);
new FareMedia.Loader(this).loadTable(zip);
Expand Down
Loading