gtfs 4.10.3 → 4.11.0

package/lib/gtfs/location-groups.js

@@ -0,0 +1,32 @@
+import sqlString from 'sqlstring-sqlite';
+
+import { openDb } from '../db.js';
+
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
+import locationGroups from '../../models/gtfs/location-groups.js';
+
+/*
+ * Returns an array of all location groups that match the query parameters.
+ */
+export function getLocationGroups(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {},
+) {
+  const db = options.db ?? openDb();
+  const tableName = sqlString.escapeId(locationGroups.filenameBase);
+  const selectClause = formatSelectClause(fields);
+  const whereClause = formatWhereClauses(query);
+  const orderByClause = formatOrderByClause(orderBy);
+
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
+    )
+    .all();
+}

package/lib/gtfs/pathways.js

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

package/lib/gtfs/routes.js

@@ -18,7 +18,7 @@ function buildStoptimeSubquery(query) {
 
 function buildTripSubquery(query) {
   return `SELECT DISTINCT route_id FROM trips WHERE trip_id IN (${buildStoptimeSubquery(
-    query
+    query,
   )})`;
 }
 
@@ -37,7 +37,7 @@ export function getRoutes(query = {}, fields = [], orderBy = [], options = {}) {
   const stoptimeQuery = pick(query, ['stop_id']);
 
   const whereClauses = Object.entries(routeQuery).map(([key, value]) =>
-    formatWhereClause(key, value)
+    formatWhereClause(key, value),
   );
 
   if (Object.values(stoptimeQuery).length > 0) {
@@ -50,7 +50,7 @@ export function getRoutes(query = {}, fields = [], orderBy = [], options = {}) {
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }

package/lib/gtfs/shapes.js

@@ -48,7 +48,7 @@ export function getShapes(query = {}, fields = [], orderBy = [], options = {}) {
   ]);
 
   const whereClauses = Object.entries(shapeQuery).map(([key, value]) =>
-    formatWhereClause(key, value)
+    formatWhereClause(key, value),
   );
 
   if (Object.values(tripQuery).length > 0) {
@@ -61,7 +61,7 @@ export function getShapes(query = {}, fields = [], orderBy = [], options = {}) {
 
   return db
     .prepare(
-      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`,
     )
     .all();
 }
@@ -93,17 +93,17 @@ export function getShapesAsGeoJSON(query = {}, options = {}) {
       shapeQuery,
       ['shape_id', 'shape_pt_sequence', 'shape_pt_lon', 'shape_pt_lat'],
       [],
-      options
+      options,
     );
     const routeAttributes = getRouteAttributes(
       { route_id: route.route_id },
       [],
       [],
-      options
+      options,
     );
 
     const agency = agencies.find(
-      (agency) => agency.agency_id === route.agency_id
+      (agency) => agency.agency_id === route.agency_id,
     );
 
     const geojsonProperties = {

package/lib/gtfs/stop-areas.js

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

package/lib/gtfs/stop-times.js

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

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

@@ -348,7 +348,6 @@ const readFiles = async (task) => {
       }
     } catch (error) {
       task.error(error);
-      console.error(error);
       throw new Error(`Unable to unzip file ${task.path}`);
     }
   } else {
@@ -470,22 +469,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/log-utils.js

@@ -1,11 +1,7 @@
 import { clearLine, cursorTo } from 'node:readline';
-import PrettyError from 'pretty-error';
 import { noop } from 'lodash-es';
 import * as colors from 'yoctocolors';
 
-const pe = new PrettyError();
-pe.start();
-
 /*
  * Returns a log function based on config settings
  */
@@ -71,7 +67,7 @@ export function formatError(error) {
   const messageText = error instanceof Error ? error.message : error;
   const errorMessage = `${colors.underline('Error')}: ${messageText.replace(
     'Error: ',
-    ''
+    '',
   )}`;
   return colors.red(errorMessage);
 }

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();
 }