gtfs-to-html 2.12.3 → 2.12.4

package/dist/bin/gtfs-to-html.js

@@ -112,6 +112,27 @@ function calendarToDateList(calendar, startDate, endDate) {
   }
   return Array.from(dates);
 }
+function combineCalendars(calendars) {
+  const combinedCalendar = {
+    monday: 0,
+    tuesday: 0,
+    wednesday: 0,
+    thursday: 0,
+    friday: 0,
+    saturday: 0,
+    sunday: 0
+  };
+  for (const calendar of calendars) {
+    for (const day of Object.keys(
+      combinedCalendar
+    )) {
+      if (calendar[day] === 1) {
+        combinedCalendar[day] = 1;
+      }
+    }
+  }
+  return combinedCalendar;
+}
 function secondsAfterMidnight(timeString) {
   return moment.duration(timeString).asSeconds();
 }
@@ -522,7 +543,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.12.3",
+  version: "2.12.4",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -572,26 +593,26 @@ var package_default = {
     postinstall: "node scripts/postinstall.js"
   },
   dependencies: {
-    "@maplibre/maplibre-gl-geocoder": "^1.9.1",
-    "@turf/helpers": "^7.3.1",
-    "@turf/simplify": "^7.3.1",
+    "@maplibre/maplibre-gl-geocoder": "^1.9.4",
+    "@turf/helpers": "^7.3.2",
+    "@turf/simplify": "^7.3.2",
     anchorme: "^3.0.8",
     archiver: "^7.0.1",
     "cli-table": "^0.3.11",
     "css.escape": "^1.5.1",
     "csv-stringify": "^6.6.0",
     express: "^5.2.1",
-    gtfs: "^4.18.2",
+    gtfs: "^4.18.3",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
-    "lodash-es": "^4.17.21",
-    "maplibre-gl": "^5.14.0",
+    "lodash-es": "^4.17.23",
+    "maplibre-gl": "^5.16.0",
     marked: "^17.0.1",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.3",
-    puppeteer: "^24.32.0",
+    puppeteer: "^24.35.0",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     sqlstring: "^2.3.3",
@@ -607,7 +628,7 @@ var package_default = {
     "@types/js-beautify": "^1.14.3",
     "@types/lodash-es": "^4.17.12",
     "@types/morgan": "^1.9.10",
-    "@types/node": "^24",
+    "@types/node": "^25",
     "@types/pug": "^2.0.10",
     "@types/sanitize-html": "^2.16.0",
     "@types/sqlstring": "^2.3.2",
@@ -615,7 +636,7 @@ var package_default = {
     "@types/yargs": "^17.0.35",
     husky: "^9.1.7",
     "lint-staged": "^16.2.7",
-    prettier: "^3.7.4",
+    prettier: "^3.8.1",
     tsup: "^8.5.1",
     typescript: "^5.9.3"
   },
@@ -696,6 +717,16 @@ var deduplicateTrips = (trips) => {
     ).join("|");
     if (!uniqueTrips.has(tripSignature)) {
       uniqueTrips.set(tripSignature, trip);
+    } else {
+      const existingTrip = uniqueTrips.get(tripSignature);
+      if (!existingTrip) {
+        continue;
+      }
+      if (!existingTrip.additional_service_ids) {
+        existingTrip.additional_service_ids = [];
+      }
+      existingTrip.additional_service_ids.push(trip.service_id);
+      uniqueTrips.set(tripSignature, existingTrip);
     }
   }
   return Array.from(uniqueTrips.values());
@@ -1377,7 +1408,7 @@ var addTripContinuation = (trip, timetable) => {
     trip.continues_as_route = nextTrip;
   }
 };
-var filterTrips = (timetable, config) => {
+var filterTrips = (timetable, calendars, config) => {
   let filteredTrips = timetable.orderedTrips;
   for (const trip of filteredTrips) {
     const combinedStoptimes = [];
@@ -1404,7 +1435,26 @@ var filterTrips = (timetable, config) => {
   if (config.showDuplicateTrips === false) {
     filteredTrips = deduplicateTrips(filteredTrips);
   }
-  return filteredTrips;
+  const formattedTrips = filteredTrips.map((trip) => {
+    const tripCalendars = calendars.filter((calendar) => {
+      return [
+        trip.service_id,
+        ...trip.additional_service_ids || []
+      ].includes(calendar.service_id);
+    }) ?? [];
+    trip.dayList = formatDays(combineCalendars(tripCalendars), config);
+    trip.dayListLong = formatDaysLong(trip.dayList, config);
+    if (timetable.routes.length === 1) {
+      trip.route_short_name = timetable.routes[0].route_short_name;
+    } else {
+      const route = timetable.routes.find(
+        (route2) => route2.route_id === trip.route_id
+      );
+      trip.route_short_name = route?.route_short_name;
+    }
+    return trip;
+  });
+  return formattedTrips;
 };
 var getTripsForTimetable = (timetable, calendars, config) => {
   const tripQuery = {
@@ -1430,7 +1480,7 @@ var getTripsForTimetable = (timetable, calendars, config) => {
   timetable.service_ids = uniq(trips.map((trip) => trip.service_id));
   const formattedTrips = [];
   for (const trip of trips) {
-    const formattedTrip = formatTrip(trip, timetable, calendars, config);
+    const formattedTrip = trip;
     formattedTrip.stoptimes = getStoptimes(
       {
         trip_id: formattedTrip.trip_id
@@ -1580,7 +1630,7 @@ var formatTimetables = (timetables, config) => {
     timetable.trip_ids = uniq(
       timetable.orderedTrips.map((trip) => trip.trip_id)
     );
-    timetable.orderedTrips = filterTrips(timetable, config);
+    timetable.orderedTrips = filterTrips(timetable, calendars, config);
     timetable.stops = formatStops(timetable, config);
     return timetable;
   });
@@ -2135,22 +2185,6 @@ function formatDaysLong(dayList, config) {
   const mapObject = zipObject(config.daysShortStrings, config.daysStrings);
   return replaceAll(dayList, mapObject);
 }
-function formatTrip(trip, timetable, calendars, config) {
-  trip.calendar = find2(calendars, {
-    service_id: trip.service_id
-  });
-  trip.dayList = formatDays(trip.calendar, config);
-  trip.dayListLong = formatDaysLong(trip.dayList, config);
-  if (timetable.routes.length === 1) {
-    trip.route_short_name = timetable.routes[0].route_short_name;
-  } else {
-    const route = timetable.routes.find(
-      (route2) => route2.route_id === trip.route_id
-    );
-    trip.route_short_name = route.route_short_name;
-  }
-  return trip;
-}
 function formatFrequency(frequency, config) {
   const startTime = fromGTFSTime(frequency.start_time);
   const endTime = fromGTFSTime(frequency.end_time);