@transportme/load-ptv-gtfs 1.4.32 → 1.4.34

package/lib/loader/RouteLoader.mjs

@@ -13,9 +13,11 @@ export default class RouteLoader {
   #routesReader
   #operators = {}
   #agencyFile
+  #routesFile
 
   #routeIDMap = {}
 
+
   /**
    * Creates a new Shape Loader.
    * 
@@ -27,8 +29,8 @@ export default class RouteLoader {
   constructor(routesFile, agencyFile, mode, database) {
     this.#routes = this.getRoutesDB(database)
     this.#mode = mode
-    this.#routesReader = this.createRouteReader(routesFile, mode)
-    this.#agencyFile = agencyFile
+    this.#routesFile = routesFile
+    this.#agencyFile = agencyFile 
   }
 
   getRoutesDB(db) {
@@ -111,6 +113,8 @@ export default class RouteLoader {
   async loadRoutes({ processRoute } = {}) {
     await this.loadAgencies()
 
+    this.#routesReader = this.createRouteReader(this.#routesFile, this.#mode)
+
     await this.#routesReader.open()
     while (this.#routesReader.available()) {
       try {

package/lib/loader/ShapeLoader.mjs

@@ -6,6 +6,8 @@ export default class ShapeLoader {
   #routes
   #shapeReader
 
+  #shapeFile
+
   #routeCache = {}
 
   /**
@@ -16,7 +18,7 @@ export default class ShapeLoader {
    */
   constructor(shapeFile, database) {
     this.#routes = this.getRoutesDB(database)
-    this.#shapeReader = this.createShapeReader(shapeFile)
+    this.#shapeFile = shapeFile
   }
 
   getRoutesDB(db) {
@@ -83,6 +85,8 @@ export default class ShapeLoader {
    * @param {function} options.shapeIDMap A mapping of shape IDs to their trip IDs.
    */
   async loadShapes({ shapeIDMap }) {
+    this.#shapeReader = this.createShapeReader(this.#shapeFile)
+
     await this.#shapeReader.open()
 
     let shapesLoaded = 0

package/lib/loader/StopsLoader.mjs

@@ -10,6 +10,10 @@ export default class StopsLoader {
   #mode
   #stopsReader
 
+  #stopsFile
+  #suburbs
+  #suburbHook
+
   #parentHolding = {}
 
   /**
@@ -25,7 +29,9 @@ export default class StopsLoader {
   constructor(stopsFile, suburbs, mode, database, suburbHook) {
     this.#stops = this.getStopsDB(database)
     this.#mode = mode
-    this.#stopsReader = this.createStopReader(stopsFile, suburbs, suburbHook)
+    this.#stopsFile = stopsFile
+    this.#suburbs = suburbs
+    this.#suburbHook = suburbHook
   }
 
   getStopsDB(db) {
@@ -195,6 +201,7 @@ export default class StopsLoader {
    * @param {function} options.getMergeName Used to get a stop's merge name. Return null to use the default merge name.
    */
   async loadStops(options) {
+    this.#stopsReader = this.createStopReader(this.#stopsFile, this.#suburbs, this.#suburbHook)
     await this.#stopsReader.open()
     while (this.#stopsReader.available()) {
       try {

package/lib/loader/TripLoader.mjs

@@ -32,6 +32,11 @@ export default class TripLoader {
 
   #tripsToLoad = []
 
+  #tripsFile
+  #stopTimesFile
+  #calendarFile
+  #calendarDatesFile
+
   /**
    * Creates a new Trip Loader.
    * 
@@ -50,9 +55,10 @@ export default class TripLoader {
 
     this.#mode = mode
 
-    this.#stopTimesReader = this.createStopTimesReader(stopTimesFile, mode)
-    this.#tripsReader = this.createTripReader(tripsFile, null, null, mode)
-    this.#calendarReader = this.createCalendarReader(calendarFile, calendarDatesFile)
+    this.#tripsFile = tripsFile
+    this.#stopTimesFile = stopTimesFile
+    this.#calendarFile = calendarFile
+    this.#calendarDatesFile = calendarDatesFile
   }
 
   getRoutesDB(db) {
@@ -116,7 +122,12 @@ export default class TripLoader {
     if (this.#stopCache[stopGTFSID]) return this.#stopCache[stopGTFSID]
 
     let stop = await this.stops.findDocument({
-      'bays.stopGTFSID': stopGTFSID
+      bays: {
+        $elemMatch: {
+          stopGTFSID,
+          mode: this.#mode
+        }
+      }
     })
 
     this.#stopCache[stopGTFSID] = stop
@@ -131,6 +142,7 @@ export default class TripLoader {
       let stopData = await this.findMatchingStop(stop.stopID)
       if (!stopData) throw new Error(`Failed to match stop ${stop.stopID} in trip ${tripData.getTripID()}`)
       let bay = stopData.bays.find(bay => bay.stopGTFSID === stop.stopID && bay.mode === this.#mode)
+      if (!bay) throw new Error(`Missing bay for given stop ID ${stop.stopID} in trip ${tripData.getTripID()}`)
 
       let data = {
         stopName: bay.fullStopName,
@@ -230,6 +242,10 @@ export default class TripLoader {
   async loadTrips({ routeIDMap, processTrip, onWrite = () => {} }) {
     this.#routeIDMap = routeIDMap
 
+    this.#stopTimesReader = this.createStopTimesReader(this.#stopTimesFile, this.#mode)
+    this.#tripsReader = this.createTripReader(this.#tripsFile, null, null, this.#mode)
+    this.#calendarReader = this.createCalendarReader(this.#calendarFile, this.#calendarDatesFile)
+
     await this.loadCalendarData()
     await this.loadTripsData()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transportme/load-ptv-gtfs",
-  "version": "1.4.32",
+  "version": "1.4.34",
   "description": "",
   "main": "index.mjs",
   "scripts": {