@transportme/load-ptv-gtfs 1.3.7 → 1.3.9

package/index.mjs

@@ -13,7 +13,6 @@ import { GTFSStopTime } from './lib/gtfs-parser/GTFSStopTime.mjs'
 import GTFSTrip from './lib/gtfs-parser/GTFSTrip.mjs'
 
 import setRouteStops from './lib/post-processing/set-route-stops.mjs'
-import setStopServices from './lib/post-processing/set-stop-services.mjs'
 
 import GTFSAgencyReader from './lib/gtfs-parser/readers/GTFSAgencyReader.mjs'
 import GTFSCalendarDateReader from './lib/gtfs-parser/readers/GTFSCalendarDatesReader.mjs'
@@ -41,5 +40,5 @@ export {
   RouteLoader, ShapeLoader,
   StopsLoader, TripLoader,
   GTFSTypes, GTFSReaders,
-  setRouteStops, setStopServices
+  setRouteStops
 }

package/lib/loader/TripLoader.mjs

@@ -120,10 +120,8 @@ export default class TripLoader {
         stopDistance: stop.distanceTravelled
       }
 
-      if (bay.platform) {
-        if (bay.parentStopGTFSID) data.stopGTFSID = bay.parentStopGTFSID
-        data.platform = bay.platform
-      }
+      if (bay.parentStopGTFSID) data.stopGTFSID = bay.parentStopGTFSID
+      if (bay.platform) data.platform = bay.platform
 
       return data
     })

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.7",
+  "version": "1.3.9",
   "description": "",
   "main": "index.mjs",
   "scripts": {

package/lib/post-processing/set-stop-services.mjs

@@ -1,71 +0,0 @@
-import DatabaseConnection from '@transportme/database/lib/DatabaseConnection.mjs'
-import async from 'async'
-
-const AGGREGATION_GROUP = {
-  $group: {
-    _id: {
-      routeGTFSID: "$routeGTFSID",
-      gtfsDirection: "$gtfsDirection",
-      routeNumber: "$routeNumber"
-    }
-  }
-}
-
-function compareService(a, b) {
-  return a.routeGTFSID.localeCompare(b.routeGTFSID) || a.gtfsDirection - b.gtfsDirection
-}
-
-/**
- * Loads service data onto all stops in the database.
- * 
- * @param {DatabaseConnection} database The database connection to use
- * @param {function} [onMilestone] A function triggered for every 500 stops processed
- */
-export default async function setStopServices(database, onMilestone = () => {}) {
-  let gtfsTimetables = database.getCollection('gtfs timetables')
-  let stops = database.getCollection('stops')
-
-  let stopIDs = await stops.distinct('_id')
-
-  let total = stopIDs.length
-
-  let count = 0
-  await async.forEachLimit(stopIDs, 100, async id => {
-    let stop = await stops.findDocument({ _id: id })
-
-    await async.forEach(stop.bays, async bay => {
-      let screenServices = await gtfsTimetables.aggregate([
-        {
-          $match: {
-            mode: bay.mode,
-            stopTimings: {
-              $elemMatch: { stopGTFSID: bay.stopGTFSID, 'stopConditions.pickup': 0 }
-            }
-          }
-        },
-        AGGREGATION_GROUP
-      ]).toArray()
-
-      let services = await gtfsTimetables.aggregate([
-        {
-          $match: {
-            mode: bay.mode,
-            'stopTimings.stopGTFSID': bay.stopGTFSID
-          }
-        },
-        AGGREGATION_GROUP
-      ]).toArray()
-
-      bay.services = services.map(e => e._id).sort(compareService)
-      bay.screenServices = screenServices.map(e => e._id).sort(compareService)
-    })
-
-    await stops.updateDocument({ _id: id }, {
-      $set: {
-        bays: stop.bays
-      }
-    })
-
-    if (++count % 500 === 0) onMilestone(count, total)
-  })
-}

package/test/set-stop-services.test.mjs

@@ -1,69 +0,0 @@
-import { expect } from 'chai'
-import path from 'path'
-import url from 'url'
-import { TRANSIT_MODES } from '../lib/constants.mjs'
-import { LokiDatabaseConnection } from '@transportme/database'
-import StopsLoader from '../lib/loader/StopsLoader.mjs'
-import RouteLoader from '../lib/loader/RouteLoader.mjs'
-import TripLoader from '../lib/loader/TripLoader.mjs'
-import setStopServices from '../lib/post-processing/set-stop-services.mjs'
-import suburbs from './sample-data/suburbs.json' with { type: 'json' }
-
-const __filename = url.fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-const routesFile = path.join(__dirname, 'sample-data', 'routes', 'metro_lines.txt')
-const agencyFile = path.join(__dirname, 'sample-data', 'routes', 'agency.txt')
-
-const calendarFile = path.join(__dirname, 'sample-data', 'calendar', 'calendar.txt')
-const calendarDatesFile = path.join(__dirname, 'sample-data', 'calendar', 'calendar_dates.txt')
-
-const stopsFile = path.join(__dirname, 'sample-data', 'trips', 'stops.txt')
-const stopTimesFile = path.join(__dirname, 'sample-data', 'trips', 'stop_times.txt')
-const tripsFile = path.join(__dirname, 'sample-data', 'trips', 'trips.txt')
-
-describe('The set stop services function', () => {
-  it('Should set stop and screen services on each bay', 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
-    })
-
-    await setStopServices(database)
-
-    let alamein = await stops.findDocument({ 'bays.stopGTFSID': 'vic:rail:ALM' })
-    let alameinPlatform = alamein.bays.find(bay => bay.stopGTFSID === 'vic:rail:ALM')
-    expect(alameinPlatform).to.not.be.null
-    expect(alameinPlatform.services).to.deep.equal([{
-      routeGTFSID: "2-ALM",
-      gtfsDirection: 0,
-      routeNumber: null
-    }, {
-      routeGTFSID: "2-ALM",
-      gtfsDirection: 1,
-      routeNumber: null
-    }])
-
-    expect(alameinPlatform.screenServices, "Only trips from Alamein to Camberwell should have matched").to.deep.equal([{
-      routeGTFSID: "2-ALM",
-      gtfsDirection: 1,
-      routeNumber: null
-    }])
-  })
-})