Better CSV trip names

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+
+### Updated
+
+- Dependency updates
+- Better trip names for CSV export
+
 ## [2.3.0] - 2021-11-05
 
 ### Added

lib/template-functions.js

@@ -161,3 +161,25 @@ export function formatTripName(trip, index, timetable) {
 
   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;
+}

lib/utils.js

@@ -72,7 +72,7 @@ import {
   fromGTFSTime,
   calendarCodeToCalendar,
 } from './time-utils.js';
-import { formatTripName } from './template-functions.js';
+import { formatTripNameForCSV } from './template-functions.js';
 
 const { version } = JSON.parse(
   readFileSync(new URL('../package.json', import.meta.url))
@@ -1550,8 +1550,8 @@ export async function generateTimetableCSV(timetable) {
 
   lines.push([
     '',
-    ...timetable.orderedTrips.map((trip, index) =>
-      formatTripName(trip, index, timetable)
+    ...timetable.orderedTrips.map((trip) =>
+      formatTripNameForCSV(trip, timetable)
     ),
   ]);