@transportme/load-ptv-gtfs 1.4.19 → 1.4.21

package/lib/gtfs-parser/GTFSTrip.mjs

@@ -51,7 +51,7 @@ export default class GTFSTrip {
    * @returns {GTFSTrip} A trip instance representing the data being passed in
    */
   static create(data, mode) {
-    let types = [ SmartrakTrip, MetroTrip, GTFSTrip ]
+    let types = [ SmartrakTrip, IdentifiableTrip, GTFSTrip ]
     for (let type of types) {
       if (type.canProcess(data, mode)) return new type(data)
     }
@@ -157,19 +157,19 @@ export class SmartrakTrip extends GTFSTrip {
  * Example: 02-BEG--58-T5_n4-3651
  * RRB Example: 02-SUY--13-T2-BS000
  */
-export class MetroTrip extends GTFSTrip {
+export class IdentifiableTrip extends GTFSTrip {
 
   #runID
 
   constructor(data) {
     super(data)
 
-    let runID = data.id.match(/^02-\w{3}-.*-(\w{1,2}\d{2,3})$/)
+    let runID = data.id.match(/^\d\d-\w{1,3}-.*-(\w+)$/)
     this.#runID = runID[1]
   }
 
   static canProcess(data, mode) {
-    return mode === TRANSIT_MODES.metroTrain && data.id.match(/^02-\w{3}-.*-(\w{1,2}\d{2,3})$/)
+    return mode === TRANSIT_MODES.metroTrain && data.id.match(/^\d\d-\w{1,3}-.*-(\w+)$/)
   }
 
   getTrainDirection() {

package/lib/loader/TripLoader.mjs

@@ -201,6 +201,7 @@ export default class TripLoader {
     this.updateStopServices(processedData)
     
     this.#tripsToLoad.push(processedData)
+    this.#tripDetails[tripID] = null // Clear it from the cache once loaded to free up some memory
   }
 
   updateStopServices(trip) {
@@ -226,7 +227,7 @@ export default class TripLoader {
    * @param {object} options.routeIDMap A mapping of full route IDs to their simplified IDs.
    * @param {function} [options.processTrip] A function to modify trip data on a per-trip basis. It should return null to discard the trip.
    */
-  async loadTrips({ routeIDMap, processTrip }) {
+  async loadTrips({ routeIDMap, processTrip, onWrite = () => {} }) {
     this.#routeIDMap = routeIDMap
 
     await this.loadCalendarData()
@@ -242,11 +243,13 @@ export default class TripLoader {
       if (this.#tripsToLoad.length === 5000) { // Flush the cache every 5000 trips
         tripsLoaded += this.#tripsToLoad.length
         await this.writeTrips()
+        onWrite(tripsLoaded)
       }
     }
 
     tripsLoaded += this.#tripsToLoad.length
     await this.writeTrips()
+    onWrite(tripsLoaded)
   }
 
   getTripsToLoad() {

package/package.json

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