@transportme/load-ptv-gtfs 1.3.11 → 1.4.2

package/lib/gtfs-parser/readers/line-reader.mjs

@@ -58,7 +58,13 @@ export default class CSVLineReader {
   }
 
   #setHeaders(line) {
-    let parts = line.match(/"([^"]*)"/g).map(f => f.slice(1, -1))
+    let parts
+    if (line.includes('"')) {
+      parts = line.match(/"([^"]*)"/g).map(f => f.slice(1, -1))
+    } else {
+      parts = line.split(',')
+    }
+
     return this.#headers.reduce((acc, header, i) => {
       acc[header] = parts[i]
       return acc

package/lib/loader/RouteLoader.mjs

@@ -24,7 +24,7 @@ export default class RouteLoader {
    * @param {DatabaseConnection} database A database connection
    */
   constructor(routesFile, agencyFile, mode, database) {
-    this.#routes = database.getCollection('routes')
+    this.#routes = database.getCollection('gtfs-routes')
     this.#mode = mode
     this.#routesReader = new GTFSRouteReader(routesFile, mode)
     this.#agencyFile = agencyFile

package/lib/loader/ShapeLoader.mjs

@@ -15,7 +15,7 @@ export default class ShapeLoader {
    * @param {DatabaseConnection} database A database connection
    */
   constructor(shapeFile, database) {
-    this.#routes = database.getCollection('routes')
+    this.#routes = database.getCollection('gtfs-routes')
     this.#shapeReader = new GTFSShapeReader(shapeFile)
   }
 

package/lib/loader/StopsLoader.mjs

@@ -22,7 +22,7 @@ export default class StopsLoader {
    * @param {function} [suburbHook] A hook that returns the stop's suburb, or null if unavailable. This function is called before processing from the stop's name or location
    */
   constructor(stopsFile, suburbs, mode, database, suburbHook) {
-    this.#stops = database.getCollection('stops')
+    this.#stops = database.getCollection('gtfs-stops')
     this.#mode = mode
     this.#stopsReader = new GTFSStopsReader(stopsFile, suburbs, suburbHook)
   }

package/lib/loader/TripLoader.mjs

@@ -44,9 +44,9 @@ export default class TripLoader {
    * @param {DatabaseConnection} database A database connection
    */
   constructor({ tripsFile, stopTimesFile, calendarFile, calendarDatesFile }, mode, database) {
-    this.#routes = database.getCollection('routes')
-    this.#stops = database.getCollection('stops')
-    this.#trips = database.getCollection('gtfs timetables')
+    this.#routes = database.getCollection('gtfs-routes')
+    this.#stops = database.getCollection('gtfs-stops')
+    this.#trips = database.getCollection('gtfs-gtfs timetables')
 
     this.#mode = mode
 

package/lib/post-processing/set-route-stops.mjs

@@ -9,8 +9,8 @@ import { TRANSIT_MODES } from '../constants.mjs'
  * @param {DatabaseConnection} database The database connection to use
  */
 export default async function setRouteStops(database, directionsMap, onMilestone = () => {}) {
-  let gtfsTimetables = database.getCollection('gtfs timetables')
-  let routes = database.getCollection('routes')
+  let gtfsTimetables = database.getCollection('gtfs-gtfs timetables')
+  let routes = database.getCollection('gtfs-routes')
 
   let allRoutes = await routes.distinct('routeGTFSID')
 
@@ -73,6 +73,11 @@ export default async function setRouteStops(database, directionsMap, onMilestone
         if (routeData.routeName === 'Stony Point') {
           isUp = currentDir.includes('Frankston')
           directionName = directionName.slice(0, -16)
+        } else if (routeData.routeName === 'City Circle') {
+          isUp = false
+          let directionStops = stopsByService[routeGTFSID][gtfsDirection]
+          let isClockwise = directionStops.stops[1].stopName === 'Southern Cross Railway Station'
+          directionName = `City Circle (${isClockwise ? 'Clockwise' : 'Anti-Clockwise'})`
         } else {
           directionName = isUp ? 'City' :  routeData.routeName
         }

package/package.json

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

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

@@ -37,7 +37,7 @@ describe('The GTFS Agency Reader', () => {
 describe('The GTFS Routes Loader', () => {
   it('Should process the routes and add them to the database', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let routes = await database.createCollection('routes')
+    let routes = await database.createCollection('gtfs-routes')
 
     let loader = new RouteLoader(regionalRoutesFile, agencyFile, TRANSIT_MODES.bus, database)
     await loader.loadRoutes()
@@ -53,7 +53,7 @@ describe('The GTFS Routes Loader', () => {
 
   it('Should open the agency.txt file and load all operators', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    await database.createCollection('routes')
+    await database.createCollection('gtfs-routes')
 
     let loader = new RouteLoader(regionalRoutesFile, agencyFile, TRANSIT_MODES.bus, database)
     await loader.loadAgencies()
@@ -66,7 +66,7 @@ describe('The GTFS Routes Loader', () => {
 
   it('Should handle smartrak routes', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let routes = await database.createCollection('routes')
+    let routes = await database.createCollection('gtfs-routes')
 
     let loader = new RouteLoader(metroRoutesFile, agencyFile, TRANSIT_MODES.bus, database)
     await loader.loadRoutes()
@@ -83,7 +83,7 @@ describe('The GTFS Routes Loader', () => {
 
   it('Should handle metro train routes', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let routes = await database.createCollection('routes')
+    let routes = await database.createCollection('gtfs-routes')
 
     let loader = new RouteLoader(metroLinesFile, agencyFile, TRANSIT_MODES.metroTrain, database)
     await loader.loadRoutes()
@@ -101,7 +101,7 @@ describe('The GTFS Routes Loader', () => {
 
   it('Should allow for custom route rewriting', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let routes = await database.createCollection('routes')
+    let routes = await database.createCollection('gtfs-routes')
 
     let loader = new RouteLoader(wgtFile, agencyFile, TRANSIT_MODES.bus, database)
     await loader.loadRoutes({
@@ -146,7 +146,7 @@ describe('The GTFS Routes Loader', () => {
 
   it('Should return a route ID map', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let routes = await database.createCollection('routes')
+    let routes = await database.createCollection('gtfs-routes')
 
     let loader = new RouteLoader(wgtFile, agencyFile, TRANSIT_MODES.bus, database)
     await loader.loadRoutes({
@@ -167,7 +167,7 @@ describe('The GTFS Routes Loader', () => {
 
   it('Should allow for dropping of unwanted routes', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let routes = await database.createCollection('routes')
+    let routes = await database.createCollection('gtfs-routes')
 
     let loader = new RouteLoader(vlineFile, agencyFile, TRANSIT_MODES.regionalTrain, database)
     await loader.loadRoutes({
@@ -193,7 +193,7 @@ describe('The GTFS Routes Loader', () => {
 
   it('Should handle invalid agency references', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let routes = await database.createCollection('routes')
+    let routes = await database.createCollection('gtfs-routes')
 
     let loader = new RouteLoader(badRoutesFile_NoAgency, agencyFile, TRANSIT_MODES.bus, database)
     await loader.loadRoutes()

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

@@ -26,9 +26,9 @@ const shapeFile = path.join(__dirname, 'sample-data', 'shapes', 'shapes.txt')
 describe('The ShapeLoader class', () => {
   it('Should process the shapes and append it to the route data', 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 stops = await database.createCollection('gtfs-stops')
+    let routes = await database.createCollection('gtfs-routes')
+    let trips = await database.createCollection('gtfs-gtfs timetables')
 
     let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroBus, database)
     await stopLoader.loadStops()
@@ -65,9 +65,9 @@ describe('The ShapeLoader class', () => {
 
   it('Should merge duplicate shapes with the same length and start/end coordinates', 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 stops = await database.createCollection('gtfs-stops')
+    let routes = await database.createCollection('gtfs-routes')
+    let trips = await database.createCollection('gtfs-gtfs timetables')
 
     let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroBus, database)
     await stopLoader.loadStops()

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

@@ -32,7 +32,7 @@ const multiParentStopFile = path.join(__dirname, 'sample-data', 'parent-stop', '
 describe('The GTFS Stops 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 stops = await database.createCollection('gtfs-stops')
 
     let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.bus, database)
     await loader.loadStops()
@@ -46,7 +46,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should merge street-level stops matching with the exact same name', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.bus, database)
     await loader.loadStops()
@@ -77,7 +77,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should merge non street stops, and keep the secondary stop name if they are the same', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.bus, database)
     await loader.loadStops()
@@ -93,7 +93,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should merge non street stops, and discard the secondary stop name if they are different', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.bus, database)
     await loader.loadStops()
@@ -109,7 +109,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should update the suburb list as well', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.bus, database)
     await loader.loadStops()
@@ -126,7 +126,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should not merge stops that are forced to be unique and would otherwise be merged', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     function getMergeName(stop) {
       if (uniqueStops.includes(stop.fullStopName)) return stop.fullStopName
@@ -162,7 +162,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should override stop names if required', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     await (new StopsLoader(stopNameOverrides, suburbs, TRANSIT_MODES.bus, database)).loadStops({
       processStop: stop => {
@@ -185,7 +185,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should handle CSV blank spaces and other unicode junk', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     await (new StopsLoader(specialHeader, suburbs, TRANSIT_MODES.bus, database)).loadStops()
 
@@ -199,7 +199,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should allow for a custom suburb hook', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let testSuburbs = ['A', 'B', 'C', null, 'D']
 
@@ -215,7 +215,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should allow for individual stops to be loaded in', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let loader = new StopsLoader(specialHeader, suburbs, TRANSIT_MODES.bus, database)
     let reader = new GTFSStopsReader('')
@@ -251,7 +251,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should not load duplicate stops with the same mode in', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let loader = new StopsLoader(specialHeader, suburbs, TRANSIT_MODES.bus, database)
     let reader = new GTFSStopsReader('')
@@ -284,7 +284,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should load duplicate stops with the different mode in', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let busLoader = new StopsLoader(specialHeader, suburbs, TRANSIT_MODES.bus, database)
     let coachLoader = new StopsLoader(specialHeader, suburbs, TRANSIT_MODES.regionalCoach, database)
@@ -321,7 +321,7 @@ describe('The GTFS Stops Loader', () => {
 
   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')
+    let stops = await database.createCollection('gtfs-stops')
 
     await (new StopsLoader(generalStores, suburbs, TRANSIT_MODES.bus, database)).loadStops()
 
@@ -332,7 +332,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should handle extra spaces within the stop name', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     await (new StopsLoader(unionWithSpaces, suburbs, TRANSIT_MODES.bus, database)).loadStops()
 
@@ -342,7 +342,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should merge stops into their designated parent stops even if the names do not match', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     await (new StopsLoader(parentStopsFile, suburbs, TRANSIT_MODES.metroTrain, database)).loadStops()
 
@@ -362,7 +362,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should handle the parent being part of a merged stop', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     await (new StopsLoader(multiParentStopFile, suburbs, TRANSIT_MODES.regionalCoach, database)).loadStops()
 
@@ -379,7 +379,7 @@ describe('The GTFS Stops Loader', () => {
 
   it('Should use stop and station names and suburbs', async () => {
     let database = new LokiDatabaseConnection('test-db')
-    let stops = await database.createCollection('stops')
+    let stops = await database.createCollection('gtfs-stops')
 
     let data = [{
       "stop_id": "vic:rail:THL",

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

@@ -24,9 +24,9 @@ const tripsFile = path.join(__dirname, 'sample-data', 'trips', 'trips.txt')
 describe('The TripLoader class', () => {
   it('Should process the trip and add it to the database', 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 stops = await database.createCollection('gtfs-stops')
+    let routes = await database.createCollection('gtfs-routes')
+    let trips = await database.createCollection('gtfs-gtfs timetables')
 
     let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
     await stopLoader.loadStops()
@@ -90,9 +90,9 @@ describe('The TripLoader class', () => {
 
   it('It should return a mapping of Shape IDs to Route IDs', 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 stops = await database.createCollection('gtfs-stops')
+    let routes = await database.createCollection('gtfs-routes')
+    let trips = await database.createCollection('gtfs-gtfs timetables')
 
     let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
     await stopLoader.loadStops()
@@ -115,9 +115,9 @@ describe('The TripLoader class', () => {
 
   it('Should return a mapping of Route + GTFS Direction ID to PTV Direction Names', 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 stops = await database.createCollection('gtfs-stops')
+    let routes = await database.createCollection('gtfs-routes')
+    let trips = await database.createCollection('gtfs-gtfs timetables')
 
     let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
     await stopLoader.loadStops()
@@ -142,9 +142,9 @@ describe('The TripLoader class', () => {
 
   it('Should return a mapping stop services', 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 stops = await database.createCollection('gtfs-stops')
+    let routes = await database.createCollection('gtfs-routes')
+    let trips = await database.createCollection('gtfs-gtfs timetables')
 
     let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
     await stopLoader.loadStops()

package/test/line-reader.test.mjs

@@ -9,6 +9,8 @@ const __dirname = path.dirname(__filename)
 const stopsFile = path.join(__dirname, 'sample-data', 'gtfs-splitting', 'line_reader_test.txt')
 const oneLineFile = path.join(__dirname, 'sample-data', 'one_line.csv')
 
+const noQuotesFile = path.join(__dirname, 'sample-data', 'mtm-rail', 'stops.txt')
+
 describe('The CSVLineReader class', () => {
   it('Should open a CSV file and identify the headers', async () => {
     let reader = new CSVLineReader(stopsFile)
@@ -21,6 +23,30 @@ describe('The CSVLineReader class', () => {
     await reader.close()
   })
 
+  it('Can handle files that are not quoted', async () => {
+    let reader = new CSVLineReader(noQuotesFile)
+    await reader.open()
+
+    let line = await reader.nextLine()
+    expect(line).to.deep.equal({
+      stop_id: '77945',
+      stop_code: '',
+      stop_name: 'Alamein_Up',
+      stop_desc: '',
+      stop_lat: '-37.868383',
+      stop_lon: '145.079837',
+      zone_id: '',
+      stop_url: '',
+      location_type: '0',
+      parent_station: '',
+      stop_timezone: '',
+      wheelchair_boarding: '',
+      platform_code: '',
+      tts_stop_name: ''
+    })
+    await reader.close()
+  })
+
   it('Should return the first line of the CSV, with the fields mapped to their headers', async () => {
     let reader = new CSVLineReader(stopsFile)
     await reader.open()

package/test/merge-stops-full.test.mjs

@@ -25,9 +25,9 @@ const tripsFile = path.join(__dirname, 'sample-data', 'merge', 'trips.txt')
 const shapeFile = path.join(__dirname, 'sample-data', 'merge', 'shapes.txt')
 
 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 stops = await database.createCollection('gtfs-stops')
+let routes = await database.createCollection('gtfs-routes')
+let trips = await database.createCollection('gtfs-gtfs timetables')
 
 let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
 await stopLoader.loadStops()
@@ -97,6 +97,18 @@ describe('The GTFS Route stop merger', () => {
       expect(stonyPoint.stops[stonyPoint.stops.length - 1].stopName).to.equal('Stony Point Railway Station')
     })
 
+    it('Should set City Circle trips as Down', async () => {
+      let cityCircleRoute = await routes.findDocument({ routeGTFSID: '2-CCL' })
+      expect(cityCircleRoute).to.not.be.null
+
+      let direction = cityCircleRoute.directions.find(dir => dir.directionName === 'City Circle (Clockwise)')
+      expect(direction).to.not.be.undefined
+      expect(direction.trainDirection).to.equal('Down')
+      expect(direction.stops[0].stopName).to.equal('Flinders Street Railway Station')
+      expect(direction.stops[direction.stops.length - 2].stopName).to.equal('Parliament Railway Station')
+      expect(direction.stops[direction.stops.length - 1].stopName).to.equal('Flinders Street Railway Station')
+    })
+
     it('Should mark the PTV Route direction', async () => {
       let stonyPointRoute = await routes.findDocument({ routeGTFSID: '2-STY' })
       expect(stonyPointRoute.ptvDirections['Stony Point']).to.equal(0)

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

@@ -30,7 +30,7 @@ describe('The GTFS Loaders with the new Metro 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 stops = await database.createCollection('gtfs-stops')
 
       let loader = new StopsLoader(simpleStopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
       await loader.loadStops()
@@ -44,7 +44,7 @@ describe('The GTFS Loaders with the new Metro data', () => {
 
     it('Should label the individual platforms with their platform numbers', async () => {
       let database = new LokiDatabaseConnection('test-db')
-      let stops = await database.createCollection('stops')
+      let stops = await database.createCollection('gtfs-stops')
 
       let loader = new StopsLoader(simpleStopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
       await loader.loadStops()
@@ -67,7 +67,7 @@ describe('The GTFS Loaders with the new 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 routes = await database.createCollection('gtfs-routes')
 
       let routeLoader = new RouteLoader(routesFile, agencyFile, TRANSIT_MODES.metroTrain, database)
       await routeLoader.loadRoutes()
@@ -82,9 +82,9 @@ describe('The GTFS Loaders with the new Metro data', () => {
   describe('The trip loader', () => {
     it('It should accept trip IDs in the new format and extract the TDN from there', 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 stops = await database.createCollection('gtfs-stops')
+      let routes = await database.createCollection('gtfs-routes')
+      let trips = await database.createCollection('gtfs-gtfs timetables')
 
       let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
       await stopLoader.loadStops()
@@ -131,9 +131,9 @@ describe('The GTFS Loaders with the new Metro data', () => {
 
     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 stops = await database.createCollection('gtfs-stops')
+      let routes = await database.createCollection('gtfs-routes')
+      let trips = await database.createCollection('gtfs-gtfs timetables')
 
       let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
       await stopLoader.loadStops()
@@ -169,9 +169,9 @@ describe('The GTFS Loaders with the new Metro data', () => {
 
     it('Should wrap times past midnight back to 00:00 NEXT DAY in the trip times', 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 stops = await database.createCollection('gtfs-stops')
+      let routes = await database.createCollection('gtfs-routes')
+      let trips = await database.createCollection('gtfs-gtfs timetables')
 
       let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
       await stopLoader.loadStops()

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

@@ -19,7 +19,7 @@ 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 stops = await database.createCollection('gtfs-stops')
 
       let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.tram, database)
       await loader.loadStops()
@@ -35,7 +35,7 @@ describe('The GTFS Loaders with the new Tram 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 routes = await database.createCollection('gtfs-routes')
 
       let routeLoader = new RouteLoader(routesFile, agencyFile, TRANSIT_MODES.tram, database)
       await routeLoader.loadRoutes()

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

@@ -26,7 +26,7 @@ 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 routes = await database.createCollection('gtfs-routes')
 
       let routeLoader = new RouteLoader(routesFile, agencyFile, TRANSIT_MODES.metroTrain, database)
       await routeLoader.loadRoutes()
@@ -41,9 +41,9 @@ describe('The GTFS Loaders with the new 230525 Metro data', () => {
   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 stops = await database.createCollection('gtfs-stops')
+      let routes = await database.createCollection('gtfs-routes')
+      let trips = await database.createCollection('gtfs-gtfs timetables')
 
       let stopLoader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.metroTrain, database)
       await stopLoader.loadStops()

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

@@ -19,7 +19,7 @@ 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 stops = await database.createCollection('gtfs-stops')
 
       let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.tram, database)
       await loader.loadStops()
@@ -34,7 +34,7 @@ describe('The GTFS Loaders with the new Tram data', () => {
 
     it('Should clean up extra spaces', async () => {
       let database = new LokiDatabaseConnection('test-db')
-      let stops = await database.createCollection('stops')
+      let stops = await database.createCollection('gtfs-stops')
 
       let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.tram, database)
       await loader.loadStops()
@@ -50,7 +50,7 @@ describe('The GTFS Loaders with the new Tram data', () => {
 
     it('Should remove half suburbs in the name', async () => {
       let database = new LokiDatabaseConnection('test-db')
-      let stops = await database.createCollection('stops')
+      let stops = await database.createCollection('gtfs-stops')
 
       let loader = new StopsLoader(stopsFile, suburbs, TRANSIT_MODES.tram, database)
       await loader.loadStops()

package/test/sample-data/merge/shapes.txt

@@ -1219,4 +1219,6 @@ shape_id,shape_pt_lat,shape_pt_lon,shape_pt_sequence,shape_dist_traveled
 "2-STY-vpt-1.2.H","-38.3735310845842","145.218832701718","146","30453.97"
 "2-STY-vpt-1.2.H","-38.3738969985651","145.219785272927","147","30546.45"
 "2-STY-vpt-1.2.H","-38.3742189306907","145.221402857812","148","30691.93"
-"2-STY-vpt-1.2.H","-38.3742345364979","145.221837462187","149","30729.86"
+"2-STY-vpt-1.2.H","-38.3742345364979","145.221837462187","149","30729.86"
+"2-CCL-vpt-38.5.H","-37.81853876","144.96484870","1","0.00"
+"2-CCL-vpt-38.5.H","-37.81922050","144.96266539","2","206.22"

package/test/sample-data/merge/stop_times.txt

@@ -94,4 +94,10 @@ trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_t
 "02-STY--12-T5-8501","14:33:00","14:33:00","19830","7","","0","0","24765.17"
 "02-STY--12-T5-8501","14:36:00","14:36:00","19829","8","","0","0","27053.40"
 "02-STY--12-T5-8501","14:39:00","14:39:00","19828","9","","0","0","28905.48"
-"02-STY--12-T5-8501","14:43:00","14:43:00","19827","10","","0","0","30729.86"
+"02-STY--12-T5-8501","14:43:00","14:43:00","19827","10","","0","0","30729.86"
+"02-CCL--38-T5_cw-0837","23:51:00","23:51:00","19854","1","","0","0","0.00"
+"02-CCL--38-T5_cw-0837","23:54:00","23:54:00","22180","2","","0","0","1363.56"
+"02-CCL--38-T5_cw-0837","23:56:00","23:56:00","19841","3","","0","0","2443.56"
+"02-CCL--38-T5_cw-0837","23:58:00","23:58:00","19842","4","","0","0","3052.86"
+"02-CCL--38-T5_cw-0837","24:00:00","24:00:00","19843","5","","0","0","4168.05"
+"02-CCL--38-T5_cw-0837","24:03:00","24:03:00","19854","6","","0","0","5603.97"

package/test/sample-data/merge/trips.txt

@@ -3,4 +3,5 @@ route_id,service_id,trip_id,shape_id,trip_headsign,direction_id,block_id
 "aus:vic:vic-02-PKM:","T2_2","02-PKM--12-T5-C001","2-PKM-vpt-1.3.H","East Pakenham","0","10867"
 "aus:vic:vic-02-PKM:","T2_2","02-PKM--12-T5-C002","2-PKM-vpt-1.12.R","Flinders Street","1",""
 "aus:vic:vic-02-STY:","T2_2","02-STY--12-T5-8500","2-STY-vpt-1.1.R","Frankston","1",""
-"aus:vic:vic-02-STY:","T2_2","02-STY--12-T5-8501","2-STY-vpt-1.2.H","Stony Point","0",""
+"aus:vic:vic-02-STY:","T2_2","02-STY--12-T5-8501","2-STY-vpt-1.2.H","Stony Point","0",""
+"aus:vic:vic-02-CCL:","T2_2","02-CCL--38-T5_cw-0837","2-CCL-vpt-38.5.H","Flinders Street via City Loop","0",""

package/test/sample-data/mtm-rail/stops.txt

@@ -0,0 +1,4 @@
+stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,location_type,parent_station,stop_timezone,wheelchair_boarding,platform_code,tts_stop_name
+77945,,Alamein_Up,,-37.868383,145.079837,,,0,,,,,
+77949,,Ashburton_Up,,-37.862461,145.081537,,,0,,,,,
+77972,,Burwood_Up,,-37.851461,145.081497,,,0,,,,,

package/test/sample-data/routes/metro_lines.txt

@@ -4,4 +4,5 @@ route_id,agency_id,route_short_name,route_long_name,route_type,route_color,route
 "aus:vic:vic-02-RCE:","3","Flemington Racecourse","City","2","95979A","000000"
 "aus:vic:vic-02-STY:","3","Stony Point","Stony Point - Frankston","2","028430","FFFFFF"
 "aus:vic:vic-02-PKM:","3","Pakenham","Pakenham - City","2","279FD5","000000"
-"aus:vic:vic-02-PKM:","3","Pakenham","Pakenham - City","2","279FD5","000000"
+"aus:vic:vic-02-PKM:","3","Pakenham","Pakenham - City","2","279FD5","000000"
+"aus:vic:vic-02-CCL:","","City Circle","","2","0072CE","FFFFFF"