gtfs-to-html 2.4.4 → 2.5.0

package/CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.0] - 2022-12-31
+
+### Updated
+
+- Updated to node-gtfs v4
+- Dependency updates
+
 ## [2.4.4] - 2022-12-22
 
 ### Updated

package/app/index.js

@@ -39,7 +39,9 @@ config.log = console.log;
 config.logWarning = console.warn;
 config.logError = console.error;
 
-openDb(config).catch((error) => {
+try {
+  openDb(config);
+} catch (error) {
   if (error instanceof Error && error.code === 'SQLITE_CANTOPEN') {
     config.logError(
       `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
@@ -47,7 +49,7 @@ openDb(config).catch((error) => {
   }
 
   throw error;
-});
+}
 
 /*
  * Show all timetable pages
@@ -56,7 +58,7 @@ router.get('/', async (request, response, next) => {
   try {
     const timetablePages = [];
     const timetablePageIds = map(
-      await getTimetablePagesForAgency(config),
+      getTimetablePagesForAgency(config),
       'timetable_page_id'
     );
 

package/lib/geojson-utils.js

@@ -61,27 +61,22 @@ const simplifyGeoJSON = (geojson, config) => {
 /*
  * Get the geoJSON for a timetable.
  */
-export async function getTimetableGeoJSON(timetable, config) {
-  const [shapesGeojsons, stopsGeojsons] = await Promise.all([
-    await Promise.all(
-      timetable.route_ids.map((routeId) =>
-        getShapesAsGeoJSON({
-          route_id: routeId,
-          direction_id: timetable.direction_id,
-          trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
-        })
-      )
-    ),
-    await Promise.all(
-      timetable.route_ids.map((routeId) =>
-        getStopsAsGeoJSON({
-          route_id: routeId,
-          direction_id: timetable.direction_id,
-          trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
-        })
-      )
-    ),
-  ]);
+export function getTimetableGeoJSON(timetable, config) {
+  const shapesGeojsons = timetable.route_ids.map((routeId) =>
+    getShapesAsGeoJSON({
+      route_id: routeId,
+      direction_id: timetable.direction_id,
+      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
+    })
+  );
+
+  const stopsGeojsons = timetable.route_ids.map((routeId) =>
+    getStopsAsGeoJSON({
+      route_id: routeId,
+      direction_id: timetable.direction_id,
+      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
+    })
+  );
 
   const geojson = mergeGeojson(...shapesGeojsons, ...stopsGeojsons);
   return simplifyGeoJSON(geojson, config);
@@ -90,11 +85,9 @@ export async function getTimetableGeoJSON(timetable, config) {
 /*
  * Get the geoJSON for an agency (all routes and stops).
  */
-export async function getAgencyGeoJSON(config) {
-  const [shapesGeojsons, stopsGeojsons] = await Promise.all([
-    getShapesAsGeoJSON(),
-    getStopsAsGeoJSON(),
-  ]);
+export function getAgencyGeoJSON(config) {
+  const shapesGeojsons = getShapesAsGeoJSON();
+  const stopsGeojsons = getStopsAsGeoJSON();
 
   const geojson = mergeGeojson(shapesGeojsons, stopsGeojsons);
   return simplifyGeoJSON(geojson, config);

package/lib/gtfs-to-html.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { mkdir, writeFile } from 'node:fs/promises';
 
 import { map } from 'lodash-es';
-import { openDb, getDb, importGtfs } from 'gtfs';
+import { openDb, importGtfs } from 'gtfs';
 import sanitize from 'sanitize-filename';
 import Timer from 'timer-machine';
 
@@ -35,6 +35,7 @@ import {
 /*
  * Generate HTML timetables from GTFS.
  */
+/* eslint-disable complexity */
 const gtfsToHtml = async (initialConfig) => {
   const config = setDefaultConfig(initialConfig);
   const timer = new Timer();
@@ -45,7 +46,9 @@ const gtfsToHtml = async (initialConfig) => {
 
   timer.start();
 
-  await openDb(config).catch((error) => {
+  try {
+    openDb(config);
+  } catch (error) {
     if (error instanceof Error && error.code === 'SQLITE_CANTOPEN') {
       config.logError(
         `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
@@ -53,17 +56,6 @@ const gtfsToHtml = async (initialConfig) => {
     }
 
     throw error;
-  });
-
-  if (config.debug === true) {
-    const db = getDb();
-
-    db.on('profile', (sql, nsecs) => {
-      if (sql.startsWith('SELECT')) {
-        console.log(sql);
-        console.log(nsecs);
-      }
-    });
   }
 
   if (!config.agencies || config.agencies.length === 0) {
@@ -91,7 +83,7 @@ const gtfsToHtml = async (initialConfig) => {
 
   const timetablePages = [];
   const timetablePageIds = map(
-    await getTimetablePagesForAgency(config),
+    getTimetablePagesForAgency(config),
     'timetable_page_id'
   );
   await prepDirectory(exportPath);
@@ -190,7 +182,7 @@ const gtfsToHtml = async (initialConfig) => {
   }
 
   // Generate output log.txt
-  const logText = await generateLogText(outputStats, config);
+  const logText = generateLogText(outputStats, config);
   await writeFile(path.join(exportPath, 'log.txt'), logText);
 
   // Zip output, if specified
@@ -217,5 +209,6 @@ const gtfsToHtml = async (initialConfig) => {
 
   timer.stop();
 };
+/* eslint-enable complexity */
 
 export default gtfsToHtml;

package/lib/log-utils.js

@@ -11,8 +11,8 @@ pe.start();
 /*
  * Creates text for a log of output details.
  */
-export async function generateLogText(outputStats, config) {
-  const feedInfo = await getFeedInfo();
+export function generateLogText(outputStats, config) {
+  const feedInfo = getFeedInfo();
   const feedVersion =
     feedInfo.length > 0 && feedInfo[0].feed_version
       ? feedInfo[0].feed_version

package/lib/utils.js

@@ -27,7 +27,6 @@ import {
   getTimetableNotesReferences,
   getTimetableNotes,
   getRoutes,
-  getDb,
   getCalendars,
   getTimetableStopOrders,
   getStops,
@@ -37,6 +36,7 @@ import {
   getTimetables,
   getTimetablePages,
   getAgencies,
+  openDb,
 } from 'gtfs';
 import { stringify } from 'csv-stringify';
 import moment from 'moment';
@@ -275,8 +275,8 @@ const sortTripsByStoptimeAtStop = (trips, stopId) =>
 /*
  * Get all calendar dates for a specific timetable.
  */
-const getCalendarDatesForTimetable = async (timetable, config) => {
-  const calendarDates = await getCalendarDates(
+const getCalendarDatesForTimetable = (timetable, config) => {
+  const calendarDates = getCalendarDates(
     {
       service_id: timetable.service_ids,
     },
@@ -334,8 +334,8 @@ const getDaysFromCalendars = (calendars) => {
 /*
  * Get the `trip_headsign` for a specific timetable.
  */
-const getDirectionHeadsignFromTimetable = async (timetable) => {
-  const trips = await getTrips(
+const getDirectionHeadsignFromTimetable = (timetable) => {
+  const trips = getTrips(
     {
       direction_id: timetable.direction_id,
       route_id: timetable.route_ids,
@@ -353,31 +353,31 @@ const getDirectionHeadsignFromTimetable = async (timetable) => {
 /*
  * Get the notes for a specific timetable.
  */
-const getTimetableNotesForTimetable = async (timetable, config) => {
+const getTimetableNotesForTimetable = (timetable, config) => {
   const noteReferences = [
     // Get all notes for this timetable.
-    ...(await getTimetableNotesReferences({
+    ...getTimetableNotesReferences({
       timetable_id: timetable.timetable_id,
-    })),
+    }),
 
     // Get all notes for this route.
-    ...(await getTimetableNotesReferences({
+    ...getTimetableNotesReferences({
       route_id: timetable.routes.map((route) => route.route_id),
       timetable_id: null,
-    })),
+    }),
 
     // Get all notes for all trips in this timetable.
-    ...(await getTimetableNotesReferences({
+    ...getTimetableNotesReferences({
       trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
-    })),
+    }),
 
     // Get all notes for all stops in this timetable.
-    ...(await getTimetableNotesReferences({
+    ...getTimetableNotesReferences({
       stop_id: timetable.stops.map((stop) => stop.stop_id),
       trip_id: null,
       route_id: null,
       timetable_id: null,
-    })),
+    }),
   ];
 
   const usedNoteReferences = [];
@@ -416,7 +416,7 @@ const getTimetableNotesForTimetable = async (timetable, config) => {
     }
   }
 
-  const notes = await getTimetableNotes({
+  const notes = getTimetableNotes({
     note_id: usedNoteReferences.map((noteReference) => noteReference.note_id),
   });
 
@@ -445,14 +445,14 @@ const getTimetableNotesForTimetable = async (timetable, config) => {
  * Create a timetable page from a single timetable. Used if no
  * `timetable_pages.txt` is present.
  */
-const convertTimetableToTimetablePage = async (timetable, config) => {
+const convertTimetableToTimetablePage = (timetable, config) => {
   if (!timetable.routes) {
-    timetable.routes = await getRoutes({
+    timetable.routes = getRoutes({
       route_id: timetable.route_ids,
     });
   }
 
-  const filename = await generateFileName(timetable, config);
+  const filename = generateFileName(timetable, config);
 
   return {
     timetable_page_id: timetable.timetable_id,
@@ -517,61 +517,47 @@ const convertRouteToTimetablePage = (
  * Create timetable pages for all routes in an agency. Used if no
  * `timetables.txt` is present.
  */
-const convertRoutesToTimetablePages = async (config) => {
-  const db = getDb();
-  const routes = await getRoutes();
-  const calendars = await getCalendars();
+const convertRoutesToTimetablePages = (config) => {
+  const db = openDb(config);
+  const routes = getRoutes();
+  const calendars = getCalendars();
 
   // Find all calendar dates with service_ids not present in `calendar.txt`.
   const serviceIds = calendars.map((calendar) => calendar.service_id);
-  const calendarDates = await db.all(
-    `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds
-      .map((serviceId) => `'${serviceId}'`)
-      .join(', ')})`
-  );
+  const calendarDates = db
+    .prepare(
+      `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds
+        .map((serviceId) => `'${serviceId}'`)
+        .join(', ')})`
+    )
+    .all();
+
+  const timetablePages = routes.map((route) => {
+    const trips = getTrips(
+      {
+        route_id: route.route_id,
+      },
+      ['trip_headsign', 'direction_id']
+    );
+    const directions = uniqBy(trips, (trip) => trip.direction_id);
+    const dayGroups = groupBy(calendars, calendarToCalendarCode);
+    const calendarDateGroups = groupBy(calendarDates, 'service_id');
 
-  const timetablePages = await Promise.all(
-    routes.map(async (route) => {
-      const trips = await getTrips(
-        {
-          route_id: route.route_id,
-        },
-        ['trip_headsign', 'direction_id']
-      );
-      const directions = uniqBy(trips, (trip) => trip.direction_id);
-      const dayGroups = groupBy(calendars, calendarToCalendarCode);
-      const calendarDateGroups = groupBy(calendarDates, 'service_id');
-
-      return Promise.all(
-        directions.map((direction) =>
-          Promise.all([
-            Promise.all(
-              Object.values(dayGroups).map((calendars) =>
-                convertRouteToTimetablePage(
-                  route,
-                  direction,
-                  calendars,
-                  null,
-                  config
-                )
-              )
-            ),
-            Promise.all(
-              Object.values(calendarDateGroups).map((calendarDates) =>
-                convertRouteToTimetablePage(
-                  route,
-                  direction,
-                  null,
-                  calendarDates,
-                  config
-                )
-              )
-            ),
-          ])
+    return directions.map((direction) => [
+      Object.values(dayGroups).map((calendars) =>
+        convertRouteToTimetablePage(route, direction, calendars, null, config)
+      ),
+      Object.values(calendarDateGroups).map((calendarDates) =>
+        convertRouteToTimetablePage(
+          route,
+          direction,
+          null,
+          calendarDates,
+          config
         )
-      );
-    })
-  );
+      ),
+    ]);
+  });
 
   return compact(flattenDeep(timetablePages));
 };
@@ -652,9 +638,9 @@ const duplicateStopsForDifferentArrivalDeparture = (
 /*
  * Get a sorted array of stop_ids for a specific timetable.
  */
-const getStopOrder = async (timetable, config) => {
+const getStopOrder = (timetable, config) => {
   // First, check if `timetable_stop_order.txt` for route exists
-  const timetableStopOrders = await getTimetableStopOrders(
+  const timetableStopOrders = getTimetableStopOrders(
     {
       timetable_id: timetable.timetable_id,
     },
@@ -714,45 +700,43 @@ const getStopOrder = async (timetable, config) => {
 /*
  * Get an array of stops for a specific timetable.
  */
-const getStopsForTimetable = async (timetable, config) => {
+const getStopsForTimetable = (timetable, config) => {
   if (timetable.orderedTrips.length === 0) {
     return [];
   }
 
-  const orderedStopIds = await getStopOrder(timetable, config);
-  const orderedStops = await Promise.all(
-    orderedStopIds.map(async (stopId, index) => {
-      const stops = await getStops({
-        stop_id: stopId,
-      });
+  const orderedStopIds = getStopOrder(timetable, config);
+  const orderedStops = orderedStopIds.map((stopId, index) => {
+    const stops = getStops({
+      stop_id: stopId,
+    });
 
-      if (stops.length === 0) {
-        throw new Error(
-          `No stop found found for stop_id=${stopId} in timetable_id=${timetable.timetable_id}`
-        );
-      }
+    if (stops.length === 0) {
+      throw new Error(
+        `No stop found found for stop_id=${stopId} in timetable_id=${timetable.timetable_id}`
+      );
+    }
 
-      const stop = {
-        ...stops[0],
-        trips: [],
-      };
+    const stop = {
+      ...stops[0],
+      trips: [],
+    };
 
-      if (
-        index < orderedStopIds.length - 1 &&
-        stopId === orderedStopIds[index + 1]
-      ) {
-        stop.type = 'arrival';
-      } else if (index > 0 && stopId === orderedStopIds[index - 1]) {
-        stop.type = 'departure';
-      }
+    if (
+      index < orderedStopIds.length - 1 &&
+      stopId === orderedStopIds[index + 1]
+    ) {
+      stop.type = 'arrival';
+    } else if (index > 0 && stopId === orderedStopIds[index - 1]) {
+      stop.type = 'departure';
+    }
 
-      return stop;
-    })
-  );
+    return stop;
+  });
 
   // If `showStopCity` is true, look up stop attributes.
   if (timetable.showStopCity) {
-    const stopAttributes = await getStopAttributes({
+    const stopAttributes = getStopAttributes({
       stop_id: orderedStopIds,
     });
 
@@ -773,8 +757,8 @@ const getStopsForTimetable = async (timetable, config) => {
 /*
  * Get all calendars from a specific timetable.
  */
-const getCalendarsFromTimetable = async (timetable) => {
-  const db = getDb();
+const getCalendarsFromTimetable = (timetable) => {
+  const db = openDb();
   let whereClause = '';
   const whereClauses = [];
 
@@ -808,14 +792,14 @@ const getCalendarsFromTimetable = async (timetable) => {
     whereClause = `WHERE ${whereClauses.join(' AND ')}`;
   }
 
-  return db.all(`SELECT * FROM calendar ${whereClause}`);
+  return db.prepare(`SELECT * FROM calendar ${whereClause}`).all();
 };
 
 /*
  * Get all calendar date service ids for an agency between two dates.
  */
-const getCalendarDatesServiceIds = async (startDate, endDate) => {
-  const db = getDb();
+const getCalendarDatesServiceIds = (startDate, endDate) => {
+  const db = openDb();
   const whereClauses = ['exception_type = 1'];
 
   if (endDate) {
@@ -826,11 +810,13 @@ const getCalendarDatesServiceIds = async (startDate, endDate) => {
     whereClauses.push(`date >= ${sqlString.escape(startDate)}`);
   }
 
-  const calendarDates = await db.all(
-    `SELECT DISTINCT service_id FROM calendar_dates WHERE ${whereClauses.join(
-      ' AND '
-    )}`
-  );
+  const calendarDates = db
+    .prepare(
+      `SELECT DISTINCT service_id FROM calendar_dates WHERE ${whereClauses.join(
+        ' AND '
+      )}`
+    )
+    .all();
   return calendarDates.map((calendarDate) => calendarDate.service_id);
 };
 
@@ -839,8 +825,8 @@ const getCalendarDatesServiceIds = async (startDate, endDate) => {
  * and the stop_id of parent station itself. If no parent station, it returns the
  * stop_id.
  */
-const getAllStationStopIds = async (stopId) => {
-  const stops = await getStops({
+const getAllStationStopIds = (stopId) => {
+  const stops = getStops({
     stop_id: stopId,
   });
 
@@ -850,7 +836,7 @@ const getAllStationStopIds = async (stopId) => {
     return [stopId];
   }
 
-  const stopsInParentStation = await getStops(
+  const stopsInParentStation = getStops(
     {
       parent_station: stop.parent_station,
     },
@@ -866,8 +852,8 @@ const getAllStationStopIds = async (stopId) => {
 /*
  * Get trips with the same `block_id`.
  */
-const getTripsWithSameBlock = async (trip, timetable) => {
-  const trips = await getTrips(
+const getTripsWithSameBlock = (trip, timetable) => {
+  const trips = getTrips(
     {
       block_id: trip.block_id,
       service_id: timetable.service_ids,
@@ -875,26 +861,24 @@ const getTripsWithSameBlock = async (trip, timetable) => {
     ['trip_id', 'route_id']
   );
 
-  await Promise.all(
-    trips.map(async (blockTrip) => {
-      const stopTimes = await getStoptimes(
-        {
-          trip_id: blockTrip.trip_id,
-        },
-        [],
-        [['stop_sequence', 'ASC']]
-      );
+  for (const blockTrip of trips) {
+    const stopTimes = getStoptimes(
+      {
+        trip_id: blockTrip.trip_id,
+      },
+      [],
+      [['stop_sequence', 'ASC']]
+    );
 
-      if (stopTimes.length === 0) {
-        throw new Error(
-          `No stoptimes found found for trip_id=${blockTrip.trip_id}`
-        );
-      }
+    if (stopTimes.length === 0) {
+      throw new Error(
+        `No stoptimes found found for trip_id=${blockTrip.trip_id}`
+      );
+    }
 
-      blockTrip.firstStoptime = first(stopTimes);
-      blockTrip.lastStoptime = last(stopTimes);
-    })
-  );
+    blockTrip.firstStoptime = first(stopTimes);
+    blockTrip.lastStoptime = last(stopTimes);
+  }
 
   return sortBy(trips, (trip) => trip.firstStoptime.departure_timestamp);
 };
@@ -903,7 +887,7 @@ const getTripsWithSameBlock = async (trip, timetable) => {
  * Get next trip and previous trip with the same `block_id` if it arrives or
  * departs from the same stop and is a different route.
  */
-const addTripContinuation = async (trip, timetable) => {
+const addTripContinuation = (trip, timetable) => {
   if (!trip.block_id) {
     return;
   }
@@ -911,10 +895,10 @@ const addTripContinuation = async (trip, timetable) => {
   const maxContinuesAsWaitingTimeSeconds = 60 * 60;
 
   const firstStoptime = first(trip.stoptimes);
-  const firstStopIds = await getAllStationStopIds(firstStoptime.stop_id);
+  const firstStopIds = getAllStationStopIds(firstStoptime.stop_id);
   const lastStoptime = last(trip.stoptimes);
-  const lastStopIds = await getAllStationStopIds(lastStoptime.stop_id);
-  const blockTrips = await getTripsWithSameBlock(trip, timetable);
+  const lastStopIds = getAllStationStopIds(lastStoptime.stop_id);
+  const blockTrips = getTripsWithSameBlock(trip, timetable);
 
   // "Continues From" trips must be the previous trip chronologically.
   const previousTrip = findLast(
@@ -937,7 +921,7 @@ const addTripContinuation = async (trip, timetable) => {
       firstStoptime.departure_timestamp - maxContinuesAsWaitingTimeSeconds &&
     firstStopIds.includes(previousTrip.lastStoptime.stop_id)
   ) {
-    const routes = await getRoutes({
+    const routes = getRoutes({
       route_id: previousTrip.route_id,
     });
 
@@ -968,7 +952,7 @@ const addTripContinuation = async (trip, timetable) => {
       lastStoptime.arrival_timestamp + maxContinuesAsWaitingTimeSeconds &&
     lastStopIds.includes(nextTrip.firstStoptime.stop_id)
   ) {
-    const routes = await getRoutes({
+    const routes = getRoutes({
       route_id: nextTrip.route_id,
     });
 
@@ -1021,7 +1005,9 @@ const filterTrips = (timetable) => {
 /*
  * Get all trips from a timetable.
  */
-const getTripsForTimetable = async (timetable, calendars, config) => {
+
+/* eslint-disable complexity */
+const getTripsForTimetable = (timetable, calendars, config) => {
   const tripQuery = {
     route_id: timetable.route_ids,
     service_id: timetable.service_ids,
@@ -1031,7 +1017,7 @@ const getTripsForTimetable = async (timetable, calendars, config) => {
     tripQuery.direction_id = timetable.direction_id;
   }
 
-  const trips = await getTrips(tripQuery);
+  const trips = getTrips(tripQuery);
 
   if (trips.length === 0) {
     timetable.warnings.push(
@@ -1043,7 +1029,7 @@ const getTripsForTimetable = async (timetable, calendars, config) => {
     );
   }
 
-  const frequencies = await getFrequencies({
+  const frequencies = getFrequencies({
     trip_id: trips.map((trip) => trip.trip_id),
   });
 
@@ -1051,81 +1037,78 @@ const getTripsForTimetable = async (timetable, calendars, config) => {
   timetable.service_ids = uniq(trips.map((trip) => trip.service_id));
 
   const formattedTrips = [];
-  await Promise.all(
-    trips.map(async (trip) => {
-      const formattedTrip = formatTrip(trip, timetable, calendars, config);
-      formattedTrip.stoptimes = await getStoptimes(
-        {
-          trip_id: formattedTrip.trip_id,
-        },
-        [],
-        [['stop_sequence', 'ASC']]
-      );
 
-      if (formattedTrip.stoptimes.length === 0) {
-        timetable.warnings.push(
-          `No stoptimes found for trip_id=${
-            formattedTrip.trip_id
-          }, route_id=${timetable.route_ids.join('_')}, timetable_id=${
-            timetable.timetable_id
-          }`
-        );
-      }
+  for (const trip of trips) {
+    const formattedTrip = formatTrip(trip, timetable, calendars, config);
+    formattedTrip.stoptimes = getStoptimes(
+      {
+        trip_id: formattedTrip.trip_id,
+      },
+      [],
+      [['stop_sequence', 'ASC']]
+    );
 
-      // Exclude trips before timetable `start_timestamp`
-      if (
-        timetable.start_timestamp !== '' &&
-        timetable.start_timestamp !== null &&
-        timetable.start_timestamp !== undefined
-      ) {
-        if (trip.stoptimes[0].arrival_timestamp < timetable.start_timestamp) {
-          return;
-        }
-      }
+    if (formattedTrip.stoptimes.length === 0) {
+      timetable.warnings.push(
+        `No stoptimes found for trip_id=${
+          formattedTrip.trip_id
+        }, route_id=${timetable.route_ids.join('_')}, timetable_id=${
+          timetable.timetable_id
+        }`
+      );
+    }
 
-      // Exclude trips after timetable `end_timestamp`
-      if (
-        timetable.end_timestamp !== '' &&
-        timetable.end_timestamp !== null &&
-        timetable.end_timestamp !== undefined
-      ) {
-        if (trip.stoptimes[0].arrival_timestamp >= timetable.end_timestamp) {
-          return;
-        }
-      }
+    // Exclude trips before timetable `start_timestamp`
+    if (
+      timetable.start_timestamp !== '' &&
+      timetable.start_timestamp !== null &&
+      timetable.start_timestamp !== undefined &&
+      trip.stoptimes[0].arrival_timestamp < timetable.start_timestamp
+    ) {
+      return;
+    }
 
-      if (timetable.show_trip_continuation) {
-        await addTripContinuation(formattedTrip, timetable);
+    // Exclude trips after timetable `end_timestamp`
+    if (
+      timetable.end_timestamp !== '' &&
+      timetable.end_timestamp !== null &&
+      timetable.end_timestamp !== undefined &&
+      trip.stoptimes[0].arrival_timestamp >= timetable.end_timestamp
+    ) {
+      return;
+    }
 
-        if (formattedTrip.continues_as_route) {
-          timetable.has_continues_as_route = true;
-        }
+    if (timetable.show_trip_continuation) {
+      addTripContinuation(formattedTrip, timetable);
 
-        if (formattedTrip.continues_from_route) {
-          timetable.has_continues_from_route = true;
-        }
+      if (formattedTrip.continues_as_route) {
+        timetable.has_continues_as_route = true;
       }
 
-      const tripFrequencies = frequencies.filter(
-        (frequency) => frequency.trip_id === trip.trip_id
-      );
-
-      if (tripFrequencies.length === 0) {
-        formattedTrips.push(formattedTrip);
-      } else {
-        const frequencyTrips = generateTripsByFrequencies(
-          formattedTrip,
-          frequencies,
-          config
-        );
-        formattedTrips.push(...frequencyTrips);
-        timetable.frequencies = frequencies;
-        timetable.frequencyExactTimes = some(frequencies, {
-          exact_times: 1,
-        });
+      if (formattedTrip.continues_from_route) {
+        timetable.has_continues_from_route = true;
       }
-    })
-  );
+    }
+
+    const tripFrequencies = frequencies.filter(
+      (frequency) => frequency.trip_id === trip.trip_id
+    );
+
+    if (tripFrequencies.length === 0) {
+      formattedTrips.push(formattedTrip);
+    } else {
+      const frequencyTrips = generateTripsByFrequencies(
+        formattedTrip,
+        frequencies,
+        config
+      );
+      formattedTrips.push(...frequencyTrips);
+      timetable.frequencies = frequencies;
+      timetable.frequencyExactTimes = some(frequencies, {
+        exact_times: 1,
+      });
+    }
+  }
 
   if (config.useParentStation) {
     const stopIds = [];
@@ -1136,7 +1119,7 @@ const getTripsForTimetable = async (timetable, calendars, config) => {
       }
     }
 
-    const stops = await getStops(
+    const stops = getStops(
       {
         stop_id: uniq(stopIds),
       },
@@ -1156,73 +1139,65 @@ const getTripsForTimetable = async (timetable, calendars, config) => {
 
   return sortTrips(formattedTrips, config);
 };
+/* eslint-enable complexity */
 
 /*
  * Format timetables for display.
  */
-const formatTimetables = async (timetables, config) => {
-  const formattedTimetables = await Promise.all(
-    timetables.map(async (timetable) => {
-      timetable.warnings = [];
-      const dayList = formatDays(timetable, config);
-      const calendars = await getCalendarsFromTimetable(timetable);
-      let serviceIds = calendars.map((calendar) => calendar.service_id);
-
-      if (timetable.include_exceptions === 1) {
-        const calendarDatesServiceIds = await getCalendarDatesServiceIds(
-          timetable.start_date,
-          timetable.end_date
-        );
-        serviceIds = uniq([...serviceIds, ...calendarDatesServiceIds]);
-      }
+const formatTimetables = (timetables, config) => {
+  const formattedTimetables = timetables.map((timetable) => {
+    timetable.warnings = [];
+    const dayList = formatDays(timetable, config);
+    const calendars = getCalendarsFromTimetable(timetable);
+    let serviceIds = calendars.map((calendar) => calendar.service_id);
+
+    if (timetable.include_exceptions === 1) {
+      const calendarDatesServiceIds = getCalendarDatesServiceIds(
+        timetable.start_date,
+        timetable.end_date
+      );
+      serviceIds = uniq([...serviceIds, ...calendarDatesServiceIds]);
+    }
 
-      Object.assign(timetable, {
-        noServiceSymbolUsed: false,
-        requestDropoffSymbolUsed: false,
-        noDropoffSymbolUsed: false,
-        requestPickupSymbolUsed: false,
-        noPickupSymbolUsed: false,
-        interpolatedStopSymbolUsed: false,
-        showStopCity: config.showStopCity,
-        showStopDescription: config.showStopDescription,
-        noServiceSymbol: config.noServiceSymbol,
-        requestDropoffSymbol: config.requestDropoffSymbol,
-        noDropoffSymbol: config.noDropoffSymbol,
-        requestPickupSymbol: config.requestPickupSymbol,
-        noPickupSymbol: config.noPickupSymbol,
-        interpolatedStopSymbol: config.interpolatedStopSymbol,
-        orientation: timetable.orientation || config.defaultOrientation,
-        service_ids: serviceIds,
-        dayList,
-        dayListLong: formatDaysLong(dayList, config),
-      });
+    Object.assign(timetable, {
+      noServiceSymbolUsed: false,
+      requestDropoffSymbolUsed: false,
+      noDropoffSymbolUsed: false,
+      requestPickupSymbolUsed: false,
+      noPickupSymbolUsed: false,
+      interpolatedStopSymbolUsed: false,
+      showStopCity: config.showStopCity,
+      showStopDescription: config.showStopDescription,
+      noServiceSymbol: config.noServiceSymbol,
+      requestDropoffSymbol: config.requestDropoffSymbol,
+      noDropoffSymbol: config.noDropoffSymbol,
+      requestPickupSymbol: config.requestPickupSymbol,
+      noPickupSymbol: config.noPickupSymbol,
+      interpolatedStopSymbol: config.interpolatedStopSymbol,
+      orientation: timetable.orientation || config.defaultOrientation,
+      service_ids: serviceIds,
+      dayList,
+      dayListLong: formatDaysLong(dayList, config),
+    });
 
-      timetable.orderedTrips = await getTripsForTimetable(
-        timetable,
-        calendars,
-        config
-      );
-      timetable.stops = await getStopsForTimetable(timetable, config);
-      timetable.calendarDates = await getCalendarDatesForTimetable(
-        timetable,
-        config
-      );
-      timetable.timetable_label = formatTimetableLabel(timetable);
-      timetable.notes = await getTimetableNotesForTimetable(timetable, config);
+    timetable.orderedTrips = getTripsForTimetable(timetable, calendars, config);
+    timetable.stops = getStopsForTimetable(timetable, config);
+    timetable.calendarDates = getCalendarDatesForTimetable(timetable, config);
+    timetable.timetable_label = formatTimetableLabel(timetable);
+    timetable.notes = getTimetableNotesForTimetable(timetable, config);
 
-      if (config.showMap) {
-        timetable.geojson = await getTimetableGeoJSON(timetable, config);
-      }
+    if (config.showMap) {
+      timetable.geojson = getTimetableGeoJSON(timetable, config);
+    }
 
-      // Filter trips after all timetable properties are assigned
-      timetable.orderedTrips = filterTrips(timetable);
+    // Filter trips after all timetable properties are assigned
+    timetable.orderedTrips = filterTrips(timetable);
 
-      // Format stops after all timetable properties are assigned
-      timetable.stops = formatStops(timetable, config);
+    // Format stops after all timetable properties are assigned
+    timetable.stops = formatStops(timetable, config);
 
-      return timetable;
-    })
-  );
+    return timetable;
+  });
 
   if (config.allowEmptyTimetables) {
     return formattedTimetables;
@@ -1236,15 +1211,15 @@ const formatTimetables = async (timetables, config) => {
 /*
  * Get all timetable pages for an agency.
  */
-export async function getTimetablePagesForAgency(config) {
-  const timetables = mergeTimetablesWithSameId(await getTimetables());
+export function getTimetablePagesForAgency(config) {
+  const timetables = mergeTimetablesWithSameId(getTimetables());
 
   // If no timetables, build each route and direction into a timetable.
   if (timetables.length === 0) {
     return convertRoutesToTimetablePages(config);
   }
 
-  const timetablePages = await getTimetablePages(
+  const timetablePages = getTimetablePages(
     {},
     [],
     [['timetable_page_id', 'ASC']]
@@ -1253,48 +1228,44 @@ export async function getTimetablePagesForAgency(config) {
   // Check if there are any timetable pages defined in `timetable_pages.txt`.
   if (timetablePages.length === 0) {
     // If no timetablepages, use timetables
-    return Promise.all(
-      timetables.map((timetable) =>
-        convertTimetableToTimetablePage(timetable, config)
-      )
+    return timetables.map((timetable) =>
+      convertTimetableToTimetablePage(timetable, config)
     );
   }
 
-  const routes = await getRoutes();
+  const routes = getRoutes();
 
   // Otherwise, use timetable pages defined in `timetable_pages.txt`.
-  return Promise.all(
-    timetablePages.map(async (timetablePage) => {
-      timetablePage.timetables = sortBy(
-        timetables.filter(
-          (timetable) =>
-            timetable.timetable_page_id === timetablePage.timetable_page_id
-        ),
-        'timetable_sequence'
-      );
+  return timetablePages.map((timetablePage) => {
+    timetablePage.timetables = sortBy(
+      timetables.filter(
+        (timetable) =>
+          timetable.timetable_page_id === timetablePage.timetable_page_id
+      ),
+      'timetable_sequence'
+    );
 
-      // Add routes for each timetable.
-      for (const timetable of timetablePage.timetables) {
-        timetable.routes = routes.filter((route) =>
-          timetable.route_ids.includes(route.route_id)
-        );
-      }
+    // Add routes for each timetable.
+    for (const timetable of timetablePage.timetables) {
+      timetable.routes = routes.filter((route) =>
+        timetable.route_ids.includes(route.route_id)
+      );
+    }
 
-      return timetablePage;
-    })
-  );
+    return timetablePage;
+  });
 }
 
 /*
  * Get a timetable_page by id.
  */
-const getTimetablePageById = async (timetablePageId, config) => {
+const getTimetablePageById = (timetablePageId, config) => {
   // Check if there are any timetable pages defined in `timetable_pages.txt`.
-  const timetablePages = await getTimetablePages({
+  const timetablePages = getTimetablePages({
     timetable_page_id: timetablePageId,
   });
 
-  const timetables = mergeTimetablesWithSameId(await getTimetables());
+  const timetables = mergeTimetablesWithSameId(getTimetables());
 
   if (timetablePages.length > 1) {
     throw new Error(
@@ -1313,13 +1284,11 @@ const getTimetablePageById = async (timetablePageId, config) => {
     );
 
     // Add routes for each timetable
-    await Promise.all(
-      timetablePage.timetables.map(async (timetable) => {
-        timetable.routes = await getRoutes({
-          route_id: timetable.route_ids,
-        });
-      })
-    );
+    for (const timetable of timetablePage.timetables) {
+      timetable.routes = getRoutes({
+        route_id: timetable.route_ids,
+      });
+    }
 
     return timetablePage;
   }
@@ -1356,11 +1325,11 @@ const getTimetablePageById = async (timetablePageId, config) => {
 
   const routeId = parts.join('|');
 
-  const routes = await getRoutes({
+  const routes = getRoutes({
     route_id: routeId,
   });
 
-  const trips = await getTrips(
+  const trips = getTrips(
     {
       route_id: routeId,
       direction_id: directionId,
@@ -1376,12 +1345,12 @@ const getTimetablePageById = async (timetablePageId, config) => {
   }
 
   if (/^[01]*$/.test(calendarCode)) {
-    calendars = await getCalendars({
+    calendars = getCalendars({
       ...calendarCodeToCalendar(calendarCode),
     });
   } else {
     serviceId = calendarCode;
-    calendarDates = await getCalendarDates({
+    calendarDates = getCalendarDates({
       exception_type: 1,
       service_id: serviceId,
     });
@@ -1462,10 +1431,10 @@ export function setDefaultConfig(initialConfig) {
 /*
  * Get a timetable page by id.
  */
-export async function getFormattedTimetablePage(timetablePageId, config) {
-  const timetablePage = await getTimetablePageById(timetablePageId, config);
+export function getFormattedTimetablePage(timetablePageId, config) {
+  const timetablePage = getTimetablePageById(timetablePageId, config);
 
-  timetablePage.consolidatedTimetables = await formatTimetables(
+  timetablePage.consolidatedTimetables = formatTimetables(
     timetablePage.timetables,
     config
   );
@@ -1481,7 +1450,7 @@ export async function getFormattedTimetablePage(timetablePageId, config) {
     flatMap(timetablePage.consolidatedTimetables, 'route_ids')
   );
 
-  const timetableRoutes = await getRoutes(
+  const timetableRoutes = getRoutes(
     {
       route_id: timetablePage.route_ids,
     },
@@ -1502,21 +1471,17 @@ export async function getFormattedTimetablePage(timetablePageId, config) {
   }
 
   // Get `direction_name` for each timetable.
-  await Promise.all(
-    timetablePage.consolidatedTimetables.map(async (timetable) => {
-      if (isNullOrEmpty(timetable.direction_name)) {
-        timetable.direction_name = await getDirectionHeadsignFromTimetable(
-          timetable
-        );
-      }
+  for (const timetable of timetablePage.consolidatedTimetables) {
+    if (isNullOrEmpty(timetable.direction_name)) {
+      timetable.direction_name = getDirectionHeadsignFromTimetable(timetable);
+    }
 
-      if (!timetable.routes) {
-        timetable.routes = await getRoutes({
-          route_id: timetable.route_ids,
-        });
-      }
-    })
-  );
+    if (!timetable.routes) {
+      timetable.routes = getRoutes({
+        route_id: timetable.route_ids,
+      });
+    }
+  }
 
   return timetablePage;
 }
@@ -1564,7 +1529,7 @@ export function generateTimetableHTML(timetablePage, config) {
 /*
  * Generate the CSV timetable for a timetable page.
  */
-export async function generateTimetableCSV(timetable) {
+export function generateTimetableCSV(timetable) {
   // Generate horizontal orientation, then transpose if vertical is needed.
   const lines = [];
 
@@ -1606,15 +1571,15 @@ export async function generateTimetableCSV(timetable) {
 /*
  * Generate the HTML for the agency overview page.
  */
-export async function generateOverviewHTML(timetablePages, config) {
-  const agencies = await getAgencies();
+export function generateOverviewHTML(timetablePages, config) {
+  const agencies = getAgencies();
   if (agencies.length === 0) {
     throw new Error('No agencies found');
   }
 
   let geojson;
   if (config.showMap) {
-    geojson = await getAgencyGeoJSON(config);
+    geojson = getAgencyGeoJSON(config);
   }
 
   // Sort timetables for display, first numerically then alphabetically.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.4.4",
+  "version": "2.5.0",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -42,7 +42,7 @@
     "copy-dir": "^1.3.0",
     "csv-stringify": "^6.2.3",
     "express": "^4.18.2",
-    "gtfs": "^3.8.0",
+    "gtfs": "^4.0.1",
     "js-beautify": "^1.14.7",
     "lodash-es": "^4.17.21",
     "moment": "^2.29.4",
@@ -59,7 +59,7 @@
     "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
-    "eslint": "^8.30.0",
+    "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-xo": "^0.43.1",
     "husky": "^8.0.2",