gtfs-to-html 2.10.6 → 2.10.7

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

@@ -499,7 +499,7 @@ function formatTripNameForCSV(trip, timetable) {
 }
 
 // package.json
-var version = "2.10.6";
+var version = "2.10.7";
 
 // src/lib/utils.ts
 var isTimepoint = (stoptime) => {
@@ -961,7 +961,9 @@ var getStopOrder = (timetable, config) => {
       timetable.orderedTrips,
       config
     );
-    const stopIds = longestTripStoptimes.map((stoptime) => stoptime.stop_id);
+    const stopIds = longestTripStoptimes.map(
+      (stoptime) => stoptime.stop_id
+    );
     const missingStopIds = difference(
       uniq(
         timetable.orderedTrips.flatMap(
@@ -972,7 +974,7 @@ var getStopOrder = (timetable, config) => {
     );
     if (missingStopIds.length > 0) {
       timetable.warnings.push(
-        `Timetable ${timetable.timetable_id} stops are unable to be topologically sorted and has no \`timetable_stop_order.txt\`. Falling back to using the using the stop order from trip with most stoptimes, but this does not include stop_ids ${new Intl.ListFormat("en", { style: "long", type: "conjunction" }).format(missingStopIds)}. Try manually specifying stops with \`timetable_stop_order.txt\`. Read more at https://gtfstohtml.com/docs/timetable-stop-order`
+        `Timetable ${timetable.timetable_id} stops are unable to be topologically sorted and has no \`timetable_stop_order.txt\`. Falling back to using the using the stop order from trip with most stoptimes, but this does not include stop_ids ${formatListForDisplay(missingStopIds)}. Try manually specifying stops with \`timetable_stop_order.txt\`. Read more at https://gtfstohtml.com/docs/timetable-stop-order`
       );
     }
     return duplicateStopsForDifferentArrivalDeparture(
@@ -1550,7 +1552,7 @@ function getFormattedTimetablePage(timetablePageId, config) {
     route_ids: uniqueRoutes.map((route) => route.route_id),
     agency_ids: uniq(compact(timetableRoutes.map((route) => route.agency_id))),
     filename: timetablePage.filename ?? `${timetablePage.timetable_page_id}.html`,
-    timetable_page_label: timetablePage.timetable_page_label ?? formatRouteNames(uniqueRoutes)
+    timetable_page_label: timetablePage.timetable_page_label ?? formatListForDisplay(uniqueRoutes.map((route) => formatRouteName(route)))
   };
   return formattedTimetablePage;
 }
@@ -1582,7 +1584,7 @@ function generateTimetableHTML(timetablePage, config) {
   const templateVars = {
     timetablePage,
     config,
-    title: `${timetablePage.timetable_page_label} | ${formatAgencyNames(agencies)}`
+    title: `${timetablePage.timetable_page_label} | ${formatListForDisplay(agencies.map((agency) => agency.agency_name))}`
   };
   return renderTemplate("timetablepage", templateVars, config);
 }
@@ -1649,11 +1651,12 @@ function generateOverviewHTML(timetablePages, config) {
       ...first(agencies),
       geojson
     },
+    // Legacy agency object
     agencies,
     geojson,
     config,
     timetablePages: sortedTimetablePages,
-    title: `${formatAgencyNames(agencies)} Timetables`
+    title: `${formatListForDisplay(agencies.map((agency) => agency.agency_name))} Timetables`
   };
   return renderTemplate("overview", templateVars, config);
 }
@@ -1989,17 +1992,11 @@ var formatRouteName = (route) => {
   }
   return route.route_long_name ?? "Unknown";
 };
-var formatRouteNames = (routes) => {
-  return new Intl.ListFormat("en-US", {
-    style: "long",
-    type: "conjunction"
-  }).format(routes.map((route) => formatRouteName(route)));
-};
-var formatAgencyNames = (agencies) => {
+var formatListForDisplay = (list) => {
   return new Intl.ListFormat("en-US", {
     style: "long",
     type: "conjunction"
-  }).format(agencies.map((agency) => agency.agency_name));
+  }).format(list);
 };
 function mergeTimetablesWithSameId(timetables) {
   if (timetables.length === 0) {