gtfs 4.1.0 → 4.2.0

package/@types/index.d.ts

@@ -383,6 +383,17 @@ export function getStopAreas(
   options?: QueryOptions
 ): SqlResults;
 
+/**
+ * Returns an array of calendar_attributes that match query parameters.
+ * This is for the non-standard `calendar_attributes.txt` file.
+ */
+export function getCalendarAttributes(
+  query?: SqlWhere,
+  fields?: SqlSelect,
+  sortBy?: SqlOrderBy,
+  options?: QueryOptions
+): SqlResults;
+
 /**
  * Returns an array of directions that match query parameters.
  * This is for the non-standard `directions.txt` file.
@@ -394,6 +405,17 @@ export function getDirections(
   options?: QueryOptions
 ): SqlResults;
 
+/**
+ * Returns an array of route_attributes that match query parameters.
+ * This is for the non-standard `route_attributes.txt` file.
+ */
+export function getRouteAttributes(
+  query?: SqlWhere,
+  fields?: SqlSelect,
+  sortBy?: SqlOrderBy,
+  options?: QueryOptions
+): SqlResults;
+
 /**
  * Returns an array of stop_attributes that match query parameters.
  * This is for the non-standard `stop_attributes.txt` file.

package/CHANGELOG.md

@@ -5,6 +5,24 @@ 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).
 
+## [4.2.0] - 2023-04-13
+
+### Updated
+
+- Add route_attributes to getShapesAsGeoJSON() function as geojson properties
+- Add stop_attributes to getStopsAsGeoJSON() function as geojson properties
+- Support for multi-column primary keys
+
+## [4.1.1] - 2023-04-12
+
+### Added
+
+- Support for GTFS+ Files
+
+### Updated
+
+- Dependency updates
+
 ## [4.1.0] - 2023-02-25
 
 ### Added

package/README.md

@@ -692,7 +692,7 @@ const stops = getStops({
 
 #### getStopsAsGeoJSON(query, options)
 
-Returns geoJSON object of stops that match query parameters. All valid queries for `getStops()` work for `getStopsAsGeoJSON()`.
+Returns geoJSON object of stops that match query parameters. Stops will include all properties of each stop from stops.txt and stop_attributes.txt if present. All valid queries for `getStops()` work for `getStopsAsGeoJSON()`.
 
 ```js
 import { getStopsAsGeoJSON } from 'gtfs';
@@ -804,7 +804,7 @@ const shapes = getShapes({
 
 #### getShapesAsGeoJSON(query, options)
 
-Returns a geoJSON object of shapes that match query parameters. All valid queries for `getShapes()` work for `getShapesAsGeoJSON()`.
+Returns a geoJSON object of shapes that match query parameters. Shapes will include all properties of each route from routes.txt and route_attributes.txt if present. All valid queries for `getShapes()` work for `getShapesAsGeoJSON()`.
 
 ```js
 import { getShapesAsGeoJSON } from 'gtfs';
@@ -1162,8 +1162,82 @@ import { getVehiclePositions } from 'gtfs';
 const vehiclePositions = getVehiclePositions();
 ```
 
+### GTFS+ Files
+
+#### getCalendarAttributes(query, fields, sortBy, options)
+
+Returns an array of calendar_attributes that match query parameters.
+
+```js
+import { getCalendarAttributes } from 'gtfs';
+
+// Get all calendar attributes
+const calendarAttributes = getCalendarAttributes();
+
+// Get calendar attributes for specific service
+const calendarAttributes = getCalendarAttributes({
+  service_id: '1234',
+});
+```
+
+#### getDirections(query, fields, sortBy, options)
+
+Returns an array of directions that match query parameters.
+
+```js
+import { getDirections } from 'gtfs';
+
+// Get all directions
+const directions = getDirections();
+
+// Get directions for a specific route
+const directions = getDirections({
+  route_id: '1234',
+});
+
+// Get directions for a specific route and direction
+const directions = getDirections({
+  route_id: '1234',
+  direction_id: 1,
+});
+```
+
+#### getRouteAttributes(query, fields, sortBy, options)
+
+Returns an array of route_attributes that match query parameters.
+
+```js
+import { getRouteAttributes } from 'gtfs';
+
+// Get all route attributes
+const routeAttributes = getRouteAttributes();
+
+// Get route attributes for specific route
+const routeAttributes = getRouteAttributes({
+  route_id: '1234',
+});
+```
+
+#### getStopAttributes(query, fields, sortBy, options)
+
+Returns an array of stop_attributes that match query parameters.
+
+```js
+import { getStopAttributes } from 'gtfs';
+
+// Get all stop attributes
+const stopAttributes = getStopAttributes();
+
+// Get stop attributes for specific stop
+const stopAttributes = getStopAttributes({
+  stop_id: '1234',
+});
+```
+
 ### GTFS-Ride Files
 
+See full [documentation of GTFS Ride](https://gtfsride.org).
+
 #### getBoardAlights(query, fields, sortBy, options)
 
 Returns an array of board_alight that match query parameters. [Details on board_alight.txt](http://gtfsride.org/specification#board_alighttxt)
@@ -1316,45 +1390,7 @@ const runEvents = runEvents({
 });
 ```
 
-### Non-standard GTFS Files
-
-#### getDirections(query, fields, sortBy, options)
-
-Returns an array of directions that match query parameters. This is for the non-standard `directions.txt` file. [Details on directions.txt](https://trilliumtransit.com/gtfs/reference/#directions)
-
-```js
-import { getDirections } from 'gtfs';
-
-// Get all directions
-const directions = getDirections();
-
-// Get directions for a specific route
-const directions = getDirections({
-  route_id: '1234',
-});
-
-// Get directions for a specific route and direction
-const directions = getDirections({
-  route_id: '1234',
-  direction_id: 1,
-});
-```
-
-#### getStopAttributes(query, fields, sortBy, options)
-
-Returns an array of stop_attributes that match query parameters. This is for the non-standard `stop_attributes.txt` file. [Details on stop_attributes.txt](https://trilliumtransit.com/gtfs/reference/#stop_attributes)
-
-```js
-import { getStopAttributes } from 'gtfs';
-
-// Get all stop attributes
-const stopAttributes = getStopAttributes();
-
-// Get stop attributes for specific stop
-const stopAttributes = getStopAttributes({
-  stop_id: '1234',
-});
-```
+### Other Non-standard GTFS Files
 
 #### getTripsDatedVehicleJourneys(query, fields, sortBy, options)
 

package/lib/gtfs/shapes.js

@@ -14,6 +14,7 @@ import { shapesToGeoJSONFeatures } from '../geojson-utils.js';
 import shapes from '../../models/gtfs/shapes.js';
 import { getAgencies } from './agencies.js';
 import { getRoutes } from './routes.js';
+import { getRouteAttributes } from '../gtfs-plus/route-attributes.js';
 
 function buildTripSubquery(query) {
   const whereClause = formatWhereClauses(query);
@@ -92,6 +93,12 @@ export function getShapesAsGeoJSON(query = {}, options = {}) {
       [],
       options
     );
+    const routeAttributes = getRouteAttributes(
+      { route_id: route.route_id },
+      [],
+      [],
+      options
+    );
 
     const agency = agencies.find(
       (agency) => agency.agency_id === route.agency_id
@@ -101,6 +108,7 @@ export function getShapesAsGeoJSON(query = {}, options = {}) {
       agency_name: agency ? agency.agency_name : undefined,
       shape_id: query.shape_id,
       ...route,
+      ...(routeAttributes?.[0] || []),
     };
     features.push(...shapesToGeoJSONFeatures(shapes, geojsonProperties));
   }

package/lib/gtfs/stops.js

@@ -12,6 +12,7 @@ import {
 import { stopsToGeoJSON } from '../geojson-utils.js';
 import stops from '../../models/gtfs/stops.js';
 import { getAgencies } from './agencies.js';
+import { getStopAttributes } from '../gtfs-plus/stop-attributes.js';
 
 function buildTripSubquery(query) {
   const whereClause = formatWhereClauses(query);
@@ -89,12 +90,17 @@ export function getStopsAsGeoJSON(query = {}, options = {}) {
       .prepare(`SELECT * FROM routes WHERE route_id IN (${routeSubquery})`)
       .all(stop.stop_id);
 
+    const stopAttributes = getStopAttributes({ stop_id: stop.stop_id });
+
     stop.routes = orderBy(routes, (route) =>
       Number.parseInt(route.route_short_name, 10)
     );
     stop.agency_name = agencies[0].agency_name;
 
-    return stop;
+    return {
+      ...stop,
+      ...(stopAttributes?.[0] || []),
+    };
   });
 
   // Exclude stops not part of any route

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.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';
@@ -139,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 };
 

package/lib/import.js

@@ -329,13 +329,23 @@ const createTables = (db) => {
         check = `CHECK( ${column.name} <= ${column.max} )`;
       }
 
-      const primary = column.primary ? 'PRIMARY KEY' : '';
       const required = column.required ? 'NOT NULL' : '';
       const columnDefault = column.default ? 'DEFAULT ' + column.default : '';
       const columnCollation = column.nocase ? 'COLLATE NOCASE' : '';
-      return `${column.name} ${column.type} ${check} ${primary} ${required} ${columnDefault} ${columnCollation}`;
+      return `${column.name} ${column.type} ${check} ${required} ${columnDefault} ${columnCollation}`;
     });
 
+    // Find Primary Key fields
+    const primaryColumns = model.schema.filter((column) => column.primary);
+
+    if (primaryColumns.length > 0) {
+      columns.push(
+        `PRIMARY KEY (${primaryColumns
+          .map((column) => column.name)
+          .join(', ')})`
+      );
+    }
+
     db.prepare(`DROP TABLE IF EXISTS ${model.filenameBase};`).run();
 
     db.prepare(

package/models/gtfs/agency.js

@@ -1,14 +1,10 @@
 const model = {
   filenameBase: 'agency',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'agency_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'agency_name',

package/models/gtfs/attributions.js

@@ -5,6 +5,7 @@ const model = {
       name: 'attribution_id',
       type: 'varchar(255)',
       primary: true,
+      required: true,
     },
     {
       name: 'agency_id',

package/models/gtfs/calendar-dates.js

@@ -1,22 +1,17 @@
 const model = {
   filenameBase: 'calendar_dates',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'service_id',
       type: 'varchar(255)',
       required: true,
-      index: true,
+      primary: true,
     },
     {
       name: 'date',
       type: 'integer',
       required: true,
-      index: true,
+      primary: true,
     },
     {
       name: 'exception_type',

package/models/gtfs/fare-leg-rules.js

@@ -8,19 +8,23 @@ const model = {
     {
       name: 'network_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'from_area_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'to_area_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'fare_product_id',
       type: 'varchar(255)',
       required: true,
+      primary: true,
     },
   ],
 };

package/models/gtfs/fare-products.js

@@ -11,6 +11,11 @@ const model = {
       name: 'fare_product_name',
       type: 'varchar(255)',
     },
+    {
+      name: 'fare_media_id',
+      type: 'varchar(255)',
+      primary: true,
+    },
     {
       name: 'amount',
       type: 'real',

package/models/gtfs/fare-rules.js

@@ -1,11 +1,6 @@
 const model = {
   filenameBase: 'fare_rules',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'fare_id',
       type: 'varchar(255)',

package/models/gtfs/fare-transfer-rules.js

@@ -4,15 +4,18 @@ const model = {
     {
       name: 'from_leg_group_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'to_leg_group_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'transfer_count',
       type: 'integer',
       min: -1,
+      primary: true,
     },
     {
       name: 'transfer_id',
@@ -22,6 +25,7 @@ const model = {
       name: 'duration_limit',
       type: 'integer',
       min: 0,
+      primary: true,
     },
     {
       name: 'duration_limit_type',
@@ -34,10 +38,12 @@ const model = {
       type: 'integer',
       min: 0,
       max: 2,
+      required: true,
     },
     {
       name: 'fare_product_id',
       type: 'varchar(255)',
+      primary: true,
     },
   ],
 };

package/models/gtfs/feed-info.js

@@ -1,11 +1,6 @@
 const model = {
   filenameBase: 'feed_info',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'feed_publisher_name',
       type: 'varchar(255)',

package/models/gtfs/frequencies.js

@@ -1,21 +1,17 @@
 const model = {
   filenameBase: 'frequencies',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'trip_id',
       type: 'varchar(255)',
       required: true,
-      index: true,
+      primary: true,
     },
     {
       name: 'start_time',
       type: 'varchar(255)',
       required: true,
+      primary: true,
     },
     {
       name: 'start_timestamp',

package/models/gtfs/shapes.js

@@ -1,16 +1,11 @@
 const model = {
   filenameBase: 'shapes',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'shape_id',
       type: 'varchar(255)',
       required: true,
-      index: true,
+      primary: true,
     },
     {
       name: 'shape_pt_lat',
@@ -30,6 +25,7 @@ const model = {
       name: 'shape_pt_sequence',
       type: 'integer',
       required: true,
+      primary: true,
       min: 0,
     },
     {

package/models/gtfs/stop-times.js

@@ -1,16 +1,11 @@
 const model = {
   filenameBase: 'stop_times',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'trip_id',
       type: 'varchar(255)',
       required: true,
-      index: true,
+      primary: true,
     },
     {
       name: 'arrival_time',
@@ -39,8 +34,8 @@ const model = {
       name: 'stop_sequence',
       type: 'integer',
       required: true,
+      primary: true,
       min: 0,
-      index: true,
     },
     {
       name: 'stop_headsign',

package/models/gtfs/transfers.js

@@ -1,44 +1,42 @@
 const model = {
   filenameBase: 'transfers',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'from_stop_id',
       type: 'varchar(255)',
-      index: true,
+      primary: true,
     },
     {
       name: 'to_stop_id',
       type: 'varchar(255)',
-      index: true,
+      primary: true,
     },
     {
       name: 'from_route_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'to_route_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'from_trip_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'to_trip_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'transfer_type',
       type: 'integer',
       min: 0,
       max: 5,
-      required: false,
-      default: 0
+      default: 0,
     },
     {
       name: 'min_transfer_time',

package/models/gtfs/translations.js

@@ -1,24 +1,22 @@
 const model = {
   filenameBase: 'translations',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'table_name',
       type: 'varchar(255)',
+      primary: true,
       required: true,
     },
     {
       name: 'field_name',
       type: 'varchar(255)',
+      primary: true,
       required: true,
     },
     {
       name: 'language',
       type: 'varchar(255)',
+      primary: true,
       required: true,
     },
     {
@@ -29,14 +27,17 @@ const model = {
     {
       name: 'record_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'record_sub_id',
       type: 'varchar(255)',
+      primary: true,
     },
     {
       name: 'field_value',
       type: 'varchar(2047)',
+      primary: true,
     },
   ],
 };

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,24 +1,20 @@
 const model = {
   filenameBase: 'directions',
   nonstandard: true,
+  extension: 'gtfs-plus',
   schema: [
-    {
-      name: 'id',
-      type: 'integer',
-      primary: true,
-    },
     {
       name: 'route_id',
       type: 'varchar(255)',
       required: true,
-      index: true,
+      primary: true,
     },
     {
       name: 'direction_id',
       type: 'integer',
       min: 0,
       max: 1,
-      index: true,
+      primary: true,
     },
     {
       name: 'direction',

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,17 +1,26 @@
 const model = {
   filenameBase: 'stop_attributes',
   nonstandard: true,
+  extension: 'gtfs-plus',
   schema: [
     {
-      name: 'id',
-      type: 'integer',
+      name: 'stop_id',
+      type: 'varchar(255)',
+      required: true,
       primary: true,
     },
     {
-      name: 'stop_id',
+      name: 'accessibility_id',
+      type: 'integer',
+      min: 0,
+    },
+    {
+      name: 'cardinal_direction',
+      type: 'varchar(255)',
+    },
+    {
+      name: 'relative_position',
       type: 'varchar(255)',
-      required: true,
-      index: true,
     },
     {
       name: 'stop_city',

package/models/gtfs-realtime/service-alert-targets.js

@@ -7,7 +7,6 @@ const model = {
       type: 'varchar(255)',
       required: true,
       primary: true,
-      index: true,
       source: 'parent.id',
     },
     {

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';
@@ -71,14 +74,16 @@ const models = [
   transfers,
   translations,
   trips,
-  directions,
-  stopAttributes,
   timetables,
   timetablePages,
   timetableStopOrder,
   timetableNotes,
   timetableNotesReferences,
   tripsDatedVehicleJourney,
+  calendarAttributes,
+  directions,
+  routeAttributes,
+  stopAttributes,
   boardAlight,
   rideFeedInfo,
   riderTrip,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -74,13 +74,13 @@
   },
   "dependencies": {
     "@turf/helpers": "^6.5.0",
-    "better-sqlite3": "^8.1.0",
-    "csv-parse": "^5.3.5",
-    "csv-stringify": "^6.2.4",
+    "better-sqlite3": "^8.3.0",
+    "csv-parse": "^5.3.6",
+    "csv-stringify": "^6.3.0",
     "gtfs-realtime-bindings": "^1.1.1",
     "lodash-es": "^4.17.21",
     "long": "^5.2.1",
-    "node-fetch": "^3.3.0",
+    "node-fetch": "^3.3.1",
     "pluralize": "^8.0.0",
     "pretty-error": "^4.0.0",
     "promise-map-series": "^0.3.0",
@@ -95,14 +95,14 @@
     "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
-    "@types/better-sqlite3": "^7.6.3",
+    "@types/better-sqlite3": "^7.6.4",
     "dtslint": "^4.2.1",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.38.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-config-xo": "^0.43.1",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
-    "prettier": "^2.8.4",
+    "prettier": "^2.8.7",
     "pretty-quick": "^3.1.3",
     "should": "^13.2.3"
   },

package/test/mocha/advanced-query.js

@@ -57,14 +57,14 @@ describe('advancedQuery():', () => {
     const results = advancedQuery('stop_times', advancedQueryOptions);
 
     const expectedResults = [
-      { trip_id: '329', arrival_time: '9:09:00' },
-      { trip_id: '329', arrival_time: '8:52:00' },
-      { trip_id: '329', arrival_time: '8:44:00' },
-      { trip_id: '329', arrival_time: '8:35:00' },
-      { trip_id: '329', arrival_time: '8:27:00' },
-      { trip_id: '329', arrival_time: '8:16:00' },
-      { trip_id: '329', arrival_time: '8:03:00' },
       { trip_id: '329', arrival_time: '7:56:00' },
+      { trip_id: '329', arrival_time: '8:03:00' },
+      { trip_id: '329', arrival_time: '8:16:00' },
+      { trip_id: '329', arrival_time: '8:27:00' },
+      { trip_id: '329', arrival_time: '8:35:00' },
+      { trip_id: '329', arrival_time: '8:44:00' },
+      { trip_id: '329', arrival_time: '8:52:00' },
+      { trip_id: '329', arrival_time: '9:09:00' },
     ];
 
     should.exist(results);

package/test/mocha/get-agencies.js

@@ -28,7 +28,6 @@ describe('getAgencies():', () => {
     const results = getAgencies();
 
     const expectedResult = {
-      id: 1,
       agency_id: 'CT',
       agency_name: 'Caltrain',
       agency_url: 'http://www.caltrain.com',
@@ -54,7 +53,6 @@ describe('getAgencies():', () => {
     });
 
     const expectedResult = {
-      id: 1,
       agency_id: 'CT',
       agency_name: 'Caltrain',
       agency_url: 'http://www.caltrain.com',

package/test/mocha/get-calendar-attributes.js

@@ -0,0 +1,33 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import {
+  openDb,
+  closeDb,
+  importGtfs,
+  getCalendarAttributes,
+} from '../../index.js';
+
+describe('getCalendarAttributes():', () => {
+  before(async () => {
+    openDb(config);
+    await importGtfs(config);
+  });
+
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
+  });
+
+  it('should return empty array if no calendar attributes', () => {
+    const serviceId = 'fake-service-id';
+
+    const results = getCalendarAttributes({
+      service_id: serviceId,
+    });
+    should.exists(results);
+    results.should.have.length(0);
+  });
+});

package/test/mocha/get-calendar-dates.js

@@ -38,28 +38,24 @@ describe('getCalendarDates():', () => {
 
     const expectedResults = [
       {
-        id: 2,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20161124,
         exception_type: 2,
         holiday_name: null,
       },
       {
-        id: 4,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160905,
         exception_type: 2,
         holiday_name: null,
       },
       {
-        id: 6,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160704,
         exception_type: 2,
         holiday_name: null,
       },
       {
-        id: 8,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160530,
         exception_type: 2,

package/test/mocha/get-route-attributes.js

@@ -0,0 +1,33 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import {
+  openDb,
+  closeDb,
+  importGtfs,
+  getRouteAttributes,
+} from '../../index.js';
+
+describe('getRouteAttributes():', () => {
+  before(async () => {
+    openDb(config);
+    await importGtfs(config);
+  });
+
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
+  });
+
+  it('should return empty array if no route attributes', () => {
+    const routeId = 'fake-route-id';
+
+    const results = getRouteAttributes({
+      route_id: routeId,
+    });
+    should.exists(results);
+    results.should.have.length(0);
+  });
+});

package/test/mocha/open-db.js

@@ -83,7 +83,6 @@ describe('openDb():', () => {
     );
 
     const expectedResult = {
-      id: 1424,
       shape_id: 'cal_sf_tam',
       shape_pt_lat: 37.45375587083584,
       shape_pt_lon: -122.18063950538635,