@transportme/load-ptv-gtfs 1.2.2 → 1.2.3

package/lib/gtfs-parser/GTFSRoute.mjs

@@ -57,7 +57,7 @@ export default class GTFSRoute {
    */
   static create(data, mode) {
     let { routeGTFSID } = data
-    let routeTypes = [ MetroGTFSRoute, NewGTFSRoute, SmartrakGTFSRoute, GTFSRoute ]
+    let routeTypes = [ RailGTFSRoute, NewGTFSRoute, SmartrakGTFSRoute, GTFSRoute ]
     for (let type of routeTypes) {
       if (type.canProcess(routeGTFSID, mode)) return new type(data)
     }
@@ -105,20 +105,20 @@ class NewGTFSRoute extends GTFSRoute {
 }
 
 /**
- * Used to represent a Metro train route on the new data
+ * Used to represent a Metro train route on the new data. Suspect it works on V/Line routes as well
  *
  * Used for a technicality where the route name (eg Pakenham) is stored in the route number instead.
  */
-class MetroGTFSRoute extends NewGTFSRoute {
+class RailGTFSRoute extends NewGTFSRoute {
 
   constructor(data) {
     super(data)
-    this.routeName = this.routeNumber
+    this.routeName = this.routeNumber.replace(' Bus Replacement', '')
     this.routeNumber = null
   }
 
   static canProcess(routeGTFSID, mode) {
-    return super.canProcess(routeGTFSID, mode) && mode === TRANSIT_MODES.metroTrain
+    return super.canProcess(routeGTFSID, mode) && (mode === TRANSIT_MODES.metroTrain || mode === TRANSIT_MODES.regionalTrain)
   }
 
-}
+}

package/lib/gtfs-parser/GTFSStop.mjs

@@ -136,6 +136,14 @@ export class GTFSStop {
       }
     }
 
+    if (stopNumberParts = stopName.match(/^(.*) #(D?\d*[A-Za-z]?)$/)) {
+      // Stops in the form ABC Road #123
+      return {
+        stopNumber: stopNumberParts[2].toUpperCase(),
+        stopName: stopNumberParts[1]
+      }
+    }
+
     return { stopNumber: null, stopName: stopName }
   }
 

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, MetroTrip, GTFSTrip ]
+    let types = [ SmartrakTrip, MetroRRBTrip, MetroTrip, GTFSTrip ]
     for (let type of types) {
       if (type.canProcess(data, mode)) return new type(data)
     }
@@ -176,4 +176,16 @@ export class MetroTrip extends GTFSTrip {
     return this.#runID
   }
 
+}
+
+export class MetroRRBTrip extends MetroTrip {
+
+  constructor(data) {
+    super(data)
+  }
+
+  static canProcess(data, mode) {
+    return super.canProcess(data, mode) && data.id.match(/^02-\w{3}-R-/)
+  }
+
 }

package/package.json

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

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

@@ -0,0 +1,80 @@
+import { LokiDatabaseConnection } from '@transportme/database'
+import StopsLoader from '../lib/loader/StopsLoader.mjs'
+import { TRANSIT_MODES } from '../lib/constants.mjs'
+import path from 'path'
+import url from 'url'
+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'
+
+const __filename = url.fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const agencyFile = path.join(__dirname, 'sample-data', 'routes', 'agency.txt')
+
+const calendarFile = path.join(__dirname, 'sample-data', 'new-metro-2', 'calendar.txt')
+const calendarDatesFile = path.join(__dirname, 'sample-data', 'new-metro-2', 'calendar_dates.txt')
+
+const routesFile = path.join(__dirname, 'sample-data', 'new-metro-2', 'routes.txt')
+
+const stopTimesFile = path.join(__dirname, 'sample-data', 'new-metro-2', 'stop_times.txt')
+const tripsFile = path.join(__dirname, 'sample-data', 'new-metro-2', 'trips.txt')
+const stopsFile = path.join(__dirname, 'sample-data', 'new-metro-2', 'stops.txt')
+
+describe('The GTFS Loaders with the new 230525 Metro data', () => {
+  describe('The route loader', () => {
+    it('Should convert the updated route ID format to the legacy format', async () => {
+      let database = new LokiDatabaseConnection('test-db')
+      let routes = await database.createCollection('routes')
+
+      let routeLoader = new RouteLoader(routesFile, agencyFile, TRANSIT_MODES.metroTrain, database)
+      await routeLoader.loadRoutes()
+
+      let williamstown = await routes.findDocument({ routeGTFSID: '2-WIL' })
+
+      expect(williamstown).to.exist
+      expect(williamstown.routeName).to.equal('Williamstown')
+    })
+  })
+
+  describe('The trip loader', () => {
+    it('It identify a rail replacement bus trip and mark it as such', async () => {
+      let database = new LokiDatabaseConnection('test-db')
+      let stops = await database.createCollection('stops')
+      let routes = await database.createCollection('routes')
+      let trips = await database.createCollection('gtfs timetables')
+
+      let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
+      await stopLoader.loadStops()
+
+      let routeLoader = new RouteLoader(routesFile, agencyFile, TRANSIT_MODES.metroTrain, database)
+      await routeLoader.loadRoutes()
+
+      let routeIDMap = routeLoader.getRouteIDMap()
+
+      let tripLoader = new TripLoader({
+        tripsFile, stopTimesFile,
+        calendarFile, calendarDatesFile
+      }, TRANSIT_MODES.metroTrain, database)
+
+      await tripLoader.loadTrips({ routeIDMap })
+
+      let trip = await trips.findDocument({ runID: 'BW000' })
+
+      expect(trip).to.not.be.null
+      expect(trip.tripID).to.equal('02-WIL-R-7-T6-BW000')
+      expect(trip.shapeID).to.equal('2-WIL-R-vpt-7.1.R')
+      expect(trip.routeGTFSID).to.equal('2-WIL')
+      expect(trip.block).to.equal(null)
+      expect(trip.isRailReplacementBus).to.be.true
+      expect(trip.direction).to.equal('Up')
+
+      expect(trip.stopTimings[0].stopName).to.equal('Williamstown Railway Station')
+      expect(trip.stopTimings[0].platform).to.equal('RRB')
+
+      expect(trip.stopTimings[3].stopName).to.equal('Newport Railway Station')
+      expect(trip.stopTimings[3].platform).to.equal('RRB')
+    })
+  })
+})

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

