@transportme/load-ptv-gtfs 1.4.23 → 1.4.25

package/lib/loader/TripLoader.mjs

@@ -163,15 +163,15 @@ export default class TripLoader {
 
     dbTrip.origin = stopTimings[0].stopName
     dbTrip.departureTime = minutesPastMidnightToHHMM(stopTimings[0].departureTimeMinutes)
-    stopTimings[0].arrivalTime = null
-    stopTimings[0].arrivalTimeMinutes = null
+    // stopTimings[0].arrivalTime = null
+    // stopTimings[0].arrivalTimeMinutes = null
     stopTimings[0].stopConditions.dropoff = 1
-    
+
     let lastStop = stopTimings[stopTimings.length - 1]
     dbTrip.destination = lastStop.stopName
     dbTrip.destinationArrivalTime = minutesPastMidnightToHHMM(lastStop.arrivalTimeMinutes)
-    lastStop.departureTime = null
-    lastStop.departureTimeMinutes = null
+    // lastStop.departureTime = null
+    // lastStop.departureTimeMinutes = null
     lastStop.stopConditions.pickup = 1
 
     return dbTrip

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

@@ -20,87 +20,89 @@ export default async function setRouteStops(database, directionsMap, onMilestone
   } = {}) {
   let gtfsTimetables = database.getCollection(timetableColl)
   let routes = database.getCollection(routeColl)
-
-  let allRoutes = await routes.distinct('routeGTFSID')
+  
+  let totalRouteCount = await routes.countDocuments({})
+  let total = totalRouteCount
+  let count = 0
 
   let stopsByService = {}
 
-  let count = 0
-  let total = allRoutes.length
-
-  await async.forEachLimit(allRoutes, 100, async routeGTFSID => {
-    let routeData = await routes.findDocument({ routeGTFSID })
-    let routeVariants = routeData.routePath.map(variant => ({ shapeID: variant.fullGTFSIDs[0], routeGTFSID }))
-    let routeDirections = [[], []]
-
-    for (let variant of routeVariants) {
-      let timetable = await gtfsTimetables.findDocument(variant)
-      if (!timetable) {
-        console.log('No timetable match for shapeID', variant)
-        continue
-      }
+  for (let mode of Object.values(TRANSIT_MODES)) {
+    let allRoutes = await routes.distinct('routeGTFSID', { mode })
 
-      routeDirections[timetable.gtfsDirection].push(timetable.stopTimings.map(stop => ({
-        stopName: stop.stopName,
-        stopNumber: stop.stopNumber,
-        suburb: stop.suburb,
-        stopGTFSID: stop.stopGTFSID
-      })))
-    }
-
-    for (let gtfsDirection = 0; gtfsDirection < routeDirections.length; gtfsDirection++) {
-      let routeDirection = routeDirections[gtfsDirection]
-      if (!routeDirection.length) continue
-
-      let directionStops = merge(routeDirection, (a, b) => a.stopName === b.stopName)
-      let mostCommonDestinations = (await gtfsTimetables.aggregate([
-        { $match: { routeGTFSID, gtfsDirection } },
-        { $sortByCount: '$destination' }
-      ]).toArray()).map(e => e._id)
-
-      let lastStop = directionStops[directionStops.length - 1]
-      let lastStopName = lastStop.stopName
-
-      let directionName = lastStopName
-      if (directionName.includes('School') || directionName.includes('College')) {
-        directionName = mostCommonDestinations[0]
-      }
+    await async.forEachLimit(allRoutes, 30, async routeGTFSID => {
+      let routeData = await routes.findDocument({ routeGTFSID }, { 'routePath.path': 0 })
+      let routeVariants = routeData.routePath.map(variant => ({ shapeID: variant.fullGTFSIDs[0], routeGTFSID }))
+      let routeDirections = [[], []]
+
+      for (let variant of routeVariants) {
+        let timetable = await gtfsTimetables.findDocument(variant, { gtfsDirection: 1, stopTimings: 1 })
+        if (!timetable) {
+          console.log('No timetable match for shapeID', variant)
+          continue
+        }
 
-      if (!stopsByService[routeGTFSID]) stopsByService[routeGTFSID] = []
-      stopsByService[routeGTFSID][gtfsDirection] = {
-        directionName,
-        gtfsDirection,
-        stops: directionStops
+        routeDirections[timetable.gtfsDirection].push(timetable.stopTimings.map(stop => ({
+          stopName: stop.stopName,
+          stopNumber: stop.stopNumber,
+          suburb: stop.suburb,
+          stopGTFSID: stop.stopGTFSID
+        })))
       }
 
-      if (routeData.mode === TRANSIT_MODES.metroTrain) {
-        let currentDir = stopsByService[routeGTFSID][gtfsDirection].directionName
-        let isUp = currentDir.includes('Flinders Street') || currentDir.includes('Town Hall')
-
-        let directionName = stopsByService[routeGTFSID][gtfsDirection].directionName
-
-        if (routeData.routeName === 'Stony Point') {
-          isUp = currentDir.includes('Frankston')
-          directionName = directionName.slice(0, -16)
-        } else if (routeData.routeName === 'City Circle') {
-          isUp = false
-          let directionStops = stopsByService[routeGTFSID][gtfsDirection]
-          let isClockwise = directionStops.stops[1].stopName === 'Southern Cross Railway Station'
-          directionName = `City Circle (${isClockwise ? 'Clockwise' : 'Anti-Clockwise'})`
-        } else {
-          directionName = isUp ? 'City' :  routeData.routeName
+      for (let gtfsDirection = 0; gtfsDirection < routeDirections.length; gtfsDirection++) {
+        let routeDirection = routeDirections[gtfsDirection]
+        if (!routeDirection.length) continue
+
+        let directionStops = merge(routeDirection, (a, b) => a.stopName === b.stopName)
+        let mostCommonDestinations = (await gtfsTimetables.aggregate([
+          { $match: { routeGTFSID, gtfsDirection } },
+          { $sortByCount: '$destination' }
+        ]).toArray()).map(e => e._id)
+
+        let lastStop = directionStops[directionStops.length - 1]
+        let lastStopName = lastStop.stopName
+
+        let directionName = lastStopName
+        if (directionName.includes('School') || directionName.includes('College')) {
+          directionName = mostCommonDestinations[0]
+        }
+
+        if (!stopsByService[routeGTFSID]) stopsByService[routeGTFSID] = []
+        stopsByService[routeGTFSID][gtfsDirection] = {
+          directionName,
+          gtfsDirection,
+          stops: directionStops
         }
 
-        stopsByService[routeGTFSID][gtfsDirection].directionName = directionName
-        stopsByService[routeGTFSID][gtfsDirection].trainDirection = isUp ? 'Up' : 'Down'
+        if (routeData.mode === TRANSIT_MODES.metroTrain) {
+          let currentDir = stopsByService[routeGTFSID][gtfsDirection].directionName
+          let isUp = currentDir.includes('Flinders Street') || currentDir.includes('Town Hall')
+
+          let directionName = stopsByService[routeGTFSID][gtfsDirection].directionName
+
+          if (routeData.routeName === 'Stony Point') {
+            isUp = currentDir.includes('Frankston')
+            directionName = directionName.slice(0, -16)
+          } else if (routeData.routeName === 'City Circle') {
+            isUp = false
+            let directionStops = stopsByService[routeGTFSID][gtfsDirection]
+            let isClockwise = directionStops.stops[1].stopName === 'Southern Cross Railway Station'
+            directionName = `City Circle (${isClockwise ? 'Clockwise' : 'Anti-Clockwise'})`
+          } else {
+            directionName = isUp ? 'City' :  routeData.routeName
+          }
+
+          stopsByService[routeGTFSID][gtfsDirection].directionName = directionName
+          stopsByService[routeGTFSID][gtfsDirection].trainDirection = isUp ? 'Up' : 'Down'
+        }
       }
-    }
 
-    if (++count % 25 === 0) onMilestone(count, total)
-  })
+      if (++count % 25 === 0) onMilestone(count, total)
+    })
+  }
 
   let bulkOperations = []
-  
   Object.keys(stopsByService).forEach(routeGTFSID => {
     bulkOperations.push({
       updateOne: {

package/package.json

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