gtfs-to-html 2.2.0 → 2.3.2

package/lib/template-functions.js

@@ -31,7 +31,10 @@ export function timetablePageHasDifferentDays(timetablePage) {
       return true;
     }
 
-    return timetable.dayListLong === timetablePage.consolidatedTimetables[idx - 1].dayListLong;
+    return (
+      timetable.dayListLong ===
+      timetablePage.consolidatedTimetables[idx - 1].dayListLong
+    );
   });
 }
 
@@ -45,7 +48,10 @@ export function timetablePageHasDifferentLabels(timetablePage) {
       return true;
     }
 
-    return timetable.timetable_label === timetablePage.consolidatedTimetables[idx - 1].timetable_label;
+    return (
+      timetable.timetable_label ===
+      timetablePage.consolidatedTimetables[idx - 1].timetable_label
+    );
   });
 }
 
@@ -53,34 +59,39 @@ export function timetablePageHasDifferentLabels(timetablePage) {
  * Discern if a timetable has any notes or notices to display.
  */
 export function hasNotesOrNotices(timetable) {
-  return timetable.requestPickupSymbolUsed
-    || timetable.noPickupSymbolUsed
-    || timetable.requestDropoffSymbolUsed
-    || timetable.noDropoffSymbolUsed
-    || timetable.noServiceSymbolUsed
-    || timetable.interpolatedStopSymbolUsed
-    || timetable.notes.length > 0;
+  return (
+    timetable.requestPickupSymbolUsed ||
+    timetable.noPickupSymbolUsed ||
+    timetable.requestDropoffSymbolUsed ||
+    timetable.noDropoffSymbolUsed ||
+    timetable.noServiceSymbolUsed ||
+    timetable.interpolatedStopSymbolUsed ||
+    timetable.notes.length > 0
+  );
 }
 
 /*
  * Return an array of all timetable notes that relate to the entire timetable or route.
  */
 export function getNotesForTimetableLabel(notes) {
-  return notes.filter(note => !note.stop_id && !note.trip_id);
+  return notes.filter((note) => !note.stop_id && !note.trip_id);
 }
 
 /*
  * Return an array of all timetable notes for a specific stop and stop_sequence.
  */
 export function getNotesForStop(notes, stop) {
-  return notes.filter(note => {
+  return notes.filter((note) => {
     // Don't show if note applies only to a specific trip.
     if (note.trip_id) {
       return false;
     }
 
     // Don't show if note applies only to a specific stop_sequence that is not found.
-    if (note.stop_sequence && !stop.trips.some(trip => trip.stop_sequence === note.stop_sequence)) {
+    if (
+      note.stop_sequence &&
+      !stop.trips.some((trip) => trip.stop_sequence === note.stop_sequence)
+    ) {
       return false;
     }
 
@@ -92,7 +103,7 @@ export function getNotesForStop(notes, stop) {
  * Return an array of all timetable notes for a specific trip.
  */
 export function getNotesForTrip(notes, trip) {
-  return notes.filter(note => {
+  return notes.filter((note) => {
     // Don't show if note applies only to a specific stop.
     if (note.stop_id) {
       return false;
@@ -106,17 +117,69 @@ export function getNotesForTrip(notes, trip) {
  * Return an array of all timetable notes for a specific stoptime.
  */
 export function getNotesForStoptime(notes, stoptime) {
-  return notes.filter(note => {
+  return notes.filter((note) => {
     // Show notes that apply to all trips at this stop if `show_on_stoptime` is true.
-    if (!note.trip_id && note.stop_id === stoptime.stop_id && note.show_on_stoptime === 1) {
+    if (
+      !note.trip_id &&
+      note.stop_id === stoptime.stop_id &&
+      note.show_on_stoptime === 1
+    ) {
       return true;
     }
 
     // Show notes that apply to all stops of this trip if `show_on_stoptime` is true.
-    if (!note.stop_id && note.trip_id === stoptime.trip_id && note.show_on_stoptime === 1) {
+    if (
+      !note.stop_id &&
+      note.trip_id === stoptime.trip_id &&
+      note.show_on_stoptime === 1
+    ) {
       return true;
     }
 
-    return note.trip_id === stoptime.trip_id && note.stop_id === stoptime.stop_id;
+    return (
+      note.trip_id === stoptime.trip_id && note.stop_id === stoptime.stop_id
+    );
   });
 }
+
+/*
+ * Formats a trip name.
+ */
+export function formatTripName(trip, index, timetable) {
+  let tripName = '';
+  if (timetable.routes.length > 1) {
+    tripName = trip.route_short_name;
+  } else if (trip.trip_short_name) {
+    tripName += trip.trip_short_name;
+  } else {
+    tripName += `Run #${index + 1}`;
+  }
+
+  if (timetableHasDifferentDays(timetable)) {
+    tripName += ` ${trip.dayList}`;
+  }
+
+  return tripName;
+}
+
+/*
+ * Formats a trip name.
+ */
+export function formatTripNameForCSV(trip, timetable) {
+  let tripName = '';
+  if (timetable.routes.length > 1) {
+    tripName += `${trip.route_short_name} - `;
+  }
+
+  if (trip.trip_short_name) {
+    tripName += trip.trip_short_name;
+  } else {
+    tripName += trip.trip_id;
+  }
+
+  if (timetableHasDifferentDays(timetable)) {
+    tripName += ` - ${trip.dayList}`;
+  }
+
+  return tripName;
+}

package/lib/time-utils.js

@@ -9,7 +9,7 @@ export function fromGTFSTime(timeString) {
   return moment({
     hour: duration.hours(),
     minute: duration.minutes(),
-    second: duration.seconds()
+    second: duration.seconds(),
   });
 }
 
@@ -49,7 +49,15 @@ export function calendarToCalendarCode(c) {
  * Convert a string of 1s and 0s representing a weekday to an object.
  */
 export function calendarCodeToCalendar(code) {
-  const days = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'];
+  const days = [
+    'monday',
+    'tuesday',
+    'wednesday',
+    'thursday',
+    'friday',
+    'saturday',
+    'sunday',
+  ];
   const calendar = {};
 
   for (const [index, day] of days.entries()) {