@@ -0,0 +1,35 @@
+import { LokiDatabaseConnection } from '@transportme/database'
+import StopsLoader from '../lib/loader/StopsLoader.mjs'
+import { TRANSIT_MODES } from '../lib/constants.mjs'
+import path from 'path'
+import url from 'url'
+import { expect } from 'chai'
+import suburbs from './sample-data/suburbs.json' with { type: 'json' }
+import RouteLoader from '../lib/loader/RouteLoader.mjs'
+
+const __filename = url.fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const agencyFile = path.join(__dirname, 'sample-data', 'routes', 'agency.txt')
+
+const routesFile = path.join(__dirname, 'sample-data', 'new-tram-2', 'routes.txt')
+const stopsFile = path.join(__dirname, 'sample-data', 'new-tram-2', 'stops.txt')
+
+describe('The GTFS Loaders with the new Tram data', () => {
+  describe('The stop loader', () => {
+    it('Should process the stops and add them to the database', 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': 'Glenferrie Road/Wattletree Road'
+      })
+
+      expect(stop).to.not.be.null
+      expect(stop.bays[0].stopNumber).to.equal('45')
+    })
+  })
+})

package/test/sample-data/new-metro-2/calendar.txt

@@ -0,0 +1,13 @@
+service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date
+"T2","0","0","0","0","0","1","0","20250124","20250128"
+"T5","0","1","1","1","0","0","0","20250121","20250123"
+"T5_1","0","1","0","0","0","0","0","20250124","20250128"
+"T5+v6","0","1","1","0","0","0","0","20250121","20250123"
+"T5+v7","0","0","0","1","0","0","0","20250121","20250123"
+"T5+v8","0","0","1","1","0","0","0","20250121","20250123"
+"T5+v9","0","1","0","0","0","0","0","20250121","20250123"
+"T5+w3","0","1","0","0","0","0","0","20250124","20250128"
+"T5+w4","0","1","0","0","0","0","0","20250124","20250128"
+"T6","0","0","0","0","1","0","0","20250124","20250128"
+"UE","1","0","0","0","0","0","0","20250124","20250128"
+"UH","0","0","0","0","0","0","1","20250124","20250128"

package/test/sample-data/new-metro-2/calendar_dates.txt

@@ -0,0 +1 @@
+service_id,date,exception_type

package/test/sample-data/new-metro-2/routes.txt

@@ -0,0 +1,2 @@
+route_id,agency_id,route_short_name,route_long_name,route_type,route_color,route_text_color
+"aus:vic:vic-02-WIL-R:","","Williamstown Bus Replacement","Williamstown - City","2","FE5000","FFFFFF"

package/test/sample-data/new-metro-2/stop_times.txt

@@ -0,0 +1,5 @@
+trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_type,drop_off_type,shape_dist_traveled
+"02-WIL-R-7-T6-BW000","20:59:00","20:59:00","26315","1","","0","0","0.00"
+"02-WIL-R-7-T6-BW000","21:01:00","21:01:00","26314","2","","0","0","1181.84"
+"02-WIL-R-7-T6-BW000","21:03:00","21:03:00","26247","3","","0","0","1940.26"
+"02-WIL-R-7-T6-BW000","21:19:00","21:19:00","26242","4","","0","0","4445.63"

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

