gtfs-to-html 2.10.13 → 2.10.15

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

@@ -112,7 +112,6 @@ import {
   flatMap as flatMap2,
   flattenDeep,
   flow,
-  isEqual,
   groupBy,
   head,
   last,
@@ -140,7 +139,7 @@ import {
   getFrequencies,
   getTimetables,
   getTimetablePages,
-  getAgencies,
+  getAgencies as getAgencies2,
   openDb
 } from "gtfs";
 import { stringify } from "csv-stringify";
@@ -158,12 +157,14 @@ import { featureCollection, round } from "@turf/helpers";
 import { clearLine, cursorTo } from "readline";
 import { noop } from "lodash-es";
 import * as colors from "yoctocolors";
-import { getFeedInfo } from "gtfs";
+import { getAgencies, getFeedInfo } from "gtfs";
 import Table from "cli-table";
 function generateLogText(outputStats, config) {
   const feedInfo = getFeedInfo();
+  const agencies = getAgencies();
   const feedVersion = feedInfo.length > 0 && feedInfo[0].feed_version ? feedInfo[0].feed_version : "Unknown";
   const logText = [
+    `Agencies: ${agencies.map((agency) => agency.agency_name).join(", ")}`,
     `Feed Version: ${feedVersion}`,
     `GTFS-to-HTML Version: ${config.gtfsToHtmlVersion}`,
     `Date Generated: ${(/* @__PURE__ */ new Date()).toISOString()}`,
@@ -501,7 +502,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.10.13",
+  version: "2.10.15",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -552,18 +553,18 @@ var package_default = {
     anchorme: "^3.0.8",
     archiver: "^7.0.1",
     "cli-table": "^0.3.11",
-    "csv-stringify": "^6.5.2",
+    "csv-stringify": "^6.6.0",
     express: "^5.1.0",
-    gtfs: "^4.17.4",
+    gtfs: "^4.17.5",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
     "lodash-es": "^4.17.21",
-    marked: "^15.0.12",
+    marked: "^16.1.1",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.3",
-    puppeteer: "^24.9.0",
+    puppeteer: "^24.15.0",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     sqlstring: "^2.3.3",
@@ -575,19 +576,19 @@ var package_default = {
   },
   devDependencies: {
     "@types/archiver": "^6.0.3",
-    "@types/express": "^5.0.2",
+    "@types/express": "^5.0.3",
     "@types/insane": "^1.0.0",
     "@types/js-beautify": "^1.14.3",
     "@types/lodash-es": "^4.17.12",
-    "@types/morgan": "^1.9.9",
-    "@types/node": "^22.15.24",
+    "@types/morgan": "^1.9.10",
+    "@types/node": "^22",
     "@types/pug": "^2.0.10",
     "@types/sanitize-html": "^2.16.0",
     "@types/timer-machine": "^1.1.3",
     "@types/yargs": "^17.0.33",
     husky: "^9.1.7",
-    "lint-staged": "^16.1.0",
-    prettier: "^3.5.3",
+    "lint-staged": "^16.1.2",
+    prettier: "^3.6.2",
     tsup: "^8.5.0",
     typescript: "^5.8.3"
   },
@@ -657,37 +658,20 @@ var findCommonStopId = (trips, config) => {
   });
   return commonStoptime ? commonStoptime.stop_id : null;
 };
-var deduplicateTrips = (trips, commonStopId) => {
-  const deduplicatedTrips = [];
+var deduplicateTrips = (trips) => {
+  if (trips.length <= 1) {
+    return trips;
+  }
+  const uniqueTrips = /* @__PURE__ */ new Map();
   for (const trip of trips) {
-    if (deduplicatedTrips.length === 0 || trip.stoptimes.length === 0) {
-      deduplicatedTrips.push(trip);
-      continue;
-    }
-    const stoptimes = trip.stoptimes.map((stoptime) => stoptime.departure_time);
-    const selectedStoptime = commonStopId ? find(trip.stoptimes, {
-      stop_id: commonStopId
-    }) : trip.stoptimes[0];
-    const similarTrips = deduplicatedTrips.filter((trip2) => {
-      const stoptime = find(trip2.stoptimes, {
-        stop_id: selectedStoptime?.stop_id
-      });
-      if (!stoptime) {
-        return false;
-      }
-      return stoptime.departure_time === selectedStoptime?.departure_time;
-    });
-    const tripIsUnique = every2(similarTrips, (similarTrip) => {
-      const similarTripStoptimes = similarTrip.stoptimes.map(
-        (stoptime) => stoptime.departure_time
-      );
-      return !isEqual(stoptimes, similarTripStoptimes);
-    });
-    if (tripIsUnique) {
-      deduplicatedTrips.push(trip);
+    const tripSignature = trip.stoptimes.map(
+      (stoptime) => `${stoptime.stop_id}|${stoptime.departure_time}|${stoptime.arrival_time}`
+    ).join("|");
+    if (!uniqueTrips.has(tripSignature)) {
+      uniqueTrips.set(tripSignature, trip);
     }
   }
-  return deduplicatedTrips;
+  return Array.from(uniqueTrips.values());
 };
 var sortTrips = (trips, config) => {
   let sortedTrips;
@@ -741,7 +725,10 @@ var sortTrips = (trips, config) => {
     const lastStopId = last(longestTripStoptimes).stop_id;
     sortedTrips = sortTripsByStoptimeAtStop(trips, lastStopId);
   }
-  return deduplicateTrips(sortedTrips, commonStopId);
+  if (config.showDuplicateTrips === false) {
+    return deduplicateTrips(sortedTrips ?? []);
+  }
+  return sortedTrips ?? [];
 };
 var sortTripsByStoptimeAtStop = (trips, stopId) => sortBy(trips, (trip) => {
   const stoptime = find(trip.stoptimes, { stop_id: stopId });
@@ -1072,6 +1059,11 @@ var getStopOrder = (timetable, config) => {
         stopGraph.push([stopId, sortedStopIds[index + 1]]);
       }
     }
+    if (stopGraph.length === 0 && config.showOnlyTimepoint === true) {
+      timetable.warnings.push(
+        `Timetable ${timetable.timetable_id}'s trips have stoptimes with timepoints but \`showOnlyTimepoint\` is true. Try setting \`showOnlyTimepoint\` to false.`
+      );
+    }
     const stopIds = toposort(stopGraph);
     return duplicateStopsForDifferentArrivalDeparture(
       stopIds,
@@ -1606,6 +1598,7 @@ function setDefaultConfig(initialConfig) {
     serviceProvidedOnText: "Service provided on",
     showArrivalOnDifference: 0.2,
     showCalendarExceptions: true,
+    showDuplicateTrips: false,
     showMap: false,
     showOnlyTimepoint: false,
     showRouteTitle: true,
@@ -1702,7 +1695,7 @@ var generateStats = (timetablePage) => {
   return stats;
 };
 function generateTimetableHTML(timetablePage, config) {
-  const agencies = getAgencies();
+  const agencies = getAgencies2();
   const templateVars = {
     timetablePage,
     config,
@@ -1742,7 +1735,7 @@ function generateTimetableCSV(timetable) {
   return stringify(lines);
 }
 function generateOverviewHTML(timetablePages, config) {
-  const agencies = getAgencies();
+  const agencies = getAgencies2();
   if (agencies.length === 0) {
     throw new Error("No agencies found");
   }