@transportme/load-ptv-gtfs 1.1.6 → 1.1.8

package/lib/loader/TripLoader.mjs

@@ -26,6 +26,7 @@ export default class TripLoader {
   #stopCache = {}
 
   #shapeIDMap = {}
+  #directionIDMap = {}
 
   #tripsToLoad = []
 
@@ -164,7 +165,9 @@ export default class TripLoader {
     if (!processedData) return
 
     this.#shapeIDMap[tripData.shapeID] = tripData.routeGTFSID
-
+    if (!this.#directionIDMap[tripData.routeGTFSID]) this.#directionIDMap[tripData.routeGTFSID] = {}
+    this.#directionIDMap[tripData.routeGTFSID][rawTripData.getHeadsign()] = rawTripData.getGTFSDirection()
+    
     this.#tripsToLoad.push(processedData)
   }
 
@@ -211,4 +214,8 @@ export default class TripLoader {
   getShapeIDMap() {
     return this.#shapeIDMap
   }
+
+  getDirectionIDMap() {
+    return this.#directionIDMap
+  }
 }

package/lib/post-processing/set-route-stops.mjs

@@ -8,7 +8,7 @@ import { TRANSIT_MODES } from '../constants.mjs'
  * 
  * @param {DatabaseConnection} database The database connection to use
  */
-export default async function setRouteStops(database) {
+export default async function setRouteStops(database, directionsMap) {
   let gtfsTimetables = database.getCollection('gtfs timetables')
   let routes = database.getCollection('routes')
 
@@ -87,7 +87,8 @@ export default async function setRouteStops(database) {
       updateOne: {
         filter: { routeGTFSID },
         update: { $set: {
-          directions: stopsByService[routeGTFSID].filter(Boolean) // Apparently some routes dont have GTFS Dir 0
+          directions: stopsByService[routeGTFSID].filter(Boolean), // Apparently some routes dont have GTFS Dir 0
+          ptvDirections: directionsMap[routeGTFSID]
         } }
       }
     })

package/package.json

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

package/test/gtfs-trip-loader.test.mjs

@@ -109,4 +109,31 @@ describe('The TripLoader class', () => {
 
     expect(shapeIDMap['2-ALM-vpt-1.1.R']).to.equal('2-ALM')
   })
+
+  it('Should return a mapping of Route + GTFS Direction ID to PTV Direction Names', async () => {
+    let database = new LokiDatabaseConnection('test-db')
+    let stops = await database.createCollection('stops')
+    let routes = await database.createCollection('routes')
+    let trips = await database.createCollection('gtfs timetables')
+
+    let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
+    await stopLoader.loadStops()
+
+    let routeLoader = new RouteLoader(routesFile, agencyFile, TRANSIT_MODES.metroTrain, database)
+    await routeLoader.loadRoutes()
+
+    let routeIDMap = routeLoader.getRouteIDMap()
+
+    let tripLoader = new TripLoader({
+      tripsFile, stopTimesFile,
+      calendarFile, calendarDatesFile
+    }, TRANSIT_MODES.metroTrain, database)
+    
+    await tripLoader.loadTrips({ routeIDMap })
+    let directionIDMap = tripLoader.getDirectionIDMap()
+
+    expect(directionIDMap).to.deep.equal({
+      '2-ALM': { 'Alamein': 0, 'Camberwell': 1 }
+    })
+  })
 })

package/test/merge-stops-full.test.mjs

@@ -44,12 +44,13 @@ let tripLoader = new TripLoader({
 
 await tripLoader.loadTrips({ routeIDMap })
 let shapeIDMap = tripLoader.getShapeIDMap()
+let directionIDMap = tripLoader.getDirectionIDMap()
 
 let shapeLoader = new ShapeLoader(shapeFile, database)
 
 await shapeLoader.loadShapes({ shapeIDMap })
 
-await setRouteStops(database)
+await setRouteStops(database, directionIDMap)
 
 describe('The GTFS Route stop merger', () => {
   describe('When processing Metro routes', () => {
@@ -95,5 +96,11 @@ describe('The GTFS Route stop merger', () => {
       expect(stonyPoint.stops[0].stopName).to.equal('Frankston Railway Station')
       expect(stonyPoint.stops[stonyPoint.stops.length - 1].stopName).to.equal('Stony Point Railway Station')
     })
+
+    it('Should mark the PTV Route direction', async () => {
+      let stonyPointRoute = await routes.findDocument({ routeGTFSID: '2-STY' })
+      expect(stonyPointRoute.ptvDirections['Stony Point']).to.equal(0)
+      expect(stonyPointRoute.ptvDirections['Frankston']).to.equal(1)
+    })
   })
 })