gtfs-to-html 2.6.0 → 2.6.1

package/CHANGELOG.md

@@ -5,6 +5,18 @@ 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.6.1] - 2024-03-26
+
+### Fixed
+
+- Fix for missing stops
+
+### Updated
+- Dependency updates
+- Day List selector label wording
+- Updates to timetable map
+- Filename format for CSV export files
+
 ## [2.6.0] - 2024-02-27
 
 ### Updated

package/lib/file-utils.js

@@ -132,7 +132,7 @@ export function zipFolder(exportPath) {
 /*
  * Generate the filename for a given timetable.
  */
-export function generateFileName(timetable, config) {
+export function generateFileName(timetable, config, extension = 'html') {
   let filename = timetable.timetable_id;
 
   for (const route of timetable.routes) {
@@ -145,24 +145,11 @@ export function generateFileName(timetable, config) {
     filename += `_${timetable.direction_id}`;
   }
 
-  filename += `_${formatDays(timetable, config).replace(/\s/g, '')}.html`;
+  filename += `_${formatDays(timetable, config).replace(/\s/g, '')}.${extension}`;
 
   return sanitize(filename).toLowerCase();
 }
 
-/*
- * Generate the filename for a CSV timetable.
- */
-export function generateCSVFileName(timetable, timetablePage) {
-  let filename = timetablePage.filename.replace(/.html$/, '');
-
-  if (timetablePage.timetables.length > 1) {
-    filename += `_${timetable.direction_id}`;
-  }
-
-  return sanitize(`${filename}.csv`);
-}
-
 /*
  * Generates the folder name for a timetable page based on the date.
  */

package/lib/gtfs-to-html.js

@@ -12,7 +12,7 @@ import {
   generateFolderName,
   renderPdf,
   zipFolder,
-  generateCSVFileName,
+  generateFileName,
 } from './file-utils.js';
 import {
   log,
@@ -139,7 +139,7 @@ const gtfsToHtml = async (initialConfig) => {
           const csvPath = path.join(
             exportPath,
             datePath,
-            generateCSVFileName(timetable, timetablePage),
+            generateFileName(timetable, config, 'csv'),
           );
           await writeFile(csvPath, csv);
         }

package/lib/utils.js

@@ -472,7 +472,7 @@ const convertTimetableToTimetablePage = (timetable, config) => {
     });
   }
 
-  const filename = generateFileName(timetable, config);
+  const filename = generateFileName(timetable, config, 'html');
 
   return {
     timetable_page_id: timetable.timetable_id,
@@ -855,6 +855,10 @@ const getAllStationStopIds = (stopId) => {
     stop_id: stopId,
   });
 
+  if (stops.length === 0) {
+    throw new Error(`No stop found for stop_id=${stopId}`);
+  }
+
   const stop = stops[0];
 
   if (isNullOrEmpty(stop.parent_station)) {
@@ -1153,11 +1157,11 @@ const getTripsForTimetable = (timetable, calendars, config) => {
 
     for (const trip of formattedTrips) {
       for (const stoptime of trip.stoptimes) {
-        const parentStationStop = stops.find(
-          (stop) => stop.stop_id === stoptime.stop_id,
-        );
-        stoptime.stop_id =
-          parentStationStop.parent_station || parentStationStop.stop_id;
+        const stop = stops.find((stop) => stop.stop_id === stoptime.stop_id);
+
+        if (stop?.parent_station) {
+          stoptime.stop_id = stop.parent_station;
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -37,26 +37,26 @@
   "dependencies": {
     "@turf/helpers": "^6.5.0",
     "@turf/simplify": "^6.5.0",
-    "archiver": "^6.0.2",
+    "archiver": "^7.0.1",
     "cli-table": "^0.3.11",
     "copy-dir": "^1.3.0",
     "csv-stringify": "^6.4.6",
-    "express": "^4.18.2",
-    "gtfs": "^4.7.1",
+    "express": "^4.19.2",
+    "gtfs": "^4.9.0",
     "js-beautify": "^1.15.1",
     "lodash-es": "^4.17.21",
     "moment": "^2.30.1",
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.2",
-    "puppeteer": "^22.3.0",
+    "puppeteer": "^22.6.1",
     "sanitize-filename": "^1.6.3",
     "sqlstring": "^2.3.3",
     "timer-machine": "^1.1.0",
     "toposort": "^2.0.2",
     "untildify": "^5.0.0",
     "yargs": "^17.7.2",
-    "yoctocolors": "^1.0.0"
+    "yoctocolors": "^2.0.0"
   },
   "devDependencies": {
     "husky": "^9.0.11",

package/public/js/timetable-map.js

@@ -28,6 +28,11 @@ function formatRoute(route) {
           .text(route.route_long_name || ''),
       ])
       .appendTo(html);
+  } else {
+    $('<div>')
+      .addClass('hover:underline')
+      .text(route.route_long_name || '')
+      .appendTo(html);
   }
 
   return html.prop('outerHTML');
@@ -48,7 +53,7 @@ function formatStopPopup(feature, routes) {
     $('<strong>').text(feature.properties.stop_code).appendTo(html);
   }
 
-  $('<div>').addClass('text-sm').text('Routes Served:').appendTo(html);
+  $('<div>').addClass('text-sm mb-2').text('Routes Served:').appendTo(html);
 
   $(html).append(routeIds.map((routeId) => formatRoute(routes[routeId])));
 

package/views/default/timetable_menu.pug

@@ -42,7 +42,7 @@ if timetablePage.consolidatedTimetables.length > 1
                 span= directionName
         div(hidden=timetablePage.dayLists.length <= 1)
           #day_list_selector
-            h3.font-bold Days of Week
+            h3.font-bold Day of Week
             each dayList, idx in timetablePage.dayLists
               label.cursor-pointer.mb-2.w-full.flex.items-center.justify-center.px-8.py-3.border.border-transparent.text-base.rounded-md(class=idx === 0 ? 'text-white bg-blue-600': 'text-gray-600 bg-gray-300')
                 input.hidden(type="radio" name="dayList" autocomplete="off" value=dayList checked=(idx === 0))

package/www/package.json

@@ -9,8 +9,8 @@
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^3.1.0",
-    "@docusaurus/preset-classic": "^3.1.0",
+    "@docusaurus/core": "^3.1.1",
+    "@docusaurus/preset-classic": "^3.1.1",
     "clsx": "^2.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"