gtfs 3.1.1 → 3.2.0

package/lib/gtfs/fare-attributes.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import fareAttributes from '../../models/gtfs/fare-attributes.js';
 
 /*
  * Returns an array of all fare attributes that match the query parameters.
  */
-export async function getFareAttributes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getFareAttributes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(fareAttributes.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/fare-rules.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import fareRules from '../../models/gtfs/fare-rules.js';
 
 /*
  * Returns an array of all fare rules that match the query parameters.
  */
-export async function getFareRules(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getFareRules(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(fareRules.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/feed-info.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import feedInfo from '../../models/gtfs/feed-info.js';
 
 /*
  * Returns an array of all feed info that match the query parameters.
  */
-export async function getFeedInfo(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getFeedInfo(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(feedInfo.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/frequencies.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import frequencies from '../../models/gtfs/frequencies.js';
 
 /*
  * Returns an array of all frequencies that match the query parameters.
  */
-export async function getFrequencies(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getFrequencies(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(frequencies.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/levels.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import levels from '../../models/gtfs/levels.js';
 
 /*
  * Returns an array of all levels that match the query parameters.
  */
-export async function getLevels(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getLevels(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(levels.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/pathways.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import pathways from '../../models/gtfs/pathways.js';
 
 /*
  * Returns an array of all pathways that match the query parameters.
  */
-export async function getPathways(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getPathways(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(pathways.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/routes.js

@@ -3,7 +3,12 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClause,
+  formatWhereClauses,
+} from '../utils.js';
 import routes from '../../models/gtfs/routes.js';
 
 function buildStoptimeSubquery(query) {
@@ -12,15 +17,22 @@ function buildStoptimeSubquery(query) {
 }
 
 function buildTripSubquery(query) {
-  return `SELECT DISTINCT route_id FROM trips WHERE trip_id IN (${buildStoptimeSubquery(query)})`;
+  return `SELECT DISTINCT route_id FROM trips WHERE trip_id IN (${buildStoptimeSubquery(
+    query
+  )})`;
 }
 
 /*
  * Returns an array of routes that match the query parameters. A `stop_id`
  * query parameter may be passed to find all routes that contain that stop.
  */
-export async function getRoutes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getRoutes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(routes.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';
@@ -29,7 +41,9 @@ export async function getRoutes(query = {}, fields = [], orderBy = []) {
   const routeQuery = omit(query, ['stop_id']);
   const stoptimeQuery = pick(query, ['stop_id']);
 
-  const whereClauses = Object.entries(routeQuery).map(([key, value]) => formatWhereClause(key, value));
+  const whereClauses = Object.entries(routeQuery).map(([key, value]) =>
+    formatWhereClause(key, value)
+  );
 
   if (Object.values(stoptimeQuery).length > 0) {
     whereClauses.push(`route_id IN (${buildTripSubquery(stoptimeQuery)})`);
@@ -39,5 +53,7 @@ export async function getRoutes(query = {}, fields = [], orderBy = []) {
     whereClause = `WHERE ${whereClauses.join(' AND ')}`;
   }
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/shapes.js

@@ -4,7 +4,12 @@ import { featureCollection } from '@turf/helpers';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClause,
+  formatWhereClauses,
+} from '../utils.js';
 import { shapesToGeoJSONFeatures } from '../geojson-utils.js';
 import shapes from '../../models/gtfs/shapes.js';
 import { getAgencies } from './agencies.js';
@@ -21,17 +26,34 @@ function buildTripSubquery(query) {
  * query parameter may be passed to find all shapes for a trip. A
  * `direction_id` query parameter may be passed to find all shapes for a direction.
  */
-export async function getShapes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getShapes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(shapes.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';
   const orderByClause = formatOrderByClause(orderBy);
 
-  const shapeQuery = omit(query, ['route_id', 'trip_id', 'service_id', 'direction_id']);
-  const tripQuery = pick(query, ['route_id', 'trip_id', 'service_id', 'direction_id']);
-
-  const whereClauses = Object.entries(shapeQuery).map(([key, value]) => formatWhereClause(key, value));
+  const shapeQuery = omit(query, [
+    'route_id',
+    'trip_id',
+    'service_id',
+    'direction_id',
+  ]);
+  const tripQuery = pick(query, [
+    'route_id',
+    'trip_id',
+    'service_id',
+    'direction_id',
+  ]);
+
+  const whereClauses = Object.entries(shapeQuery).map(([key, value]) =>
+    formatWhereClause(key, value)
+  );
 
   if (Object.values(tripQuery).length > 0) {
     whereClauses.push(`shape_id IN (${buildTripSubquery(tripQuery)})`);
@@ -41,15 +63,17 @@ export async function getShapes(query = {}, fields = [], orderBy = []) {
     whereClause = `WHERE ${whereClauses.join(' AND ')}`;
   }
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }
 
 /*
  * Returns geoJSON of the shapes that match the query parameters. A `route_id`
  * query parameter may be passed to find all shapes for a route.
  */
-export async function getShapesAsGeoJSON(query = {}) {
-  const agencies = await getAgencies();
+export async function getShapesAsGeoJSON(query = {}, options = {}) {
+  const agencies = await getAgencies({}, [], [], options);
 
   const routeQuery = {};
 
@@ -57,21 +81,33 @@ export async function getShapesAsGeoJSON(query = {}) {
     routeQuery.route_id = query.route_id;
   }
 
-  const routes = await getRoutes(routeQuery);
+  const routes = await getRoutes(routeQuery, [], [], options);
   const features = [];
 
-  await Promise.all(routes.map(async route => {
-    const shapeQuery = { route_id: route.route_id, ...omit(query, 'route_id') };
-    const shapes = await getShapes(shapeQuery, ['shape_id', 'shape_pt_sequence', 'shape_pt_lon', 'shape_pt_lat']);
-
-    const agency = agencies.find(agency => agency.agency_id === route.agency_id);
-
-    const routeProperties = {
-      agency_name: agency ? agency.agency_name : undefined,
-      ...route
-    };
-    features.push(...shapesToGeoJSONFeatures(shapes, routeProperties));
-  }));
+  await Promise.all(
+    routes.map(async (route) => {
+      const shapeQuery = {
+        route_id: route.route_id,
+        ...omit(query, 'route_id'),
+      };
+      const shapes = await getShapes(
+        shapeQuery,
+        ['shape_id', 'shape_pt_sequence', 'shape_pt_lon', 'shape_pt_lat'],
+        [],
+        options
+      );
+
+      const agency = agencies.find(
+        (agency) => agency.agency_id === route.agency_id
+      );
+
+      const routeProperties = {
+        agency_name: agency ? agency.agency_name : undefined,
+        ...route,
+      };
+      features.push(...shapesToGeoJSONFeatures(shapes, routeProperties));
+    })
+  );
 
   return featureCollection(features);
 }

package/lib/gtfs/stop-times.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import stopTimes from '../../models/gtfs/stop-times.js';
 
 /*
  * Returns an array of stoptimes that match the query parameters.
  */
-export async function getStoptimes(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getStoptimes(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(stopTimes.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/stops.js

@@ -3,7 +3,12 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClause,
+  formatWhereClauses,
+} from '../utils.js';
 import { stopsToGeoJSON } from '../geojson-utils.js';
 import stops from '../../models/gtfs/stops.js';
 import { getAgencies } from './agencies.js';
@@ -14,7 +19,9 @@ function buildTripSubquery(query) {
 }
 
 function buildStoptimeSubquery(query) {
-  return `SELECT DISTINCT stop_id FROM stop_times WHERE trip_id IN (${buildTripSubquery(query)})`;
+  return `SELECT DISTINCT stop_id FROM stop_times WHERE trip_id IN (${buildTripSubquery(
+    query
+  )})`;
 }
 
 /*
@@ -23,17 +30,34 @@ function buildStoptimeSubquery(query) {
  * query parameter may be passed to find all shapes for a trip. A
  * `direction_id` query parameter may be passed to find all shapes for a direction.
  */
-export async function getStops(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getStops(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(stops.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';
   const orderByClause = formatOrderByClause(orderBy);
 
-  const stopQuery = omit(query, ['route_id', 'trip_id', 'service_id', 'direction_id']);
-  const tripQuery = pick(query, ['route_id', 'trip_id', 'service_id', 'direction_id']);
-
-  const whereClauses = Object.entries(stopQuery).map(([key, value]) => formatWhereClause(key, value));
+  const stopQuery = omit(query, [
+    'route_id',
+    'trip_id',
+    'service_id',
+    'direction_id',
+  ]);
+  const tripQuery = pick(query, [
+    'route_id',
+    'trip_id',
+    'service_id',
+    'direction_id',
+  ]);
+
+  const whereClauses = Object.entries(stopQuery).map(([key, value]) =>
+    formatWhereClause(key, value)
+  );
 
   if (Object.values(tripQuery).length > 0) {
     whereClauses.push(`stop_id IN (${buildStoptimeSubquery(tripQuery)})`);
@@ -43,29 +67,39 @@ export async function getStops(query = {}, fields = [], orderBy = []) {
     whereClause = `WHERE ${whereClauses.join(' AND ')}`;
   }
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }
 
 /*
  * Returns geoJSON with stops for the `agencyKey` specified, optionally limited
  * to the `stopIds` specified
  */
-export async function getStopsAsGeoJSON(query = {}) {
-  const db = await getDb();
-  const stops = await getStops(query);
+export async function getStopsAsGeoJSON(query = {}, options = {}) {
+  const db = options.db ?? (await getDb());
+  const stops = await getStops(query, [], [], options);
 
   // Get all agencies for reference
-  const agencies = await getAgencies();
-
-  const preparedStops = await Promise.all(stops.map(async stop => {
-    const routeSubquery = 'SELECT DISTINCT route_id FROM trips WHERE trip_id IN (SELECT DISTINCT trip_id FROM stop_times WHERE stop_id = ?)';
-    const routes = await db.all(`SELECT * FROM routes WHERE route_id IN (${routeSubquery})`, [stop.stop_id]);
-
-    stop.routes = orderBy(routes, route => Number.parseInt(route.route_short_name, 10));
-    stop.agency_name = agencies[0].agency_name;
-
-    return stop;
-  }));
+  const agencies = await getAgencies({}, [], [], options);
+
+  const preparedStops = await Promise.all(
+    stops.map(async (stop) => {
+      const routeSubquery =
+        'SELECT DISTINCT route_id FROM trips WHERE trip_id IN (SELECT DISTINCT trip_id FROM stop_times WHERE stop_id = ?)';
+      const routes = await db.all(
+        `SELECT * FROM routes WHERE route_id IN (${routeSubquery})`,
+        [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 stopsToGeoJSON(preparedStops);
 }

package/lib/gtfs/transfers.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import transfers from '../../models/gtfs/transfers.js';
 
 /*
  * Returns an array of all transfers that match the query parameters.
  */
-export async function getTransfers(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTransfers(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(transfers.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/translations.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import translations from '../../models/gtfs/translations.js';
 
 /*
  * Returns an array of all translations that match the query parameters.
  */
-export async function getTranslations(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTranslations(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(translations.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }

package/lib/gtfs/trips.js

@@ -2,18 +2,29 @@ import sqlString from 'sqlstring-sqlite';
 
 import { getDb } from '../db.js';
 
-import { formatOrderByClause, formatSelectClause, formatWhereClauses } from '../utils.js';
+import {
+  formatOrderByClause,
+  formatSelectClause,
+  formatWhereClauses,
+} from '../utils.js';
 import trips from '../../models/gtfs/trips.js';
 
 /*
  * Returns an array of all trips that match the query parameters.
  */
-export async function getTrips(query = {}, fields = [], orderBy = []) {
-  const db = await getDb();
+export async function getTrips(
+  query = {},
+  fields = [],
+  orderBy = [],
+  options = {}
+) {
+  const db = options.db ?? (await getDb());
   const tableName = sqlString.escapeId(trips.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }