gtfs 3.8.0 → 4.0.1

package/lib/gtfs/levels.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,16 @@ 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 = [],
-  options = {}
-) {
-  const db = options.db ?? (await getDb());
+export function getLevels(query = {}, fields = [], orderBy = [], options = {}) {
+  const db = options.db ?? openDb();
   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
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/gtfs/pathways.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import pathways from '../../models/gtfs/pathways.js';
 /*
  * Returns an array of all pathways that match the query parameters.
  */
-export async function getPathways(
+export function getPathways(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   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
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/gtfs/routes.js

@@ -1,7 +1,7 @@
 import { omit, pick } from 'lodash-es';
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -26,13 +26,8 @@ function buildTripSubquery(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 = [],
-  options = {}
-) {
-  const db = options.db ?? (await getDb());
+export function getRoutes(query = {}, fields = [], orderBy = [], options = {}) {
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(routes.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';
@@ -53,7 +48,9 @@ export async function getRoutes(
     whereClause = `WHERE ${whereClauses.join(' AND ')}`;
   }
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/gtfs/shapes.js

@@ -2,7 +2,7 @@ import { omit, pick } from 'lodash-es';
 import sqlString from 'sqlstring-sqlite';
 import { featureCollection } from '@turf/helpers';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -26,13 +26,8 @@ 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 = [],
-  options = {}
-) {
-  const db = options.db ?? (await getDb());
+export function getShapes(query = {}, fields = [], orderBy = [], options = {}) {
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(shapes.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';
@@ -63,17 +58,19 @@ export async function getShapes(
     whereClause = `WHERE ${whereClauses.join(' AND ')}`;
   }
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }
 
 /*
  * 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 = {}, options = {}) {
-  const agencies = await getAgencies({}, [], [], options);
+export function getShapesAsGeoJSON(query = {}, options = {}) {
+  const agencies = getAgencies({}, [], [], options);
 
   const routeQuery = {};
 
@@ -81,34 +78,32 @@ export async function getShapesAsGeoJSON(query = {}, options = {}) {
     routeQuery.route_id = query.route_id;
   }
 
-  const routes = await getRoutes(routeQuery, [], [], options);
+  const routes = 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'],
-        [],
-        options
-      );
-
-      const agency = agencies.find(
-        (agency) => agency.agency_id === route.agency_id
-      );
-
-      const geojsonProperties = {
-        agency_name: agency ? agency.agency_name : undefined,
-        shape_id: query.shape_id,
-        ...route,
-      };
-      features.push(...shapesToGeoJSONFeatures(shapes, geojsonProperties));
-    })
-  );
+  for (const route of routes) {
+    const shapeQuery = {
+      route_id: route.route_id,
+      ...omit(query, 'route_id'),
+    };
+    const shapes = 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 geojsonProperties = {
+      agency_name: agency ? agency.agency_name : undefined,
+      shape_id: query.shape_id,
+      ...route,
+    };
+    features.push(...shapesToGeoJSONFeatures(shapes, geojsonProperties));
+  }
 
   return featureCollection(features);
 }

package/lib/gtfs/stop-areas.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import stopAreas from '../../models/gtfs/stop-areas.js';
 /*
  * Returns an array of all stop areas that match the query parameters.
  */
-export async function getStopAreas(
+export function getStopAreas(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(stopAreas.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/gtfs/stop-times.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import stopTimes from '../../models/gtfs/stop-times.js';
 /*
  * Returns an array of stoptimes that match the query parameters.
  */
-export async function getStoptimes(
+export function getStoptimes(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   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
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/gtfs/stops.js

@@ -1,7 +1,7 @@
 import { omit, orderBy, pick } from 'lodash-es';
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -30,13 +30,8 @@ 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 = [],
-  options = {}
-) {
-  const db = options.db ?? (await getDb());
+export function getStops(query = {}, fields = [], orderBy = [], options = {}) {
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(stops.filenameBase);
   const selectClause = formatSelectClause(fields);
   let whereClause = '';
@@ -69,39 +64,38 @@ export async function getStops(
     whereClause = `WHERE ${whereClauses.join(' AND ')}`;
   }
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }
 
 /*
  * Returns geoJSON with stops for the `agencyKey` specified, optionally limited
  * to the `stopIds` specified
  */
-export async function getStopsAsGeoJSON(query = {}, options = {}) {
-  const db = options.db ?? (await getDb());
-  const stops = await getStops(query, [], [], options);
+export function getStopsAsGeoJSON(query = {}, options = {}) {
+  const db = options.db ?? openDb();
+  const stops = getStops(query, [], [], options);
 
   // Get all agencies for reference
-  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;
-    })
-  );
+  const agencies = getAgencies({}, [], [], options);
+
+  const preparedStops = stops.map((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 = db
+      .prepare(`SELECT * FROM routes WHERE route_id IN (${routeSubquery})`)
+      .all(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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import transfers from '../../models/gtfs/transfers.js';
 /*
  * Returns an array of all transfers that match the query parameters.
  */
-export async function getTransfers(
+export function getTransfers(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   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
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/gtfs/translations.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import translations from '../../models/gtfs/translations.js';
 /*
  * Returns an array of all translations that match the query parameters.
  */
-export async function getTranslations(
+export function getTranslations(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   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
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/gtfs/trips.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,16 @@ 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 = [],
-  options = {}
-) {
-  const db = options.db ?? (await getDb());
+export function getTrips(query = {}, fields = [], orderBy = [], options = {}) {
+  const db = options.db ?? openDb();
   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
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -11,22 +11,24 @@ import serviceAlerts from '../../models/gtfs-realtime/service-alerts.js';
 import serviceAlertTargets from '../../models/gtfs-realtime/service-alert-targets.js';
 
 /*
- * Returns an array of all agencies that match the query parameters.
+ * Returns an array of all serivce alerts that match the query parameters.
  */
-export async function getServiceAlerts(
+export function getServiceAlerts(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(serviceAlerts.filenameBase);
   const joinTable = sqlString.escapeId(serviceAlertTargets.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} INNER JOIN ${joinTable} ON ${tableName}.id=${joinTable}.alert_id ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} INNER JOIN ${joinTable} ON ${tableName}.id=${joinTable}.alert_id ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

package/lib/gtfs-realtime/stop-times-updates.js

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -10,21 +10,23 @@ import {
 import stopTimeUpdates from '../../models/gtfs-realtime/stop-times-updates.js';
 
 /*
- * Returns an array of all agencies that match the query parameters.
+ * Returns an array of all stop times updates that match the query parameters.
  */
-export async function getStopTimesUpdates(
+export function getStopTimesUpdates(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(stopTimeUpdates.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -10,21 +10,23 @@ import {
 import tripUpdates from '../../models/gtfs-realtime/trip-updates.js';
 
 /*
- * Returns an array of all agencies that match the query parameters.
+ * Returns an array of all trip updates that match the query parameters.
  */
-export async function getTripUpdates(
+export function getTripUpdates(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(tripUpdates.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -10,21 +10,23 @@ import {
 import vehiclePositions from '../../models/gtfs-realtime/vehicle-positions.js';
 
 /*
- * Returns an array of all agencies that match the query parameters.
+ * Returns an array of all vehicle positions that match the query parameters.
  */
-export async function getVehiclePositions(
+export function getVehiclePositions(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(vehiclePositions.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }

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

@@ -1,6 +1,6 @@
 import sqlString from 'sqlstring-sqlite';
 
-import { getDb } from '../db.js';
+import { openDb } from '../db.js';
 
 import {
   formatOrderByClause,
@@ -12,19 +12,21 @@ import boardAlights from '../../models/gtfs-ride/board-alight.js';
 /*
  * Returns an array of all board-alights that match the query parameters.
  */
-export async function getBoardAlights(
+export function getBoardAlights(
   query = {},
   fields = [],
   orderBy = [],
   options = {}
 ) {
-  const db = options.db ?? (await getDb());
+  const db = options.db ?? openDb();
   const tableName = sqlString.escapeId(boardAlights.filenameBase);
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(
-    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
-  );
+  return db
+    .prepare(
+      `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+    )
+    .all();
 }