@transportme/load-ptv-gtfs 1.1.4 → 1.1.6

package/lib/loader/StopsLoader.mjs

@@ -95,6 +95,10 @@ export default class StopsLoader {
       stop.codedSuburbs = stop.cleanSuburbs
   }
 
+  updateStopLocation(stop) {
+    stop.location.coordinates = stop.bays.map(bay => bay.location.coordinates)
+  }
+
   async mergeStops(matchingStop, stopData) {
     let newBay = stopData.bays[0]
     let hasIdenticalBay = matchingStop.bays.some(bay =>
@@ -107,6 +111,7 @@ export default class StopsLoader {
 
     this.updateStopSuburb(matchingStop)
     this.updateStopName(matchingStop)
+    this.updateStopLocation(matchingStop)
 
     await this.#stops.replaceDocument({
       _id: matchingStop._id

package/package.json

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

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

@@ -15,6 +15,8 @@ const __dirname = path.dirname(__filename)
 
 const stopsFile = path.join(__dirname, 'sample-data', 'gtfs-splitting', 'sample_stops.txt')
 
+const generalStores = path.join(__dirname, 'sample-data', 'gtfs-splitting', 'general-stores.txt')
+
 const uniqueStopsBus = path.join(__dirname, 'sample-data', 'gtfs-splitting', 'force_unique_stops_bus.txt')
 const uniqueStopsTram = path.join(__dirname, 'sample-data', 'gtfs-splitting', 'force_unique_stops_tram.txt')
 
@@ -61,6 +63,11 @@ describe('The GTFS Stops Loader', () => {
     expect(wavWarrigal).to.not.be.null
     expect(wavWarrigal.stopName).to.equal('Waverley Road/Warrigal Road')
     expect(wavWarrigal.bays.length).to.equal(2)
+
+    expect(wavWarrigal.location.coordinates).to.deep.equal([
+      [145.091009789504, -37.879427459666],
+      [145.090653754117, -37.8795658733597]
+    ])
   })
 
   it('Should merge non street stops, and keep the secondary stop name if they are the same', async () => {
@@ -290,4 +297,15 @@ describe('The GTFS Stops Loader', () => {
     expect(huntingdale.bays[1].stopGTFSID).to.equal('51586')
     expect(huntingdale.bays[1].mode).to.equal(TRANSIT_MODES.regionalCoach)
   })
+
+  it('Should not merge stops with the same name that are located far away from one another', async () => {
+    let database = new LokiDatabaseConnection('test-db')
+    let stops = await database.createCollection('stops')
+
+    await (new StopsLoader(generalStores, suburbs, TRANSIT_MODES.bus, database)).loadStops()
+
+    expect((await stops.findDocument({ 'bays.stopGTFSID': '17124' })).bays.length).to.equal(2) // Piangil
+    expect((await stops.findDocument({ 'bays.stopGTFSID': '17977' })).bays.length).to.equal(2) // Tempy
+    expect((await stops.findDocument({ 'bays.stopGTFSID': '43916' })).bays.length).to.equal(1) // Coronet Bay
+  })
 })

package/test/sample-data/gtfs-splitting/general-stores.txt

@@ -0,0 +1,19 @@
+stop_id,stop_name,stop_lat,stop_lon
+"15117","General Store/Murray Valley Hwy (Torrumbarry)","-36.0289328143973","144.516565858212"
+"17124","General Store/Murray St (Piangil)","-35.0542205869387","143.310581971833"
+"17125","General Store/Murray St (Piangil)","-35.0538456443862","143.310697481574"
+"17729","General Store/Macs St (Peterborough)","-38.6070683334915","142.87719698365"
+"17730","General Store/Macs St (Peterborough)","-38.6070003726619","142.877568193123"
+"17977","General Store/Sunraysia Hwy (Tempy)","-35.3453146606652","142.424802508117"
+"17978","General Store/Sunraysia Hwy (Tempy)","-35.344983598941","142.424623331801"
+"36974","General Store/Monash Ave (Nyah West)","-35.1852359469295","143.345799631341"
+"37899","General Store/Princes Hwy (Johnsonville)","-37.8200787799472","147.831089593645"
+"37901","General Store/Princes Hwy (Swan Reach)","-37.8219848899712","147.856891682107"
+"37902","General Store/Princes Hwy (Swan Reach)","-37.822175385113","147.85672345214"
+"37921","General Store/Main St (Bruthen)","-37.7082084114992","147.832470628437"
+"37987","General Store/Phillip Island Rd (Surf Beach)","-38.5078845836624","145.29112542319"
+"38000","General Store/Phillip Island Rd (Surf Beach)","-38.5077808366616","145.291426050202"
+"42284","General Store/Ararat - St Arnaud Rd (Navarre)","-36.8998475986824","143.113535821369"
+"43916","General Store/Champ Elysees Esp (Coronet Bay)","-38.4376225731191","145.436193608845"
+"44217","General Store/Great Ocean Rd (Nullawarre)","-38.469533626788","142.749879594372"
+"47879","General Store/Ararat-St Arnaud Rd (Navarre)","-36.8998967921621","143.113387501491"