gtfs 4.0.3 → 4.1.1

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

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

package/lib/{non-standard → gtfs-plus}/directions.js

@@ -7,7 +7,7 @@ import {
   formatSelectClause,
   formatWhereClauses,
 } from '../utils.js';
-import directions from '../../models/non-standard/directions.js';
+import directions from '../../models/gtfs-plus/directions.js';
 
 /*
  * Returns an array of all directions that match the query parameters.

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

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

package/lib/{non-standard → gtfs-plus}/stop-attributes.js

@@ -7,7 +7,7 @@ import {
   formatSelectClause,
   formatWhereClauses,
 } from '../utils.js';
-import stopAttributes from '../../models/non-standard/stop-attributes.js';
+import stopAttributes from '../../models/gtfs-plus/stop-attributes.js';
 
 /*
  * Returns an array of all stop attributes that match the query parameters.

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

@@ -11,7 +11,7 @@ import serviceAlerts from '../../models/gtfs-realtime/service-alerts.js';
 import serviceAlertTargets from '../../models/gtfs-realtime/service-alert-targets.js';
 
 /*
- * Returns an array of all serivce alerts that match the query parameters.
+ * Returns an array of all service alerts that match the query parameters.
  */
 export function getServiceAlerts(
   query = {},

package/lib/gtfs.js

@@ -28,9 +28,13 @@ import { getTransfers } from './gtfs/transfers.js';
 import { getTranslations } from './gtfs/translations.js';
 import { getTrips } from './gtfs/trips.js';
 
+// GTFS Plus Filenames
+import { getCalendarAttributes } from './gtfs-plus/calendar-attributes.js';
+import { getDirections } from './gtfs-plus/directions.js';
+import { getRouteAttributes } from './gtfs-plus/route-attributes.js';
+import { getStopAttributes } from './gtfs-plus/stop-attributes.js';
+
 // Non-standard GTFS Filenames
-import { getDirections } from './non-standard/directions.js';
-import { getStopAttributes } from './non-standard/stop-attributes.js';
 import { getTimetables } from './non-standard/timetables.js';
 import { getTimetableStopOrders } from './non-standard/timetable-stop-order.js';
 import { getTimetablePages } from './non-standard/timetable-pages.js';
@@ -51,6 +55,13 @@ import { getTripUpdates } from './gtfs-realtime/trip-updates.js';
 import { getVehiclePositions } from './gtfs-realtime/vehicle-positions.js';
 import { getServiceAlerts } from './gtfs-realtime/service-alerts.js';
 
+// ODS Filenames
+import { getDeadheads } from './ods/deadheads.js';
+import { getDeadheadTimes } from './ods/deadhead-times.js';
+import { getOpsLocations } from './ods/ops-locations.js';
+import { getRunEvents } from './ods/run-events.js';
+import { getRunsPieces } from './ods/runs-pieces.js';
+
 // Expose database connection
 import { openDb, closeDb } from './db.js';
 
@@ -132,9 +143,15 @@ export { _getTrips as getTrips };
 const _getTranslations = getTranslations;
 export { _getTranslations as getTranslations };
 
+const _getCalendarAttributes = getCalendarAttributes;
+export { _getCalendarAttributes as getCalendarAttributes };
+
 const _getDirections = getDirections;
 export { _getDirections as getDirections };
 
+const _getRouteAttributes = getRouteAttributes;
+export { _getRouteAttributes as getRouteAttributes };
+
 const _getStopAttributes = getStopAttributes;
 export { _getStopAttributes as getStopAttributes };
 
@@ -186,6 +203,21 @@ export { _getVehiclePositions as getVehiclePositions };
 const _getServiceAlerts = getServiceAlerts;
 export { _getServiceAlerts as getServiceAlerts };
 
+const _getDeadheads = getDeadheads;
+export { _getDeadheads as getDeadheads };
+
+const _getDeadheadTimes = getDeadheadTimes;
+export { _getDeadheadTimes as getDeadheadTimes };
+
+const _getOpsLocations = getOpsLocations;
+export { _getOpsLocations as getOpsLocations };
+
+const _getRunEvents = getRunEvents;
+export { _getRunEvents as getRunEvents };
+
+const _getRunsPieces = getRunsPieces;
+export { _getRunsPieces as getRunsPieces };
+
 const _openDb = openDb;
 export { _openDb as openDb };
 const _closeDb = closeDb;

package/lib/ods/deadhead-times.js

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

package/lib/ods/deadheads.js

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

package/lib/ods/ops-locations.js

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

package/lib/ods/run-events.js

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

package/lib/ods/runs-pieces.js

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

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

@@ -0,0 +1,20 @@
+const model = {
+  filenameBase: 'calendar_attributes',
+  nonstandard: true,
+  extension: 'gtfs-plus',
+  schema: [
+    {
+      name: 'service_id',
+      type: 'varchar(255)',
+      primary: true,
+    },
+    {
+      name: 'service_description',
+      type: 'varchar(255)',
+      required: true,
+      nocase: true,
+    },
+  ],
+};
+
+export default model;

package/models/{non-standard → gtfs-plus}/directions.js

@@ -1,6 +1,7 @@
 const model = {
   filenameBase: 'directions',
   nonstandard: true,
+  extension: 'gtfs-plus',
   schema: [
     {
       name: 'id',

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

@@ -0,0 +1,32 @@
+const model = {
+  filenameBase: 'route_attributes',
+  nonstandard: true,
+  extension: 'gtfs-plus',
+  schema: [
+    {
+      name: 'route_id',
+      type: 'varchar(255)',
+      primary: true,
+    },
+    {
+      name: 'category',
+      type: 'integer',
+      min: 0,
+      required: true,
+    },
+    {
+      name: 'subcategory',
+      type: 'integer',
+      min: 101,
+      required: true,
+    },
+    {
+      name: 'running_way',
+      type: 'integer',
+      min: 1,
+      required: true,
+    },
+  ],
+};
+
+export default model;

package/models/{non-standard → gtfs-plus}/stop-attributes.js

@@ -1,6 +1,7 @@
 const model = {
   filenameBase: 'stop_attributes',
   nonstandard: true,
+  extension: 'gtfs-plus',
   schema: [
     {
       name: 'id',
@@ -13,6 +14,19 @@ const model = {
       required: true,
       index: true,
     },
+    {
+      name: 'accessibility_id',
+      type: 'integer',
+      min: 0,
+    },
+    {
+      name: 'cardinal_direction',
+      type: 'varchar(255)',
+    },
+    {
+      name: 'relative_position',
+      type: 'varchar(255)',
+    },
     {
       name: 'stop_city',
       type: 'varchar(255)',

package/models/models.js

@@ -21,8 +21,6 @@ import transfers from '../models/gtfs/transfers.js';
 import translations from '../models/gtfs/translations.js';
 import trips from '../models/gtfs/trips.js';
 
-import directions from '../models/non-standard/directions.js';
-import stopAttributes from '../models/non-standard/stop-attributes.js';
 import timetables from '../models/non-standard/timetables.js';
 import timetablePages from '../models/non-standard/timetable-pages.js';
 import timetableStopOrder from '../models/non-standard/timetable-stop-order.js';
@@ -30,6 +28,11 @@ import timetableNotes from '../models/non-standard/timetable-notes.js';
 import timetableNotesReferences from '../models/non-standard/timetable-notes-references.js';
 import tripsDatedVehicleJourney from '../models/non-standard/trips-dated-vehicle-journey.js';
 
+import calendarAttributes from '../models/gtfs-plus/calendar-attributes.js';
+import directions from '../models/gtfs-plus/directions.js';
+import routeAttributes from '../models/gtfs-plus/route-attributes.js';
+import stopAttributes from '../models/gtfs-plus/stop-attributes.js';
+
 import boardAlight from '../models/gtfs-ride/board-alight.js';
 import riderTrip from '../models/gtfs-ride/rider-trip.js';
 import ridership from '../models/gtfs-ride/ridership.js';
@@ -42,6 +45,12 @@ import vehiclePositions from './gtfs-realtime/vehicle-positions.js';
 import serviceAlerts from './gtfs-realtime/service-alerts.js';
 import serviceAlertTargets from './gtfs-realtime/service-alert-targets.js';
 
+import deadheadTimes from './ods/deadhead-times.js';
+import deadheads from './ods/deadheads.js';
+import opsLocations from './ods/ops-locations.js';
+import runEvents from './ods/run-events.js';
+import runsPieces from './ods/runs-pieces.js';
+
 const models = [
   agency,
   areas,
@@ -65,14 +74,16 @@ const models = [
   transfers,
   translations,
   trips,
-  directions,
-  stopAttributes,
   timetables,
   timetablePages,
   timetableStopOrder,
   timetableNotes,
   timetableNotesReferences,
   tripsDatedVehicleJourney,
+  calendarAttributes,
+  directions,
+  routeAttributes,
+  stopAttributes,
   boardAlight,
   rideFeedInfo,
   riderTrip,
@@ -83,6 +94,11 @@ const models = [
   vehiclePositions,
   serviceAlerts,
   serviceAlertTargets,
+  deadheadTimes,
+  deadheads,
+  opsLocations,
+  runEvents,
+  runsPieces,
 ];
 
 export default models;

package/models/ods/deadhead-times.js

@@ -0,0 +1,60 @@
+const model = {
+  filenameBase: 'deadhead_times',
+  nonstandard: true,
+  extension: 'ods',
+  schema: [
+    {
+      name: 'id',
+      type: 'integer',
+      primary: true,
+    },
+    {
+      name: 'deadhead_id',
+      type: 'varchar(255)',
+      required: true,
+      index: true,
+    },
+    {
+      name: 'arrival_time',
+      type: 'varchar(255)',
+      required: true,
+    },
+    {
+      name: 'arrival_timestamp',
+      type: 'integer',
+      index: true,
+    },
+    {
+      name: 'departure_time',
+      type: 'varchar(255)',
+      required: true,
+    },
+    {
+      name: 'departure_timestamp',
+      type: 'integer',
+      index: true,
+    },
+    {
+      name: 'ops_location_id',
+      type: 'varchar(255)',
+    },
+    {
+      name: 'stop_id',
+      type: 'varchar(255)',
+    },
+    {
+      name: 'location_sequence',
+      type: 'integer',
+      required: true,
+      min: 0,
+      index: true,
+    },
+    {
+      name: 'shape_dist_traveled',
+      type: 'real',
+      min: 0,
+    },
+  ],
+};
+
+export default model;

package/models/ods/deadheads.js

@@ -0,0 +1,51 @@
+const model = {
+  filenameBase: 'deadheads',
+  nonstandard: true,
+  extension: 'ods',
+  schema: [
+    {
+      name: 'deadhead_id',
+      type: 'varchar(255)',
+      primary: true,
+      required: true,
+    },
+    {
+      name: 'service_id',
+      type: 'varchar(255)',
+      required: true,
+    },
+    {
+      name: 'block_id',
+      type: 'varchar(255)',
+      required: true,
+      index: true,
+    },
+    {
+      name: 'shape_id',
+      type: 'varchar(255)',
+      index: true,
+    },
+    {
+      name: 'to_trip_id',
+      type: 'varchar(255)',
+      index: true,
+    },
+    {
+      name: 'from_trip_id',
+      type: 'varchar(255)',
+      index: true,
+    },
+    {
+      name: 'to_deadhead_id',
+      type: 'varchar(255)',
+      index: true,
+    },
+    {
+      name: 'from_deadhead_id',
+      type: 'varchar(255)',
+      index: true,
+    },
+  ],
+};
+
+export default model;

package/models/ods/ops-locations.js

@@ -0,0 +1,44 @@
+const model = {
+  filenameBase: 'ops_locations',
+  nonstandard: true,
+  extension: 'ods',
+  schema: [
+    {
+      name: 'ops_location_id',
+      type: 'varchar(255)',
+      primary: true,
+      required: true,
+    },
+    {
+      name: 'ops_location_code',
+      type: 'varchar(255)',
+    },
+    {
+      name: 'ops_location_name',
+      type: 'varchar(255)',
+      required: true,
+      nocase: true,
+    },
+    {
+      name: 'ops_location_desc',
+      type: 'varchar(255)',
+      nocase: true,
+    },
+    {
+      name: 'ops_location_lat',
+      type: 'real',
+      required: true,
+      min: -90,
+      max: 90,
+    },
+    {
+      name: 'ops_location_lon',
+      type: 'real',
+      required: true,
+      min: -180,
+      max: 180,
+    },
+  ],
+};
+
+export default model;