@transportme/load-ptv-gtfs 1.4.30 → 1.4.31

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/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/package.json

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