@transportme/load-ptv-gtfs 1.4.8 → 1.4.10

package/lib/gtfs-parser/readers/GTFSRouteReader.mjs

@@ -11,6 +11,10 @@ export default class GTFSRouteReader extends GTFSReader {
     this.#mode = mode
   }
 
+  getMode() {
+    return this.#mode
+  }
+
   /**
    * Converts a CSV row into a route object
    * 
@@ -30,6 +34,6 @@ export default class GTFSRouteReader extends GTFSReader {
       routeName: data.route_long_name
     }
 
-    return GTFSRoute.create(routeData, this.#mode)
+    return GTFSRoute.create(routeData, this.getMode())
   } 
 }

package/lib/gtfs-parser/readers/GTFSStopsReader.mjs

@@ -12,6 +12,14 @@ export default class GTFSStopsReader extends GTFSReader {
     this.#suburbHook = suburbHook
   }
 
+  getSuburbData() {
+    return this.#suburbData
+  }
+
+  getSuburbHook() {
+    return this.#suburbHook
+  }
+
   /**
    * Converts a CSV row into a stop object
    * 
@@ -35,6 +43,6 @@ export default class GTFSStopsReader extends GTFSReader {
       parentStopGTFSID: data.parent_station
     }
 
-    return GTFSStop.create(stopData, this.#suburbData, this.#suburbHook)
+    return GTFSStop.create(stopData, this.getSuburbData(), this.getSuburbHook())
   }
 }

package/lib/gtfs-parser/readers/GTFSTripReader.mjs

@@ -13,6 +13,10 @@ export default class GTFSTripReader extends GTFSReader {
     this.#routeMappings = routeMappings
     this.#mode = mode
   }
+  
+  getMode() {
+    return this.#mode
+  }
 
   /**
    * Sets the route ID mappings of the trip reader.
@@ -31,6 +35,22 @@ export default class GTFSTripReader extends GTFSReader {
     this.#calendars = calendars
   }
 
+  getRouteMappings() {
+    return this.#routeMappings
+  }
+
+  getCalendars() {
+    return this.#calendars
+  }
+
+  getRouteMapping(routeGTFSID) {
+    return this.getRouteMappings()[routeGTFSID]
+  }
+
+  getCalendar(calendarID) {
+    return this.getCalendars()[calendarID]
+  }
+
   /**
    * Converts a CSV row into a trip object
    * 
@@ -47,8 +67,8 @@ export default class GTFSTripReader extends GTFSReader {
    */
   processEntity(data) {
     let tripData = {
-      routeGTFSID: this.#routeMappings[data.route_id],
-      calendar: this.#calendars[data.service_id],
+      routeGTFSID: this.getRouteMapping(data.route_id),
+      calendar: this.getCalendar(data.service_id),
       id: data.trip_id,
       shapeID: data.shape_id,
       headsign: data.trip_headsign,
@@ -56,6 +76,6 @@ export default class GTFSTripReader extends GTFSReader {
       block: data.block_id
     }
 
-    return GTFSTrip.create(tripData, this.#mode)
+    return GTFSTrip.create(tripData, this.getMode())
   }
 }

package/lib/loader/RouteLoader.mjs

@@ -23,15 +23,18 @@ export default class RouteLoader {
    * @param {string} agencyFile The path for the agency.txt file
    * @param {string} mode The route's mode
    * @param {DatabaseConnection} database A database connection
-   * @param {string} collectionName The collection to store the routes in. Defaults to gtfs-routes
    */
-  constructor(routesFile, agencyFile, mode, database, collectionName = 'gtfs-routes') {
-    this.#routes = database.getCollection(collectionName)
+  constructor(routesFile, agencyFile, mode, database) {
+    this.#routes = this.getRoutesDB(database)
     this.#mode = mode
     this.#routesReader = this.createRouteReader(routesFile, mode)
     this.#agencyFile = agencyFile
   }
 
+  getRoutesDB(db) {
+    return db.getCollection('gtfs-routes')
+  }
+
   createRouteReader(routesFile, mode) {
     return new GTFSRouteReader(routesFile, mode)
   }

package/lib/loader/ShapeLoader.mjs

@@ -13,13 +13,16 @@ export default class ShapeLoader {
    * 
    * @param {string} shapeFile The path for the shapes.txt file
    * @param {DatabaseConnection} database A database connection
-   * @param {string} collectionName The collection to store the routes in. Defaults to gtfs-routes
    */
-  constructor(shapeFile, database, collectionName = 'gtfs-routes') {
-    this.#routes = database.getCollection(collectionName)
+  constructor(shapeFile, database) {
+    this.#routes = this.getRoutesDB(database)
     this.#shapeReader = this.createShapeReader(shapeFile)
   }
 
+  getRoutesDB(db) {
+    return db.getCollection('gtfs-routes')
+  }
+
   createShapeReader(shapeFile) {
     return new GTFSShapeReader(shapeFile)
   }

package/lib/loader/StopsLoader.mjs

@@ -20,15 +20,18 @@ export default class StopsLoader {
    * @param {string} mode The transit mode being loaded
    * @param {DatabaseConnection} database A database connection
    * @param {function} [suburbHook] A hook that returns the stop's suburb, or null if unavailable. This function is called before processing from the stop's name or location
-   * @param {string} collectionName The collection to store the stops in. Defaults to gtfs-stops
    * 
    */
-  constructor(stopsFile, suburbs, mode, database, suburbHook, collectionName = 'gtfs-stops') {
-    this.#stops = database.getCollection(collectionName)
+  constructor(stopsFile, suburbs, mode, database, suburbHook) {
+    this.#stops = this.getStopsDB(database)
     this.#mode = mode
     this.#stopsReader = this.createStopReader(stopsFile, suburbs, suburbHook)
   }
 
+  getStopsDB(db) {
+    return db.getCollection('gtfs-stops')
+  }
+
   createStopReader(stopsFile, suburbs, suburbHook) {
     return new GTFSStopsReader(stopsFile, suburbs, suburbHook)
   }

package/lib/loader/TripLoader.mjs

@@ -42,19 +42,11 @@ export default class TripLoader {
    * @param {string} paths.calendarDatesFile The path for the calendar_dates.txt file
    * @param {string} mode The transit mode being loaded
    * @param {DatabaseConnection} database A database connection
-   * @param {Object} colls Used to specify the collection names to write into
-   * @param {string} colls.routeColl The collection to store the routes in. Defaults to gtfs-routes
-   * @param {string} colls.stopColl The collection to store the stops in. Defaults to gtfs-stops
-   * @param {string} colls.timetableColl The collection to store the timetables in. Defaults to gtfs-gtfs timetables
    */
-  constructor({ tripsFile, stopTimesFile, calendarFile, calendarDatesFile }, mode, database, {
-    routeColl = 'gtfs-routes',
-    stopColl = 'gtfs-stops',
-    timetableColl = 'gtfs-gtfs timetables'
-  } = {}) {
-    this.#routes = database.getCollection(routeColl)
-    this.#stops = database.getCollection(stopColl)
-    this.#trips = database.getCollection(timetableColl)
+  constructor({ tripsFile, stopTimesFile, calendarFile, calendarDatesFile }, mode, database) {
+    this.#routes = this.getRoutesDB(database)
+    this.#stops = this.getStopsDB(database)
+    this.#trips = this.getTripsDB(database)
 
     this.#mode = mode
 
@@ -63,6 +55,18 @@ export default class TripLoader {
     this.#calendarReader = this.createCalendarReader(calendarFile, calendarDatesFile)
   }
 
+  getRoutesDB(db) {
+    return db.getCollection('gtfs-routes')
+  }
+
+  getStopsDB(db) {
+    return db.getCollection('gtfs-stops')
+  }
+
+  getTripsDB(db) {
+    return db.getCollection('gtfs-gtfs timetables')
+  }
+
   createStopTimesReader(stopTimesFile, mode) {
     return new GTFSStopTimesReader(stopTimesFile, mode)
   }

package/package.json

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