@transportme/load-ptv-gtfs 1.4.33 → 1.4.35

package/lib/gtfs-parser/GTFSCalendarDate.mjs

@@ -4,10 +4,12 @@ export default class GTFSCalendarDate {
 
   id
   date
+  rawDate
   type
 
   constructor({ id, date, type }) {
     this.id = id
+    this.rawDate = date
     this.date = dateUtils.parseDate(date)
     this.type = type
   }

package/lib/gtfs-parser/readers/GTFSCalendarReader.mjs

@@ -6,6 +6,9 @@ export default class GTFSCalendarReader extends GTFSReader {
 
   #calendarDateFile
   #calendarDates = {}
+  #unprocessedCalendarDates = new Set()
+
+  #hasCalendar = true
 
   /**
    * Constructs a new GTFS Calendar reader.
@@ -19,14 +22,19 @@ export default class GTFSCalendarReader extends GTFSReader {
   }
 
   async open() {
-    await super.open()
+    try {
+      await super.open()
+    } catch (e) { this.#hasCalendar = false }
 
     if (!this.#calendarDateFile) return
     let calendarDateReader = new GTFSCalendarDateReader(this.#calendarDateFile)
     await calendarDateReader.open()
     while (calendarDateReader.available()) {
       let calendarDate = await calendarDateReader.getNextEntity()
-      if (!this.#calendarDates[calendarDate.id]) this.#calendarDates[calendarDate.id] = []
+      if (!this.#calendarDates[calendarDate.id]) {
+        this.#calendarDates[calendarDate.id] = []
+        this.#unprocessedCalendarDates.add(calendarDate.id)
+      }
       this.#calendarDates[calendarDate.id].push(calendarDate)
     }
   }
@@ -59,6 +67,30 @@ export default class GTFSCalendarReader extends GTFSReader {
       endDay: data.end_date
     }
 
+    this.#unprocessedCalendarDates.delete(data.service_id)
+
     return new GTFSCalendar(calendarData, this.#calendarDates[data.service_id])
   }
+
+  available() {
+    const underlyingAvailable = this.#hasCalendar ? super.available() : false
+    if (underlyingAvailable) return true
+    return this.#unprocessedCalendarDates.size > 0
+  }
+
+  getNextEntity() {
+    if (this.#hasCalendar && super.available()) return super.getNextEntity()
+    const calendarDate = Array.from(this.#unprocessedCalendarDates.values())[0]
+    const calendarData = this.#calendarDates[calendarDate]
+
+    const calendar = new GTFSCalendar({
+      id: calendarDate,
+      daysOfWeek: Array(7).fill(false),
+      startDay: calendarData[0].rawDate,
+      endDay: calendarData[0].rawDate
+    }, calendarData)
+
+    this.#unprocessedCalendarDates.delete(calendarDate)
+    return calendar
+  }
 }

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

@@ -31,7 +31,10 @@ export default class CSVLineReader {
   async open() {
     await new Promise((resolve, reject) => {
       lineReader.open(this.#file, async (err, reader) => {
-        if (err) return reject(err)
+        if (err) {
+          err.stack = `${err.stack}\n${new Error().stack.split('\n').slice(1).join('\n')}`
+          return reject(err)
+        }
 
         this.#reader = reader
         this.#headers = (await this.#readNextLine()).split(',')

package/lib/loader/RouteLoader.mjs

@@ -13,9 +13,11 @@ export default class RouteLoader {
   #routesReader
   #operators = {}
   #agencyFile
+  #routesFile
 
   #routeIDMap = {}
 
+
   /**
    * Creates a new Shape Loader.
    * 
@@ -27,8 +29,8 @@ export default class RouteLoader {
   constructor(routesFile, agencyFile, mode, database) {
     this.#routes = this.getRoutesDB(database)
     this.#mode = mode
-    this.#routesReader = this.createRouteReader(routesFile, mode)
-    this.#agencyFile = agencyFile
+    this.#routesFile = routesFile
+    this.#agencyFile = agencyFile 
   }
 
   getRoutesDB(db) {
@@ -111,6 +113,8 @@ export default class RouteLoader {
   async loadRoutes({ processRoute } = {}) {
     await this.loadAgencies()
 
+    this.#routesReader = this.createRouteReader(this.#routesFile, this.#mode)
+
     await this.#routesReader.open()
     while (this.#routesReader.available()) {
       try {

package/lib/loader/ShapeLoader.mjs

@@ -6,6 +6,8 @@ export default class ShapeLoader {
   #routes
   #shapeReader
 
+  #shapeFile
+
   #routeCache = {}
 
   /**
@@ -16,7 +18,7 @@ export default class ShapeLoader {
    */
   constructor(shapeFile, database) {
     this.#routes = this.getRoutesDB(database)
-    this.#shapeReader = this.createShapeReader(shapeFile)
+    this.#shapeFile = shapeFile
   }
 
   getRoutesDB(db) {
@@ -83,6 +85,8 @@ export default class ShapeLoader {
    * @param {function} options.shapeIDMap A mapping of shape IDs to their trip IDs.
    */
   async loadShapes({ shapeIDMap }) {
+    this.#shapeReader = this.createShapeReader(this.#shapeFile)
+
     await this.#shapeReader.open()
 
     let shapesLoaded = 0

package/lib/loader/StopsLoader.mjs

@@ -10,6 +10,10 @@ export default class StopsLoader {
   #mode
   #stopsReader
 
+  #stopsFile
+  #suburbs
+  #suburbHook
+
   #parentHolding = {}
 
   /**
@@ -25,7 +29,9 @@ export default class StopsLoader {
   constructor(stopsFile, suburbs, mode, database, suburbHook) {
     this.#stops = this.getStopsDB(database)
     this.#mode = mode
-    this.#stopsReader = this.createStopReader(stopsFile, suburbs, suburbHook)
+    this.#stopsFile = stopsFile
+    this.#suburbs = suburbs
+    this.#suburbHook = suburbHook
   }
 
   getStopsDB(db) {
@@ -195,6 +201,7 @@ export default class StopsLoader {
    * @param {function} options.getMergeName Used to get a stop's merge name. Return null to use the default merge name.
    */
   async loadStops(options) {
+    this.#stopsReader = this.createStopReader(this.#stopsFile, this.#suburbs, this.#suburbHook)
     await this.#stopsReader.open()
     while (this.#stopsReader.available()) {
       try {

package/lib/loader/TripLoader.mjs

@@ -32,6 +32,11 @@ export default class TripLoader {
 
   #tripsToLoad = []
 
+  #tripsFile
+  #stopTimesFile
+  #calendarFile
+  #calendarDatesFile
+
   /**
    * Creates a new Trip Loader.
    * 
@@ -50,9 +55,10 @@ export default class TripLoader {
 
     this.#mode = mode
 
-    this.#stopTimesReader = this.createStopTimesReader(stopTimesFile, mode)
-    this.#tripsReader = this.createTripReader(tripsFile, null, null, mode)
-    this.#calendarReader = this.createCalendarReader(calendarFile, calendarDatesFile)
+    this.#tripsFile = tripsFile
+    this.#stopTimesFile = stopTimesFile
+    this.#calendarFile = calendarFile
+    this.#calendarDatesFile = calendarDatesFile
   }
 
   getRoutesDB(db) {
@@ -236,6 +242,10 @@ export default class TripLoader {
   async loadTrips({ routeIDMap, processTrip, onWrite = () => {} }) {
     this.#routeIDMap = routeIDMap
 
+    this.#stopTimesReader = this.createStopTimesReader(this.#stopTimesFile, this.#mode)
+    this.#tripsReader = this.createTripReader(this.#tripsFile, null, null, this.#mode)
+    this.#calendarReader = this.createCalendarReader(this.#calendarFile, this.#calendarDatesFile)
+
     await this.loadCalendarData()
     await this.loadTripsData()
 

package/package.json

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