@transportme/load-ptv-gtfs 1.4.9 → 1.4.11

package/lib/gtfs-parser/GTFSRoute.mjs

@@ -57,7 +57,7 @@ export default class GTFSRoute {
    */
   static create(data, mode) {
     let { routeGTFSID } = data
-    let routeTypes = [ RailGTFSRoute, NewGTFSRoute, SmartrakGTFSRoute, MTMRailRoute, GTFSRoute ]
+    let routeTypes = [ RailGTFSRoute, NewGTFSRoute, SmartrakGTFSRoute, GTFSRoute ]
     for (let type of routeTypes) {
       if (type.canProcess(routeGTFSID, mode)) return new type(data)
     }
@@ -121,22 +121,4 @@ class RailGTFSRoute extends NewGTFSRoute {
     return super.canProcess(routeGTFSID, mode) && (mode === TRANSIT_MODES.metroTrain || mode === TRANSIT_MODES.regionalTrain)
   }
 
-}
-
-class MTMRailRoute extends GTFSRoute {
-
-  constructor(data) {
-    super(data)
-    this.routeName = 'Rail Replacement Bus'
-    this.routeNumber = null
-  }
-
-  static canProcess(routeGTFSID, mode) {
-    return !routeGTFSID.match(/^\d+-\w{1,3}/) && mode === 'metro train'
-  }
-
-  parseRouteID(routeGTFSID) {
-    return '2-RRB'
-  }  
-
 }

package/lib/gtfs-parser/GTFSTrip.mjs

@@ -50,7 +50,7 @@ export default class GTFSTrip {
    * @returns {GTFSTrip} A trip instance representing the data being passed in
    */
   static create(data, mode) {
-    let types = [ SmartrakTrip, MetroTrip, MTMRailTrip, GTFSTrip ]
+    let types = [ SmartrakTrip, MetroTrip, GTFSTrip ]
     for (let type of types) {
       if (type.canProcess(data, mode)) return new type(data)
     }
@@ -183,38 +183,4 @@ export class MetroTrip extends GTFSTrip {
     return this.#runID
   }
 
-}
-
-export class MetroRRBTrip extends MetroTrip {
-
-  constructor(data) {
-    super(data)
-  }
-
-  static canProcess(data, mode) {
-    return super.canProcess(data, mode) && data.id.match(/^02-\w{3}-R-/)
-  }
-
-}
-
-export class MTMRailTrip extends GTFSTrip {
-
-  constructor(data) {
-    if (data.headsign && data.headsign.length === 6 && data.headsign.match(/[A-Z]{3}\d{3}/)) {
-      data.block = data.headsign
-    }
-
-    super(data)
-  }
-
-  static canProcess(data, mode) {
-    return mode === TRANSIT_MODES.metroTrain && data.routeGTFSID === '2-RRB'
-  }
-
-  getTripData() {
-    return {
-      ...super.getTripData(),
-      isRailReplacementBus: true
-    }
-  }
 }

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

@@ -35,5 +35,5 @@ export default class GTFSRouteReader extends GTFSReader {
     }
 
     return GTFSRoute.create(routeData, 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.9",
+  "version": "1.4.11",
   "description": "",
   "main": "index.mjs",
   "scripts": {