gtfs-to-html 2.10.1 → 2.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.10.1",
+  "version": "2.10.3",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -52,18 +52,18 @@
     "archiver": "^7.0.1",
     "cli-table": "^0.3.11",
     "csv-stringify": "^6.5.1",
+    "dompurify": "^3.2.0",
     "express": "^5.0.1",
-    "gtfs": "^4.15.4",
+    "gtfs": "^4.15.6",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
-    "insane": "^2.6.2",
     "js-beautify": "^1.15.1",
     "lodash-es": "^4.17.21",
-    "marked": "^14.1.3",
+    "marked": "^15.0.0",
     "moment": "^2.30.1",
     "pbf": "^4.0.1",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.3",
-    "puppeteer": "^23.6.0",
+    "puppeteer": "^23.7.1",
     "sanitize-filename": "^1.6.3",
     "sqlstring": "^2.3.3",
     "timer-machine": "^1.1.0",
@@ -79,7 +79,7 @@
     "@types/js-beautify": "^1.14.3",
     "@types/lodash-es": "^4.17.12",
     "@types/morgan": "^1.9.9",
-    "@types/node": "^20.17.0",
+    "@types/node": "^22.9.0",
     "@types/pug": "^2.0.10",
     "@types/puppeteer": "^7.0.4",
     "@types/sanitize-filename": "^1.6.3",
@@ -89,7 +89,7 @@
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
     "prettier": "^3.3.3",
-    "tsup": "^8.3.0",
+    "tsup": "^8.3.5",
     "typescript": "^5.6.3"
   },
   "engines": {

package/views/default/css/timetable_styles.css

@@ -250,11 +250,18 @@ a:hover {
   font-size: 0.875rem;
 }
 
-.timetable-page .timetable .run-header {
-  text-align: center;
+.timetable-page .timetable .table-horizontal th {
   line-height: 1.15;
 }
 
+.timetable-page .timetable .trip-header {
+  text-align: center;
+}
+
+.timetable-page .timetable .trip-name {
+  display: inline-block;
+}
+
 .timetable-page .timetable .run-footer {
   text-align: center;
 }
@@ -543,19 +550,24 @@ a:hover {
 }
 
 .timetable-page .map-legend {
-  max-width: 30%;
-  background-color: #fff;
-  border-radius: 3px;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-  padding: 10px;
-  position: absolute;
-  left: 10px;
-  bottom: 10px;
-  z-index: 1;
+  padding: 0 10px;
+}
+
+@media screen and (min-width: 768px) {
+  .timetable-page .map-legend {
+    padding: 10px;
+    background-color: #fff;
+    border-radius: 3px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+    position: absolute;
+    left: 10px;
+    bottom: 35px;
+    z-index: 1;
+  }
 }
 
 .timetable-page .map-legend .legend-item {
-  padding: 5px 0;
+  padding: 4px 0;
   display: flex;
   flex-direction: row;
   align-items: start;

package/views/default/formatting_functions.pug

@@ -118,3 +118,22 @@
     return ''
   }
 
+  function formatTripName(trip, index, timetable) {
+    let tripName;
+    if (timetable.routes.length > 1) {
+      tripName = trip.route_short_name;
+    } else if (timetable.orientation === 'horizontal') {
+      // Only add this to horizontal timetables.
+      if (trip.trip_short_name) {
+        tripName = trip.trip_short_name;
+      } else {
+        tripName = `Run #${index + 1}`;
+      }
+    }
+
+    if (timetableHasDifferentDays(timetable)) {
+      tripName += ` ${trip.dayList}`;
+    }
+
+    return tripName;
+  }

package/views/default/timetable_horizontal.pug

@@ -9,7 +9,8 @@
       tr
         th.stop-header(scope="col") Stop
         each trip, idx in timetable.orderedTrips
-          th.run-header(scope="col")= formatTripName(trip, idx, timetable)
+          th.trip-header(scope="col")
+            .trip-name= formatTripName(trip, idx, timetable)
             each note in getNotesForTrip(timetable.notes, trip)
               include timetable_note_symbol.pug
       if timetable.frequencies && !timetable.frequencyExactTimes

package/views/default/timetable_vertical.pug

@@ -48,7 +48,8 @@
       each trip, idx in timetable.orderedTrips
         tr.trip-row(id=`trip_id_${formatHtmlId(trip.trip_id)}`)
           if timetableHasTripNotes || timetable.routes.length > 1
-            td.trip-notes= formatTripName(trip, idx, timetable)
+            td.trip-notes
+              .trip-name= formatTripName(trip, idx, timetable)
               each note in getNotesForTrip(timetable.notes, trip)
                 include timetable_note_symbol.pug
           if timetable.has_continues_from_route