@@ -0,0 +1,9 @@
+stop_id,stop_name,stop_lat,stop_lon,location_type,parent_station,platform_code
+"26242","Newport Rail Replacement Bus Stop","-37.84249141","144.88254956","","Parentvic:rail:NPT","R-Bus"
+"26247","North Williamstown Rail Replacement Bus Stop","-37.85750447","144.89056490","","Parentvic:rail:NWN","R-Bus"
+"26314","Williamstown Beach Rail Replacement Bus Stop","-37.86385491","144.89494197","","Parentvic:rail:WBH","R-Bus"
+"26315","Williamstown Rail Replacement Bus Stop","-37.86756640","144.90547637","","Parentvic:rail:WIL","R-Bus"
+"Parentvic:rail:NPT","Newport Railway Station","-37.84272637","144.88358830","1","",""
+"Parentvic:rail:NWN","North Williamstown Railway Station","-37.85733348","144.88906947","1","",""
+"Parentvic:rail:WBH","Williamstown Beach Railway Station","-37.86398189","144.89448368","1","",""
+"Parentvic:rail:WIL","Williamstown Railway Station","-37.86775292","144.90532331","1","",""

package/test/sample-data/new-metro-2/trips.txt

@@ -0,0 +1,2 @@
+route_id,service_id,trip_id,shape_id,trip_headsign,direction_id,block_id,wheelchair_accessible
+"aus:vic:vic-02-WIL-R:","T6","02-WIL-R-7-T6-BW000","2-WIL-R-vpt-7.1.R","Newport","1","","1"

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

@@ -0,0 +1,25 @@
+route_id,agency_id,route_short_name,route_long_name,route_type,route_color,route_text_color
+"aus:vic:vic-03-1:","37","1","South Melbourne Beach - East Coburg","0","B5BD00","000000"
+"aus:vic:vic-03-109:","37","109","Port Melbourne - Box Hill","0","E87722","000000"
+"aus:vic:vic-03-11:","37","11","Victoria Harbour Docklands - West Preston","0","6ECEB2","000000"
+"aus:vic:vic-03-12:","37","12","St Kilda (Fitzroy St) - Victoria Gardens","0","007E92","FFFFFF"
+"aus:vic:vic-03-16:","37","16","Kew - Melbourne University via St Kilda Beach","0","FBD872","000000"
+"aus:vic:vic-03-19:","37","19","Flinders Street Station, City - North Coburg","0","8A1B61","FFFFFF"
+"aus:vic:vic-03-3:","37","3","East Malvern - Melbourne University","0","8DC8E8","000000"
+"aus:vic:vic-03-30:","37","30","Central Pier Docklands - St Vincents Plaza","0","534F96","FFFFFF"
+"aus:vic:vic-03-35:","37","35","Clockwise - Clockwise","0","6B3529","FFFFFF"
+"aus:vic:vic-03-48:","37","48","Victoria Harbour Docklands - North Balwyn","0","333434","FFFFFF"
+"aus:vic:vic-03-5:","37","5","Malvern (Burke Road) - Melbourne University","0","D50032","FFFFFF"
+"aus:vic:vic-03-57:","37","57","Flinders Street Station, City - West Maribyrnong","0","00C1D5","000000"
+"aus:vic:vic-03-58:","37","58","Toorak - West Coburg","0","969696","FFFFFF"
+"aus:vic:vic-03-59:","37","59","Flinders Street Station, City - Airport West","0","00653A","FFFFFF"
+"aus:vic:vic-03-6:","37","6","Glen Iris - Moreland","0","01426A","FFFFFF"
+"aus:vic:vic-03-64:","37","64","East Brighton - Melbourne University","0","00AB8E","FFFFFF"
+"aus:vic:vic-03-67:","37","67","Carnegie - Melbourne University","0","956C58","FFFFFF"
+"aus:vic:vic-03-70:","37","70","Waterfront City Docklands - Wattle Park","0","F59BBB","000000"
+"aus:vic:vic-03-72:","37","72","Camberwell - Melbourne University","0","9ABEAA","000000"
+"aus:vic:vic-03-75:","37","75","Central Pier Docklands - Vermont South","0","00A9E0","000000"
+"aus:vic:vic-03-78:","37","78","Balaclava via Prahran - North Richmond","0","A0A0D6","000000"
+"aus:vic:vic-03-82:","37","82","Moonee Ponds - Footscray","0","D2D755","000000"
+"aus:vic:vic-03-86:","37","86","Waterfront City Docklands - Bundoora RMIT","0","FFB500","000000"
+"aus:vic:vic-03-96:","37","96","St Kilda Beach - East Brunswick","0","C6007E","FFFFFF"

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

@@ -0,0 +1,5 @@
+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"