@transportme/load-ptv-gtfs 1.4.0 → 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/post-processing/set-route-stops.mjs

@@ -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.4.0",
+  "version": "1.4.2",
   "description": "",
   "main": "index.mjs",
   "scripts": {

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

@@ -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/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"