gtfs-to-html 2.6.4 → 2.6.5

package/CHANGELOG.md

@@ -5,6 +5,16 @@ 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.5] - 2024-05-11
+
+### Updated
+- Timetable trip notes on vertical
+- Use route_text_color in timetable continuations
+- Dependency updates
+
+### Fixed
+- Handle trips with nostoptimes in overview
+
 ## [2.6.4] - 2024-04-30
 
 ### Updated

package/lib/utils.js

@@ -937,7 +937,7 @@ const getTripsWithSameBlock = (trip, timetable) => {
  * departs from the same stop and is a different route.
  */
 const addTripContinuation = (trip, timetable) => {
-  if (!trip.block_id) {
+  if (!trip.block_id || trip.stoptimes.length === 0) {
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -51,7 +51,7 @@
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.2",
-    "puppeteer": "^22.6.5",
+    "puppeteer": "^22.8.0",
     "sanitize-filename": "^1.6.3",
     "sqlstring": "^2.3.3",
     "timer-machine": "^1.1.0",

package/views/default/timetable_continuation_as.pug

@@ -1,6 +1,6 @@
 if trip.continues_as_route && trip.continues_as_route.route.route_color
   - var tdStyle = `background: #${trip.continues_as_route.route.route_color};`
-  - var aStyle = 'color: #ffffff;'
+  - var aStyle = `color: #${trip.continues_as_route.route.route_text_color || 'ffffff'};`
 else 
   - var tdStyle = ''
   - var aStyle = ''

package/views/default/timetable_continuation_from.pug

@@ -1,6 +1,6 @@
 if trip.continues_from_route && trip.continues_from_route.route.route_color
   - var tdStyle = `background: #${trip.continues_from_route.route.route_color};`
-  - var aStyle = 'color: #ffffff;'
+  - var aStyle = `color: #${trip.continues_from_route.route.route_text_color || 'ffffff'};`
 else 
   - var tdStyle = ''
   - var aStyle = ''

package/views/default/timetable_vertical.pug

@@ -7,6 +7,7 @@
 -     return memo;
 -   }, 0);
 - }
+- var timetableHasTripNotes = timetable.orderedTrips.flatMap(trip => getNotesForTrip(timetable.notes, trip)).length > 0;
 .table-container
   table(summary= getTimetableSummary(timetable) data-orientation="vertical")
     caption.sr-only= `${timetable.timetable_label} | ${timetable.dayList}`
@@ -15,6 +16,8 @@
         col(id=`stop_id_${formatHtmlId(stop.stop_id)}` class=`stop-${idx}` data-stop-id=`${stop.stop_id}` data-is-timepoint=`${stop.is_timepoint}`)
     thead
       tr
+        if timetableHasTripNotes
+          th
         if timetable.has_continues_from_route
           th.stop-header.continues-from Continues from route
 
@@ -33,6 +36,8 @@
     tbody
       if timetable.frequencies && !timetable.frequencyExactTimes
         tr.trip-row
+          if timetableHasTripNotes
+            td
           if timetable.has_continues_from_route
             td
 
@@ -42,6 +47,10 @@
             td
       each trip, idx in timetable.orderedTrips
         tr.trip-row(id=`trip_id_${formatHtmlId(trip.trip_id)}`)
+          if timetableHasTripNotes
+            td.trip-notes
+              each note in getNotesForTrip(timetable.notes, trip)
+                include timetable_note_symbol.pug
           if timetable.has_continues_from_route
             include timetable_continuation_from.pug