@transportme/load-ptv-gtfs 1.3.3 → 1.3.5

package/lib/loader/StopsLoader.mjs

@@ -76,7 +76,7 @@ export default class StopsLoader {
 
   updateStopName(stop) {
     stop.cleanNames = stop.bays
-      .filter(bay => bay.stopType === STOP_TYPE[0])
+      .filter(bay => bay.stopType === STOP_TYPE[0] || bay.stopType === STOP_TYPE[1])
       .map(bay => sanitiseName(bay.fullStopName))
       .filter((e, i, a) => a.indexOf(e) === i)
 
@@ -93,17 +93,17 @@ export default class StopsLoader {
 
   updateStopSuburb(stop) {
     stop.cleanSuburbs = stop.bays
-      .filter(bay => bay.stopType === STOP_TYPE[0])
+      .filter(bay => bay.stopType === STOP_TYPE[0] || bay.stopType === STOP_TYPE[1])
       .map(bay => sanitiseName(bay.suburb))
       .filter((e, i, a) => a.indexOf(e) === i)
 
     stop.suburb = stop.bays
-      .filter(bay => bay.stopType === STOP_TYPE[0])
+      .filter(bay => bay.stopType === STOP_TYPE[0] || bay.stopType === STOP_TYPE[1])
       .map(bay => bay.suburb)
       .filter((e, i, a) => a.indexOf(e) === i)
       .sort()
 
-      stop.codedSuburbs = stop.cleanSuburbs
+    stop.codedSuburbs = stop.cleanSuburbs
   }
 
   updateStopLocation(stop) {
@@ -158,16 +158,19 @@ export default class StopsLoader {
     let stopData = this.generateDBStopData(processedData, mergeName)
     let matchingStop = await this.findMatchingStop(processedData, mergeName)
 
+    let finalStop
     if (matchingStop) {
       await this.mergeStops(matchingStop, stopData)
+      finalStop = matchingStop
     } else {
       await this.#stops.createDocument(stopData)
+      finalStop = stopData
     }
 
     if (this.#parentHolding[stop.stopGTFSID]) {
       for (let childStop of this.#parentHolding[stop.stopGTFSID]) {
-        let childStopData = this.generateDBStopData(childStop, stopData.mergeName)
-        await this.mergeStops(stopData, childStopData)
+        let childStopData = this.generateDBStopData(childStop, finalStop.mergeName)
+        await this.mergeStops(finalStop, childStopData)
       }
       delete this.#parentHolding[stop.stopGTFSID]
     }

package/package.json

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

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

@@ -27,6 +27,7 @@ const specialHeader = path.join(__dirname, 'sample-data', 'gtfs-splitting', 'spe
 const unionWithSpaces = path.join(__dirname, 'sample-data', 'gtfs-splitting', 'union_with_spaces.txt')
 
 const parentStopsFile = path.join(__dirname, 'sample-data', 'parent-stop', 'stops.txt')
+const multiParentStopFile = path.join(__dirname, 'sample-data', 'parent-stop', 'multi_stop.txt')
 
 describe('The GTFS Stops Loader', () => {
   it('Should process the stops and add them to the database', async () => {
@@ -342,4 +343,57 @@ describe('The GTFS Stops Loader', () => {
     // TODO: Find out what the Connex stop is for
     expect(stopData.cleanNames).to.deep.equal(['clifton-hill-railway-station', 'connex'])
   })
+
+  it('Should handle the parent being part of a merged stop', async () => {
+    let database = new LokiDatabaseConnection('test-db')
+    let stops = await database.createCollection('stops')
+
+    await (new StopsLoader(multiParentStopFile, suburbs, TRANSIT_MODES.regionalCoach, database)).loadStops()
+
+    expect(await stops.countDocuments({})).to.equal(1)
+    let stopData = await stops.findDocument({})
+    expect(stopData.bays.find(bay => bay.stopGTFSID === '17799').mode).to.equal('regional coach')
+    expect(stopData.bays.find(bay => bay.stopGTFSID === '17799').stopType).to.equal('stop')
+    
+    expect(stopData.bays.find(bay => bay.stopGTFSID === 'vic:rail:ART').stopType).to.equal('station')
+    expect(stopData.bays.find(bay => bay.stopGTFSID === 'vic:rail:ART').parentStopGTFSID).to.be.null
+
+    expect(stopData.bays.find(bay => bay.stopGTFSID === '20288').parentStopGTFSID).to.equal('vic:rail:ART')
+  })
+
+  it('Should use stop and station names and suburbs', async () => {
+    let database = new LokiDatabaseConnection('test-db')
+    let stops = await database.createCollection('stops')
+
+    let data = [{
+      "stop_id": "vic:rail:THL",
+      "stop_name": "Town Hall Railway Station (Melbourne)",
+      "stop_lat": "-37.815926",
+      "stop_lon": "144.967134",
+      "parent_station": "",
+      "location_type": "1",
+      "platform_code": ""
+    },
+    {
+      "stop_id": "vic:rail:TSC",
+      "stop_name": "Town Hall Railway Station (Melbourne)",
+      "stop_lat": "-37.815926",
+      "stop_lon": "144.967134",
+      "parent_station": "",
+      "location_type": "1",
+      "platform_code": ""
+    }]
+
+    let stopLoader = new StopsLoader('', suburbs, TRANSIT_MODES.metroTrain, database)
+    let reader = new GTFSStopsReader('', suburbs)
+
+    for (let stop of data) await stopLoader.loadStop(reader.processEntity(stop))
+
+    expect(await stops.countDocuments({})).to.equal(1)
+    let stopData = await stops.findDocument({})
+    expect(stopData.stopName).to.equal('Town Hall Railway Station')
+    expect(stopData.cleanNames).to.deep.equal(['town-hall-railway-station'])
+    expect(stopData.suburb).to.deep.equal(['Melbourne'])
+    expect(stopData.cleanSuburbs).to.deep.equal(['melbourne'])
+  })
 })

package/test/sample-data/parent-stop/multi_stop.txt

@@ -0,0 +1,4 @@
+stop_id,stop_name,stop_lat,stop_lon,location_type,parent_station,wheelchair_boarding,level_id
+"17799","Ararat Railway Station/High St ","-37.28243901","142.93691236","","","0",""
+"20288","Ararat Station","-37.28220485","142.93691370","","vic:rail:ART","1","Level 0"
+"vic:rail:ART","Ararat Railway Station","-37.28224082","142.93691176","1","","1",""