@transportme/load-ptv-gtfs 1.2.0 → 1.2.2

package/lib/gtfs-parser/GTFSAgency.mjs

@@ -5,6 +5,8 @@ export default class GTFSAgency {
   website
   phone
 
+  static UNKNOWN_AGENCY = new GTFSAgency({ id: '-1', name: 'Unknown', website: '', phone: '' })
+
   constructor({ id, name, website, phone }) {
     this.id = id
     this.name = name

package/lib/gtfs-parser/GTFSStopTime.mjs

@@ -1,4 +1,4 @@
-import { hhmmToMinutesPastMidnight } from '../utils.mjs'
+import { hhmmToMinutesPastMidnight, minutesPastMidnightToHHMMWrap } from '../utils.mjs'
 
 export class GTFSStopTime {
  
@@ -14,11 +14,11 @@ export class GTFSStopTime {
   distanceTravelled
   
   constructor({ arrivalTime, departureTime, stopID, stopSequence, pickup, dropoff, distance }) {
-    this.arrivalTime = arrivalTime.slice(0, 5)
-    this.departureTime = departureTime.slice(0, 5)
+    this.arrivalTimeMinutes = hhmmToMinutesPastMidnight(arrivalTime)
+    this.departureTimeMinutes = hhmmToMinutesPastMidnight(departureTime)
 
-    this.arrivalTimeMinutes = hhmmToMinutesPastMidnight(this.arrivalTime)
-    this.departureTimeMinutes = hhmmToMinutesPastMidnight(this.departureTime)
+    this.arrivalTime = minutesPastMidnightToHHMMWrap(this.arrivalTimeMinutes)
+    this.departureTime = minutesPastMidnightToHHMMWrap(this.departureTimeMinutes)
 
     this.stopID = stopID
     this.stopSequence = stopSequence

package/lib/loader/RouteLoader.mjs

@@ -2,6 +2,7 @@ import GTFSRouteReader from '../gtfs-parser/readers/GTFSRouteReader.mjs'
 import GTFSAgencyReader from '../gtfs-parser/readers/GTFSAgencyReader.mjs'
 import { STOP_UTILS } from '@transportme/transportvic-utils'
 import GTFSRoute from '../gtfs-parser/GTFSRoute.mjs'
+import GTFSAgency from '../gtfs-parser/GTFSAgency.mjs'
 
 const { sanitiseName } = STOP_UTILS
 
@@ -109,7 +110,9 @@ export default class RouteLoader {
   }
 
   getOperator(id) {
-    return this.#operators[id]
+    let operator = this.#operators[id]
+    if (operator) return operator
+    return GTFSAgency.UNKNOWN_AGENCY
   }
 
   getRouteIDMap() {

package/lib/loader/TripLoader.mjs

@@ -4,6 +4,7 @@ import GTFSStopTimesReader from '../gtfs-parser/readers/GTFSStopTimesReader.mjs'
 import GTFSTripReader from '../gtfs-parser/readers/GTFSTripReader.mjs'
 import async from 'async'
 import { GTFSStopTime } from '../gtfs-parser/GTFSStopTime.mjs'
+import { minutesPastMidnightToHHMM } from '../utils.mjs'
 
 export default class TripLoader {
 
@@ -133,14 +134,14 @@ export default class TripLoader {
     }
 
     dbTrip.origin = stopTimings[0].stopName
-    dbTrip.departureTime = stopTimings[0].departureTime
+    dbTrip.departureTime = minutesPastMidnightToHHMM(stopTimings[0].departureTimeMinutes)
     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 = lastStop.arrivalTime
+    dbTrip.destinationArrivalTime = minutesPastMidnightToHHMM(lastStop.arrivalTimeMinutes)
     lastStop.departureTime = null
     lastStop.departureTimeMinutes = null
     lastStop.stopConditions.pickup = 1

package/lib/utils.mjs

@@ -10,7 +10,18 @@ export function toGTFSDate(date) {
   return date.toFormat('yyyyMMdd')
 }
 
+export function minutesPastMidnightToHHMM(time) {
+  let hours = Math.floor(time / 60)
+  let min = time % 60
+  
+  return `${hours < 10 ? '0' : ''}${hours}:${min < 10 ? '0' : ''}${min}`
+}
+
+export function minutesPastMidnightToHHMMWrap(time) {
+  return minutesPastMidnightToHHMM(time % 1440)
+}
+
 export function hhmmToMinutesPastMidnight(date) {
-  let [ hours, minutes ] = date.split(':')
+  let [ hours, minutes, seconds ] = date.split(':')
   return parseInt(minutes) + parseInt(hours) * 60
 }

package/package.json

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

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

@@ -7,6 +7,7 @@ import { TRANSIT_MODES } from '../lib/constants.mjs'
 import path from 'path'
 import url from 'url'
 import { expect } from 'chai'
+import GTFSAgency from '../lib/gtfs-parser/GTFSAgency.mjs'
 
 const __filename = url.fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -18,6 +19,8 @@ const agencyFile = path.join(__dirname, 'sample-data', 'routes', 'agency.txt')
 const wgtFile = path.join(__dirname, 'sample-data', 'routes', 'west_gipp_transit.txt')
 const vlineFile = path.join(__dirname, 'sample-data', 'routes', 'vline.txt')
 
+const badRoutesFile_NoAgency = path.join(__dirname, 'sample-data', 'routes', 'bad_routes.txt')
+
 describe('The GTFS Agency Reader', () => {
   it('Should read the agencies one line at a time', async () => {
     let reader = new GTFSAgencyReader(agencyFile)
@@ -187,4 +190,19 @@ describe('The GTFS Routes Loader', () => {
     expect(traralgon.routeName).to.equal('Traralgon - Melbourne Via Pakenham, Moe & Morwell')
     expect(traralgon.operators).to.have.members(['V/Line'])
   })
+
+  it('Should handle invalid agency references', async () => {
+    let database = new LokiDatabaseConnection('test-db')
+    let routes = await database.createCollection('routes')
+
+    let loader = new RouteLoader(badRoutesFile_NoAgency, agencyFile, TRANSIT_MODES.bus, database)
+    await loader.loadRoutes()
+
+    let skybus = await routes.findDocument({
+      routeGTFSID: '11-SKY'
+    })
+
+    expect(skybus).to.not.be.null
+    expect(skybus.operators).to.deep.equal([GTFSAgency.UNKNOWN_AGENCY.name]) 
+  })
 })

package/test/new-metro-loader-test.test.mjs

@@ -164,5 +164,38 @@ describe('The GTFS Loaders with the new Metro data', () => {
       expect(trip.stopTimings[3].stopName).to.equal('Parliament Railway Station')
       expect(trip.stopTimings[3].platform).to.equal('RRB')
     })
+
+    it('Should wrap times past midnight back to 00:00 NEXT DAY in the trip times', 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 trip = await trips.findDocument({ runID: 'C999' })
+
+      expect(trip).to.not.be.null
+      expect(trip.departureTime).to.equal('23:59')
+      expect(trip.destinationArrivalTime).to.equal('24:10')
+
+      expect(trip.stopTimings[0].departureTime).to.equal('23:59')
+      expect(trip.stopTimings[1].departureTime).to.equal('00:05')
+      expect(trip.stopTimings[1].arrivalTime).to.equal('00:05')
+      expect(trip.stopTimings[2].arrivalTime).to.equal('00:10')
+    })
   })
 })

package/test/sample-data/new-metro/stop_times.txt

@@ -58,4 +58,7 @@ trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_t
 "02-PKM--12-T5-C005","06:37:00","06:37:00","12175","25","","0","0","50023.30"
 "02-PKM--12-T5-C005","06:40:00","06:40:00","26502","26","","0","0","52360.00"
 "02-PKM--12-T5-C005","06:46:00","06:46:00","12173","27","","0","0","56761.80"
-"02-PKM--12-T5-C005","06:49:00","06:49:00","26507","28","","0","0","58561.26"
+"02-PKM--12-T5-C005","06:49:00","06:49:00","26507","28","","0","0","58561.26"
+"02-PKM--12-T5-C999","23:59:00","23:59:00","11218","1","","0","0","0.00"
+"02-PKM--12-T5-C999","24:05:00","24:05:00","12258","2","","0","0","2223.76"
+"02-PKM--12-T5-C999","24:10:00","24:10:00","26507","28","","0","0","58561.26"

package/test/sample-data/new-metro/trips.txt

@@ -1,5 +1,6 @@
 route_id,service_id,trip_id,shape_id,trip_headsign,direction_id,block_id
 "aus:vic:vic-02-PKM:","T5","02-PKM--12-T5-C000","2-PKM-vpt-12.20.R","Flinders Street via City Loop","1","3347"
 "aus:vic:vic-02-PKM:","T5","02-PKM--12-T5-C005","2-PKM-vpt-12.17.H","East Pakenham","0","3347"
+"aus:vic:vic-02-PKM:","T5","02-PKM--12-T5-C999","2-PKM-vpt-12.17.H","East Pakenham","0","3347"
 "aus:vic:vic-02-LIL:","T5+w3","02-LIL--13-T5_w3-BL000","2-LIL-vpt-13.133.R","Parliament","1",""
 "aus:vic:vic-02-LIL:","T5+w3","02-LIL--13-T5_w3-BL001","2-LIL-vpt-13.134.H","Burnley","0",""

package/test/sample-data/routes/bad_routes.txt

@@ -0,0 +1,4 @@
+route_id,agency_id,route_short_name,route_long_name,route_type,route_color,route_text_color
+"11-SK4-mjp-1","","","Frankston - Melbourne Airport","3","ED1C24","FFFFFF"
+"11-Ska-mjp-1","","","Melbourne City - Avalon Airport","3","ED1C24","FFFFFF"
+"11-SKY-mjp-1","","","City - Melbourne Airport","3","ED1C24","FFFFFF"