gtfs-to-html 2.6.0 → 2.6.2

package/CHANGELOG.md

@@ -5,6 +5,28 @@ 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.2] - 2024-04-19
+
+### Updated
+- Dependency updates
+- Update to timetable page sorting
+
+### Added
+
+- Markdown support in timetable notes
+
+## [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/examples/timetable_notes.txt

@@ -4,4 +4,5 @@ note_id,symbol,note
 3,,"Trip is cancelled if drawbridge is up"
 4,,"This stop is sometimes underwater"
 5,,"Driver will only stop if prearranged by fax"
-6,§,"Vehicle can arrive early if leap second is added during trip"
+6,§,"Vehicle can arrive early if leap second is added during trip and *will not wait*"
+7,,"[See list of holidays](http://transitagency.org/holidays)"

package/examples/timetable_notes_references.txt

@@ -5,3 +5,4 @@ note_id,timetable_id,route_id,trip_id,stop_id,stop_sequence,show_on_stoptime
 4,,,,254514,,
 5,,,,254514,11,
 6,,,17010,235269,,
+7,131,,,,,

package/lib/file-utils.js

@@ -11,6 +11,8 @@ import { renderFile } from 'pug';
 import puppeteer from 'puppeteer';
 import sanitize from 'sanitize-filename';
 import untildify from 'untildify';
+import insane from 'insane';
+import { marked } from 'marked';
 
 import {
   isNullOrEmpty,
@@ -132,7 +134,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 +147,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.
  */
@@ -182,9 +171,10 @@ export function generateFolderName(timetablePage) {
 export async function renderTemplate(templateFileName, templateVars, config) {
   const templatePath = getTemplatePath(templateFileName, config);
 
-  // Make template functions and lodash available inside pug templates.
+  // Make template functions, lodash and marked available inside pug templates.
   const html = await renderFile(templatePath, {
     _,
+    md: (text) => insane(marked.parseInline(text)),
     ...templateFunctions,
     formatRouteColor,
     formatRouteTextColor,

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;
+        }
       }
     }
   }
@@ -1608,17 +1612,24 @@ export function generateOverviewHTML(timetablePages, config) {
   // Sort timetables for display, first numerically then alphabetically.
   const sortedTimetablePages = sortBy(timetablePages, [
     (timetablePage) => {
+      // First sort numerically by route_short_name, removing leading non-digits
       if (
         timetablePage.consolidatedTimetables.length > 0 &&
         timetablePage.consolidatedTimetables[0].routes.length > 0
       ) {
-        return Number.parseInt(
-          timetablePage.consolidatedTimetables[0].routes[0].route_short_name,
-          10,
+        return (
+          Number.parseInt(
+            timetablePage.consolidatedTimetables[0].routes[0].route_short_name?.replace(
+              /^\D+/g,
+              '',
+            ),
+            10,
+          ) || 0
         );
       }
     },
     (timetablePage) => {
+      // Then sort by route_short_name alphabetically
       if (
         timetablePage.consolidatedTimetables.length > 0 &&
         timetablePage.consolidatedTimetables[0].routes.length > 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -37,26 +37,28 @@
   "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.10.2",
+    "insane": "^2.6.2",
     "js-beautify": "^1.15.1",
     "lodash-es": "^4.17.21",
+    "marked": "^12.0.2",
     "moment": "^2.30.1",
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.2",
-    "puppeteer": "^22.3.0",
+    "puppeteer": "^22.6.5",
     "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/views/default/timetablepage.pug

@@ -54,7 +54,10 @@ include formatting_functions.pug
               if timetable.interpolatedStopSymbolUsed
                 .note(id=`note-${timetable.timetable_id}-interpolated-stop`)= `${config.interpolatedStopSymbol} = ${config.interpolatedStopText}`
               each note in _.uniqBy(timetable.notes, 'note_id')
-                .note(id=`note-${timetable.timetable_id}-${note.note_id}`)= `${note.symbol} = ${note.note}`
+                .note(id=`note-${timetable.timetable_id}-${note.note_id}`)
+                  span= note.symbol 
+                  span  = 
+                  span!= md(note.note)
 
           if config.showCalendarExceptions && timetable.calendarDates.includedDates.length
             .included-dates= `${config.serviceProvidedOnText}: ${timetable.calendarDates.includedDates.join(', ')}`

package/www/docs/additional-files.md

@@ -13,7 +13,7 @@ By default, GTFS-to-HTML attempts to generate a timetable for each route and dir
 * [timetable_pages.txt](/docs/timetable-pages) - Specifies which HTML timetables should be grouped together into a single HTML page.
 
 ## Adding notes to timetables
-Notes about a specific trip, stop, stoptime, route or timetable can be added to timetables by using `timetable_notes.txt` and `timetable_notes_references.txt` in your GTFS.
+Notes about a specific trip, stop, stoptime, route or timetable can be added to timetables by using `timetable_notes.txt` and `timetable_notes_references.txt` in your GTFS. These notes can include links and other formatting using Markdown syntax.
 
 * [timetable_notes.txt](/docs/timetable-notes) - Specifies notes to be used in timetables.
 * [timetable_notes_references.txt](/docs/timetable-notes-references) - Specifies where notes should be placed in timetables.

package/www/docs/timetable-notes.md

@@ -15,7 +15,7 @@ Notes can have a `symbol` specified or can be left blank and GTFS-to-HTML will a
 | ----------- | ----------- |
 | `note_id` | A unique ID for the timetable note |
 | `symbol` | The symbol used to indicate the note, such as `§`. Optional, if omitted a letter of the alphabet starting with `a` will be used. |
-| `note` | The text of the note, such as "This stop is sometimes underwater". |
+| `note` | The text of the note, such as "This stop is sometimes underwater". [Markdown syntax](https://daringfireball.net/projects/markdown/syntax) is supported which allows including links and formatting. |
 
 ### Example
 
@@ -26,7 +26,8 @@ note_id,symbol,note
 3,,"Trip is cancelled if drawbridge is up"
 4,,"This stop is sometimes underwater"
 5,,"Driver will only stop if prearranged by fax"
-6,§,"Vehicle can arrive early if leap second is added during trip"
+6,§,"Vehicle can arrive early if leap second is added during trip and *will not wait*"
+7,,"[See list of holidays](http://transitagency.org/holidays)"
 ```
 
 An example of this file is located in [examples/timetable_notes.txt](https://github.com/BlinkTagInc/gtfs-to-html/blob/master/examples/timetable_notes.txt).

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.2.1",
+    "@docusaurus/preset-classic": "^3.2.1",
     "clsx": "^2.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"