gtfs-to-html 2.12.6 → 2.12.7

package/dist/app/index.js

@@ -426,6 +426,10 @@ function formatWarning(text) {
   return colors.yellow(warningMessage);
 }
 
+// src/lib/trip-id-utils.ts
+var getBaseTripId = (tripId) => tripId.replace(/_freq_\d+$/, "");
+var getBaseTripIds = (trips) => Array.from(new Set(trips.map((trip) => getBaseTripId(trip.trip_id))));
+
 // src/lib/geojson-utils.ts
 var mergeGeojson = (...geojsons) => featureCollection(geojsons.flatMap((geojson) => geojson.features));
 var truncateGeoJSONDecimals = (geojson, config2) => {
@@ -455,18 +459,19 @@ var truncateGeoJSONDecimals = (geojson, config2) => {
   return geojson;
 };
 function getTimetableGeoJSON(timetable, config2) {
+  const tripIds = getBaseTripIds(timetable.orderedTrips);
   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)
+      trip_id: tripIds
     })
   );
   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)
+      trip_id: tripIds
     })
   );
   const geojson = mergeGeojson(...shapesGeojsons, ...stopsGeojsons);
@@ -504,7 +509,7 @@ function getAgencyGeoJSON(config2) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.12.6",
+  version: "2.12.7",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -563,11 +568,11 @@ var package_default = {
     "css.escape": "^1.5.1",
     "csv-stringify": "^6.7.0",
     express: "^5.2.1",
-    gtfs: "^4.18.4",
+    gtfs: "^4.18.5",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
-    "lodash-es": "^4.17.23",
-    "maplibre-gl": "^5.21.0",
+    "lodash-es": "^4.18.1",
+    "maplibre-gl": "^5.21.1",
     marked: "^17.0.5",
     moment: "^2.30.1",
     pbf: "^4.0.1",
@@ -597,7 +602,7 @@ var package_default = {
     "lint-staged": "^16.4.0",
     prettier: "^3.8.1",
     tsup: "^8.5.1",
-    typescript: "^5.9.3"
+    typescript: "^6.0.2"
   },
   engines: {
     node: ">= 22"
@@ -827,7 +832,7 @@ var getTimetableNotesForTimetable = (timetable, config2) => {
     }),
     // Get all notes for all trips in this timetable.
     ...getTimetableNotesReferences({
-      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id)
+      trip_id: getBaseTripIds(timetable.orderedTrips)
     }),
     // Get all notes for all stops in this timetable.
     ...getTimetableNotesReferences({
@@ -1021,7 +1026,7 @@ var convertRoutesToTimetablePages = (config2) => {
     if (config2.groupTimetablesIntoPages === true) {
       timetablePages.push(
         createTimetablePage({
-          timetablePageId: `route_${route.route_short_name ?? route.route_long_name}`,
+          timetablePageId: `route_${route.route_id}`,
           timetables,
           config: config2
         })
@@ -1636,9 +1641,7 @@ var formatTimetables = (timetables, config2) => {
     if (config2.showMap) {
       timetable.geojson = getTimetableGeoJSON(timetable, config2);
     }
-    timetable.trip_ids = uniq(
-      timetable.orderedTrips.map((trip) => trip.trip_id)
-    );
+    timetable.trip_ids = uniq(getBaseTripIds(timetable.orderedTrips));
     timetable.orderedTrips = filterTrips(timetable, calendars, config2);
     timetable.stops = formatStops(timetable, config2);
     return timetable;
@@ -1804,7 +1807,7 @@ var getTimetablePageById = (timetablePageId, config2) => {
   }
   if (timetablePageId.startsWith("route_")) {
     const routes = getRoutes({
-      route_short_name: timetablePageId.split("_")[1]
+      route_id: timetablePageId.split("_")[1]
     });
     if (routes.length === 0) {
       throw new GtfsToHtmlError(