gtfs-to-html 2.4.4 → 2.5.1

package/CHANGELOG.md

@@ -5,6 +5,20 @@ 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).
 
+## [2.5.1] - 2023-03-06
+
+### Updated
+
+- Dependency updates
+- Optimize duplicateStopsForDifferentArrivalDeparture
+
+## [2.5.0] - 2022-12-31
+
+### Updated
+
+- Updated to node-gtfs v4
+- Dependency updates
+
 ## [2.4.4] - 2022-12-22
 
 ### Updated

package/app/index.js

@@ -39,7 +39,9 @@ config.log = console.log;
 config.logWarning = console.warn;
 config.logError = console.error;
 
-openDb(config).catch((error) => {
+try {
+  openDb(config);
+} catch (error) {
   if (error instanceof Error && error.code === 'SQLITE_CANTOPEN') {
     config.logError(
       `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
@@ -47,7 +49,7 @@ openDb(config).catch((error) => {
   }
 
   throw error;
-});
+}
 
 /*
  * Show all timetable pages
@@ -56,7 +58,7 @@ router.get('/', async (request, response, next) => {
   try {
     const timetablePages = [];
     const timetablePageIds = map(
-      await getTimetablePagesForAgency(config),
+      getTimetablePagesForAgency(config),
       'timetable_page_id'
     );
 

package/lib/geojson-utils.js

@@ -61,27 +61,22 @@ const simplifyGeoJSON = (geojson, config) => {
 /*
  * Get the geoJSON for a timetable.
  */
-export async function getTimetableGeoJSON(timetable, config) {
-  const [shapesGeojsons, stopsGeojsons] = await Promise.all([
-    await Promise.all(
-      timetable.route_ids.map((routeId) =>
-        getShapesAsGeoJSON({
-          route_id: routeId,
-          direction_id: timetable.direction_id,
-          trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
-        })
-      )
-    ),
-    await Promise.all(
-      timetable.route_ids.map((routeId) =>
-        getStopsAsGeoJSON({
-          route_id: routeId,
-          direction_id: timetable.direction_id,
-          trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
-        })
-      )
-    ),
-  ]);
+export function getTimetableGeoJSON(timetable, config) {
+  const shapesGeojsons = timetable.route_ids.map((routeId) =>
+    getShapesAsGeoJSON({
+      route_id: routeId,
+      direction_id: timetable.direction_id,
+      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
+    })
+  );
+
+  const stopsGeojsons = timetable.route_ids.map((routeId) =>
+    getStopsAsGeoJSON({
+      route_id: routeId,
+      direction_id: timetable.direction_id,
+      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
+    })
+  );
 
   const geojson = mergeGeojson(...shapesGeojsons, ...stopsGeojsons);
   return simplifyGeoJSON(geojson, config);
@@ -90,11 +85,9 @@ export async function getTimetableGeoJSON(timetable, config) {
 /*
  * Get the geoJSON for an agency (all routes and stops).
  */
-export async function getAgencyGeoJSON(config) {
-  const [shapesGeojsons, stopsGeojsons] = await Promise.all([
-    getShapesAsGeoJSON(),
-    getStopsAsGeoJSON(),
-  ]);
+export function getAgencyGeoJSON(config) {
+  const shapesGeojsons = getShapesAsGeoJSON();
+  const stopsGeojsons = getStopsAsGeoJSON();
 
   const geojson = mergeGeojson(shapesGeojsons, stopsGeojsons);
   return simplifyGeoJSON(geojson, config);

package/lib/gtfs-to-html.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { mkdir, writeFile } from 'node:fs/promises';
 
 import { map } from 'lodash-es';
-import { openDb, getDb, importGtfs } from 'gtfs';
+import { openDb, importGtfs } from 'gtfs';
 import sanitize from 'sanitize-filename';
 import Timer from 'timer-machine';
 
@@ -35,6 +35,7 @@ import {
 /*
  * Generate HTML timetables from GTFS.
  */
+/* eslint-disable complexity */
 const gtfsToHtml = async (initialConfig) => {
   const config = setDefaultConfig(initialConfig);
   const timer = new Timer();
@@ -45,7 +46,9 @@ const gtfsToHtml = async (initialConfig) => {
 
   timer.start();
 
-  await openDb(config).catch((error) => {
+  try {
+    openDb(config);
+  } catch (error) {
     if (error instanceof Error && error.code === 'SQLITE_CANTOPEN') {
       config.logError(
         `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
@@ -53,17 +56,6 @@ const gtfsToHtml = async (initialConfig) => {
     }
 
     throw error;
-  });
-
-  if (config.debug === true) {
-    const db = getDb();
-
-    db.on('profile', (sql, nsecs) => {
-      if (sql.startsWith('SELECT')) {
-        console.log(sql);
-        console.log(nsecs);
-      }
-    });
   }
 
   if (!config.agencies || config.agencies.length === 0) {
@@ -91,7 +83,7 @@ const gtfsToHtml = async (initialConfig) => {
 
   const timetablePages = [];
   const timetablePageIds = map(
-    await getTimetablePagesForAgency(config),
+    getTimetablePagesForAgency(config),
     'timetable_page_id'
   );
   await prepDirectory(exportPath);
@@ -190,7 +182,7 @@ const gtfsToHtml = async (initialConfig) => {
   }
 
   // Generate output log.txt
-  const logText = await generateLogText(outputStats, config);
+  const logText = generateLogText(outputStats, config);
   await writeFile(path.join(exportPath, 'log.txt'), logText);
 
   // Zip output, if specified
@@ -217,5 +209,6 @@ const gtfsToHtml = async (initialConfig) => {
 
   timer.stop();
 };
+/* eslint-enable complexity */
 
 export default gtfsToHtml;

package/lib/log-utils.js

@@ -11,8 +11,8 @@ pe.start();
 /*
  * Creates text for a log of output details.
  */
-export async function generateLogText(outputStats, config) {
-  const feedInfo = await getFeedInfo();
+export function generateLogText(outputStats, config) {
+  const feedInfo = getFeedInfo();
   const feedVersion =
     feedInfo.length > 0 && feedInfo[0].feed_version
       ? feedInfo[0].feed_version