gtfs 4.10.4 → 4.11.1

package/lib/gtfs/transfers.js

@@ -16,7 +16,7 @@ export function getTransfers(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(transfers.filenameBase);
@@ -26,7 +26,7 @@ export function getTransfers(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs/translations.js

@@ -16,7 +16,7 @@ export function getTranslations(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(translations.filenameBase);
@@ -26,7 +26,7 @@ export function getTranslations(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs/trips.js

@@ -21,7 +21,7 @@ export function getTrips(query = {}, fields = [], orderBy = [], options = {}) {
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-plus/calendar-attributes.js

@@ -16,7 +16,7 @@ export function getCalendarAttributes(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(calendarAttributes.filenameBase);
@@ -26,7 +26,7 @@ export function getCalendarAttributes(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-plus/directions.js

@@ -16,7 +16,7 @@ export function getDirections(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(directions.filenameBase);
@@ -26,7 +26,7 @@ export function getDirections(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-plus/route-attributes.js

@@ -16,7 +16,7 @@ export function getRouteAttributes(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(routeAttributes.filenameBase);
@@ -26,7 +26,7 @@ export function getRouteAttributes(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-plus/stop-attributes.js

@@ -16,7 +16,7 @@ export function getStopAttributes(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(stopAttributes.filenameBase);
@@ -26,7 +26,7 @@ export function getStopAttributes(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-realtime/service-alerts.js

@@ -17,7 +17,7 @@ export function getServiceAlerts(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(serviceAlerts.filenameBase);
@@ -28,7 +28,7 @@ export function getServiceAlerts(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} INNER JOIN ${joinTable} ON ${tableName}.id=${joinTable}.alert_id ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} INNER JOIN ${joinTable} ON ${tableName}.id=${joinTable}.alert_id ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-realtime/trip-updates.js

@@ -16,7 +16,7 @@ export function getTripUpdates(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(tripUpdates.filenameBase);
@@ -26,7 +26,7 @@ export function getTripUpdates(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-realtime/vehicle-positions.js

@@ -16,7 +16,7 @@ export function getVehiclePositions(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(vehiclePositions.filenameBase);
@@ -26,7 +26,7 @@ export function getVehiclePositions(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-ride/board-alights.js

@@ -16,7 +16,7 @@ export function getBoardAlights(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(boardAlights.filenameBase);
@@ -26,7 +26,7 @@ export function getBoardAlights(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-ride/ride-feed-infos.js

@@ -16,7 +16,7 @@ export function getRideFeedInfos(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(rideFeedInfo.filenameBase);
@@ -26,7 +26,7 @@ export function getRideFeedInfos(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-ride/rider-trips.js

@@ -16,7 +16,7 @@ export function getRiderTrips(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(riderTrip.filenameBase);
@@ -26,7 +26,7 @@ export function getRiderTrips(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-ride/riderships.js

@@ -16,7 +16,7 @@ export function getRiderships(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(riderships.filenameBase);
@@ -26,7 +26,7 @@ export function getRiderships(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs-ride/trip-capacities.js

@@ -16,7 +16,7 @@ export function getTripCapacities(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(tripCapacity.filenameBase);
@@ -26,7 +26,7 @@ export function getTripCapacities(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs.js

@@ -8,6 +8,7 @@ import exportGtfs from './export.js';
 import { getAgencies } from './gtfs/agencies.js';
 import { getAreas } from './gtfs/areas.js';
 import { getAttributions } from './gtfs/attributions.js';
+import { getBookingRules } from './gtfs/booking-rules.js';
 import { getCalendarDates } from './gtfs/calendar-dates.js';
 import { getCalendars } from './gtfs/calendars.js';
 import { getFareAttributes } from './gtfs/fare-attributes.js';
@@ -19,6 +20,8 @@ import { getFareTransferRules } from './gtfs/fare-transfer-rules.js';
 import { getFeedInfo } from './gtfs/feed-info.js';
 import { getFrequencies } from './gtfs/frequencies.js';
 import { getLevels } from './gtfs/levels.js';
+import { getLocationGroups } from './gtfs/location-groups.js';
+import { getLocationGroupStops } from './gtfs/location-group-stops.js';
 import { getNetworks } from './gtfs/networks.js';
 import { getPathways } from './gtfs/pathways.js';
 import { getRouteNetworks } from './gtfs/route-networks.js';
@@ -86,6 +89,9 @@ export { _getAreas as getAreas };
 const _getAttributions = getAttributions;
 export { _getAttributions as getAttributions };
 
+const _getBookingRules = getBookingRules;
+export { _getBookingRules as getBookingRules };
+
 const _getCalendarDates = getCalendarDates;
 export { _getCalendarDates as getCalendarDates };
 
@@ -119,6 +125,12 @@ export { _getFrequencies as getFrequencies };
 const _getLevels = getLevels;
 export { _getLevels as getLevels };
 
+const _getLocationGroups = getLocationGroups;
+export { _getLocationGroups as getLocationGroups };
+
+const _getLocationGroupStops = getLocationGroupStops;
+export { _getLocationGroupStops as getLocationGroupStops };
+
 const _getNetworks = getNetworks;
 export { _getNetworks as getNetworks };
 

package/lib/import.js

@@ -1,7 +1,6 @@
 import path from 'node:path';
 import { createReadStream, existsSync, lstatSync } from 'node:fs';
-import { readdir, rename, writeFile } from 'node:fs/promises';
-import copy from 'recursive-copy';
+import { cp, readdir, rename, writeFile } from 'node:fs/promises';
 import fetch from 'node-fetch';
 import { parse } from 'csv-parse';
 import pluralize from 'pluralize';
@@ -42,7 +41,7 @@ const downloadFiles = async (task) => {
   });
 
   if (response.status !== 200) {
-    throw new Error('Couldn’t download files');
+    throw new Error(`Unable to download GTFS from ${task.agency_url}`);
   }
 
   const buffer = await response.arrayBuffer();
@@ -51,14 +50,19 @@ const downloadFiles = async (task) => {
   task.log('Download successful');
 };
 
-const downloadGtfsRealtimeData = async (url, headers) => {
+const downloadGtfsRealtimeData = async (url, task) => {
   const response = await fetch(url, {
     method: 'GET',
-    headers: { ...{}, ...headers, ...{ 'Accept-Encoding': 'gzip' } },
+    headers: {
+      ...{},
+      ...task.realtime_headers,
+      ...{ 'Accept-Encoding': 'gzip' },
+    },
   });
 
   if (response.status !== 200) {
-    throw new Error('Couldn’t download files');
+    task.warn(`Unable to download GTFS-Realtime from ${url}`);
+    return null;
   }
 
   const buffer = await response.arrayBuffer();
@@ -190,17 +194,14 @@ const updateRealtimeData = async (task) => {
   for (const realtimeUrl of task.realtime_urls) {
     task.log(`Downloading GTFS-Realtime from ${realtimeUrl}`);
     // eslint-disable-next-line no-await-in-loop
-    const gtfsRealtimeData = await downloadGtfsRealtimeData(
-      realtimeUrl,
-      task.realtime_headers,
-    );
-
-    task.log(`Download successful`);
+    const gtfsRealtimeData = await downloadGtfsRealtimeData(realtimeUrl, task);
 
-    if (!gtfsRealtimeData.entity) {
+    if (!gtfsRealtimeData?.entity) {
       continue;
     }
 
+    task.log(`Download successful`);
+
     let totalLineCount = 0;
 
     for (const entity of gtfsRealtimeData.entity) {
@@ -353,7 +354,7 @@ const readFiles = async (task) => {
   } else {
     // Local file is unzipped, just copy it from there.
     try {
-      await copy(gtfsPath, task.downloadDir);
+      await cp(gtfsPath, task.downloadDir, { recursive: true });
     } catch {
       throw new Error(
         `Unable to load files from path \`${gtfsPath}\` defined in configuration. Verify that path exists and contains GTFS files.`,
@@ -469,22 +470,29 @@ const formatLine = (line, model, totalLineCount) => {
     }
   }
 
-  // Convert to midnight timestamp
-  const timestampColumnNames = [
+  // Convert to midnight timestamp and add timestamp columns as integer seconds from midnight
+  const timeColumnNames = [
     'start_time',
     'end_time',
     'arrival_time',
     'departure_time',
+    'prior_notice_last_time',
+    'prior_notice_start_time',
+    'start_pickup_drop_off_window',
   ];
 
-  for (const timestampColumnName of timestampColumnNames) {
-    if (formattedLine[timestampColumnName]) {
-      formattedLine[`${timestampColumnName}stamp`] =
-        calculateSecondsFromMidnight(formattedLine[timestampColumnName]);
+  for (const timeColumnName of timeColumnNames) {
+    if (formattedLine[timeColumnName]) {
+      const timestampColumnName = timeColumnName.endsWith('time')
+        ? `${timeColumnName}stamp`
+        : `${timeColumnName}_timestamp`;
+      formattedLine[timestampColumnName] = calculateSecondsFromMidnight(
+        formattedLine[timeColumnName],
+      );
 
       // Ensure leading zeros for time columns
-      formattedLine[timestampColumnName] = padLeadingZeros(
-        formattedLine[timestampColumnName],
+      formattedLine[timeColumnName] = padLeadingZeros(
+        formattedLine[timeColumnName],
       );
     }
   }

package/lib/non-standard/timetable-notes-references.js

@@ -16,7 +16,7 @@ export function getTimetableNotesReferences(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetableNotesReferences.filenameBase);
@@ -26,7 +26,7 @@ export function getTimetableNotesReferences(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/non-standard/timetable-notes.js

@@ -16,7 +16,7 @@ export function getTimetableNotes(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetableNotes.filenameBase);
@@ -26,7 +26,7 @@ export function getTimetableNotes(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/non-standard/timetable-pages.js

@@ -16,7 +16,7 @@ export function getTimetablePages(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetablePages.filenameBase);
@@ -26,7 +26,7 @@ export function getTimetablePages(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/non-standard/timetable-stop-order.js

@@ -16,7 +16,7 @@ export function getTimetableStopOrders(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetableStopOrder.filenameBase);
@@ -26,7 +26,7 @@ export function getTimetableStopOrders(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/non-standard/timetables.js

@@ -16,7 +16,7 @@ export function getTimetables(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(timetables.filenameBase);
@@ -26,7 +26,7 @@ export function getTimetables(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/non-standard/trips-dated-vehicle-journey.js

@@ -16,7 +16,7 @@ export function getTripsDatedVehicleJourneys(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(directions.filenameBase);
@@ -26,7 +26,7 @@ export function getTripsDatedVehicleJourneys(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/ods/deadhead-times.js

@@ -16,7 +16,7 @@ export function getDeadheadTimes(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(deadheadTimes.filenameBase);
@@ -26,7 +26,7 @@ export function getDeadheadTimes(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/ods/deadheads.js

@@ -16,7 +16,7 @@ export function getDeadheads(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(deadheads.filenameBase);
@@ -26,7 +26,7 @@ export function getDeadheads(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/ods/ops-locations.js

@@ -16,7 +16,7 @@ export function getOpsLocations(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(opsLocations.filenameBase);
@@ -26,7 +26,7 @@ export function getOpsLocations(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/ods/run-events.js

@@ -16,7 +16,7 @@ export function getRunEvents(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(runEvents.filenameBase);
@@ -26,7 +26,7 @@ export function getRunEvents(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/ods/runs-pieces.js

@@ -16,7 +16,7 @@ export function getRunsPieces(
   query = {},
   fields = [],
   orderBy = [],
-  options = {}
+  options = {},
 ) {
   const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(runsPieces.filenameBase);
@@ -26,7 +26,7 @@ export function getRunsPieces(
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/models/gtfs/attributions.js

@@ -10,13 +10,13 @@ const model = {
     },
     {
       name: 'agency_id',
-      type: 'varchar(255)',      
+      type: 'varchar(255)',
       prefix: true,
     },
     {
       name: 'route_id',
       type: 'varchar(255)',
-      prefix: true,      
+      prefix: true,
     },
     {
       name: 'trip_id',