@transportme/load-ptv-gtfs 1.1.1 → 1.1.3

package/index.mjs

@@ -15,6 +15,15 @@ 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'
+import GTFSCalendarReader from './lib/gtfs-parser/readers/GTFSCalendarReader.mjs'
+import GTFSRouteReader from './lib/gtfs-parser/readers/GTFSRouteReader.mjs'
+import GTFSShapeReader from './lib/gtfs-parser/readers/GTFSShapeReader.mjs'
+import GTFSStopsReader from './lib/gtfs-parser/readers/GTFSStopsReader.mjs'
+import GTFSStopTimesReader from './lib/gtfs-parser/readers/GTFSStopTimesReader.mjs'
+import GTFSTripReader from './lib/gtfs-parser/readers/GTFSTripReader.mjs'
+
 const GTFSTypes = {
   GTFSAgency, GTFSCalendar, GTFSCalendarDate,
   GTFSRoute, GTFSShape, GTFSShapePoint,
@@ -22,9 +31,15 @@ const GTFSTypes = {
   GTFSStopTime, GTFSTrip
 }
 
+const GTFSReaders = {
+  GTFSAgencyReader, GTFSCalendarDateReader, GTFSCalendarReader,
+  GTFSRouteReader, GTFSShapeReader, GTFSStopsReader, 
+  GTFSStopTimesReader, GTFSTripReader
+}
+
 export {
   RouteLoader, ShapeLoader,
   StopsLoader, TripLoader,
-  GTFSTypes,
+  GTFSTypes, GTFSReaders,
   setRouteStops, setStopServices
 }

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.1",
+  "version": "1.1.3",
   "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)
+  })
 })