@transportme/load-ptv-gtfs 1.4.30 → 1.4.32

package/index.mjs

@@ -10,7 +10,7 @@ import GTFSRoute from './lib/gtfs-parser/GTFSRoute.mjs'
 import { GTFSShape, GTFSShapePoint } from './lib/gtfs-parser/GTFSShape.mjs'
 import { GTFSStop, GTFSPlatformStop } from './lib/gtfs-parser/GTFSStop.mjs'
 import { GTFSStopTime } from './lib/gtfs-parser/GTFSStopTime.mjs'
-import GTFSTrip from './lib/gtfs-parser/GTFSTrip.mjs'
+import GTFSTrip, { IdentifiableTrip, SmartrakTrip } from './lib/gtfs-parser/GTFSTrip.mjs'
 
 import setRouteStops from './lib/post-processing/set-route-stops.mjs'
 
@@ -29,7 +29,7 @@ const GTFSTypes = {
   GTFSAgency, GTFSCalendar, GTFSCalendarDate,
   GTFSRoute, GTFSShape, GTFSShapePoint,
   GTFSStop, GTFSPlatformStop,
-  GTFSStopTime, GTFSTrip
+  GTFSStopTime, GTFSTrip, SmartrakTrip, IdentifiableTrip
 }
 
 const GTFSReaders = {

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/GTFSTrip.mjs

@@ -151,12 +151,17 @@ export class SmartrakTrip extends GTFSTrip {
   }
 
   getRunID() {
-    const tripIDParts = this.getTripID().split('-')
+    return this.constructor.getRunIDFromTripID(this.getTripID())
+  }
+
+  static getRunIDFromTripID(tripID) {
+    const tripIDParts = tripID.split('-')
+    const depotID = tripIDParts[0]
     const routeNumber = tripIDParts[1]
     const routeVariant = tripIDParts[2]
-    const rosterType = this.getCalendarName().split('-')[0].replace(/\d+/, '')
+    const rosterType = tripIDParts[4].replace(/\d+/, '')
     const tripRunID = tripIDParts[5]
-    return `${this.getDepotID()}-${routeNumber}-${routeVariant}-${rosterType}-${tripRunID}`
+    return `${depotID}-${routeNumber}-${routeVariant}-${rosterType}-${tripRunID}`
   }
 }
 

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

@@ -237,8 +237,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.30",
+  "version": "1.4.32",
   "description": "",
   "main": "index.mjs",
   "scripts": {