@transportme/load-ptv-gtfs 1.3.6 → 1.3.8

package/lib/loader/TripLoader.mjs

@@ -28,6 +28,7 @@ export default class TripLoader {
 
   #shapeIDMap = {}
   #directionIDMap = {}
+  #stopServicesMap = {}
 
   #tripsToLoad = []
 
@@ -172,9 +173,27 @@ export default class TripLoader {
     if (!this.#directionIDMap[tripData.routeGTFSID]) this.#directionIDMap[tripData.routeGTFSID] = {}
     this.#directionIDMap[tripData.routeGTFSID][rawTripData.getHeadsign()] = rawTripData.getGTFSDirection()
     
+    this.updateStopServices(processedData)
+    
     this.#tripsToLoad.push(processedData)
   }
 
+  updateStopServices(trip) {
+    let { gtfsDirection, routeGTFSID, routeNumber } = trip
+    trip.stopTimings.forEach(stop => {
+      let { stopGTFSID } = stop
+      let serviceID = `${routeGTFSID}-${gtfsDirection}-${routeNumber}`
+      if (!this.#stopServicesMap[stopGTFSID]) this.#stopServicesMap[stopGTFSID] = { services: {}, screenServices: {} }
+      if (!this.#stopServicesMap[stopGTFSID].services[serviceID]) {
+        this.#stopServicesMap[stopGTFSID].services[serviceID] = { routeGTFSID, gtfsDirection, routeNumber }
+      }
+
+      if (stop.stopConditions.pickup === 0 && !this.#stopServicesMap[stopGTFSID].screenServices[serviceID]) {
+        this.#stopServicesMap[stopGTFSID].screenServices[serviceID] = { routeGTFSID, gtfsDirection, routeNumber }
+      }
+    })
+  }
+
   /**
    * Loads the trip data into the database.
    * 
@@ -222,4 +241,16 @@ export default class TripLoader {
   getDirectionIDMap() {
     return this.#directionIDMap
   }
+
+  getStopServicesMap() {
+    let output = {}
+    for (let stopGTFSID of Object.keys(this.#stopServicesMap)) {
+      let stopServices = this.#stopServicesMap[stopGTFSID]
+      output[stopGTFSID] = {
+        services: Object.values(stopServices.services),
+        screenServices: Object.values(stopServices.screenServices)
+      }
+    }
+    return output
+  }
 }

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, directionsMap) {
+export default async function setRouteStops(database, directionsMap, onMilestone = () => {}) {
   let gtfsTimetables = database.getCollection('gtfs timetables')
   let routes = database.getCollection('routes')
 
@@ -16,6 +16,7 @@ export default async function setRouteStops(database, directionsMap) {
 
   let stopsByService = {}
 
+  let count = 0
   await async.forEachLimit(allRoutes, 100, async routeGTFSID => {
     let routeData = await routes.findDocument({ routeGTFSID })
     let routeVariants = routeData.routePath.map(variant => ({ shapeID: variant.fullGTFSIDs[0], routeGTFSID }))
@@ -78,6 +79,8 @@ export default async function setRouteStops(database, directionsMap) {
         stopsByService[routeGTFSID][gtfsDirection].trainDirection = isUp ? 'Up' : 'Down'
       }
     }
+
+    if (++count % 25 === 0) onMilestone(count, total)
   })
 
   let bulkOperations = []

package/package.json

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

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

@@ -139,4 +139,50 @@ describe('The TripLoader class', () => {
       '2-ALM': { 'Alamein': 0, 'Camberwell': 1 }
     })
   })
+
+  it('Should return a mapping stop services', 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 stopServicesMap = tripLoader.getStopServicesMap()
+
+    expect(stopServicesMap['vic:rail:ALM'].services).to.deep.equal([{
+      routeGTFSID: '2-ALM',
+      gtfsDirection: 1,
+      routeNumber: null
+    }, {
+      routeGTFSID: '2-ALM',
+      gtfsDirection: 0,
+      routeNumber: null
+    }])
+
+    expect(stopServicesMap['vic:rail:ALM'].screenServices).to.deep.equal([{
+      routeGTFSID: '2-ALM',
+      gtfsDirection: 1,
+      routeNumber: null
+    }])
+
+    expect(stopServicesMap['vic:rail:CAM'].screenServices).to.deep.equal([{
+      routeGTFSID: '2-ALM',
+      gtfsDirection: 0,
+      routeNumber: null
+    }])
+  })
 })