gtfs 3.1.0 → 3.1.4

package/lib/gtfs/stop-times.js

@@ -2,7 +2,11 @@ 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';
 
 /*
@@ -15,5 +19,7 @@ export async function getStoptimes(query = {}, fields = [], orderBy = []) {
   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
+  )})`;
 }
 
 /*
@@ -30,10 +37,22 @@ export async function getStops(query = {}, fields = [], orderBy = []) {
   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,7 +62,9 @@ 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};`
+  );
 }
 
 /*
@@ -57,15 +78,23 @@ export async function getStopsAsGeoJSON(query = {}) {
   // 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 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,7 +2,11 @@ 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';
 
 /*
@@ -15,5 +19,7 @@ export async function getTransfers(query = {}, fields = [], orderBy = []) {
   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,7 +2,11 @@ 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';
 
 /*
@@ -15,5 +19,7 @@ export async function getTranslations(query = {}, fields = [], orderBy = []) {
   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,7 +2,11 @@ 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';
 
 /*
@@ -15,5 +19,7 @@ export async function getTrips(query = {}, fields = [], orderBy = []) {
   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-ride/board-alights.js

@@ -2,7 +2,11 @@ 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 boardAlights from '../../models/gtfs-ride/board-alight.js';
 
 /*
@@ -15,5 +19,7 @@ export async function getBoardAlights(query = {}, fields = [], orderBy = []) {
   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-ride/ride-feed-infos.js

@@ -2,7 +2,11 @@ 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 rideFeedInfo from '../../models/gtfs-ride/ride-feed-info.js';
 
 /*
@@ -15,5 +19,7 @@ export async function getRideFeedInfos(query = {}, fields = [], orderBy = []) {
   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-ride/rider-trips.js

@@ -2,7 +2,11 @@ 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 riderTrip from '../../models/gtfs-ride/rider-trip.js';
 
 /*
@@ -15,5 +19,7 @@ export async function getRiderTrips(query = {}, fields = [], orderBy = []) {
   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-ride/riderships.js

@@ -2,7 +2,11 @@ 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 riderships from '../../models/gtfs-ride/ridership.js';
 
 /*
@@ -15,5 +19,7 @@ export async function getRiderships(query = {}, fields = [], orderBy = []) {
   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-ride/trip-capacities.js

@@ -2,7 +2,11 @@ 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 tripCapacity from '../../models/gtfs-ride/trip-capacity.js';
 
 /*
@@ -15,5 +19,7 @@ export async function getTripCapacities(query = {}, fields = [], orderBy = []) {
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy);
 
-  return db.all(`${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`);
+  return db.all(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  );
 }