@transportme/load-ptv-gtfs 1.4.31 → 1.4.33

package/lib/gtfs-parser/GTFSRoute.mjs

@@ -76,8 +76,8 @@ export default class GTFSRoute {
 class SmartrakGTFSRoute extends GTFSRoute {
 
   parseRouteID(routeGTFSID) {
-    let [ _, routeNumber ] = routeGTFSID.match(/^\d+\-(\w+)/)
-    return `4-${routeNumber}`
+    let [ _, routeNumber ] = routeGTFSID.match(/^\d+\-(...)/)
+    return `4-${routeNumber.replace(/[^\w_]/g, 'z')}`
   }
 
   static canProcess(routeGTFSID, mode) {

package/lib/gtfs-parser/readers/line-reader.mjs

@@ -61,7 +61,7 @@ export default class CSVLineReader {
     let parts = [ ...line.matchAll(/(?:,"|^")(""|[\w\W]*?)(?=",|"$)|(?:,(?!")|^(?!"))([^,]*?)(?=$|,)|(\r\n|\n)/gm) ].map(match => match[1] || match[2])
 
     return this.#headers.reduce((acc, header, i) => {
-      acc[header] = parts[i]
+      acc[header] = parts[i] || ''
       return acc
     }, {})
   }

package/lib/loader/RouteLoader.mjs

@@ -113,8 +113,12 @@ export default class RouteLoader {
 
     await this.#routesReader.open()
     while (this.#routesReader.available()) {
-      let route = await this.#routesReader.getNextEntity()
-      await this.loadRoute(route, processRoute)
+      try {
+        let route = await this.#routesReader.getNextEntity()
+        await this.loadRoute(route, processRoute)
+      } catch (e) {
+        console.error('Failed to load trip', e)
+      }
     }
   }
 

package/lib/loader/ShapeLoader.mjs

@@ -88,8 +88,12 @@ export default class ShapeLoader {
     let shapesLoaded = 0
 
     while (this.#shapeReader.available()) {
-      let shape = await this.#shapeReader.getNextEntity()
-      await this.loadShape(shape, shapeIDMap)
+      try {
+        let shape = await this.#shapeReader.getNextEntity()
+        await this.loadShape(shape, shapeIDMap)
+      } catch (e) {
+        console.error('Failed to load shape', e)
+      }
 
       if (++shapesLoaded === 1000) {
         await this.writeShapes()

package/lib/loader/StopsLoader.mjs

@@ -197,8 +197,12 @@ export default class StopsLoader {
   async loadStops(options) {
     await this.#stopsReader.open()
     while (this.#stopsReader.available()) {
-      let stop = await this.#stopsReader.getNextEntity()
-      await this.loadStop(stop, options)
+      try {
+        let stop = await this.#stopsReader.getNextEntity()
+        await this.loadStop(stop, options)
+      } catch (e) {
+        console.error('Failed to load stop', e)
+      }
     }
   }
 }

package/lib/loader/TripLoader.mjs

@@ -116,7 +116,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 +136,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,
@@ -237,8 +243,12 @@ export default class TripLoader {
 
     await this.#stopTimesReader.open()
     while (this.#stopTimesReader.available()) {
-      let gtfsTrip = await this.#stopTimesReader.getNextEntity()
-      await this.loadTrip(gtfsTrip, processTrip)
+      try {
+        let gtfsTrip = await this.#stopTimesReader.getNextEntity()
+        await this.loadTrip(gtfsTrip, processTrip)
+      } catch (e) {
+        console.error('Failed to load trip', e)
+      }
 
       if (this.#tripsToLoad.length === 5000) { // Flush the cache every 5000 trips
         tripsLoaded += this.#tripsToLoad.length

package/package.json

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