@transportme/load-ptv-gtfs 1.1.0 → 1.1.2

package/lib/gtfs-parser/GTFSTrip.mjs

@@ -156,13 +156,19 @@ export class MetroTrip extends GTFSTrip {
     return mode === TRANSIT_MODES.metroTrain && data.id.match(/^02-\w{3}-.*-(\w{1,2}\d{3})$/)
   }
 
+  getTrainDirection() {
+    let runID = this.getRunID()
+    return (parseInt(runID[runID.length - 1]) % 2 === 0) ? 'Up' : 'Down'
+  }
+
   getTripData() {
     let runID = this.getRunID()
 
     return {
       ...super.getTripData(),
       runID,
-      isRailReplacementBus: runID.length === 5 && runID[0] === 'B'
+      isRailReplacementBus: runID.length === 5 && runID[0] === 'B',
+      direction: this.getTrainDirection()
     }
   }
 

package/lib/loader/StopsLoader.mjs

@@ -96,7 +96,14 @@ export default class StopsLoader {
   }
 
   async mergeStops(matchingStop, stopData) {
-    matchingStop.bays.push(stopData.bays[0])
+    let newBay = stopData.bays[0]
+    let hasIdenticalBay = matchingStop.bays.some(bay =>
+      bay.mode === newBay.mode && bay.stopGTFSID === newBay.stopGTFSID
+    )
+
+    if (hasIdenticalBay) return
+
+    matchingStop.bays.push(newBay)
 
     this.updateStopSuburb(matchingStop)
     this.updateStopName(matchingStop)

package/package.json

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

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

@@ -220,4 +220,74 @@ describe('The GTFS Stops Loader', () => {
     expect(huntingdale).to.not.be.null
     expect(huntingdale.stopName).to.equal('Huntingdale Railway Station')
   })
+
+  it('Should not load duplicate stops with the same mode in', async () => {
+    let database = new LokiDatabaseConnection('test-db')
+    let stops = await database.createCollection('stops')
+
+    let loader = new StopsLoader(specialHeader, suburbs, TRANSIT_MODES.bus, database)
+    let reader = new GTFSStopsReader('')
+
+    await loader.loadStop(reader.processEntity({
+      stop_id: '51586',
+      stop_name: 'Huntingdale Station/Haughton Road (Oakleigh)',
+      stop_lat: '-37.9111998619901',
+      stop_lon: '145.103064853799'
+    }))
+
+    let huntingdale = await stops.findDocument({
+      'bays.stopGTFSID': '51586'
+    })
+    expect(huntingdale.bays.length).to.equal(1)
+    expect(huntingdale.bays[0].stopGTFSID).to.equal('51586')
+
+    await loader.loadStop(reader.processEntity({
+      stop_id: '51586',
+      stop_name: 'Huntingdale Station/Haughton Road (Oakleigh)',
+      stop_lat: '-37.9111998619901',
+      stop_lon: '145.103064853799'
+    }))
+
+    huntingdale = await stops.findDocument({
+      'bays.stopGTFSID': '51586'
+    })
+    expect(huntingdale.bays.length).to.equal(1)
+  })
+
+  it('Should load duplicate stops with the different mode in', async () => {
+    let database = new LokiDatabaseConnection('test-db')
+    let stops = await database.createCollection('stops')
+
+    let busLoader = new StopsLoader(specialHeader, suburbs, TRANSIT_MODES.bus, database)
+    let coachLoader = new StopsLoader(specialHeader, suburbs, TRANSIT_MODES.regionalCoach, database)
+    let reader = new GTFSStopsReader('')
+
+    await busLoader.loadStop(reader.processEntity({
+      stop_id: '51586',
+      stop_name: 'Huntingdale Station/Haughton Road (Oakleigh)',
+      stop_lat: '-37.9111998619901',
+      stop_lon: '145.103064853799'
+    }))
+
+    let huntingdale = await stops.findDocument({
+      'bays.stopGTFSID': '51586'
+    })
+    expect(huntingdale.bays.length).to.equal(1)
+    expect(huntingdale.bays[0].stopGTFSID).to.equal('51586')
+    expect(huntingdale.bays[0].mode).to.equal(TRANSIT_MODES.bus)
+
+    await coachLoader.loadStop(reader.processEntity({
+      stop_id: '51586',
+      stop_name: 'Huntingdale Station/Haughton Road (Oakleigh)',
+      stop_lat: '-37.9111998619901',
+      stop_lon: '145.103064853799'
+    }))
+
+    huntingdale = await stops.findDocument({
+      'bays.stopGTFSID': '51586'
+    })
+    expect(huntingdale.bays.length).to.equal(2)
+    expect(huntingdale.bays[1].stopGTFSID).to.equal('51586')
+    expect(huntingdale.bays[1].mode).to.equal(TRANSIT_MODES.regionalCoach)
+  })
 })

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

@@ -107,6 +107,7 @@ describe('The GTFS Loaders with the new Metro data', () => {
       expect(trip.routeGTFSID).to.equal('2-PKM')
       expect(trip.block).to.equal('3347')
       expect(trip.isRailReplacementBus).to.be.false
+      expect(trip.direction).to.equal('Up')
 
       expect(trip.stopTimings[0].stopName).to.equal('East Pakenham Railway Station')
       expect(trip.stopTimings[0].platform).to.equal('1')
@@ -119,13 +120,14 @@ describe('The GTFS Loaders with the new Metro data', () => {
 
       let nextTrip = await trips.findDocument({ block: '3347', runID: { $ne: 'C000' } })
       expect(nextTrip.runID).to.equal('C005')
+      expect(nextTrip.direction).to.equal('Down')
       expect(trip.isRailReplacementBus).to.be.false
       
       expect(nextTrip.stopTimings[0].stopName).to.equal('Flinders Street Railway Station')
       expect(nextTrip.stopTimings[0].platform).to.equal('7')
     })
 
-    it('It identify rail replacement bus trip', async () => {
+    it('It identify a rail replacement bus trip and mark it as such', async () => {
       let database = new LokiDatabaseConnection('test-db')
       let stops = await database.createCollection('stops')
       let routes = await database.createCollection('routes')
@@ -154,6 +156,7 @@ describe('The GTFS Loaders with the new Metro data', () => {
       expect(trip.routeGTFSID).to.equal('2-LIL')
       expect(trip.block).to.equal(null)
       expect(trip.isRailReplacementBus).to.be.true
+      expect(trip.direction).to.equal('Up')
 
       expect(trip.stopTimings[0].stopName).to.equal('Burnley Railway Station')
       expect(trip.stopTimings[0].platform).to.equal('RRB')