@transportme/load-ptv-gtfs 1.2.4 → 1.2.6

package/lib/gtfs-parser/GTFSStop.mjs

@@ -18,7 +18,7 @@ export class GTFSStop {
 
   constructor({ stopGTFSID, stopName, stopLat, stopLon }, suburbs) {
     this.stopGTFSID = stopGTFSID
-    this.originalName = stopName
+    this.originalName = stopName.replace(/ \(\w+\.\.\. #/, ' #').replace(/  +/g, ' ').trim()
     this.location = {
       type: 'Point',
       coordinates: [parseFloat(stopLon), parseFloat(stopLat)]
@@ -144,7 +144,7 @@ export class GTFSStop {
       }
     }
 
-    return { stopNumber: null, stopName: stopName }
+    return { stopNumber: null, stopName }
   }
 
   #setStopNumber() {

package/package.json

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

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

@@ -318,6 +318,6 @@ describe('The GTFS Stops Loader', () => {
     await (new StopsLoader(unionWithSpaces, suburbs, TRANSIT_MODES.bus, database)).loadStops()
 
     expect(await stops.countDocuments({})).to.equal(1)
-    expect((await stops.findDocument({ 'bays.stopGTFSID': '26535' })).bays.length).to.equal(4) // Piangil
+    expect((await stops.findDocument({ 'bays.stopGTFSID': '26535' })).bays.length).to.equal(4) // Union Station
   })
 })

package/test/newer-tram-format.test.mjs

@@ -31,5 +31,37 @@ describe('The GTFS Loaders with the new Tram data', () => {
       expect(stop).to.not.be.null
       expect(stop.bays[0].stopNumber).to.equal('45')
     })
+
+    it('Should clean up extra spaces', async () => {
+      let database = new LokiDatabaseConnection('test-db')
+      let stops = await database.createCollection('stops')
+
+      let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.tram, database)
+      await loader.loadStops()
+
+      let stop = await stops.findDocument({
+        'stopName': 'Glen Huntly Railway Station/Glen Huntly Road'
+      })
+
+      expect(stop).to.not.be.null
+      expect(stop.bays[0].stopNumber).to.equal('61')
+      expect(stop.bays[0].originalName).to.equal('Glen Huntly Railway Station/Glen Huntly Rd #61')
+    })
+
+    it('Should remove half suburbs in the name', async () => {
+      let database = new LokiDatabaseConnection('test-db')
+      let stops = await database.createCollection('stops')
+
+      let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.tram, database)
+      await loader.loadStops()
+
+      let stop = await stops.findDocument({
+        'stopName': 'Royal Melbourne Hospital-Parkville Railway Station/Royal Parade'
+      })
+
+      expect(stop).to.not.be.null
+      expect(stop.bays[0].stopNumber).to.equal('10')
+      expect(stop.bays[0].originalName).to.equal('Royal Melbourne Hospital-Parkville Station/Royal Pde #10')
+    })
   })
 })

package/test/sample-data/new-tram-2/stops.txt

@@ -2,4 +2,7 @@ stop_id,stop_name,stop_lat,stop_lon
 "10311","Glenferrie Rd/Wattletree Rd #45","-37.86245520","145.02850849"
 "10371","Duncraig Ave/Wattletree Rd #44","-37.86206934","145.02538150"
 "1083","Clyde St/Raleigh Rd #42","-37.76969864","144.89884126"
-"11285","Egerton Rd/Wattletree Rd #43","-37.86170982","145.02275399"
+"11285","Egerton Rd/Wattletree Rd #43","-37.86170982","145.02275399"
+"18404","Glen Huntly Railway Station/Glen Huntly Rd  #61","-37.88954800","145.04275047","","","0","Level 0
+"17867","Royal Melbourne Hospital-Parkville Station/Royal Pde (Melbo... #10","-37.79992871","144.95750800","","","0","Level 0"
+"17868","Royal Melbourne Hospital-Parkville Station/Royal Pde (Parkv... #10","-37.79954277","144.95759813","","","0","Level 0"