@transportme/load-ptv-gtfs 1.3.2 → 1.3.4

package/lib/gtfs-parser/GTFSTrip.mjs

@@ -48,7 +48,7 @@ export default class GTFSTrip {
    * @returns {GTFSTrip} A trip instance representing the data being passed in
    */
   static create(data, mode) {
-    let types = [ SmartrakTrip, MetroRRBTrip, MetroTrip, GTFSTrip ]
+    let types = [ SmartrakTrip, MetroTrip, GTFSTrip ]
     for (let type of types) {
       if (type.canProcess(data, mode)) return new type(data)
     }
@@ -148,12 +148,12 @@ export class MetroTrip extends GTFSTrip {
   constructor(data) {
     super(data)
 
-    let runID = data.id.match(/^02-\w{3}-.*-(\w{1,2}\d{3})$/)
+    let runID = data.id.match(/^02-\w{3}-.*-(\w{1,2}\d{2,3})$/)
     this.#runID = runID[1]
   }
 
   static canProcess(data, mode) {
-    return mode === TRANSIT_MODES.metroTrain && data.id.match(/^02-\w{3}-.*-(\w{1,2}\d{3})$/)
+    return mode === TRANSIT_MODES.metroTrain && data.id.match(/^02-\w{3}-.*-(\w{1,2}\d{2,3})$/)
   }
 
   getTrainDirection() {
@@ -163,11 +163,12 @@ export class MetroTrip extends GTFSTrip {
 
   getTripData() {
     let runID = this.getRunID()
+    let tripID = this.getTripID()
 
     return {
       ...super.getTripData(),
       runID,
-      isRailReplacementBus: runID.length === 5 && runID[0] === 'B',
+      isRailReplacementBus: (runID.length === 5 && runID[0] === 'B') || !!tripID.match(/^02-\w{3}-R-/),
       direction: this.getTrainDirection()
     }
   }

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) {

package/package.json

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

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

@@ -342,4 +342,40 @@ 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 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/gtfs-trips.test.mjs

@@ -11,21 +11,20 @@ const __dirname = path.dirname(__filename)
 
 const tripsFile = path.join(__dirname, 'sample-data', 'trips', 'trips.txt')
 const busTripsFile = path.join(__dirname, 'sample-data', 'trips', 'bus_trips.txt')
+const calendar = new GTFSCalendar({
+  id: 'T1',
+  startDay: '20241122',
+  endDay: '20241129',
+  daysOfWeek: ["0","0","0","0","1","1","0"]
+})
 
 describe('The GTFSTrip class', () => {
   it('Should process the skeleton trip data and populate the operation days', () => {
-    let calendar = new GTFSCalendar({
-      id: 'T1',
-      startDay: '20241122',
-      endDay: '20241129',
-      daysOfWeek: ["0","0","0","0","1","1","0"]
-    })
-
     // route_id,service_id,trip_id,shape_id,trip_headsign,direction_id,block_id
     // "6-452-mjp-1","T0_16","1.T0.6-452-mjp-1.1.H","6-452-mjp-1.1.H","Eynesbury","0",""
     let trip = new GTFSTrip({
       routeGTFSID: '6-452',
-      calendar: calendar,
+      calendar,
       id: '1.T0.6-452-mjp-1.1.H',
       shapeID: '6-452-mjp-1.1.H',
       headsign: 'Eynesbury',

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

@@ -7,6 +7,8 @@ import { expect } from 'chai'
 import suburbs from './sample-data/suburbs.json' with { type: 'json' }
 import RouteLoader from '../lib/loader/RouteLoader.mjs'
 import TripLoader from '../lib/loader/TripLoader.mjs'
+import GTFSCalendar from '../lib/gtfs-parser/GTFSCalendar.mjs'
+import { MetroTrip } from '../lib/gtfs-parser/GTFSTrip.mjs'
 
 const __filename = url.fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -198,4 +200,45 @@ describe('The GTFS Loaders with the new Metro data', () => {
       expect(trip.stopTimings[2].arrivalTime).to.equal('00:10')
     })
   })
+
+  describe('The MetroTrip subclass', () => {
+    it('Should detect rail buses', () => {
+      let calendar = new GTFSCalendar({
+        id: 'T1',
+        startDay: '20241122',
+        endDay: '20241129',
+        daysOfWeek: ["0","0","0","0","1","1","0"]
+      })
+
+      expect(new MetroTrip({
+        routeGTFSID: '2-PKM',
+        calendar,
+        id: '02-PKM--54-T6-C962',
+        shapeID: '2-PKM-vpt-54.70.R',
+        headsign: 'South Yarra',
+        direction: '0',
+        block: ''
+      }).getTripData().isRailReplacementBus).to.be.false
+
+      expect(new MetroTrip({
+        routeGTFSID: '2-PKM',
+        calendar,
+        id: '02-PKM-R-6-T5_bp-BF400',
+        shapeID: '2-PKM-R-vpt-6.7.R',
+        headsign: 'South Yarra',
+        direction: '0',
+        block: ''
+      }).getTripData().isRailReplacementBus).to.be.true
+
+      expect(new MetroTrip({
+        routeGTFSID: '2-PKM',
+        calendar,
+        id: '02-PKM-R-6-T5_bp-BF22',
+        shapeID: '2-PKM-R-vpt-6.7.R',
+        headsign: 'South Yarra',
+        direction: '0',
+        block: ''
+      }).getTripData().isRailReplacementBus).to.be.true
+    })
+  })
 })