gtfs-to-html 2.9.14 → 2.10.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-interface IConfig {
+interface Config {
     agencies: {
         agencyKey: string;
         agency_key?: string;
@@ -18,7 +18,7 @@ interface IConfig {
     interpolatedStopSymbol?: string;
     interpolatedStopText?: string;
     linkStopUrls?: boolean;
-    mapboxAccessToken?: string;
+    mapStyleUrl?: string;
     menuType?: 'simple' | 'jump' | 'radio';
     noDropoffSymbol?: string;
     noDropoffText?: string;
@@ -56,6 +56,6 @@ interface IConfig {
     logError?: (text: string) => void;
 }
 
-declare const gtfsToHtml: (initialConfig: IConfig) => Promise<string>;
+declare const gtfsToHtml: (initialConfig: Config) => Promise<string>;
 
 export { gtfsToHtml as default };

package/dist/index.js

@@ -334,7 +334,7 @@ function formatTripNameForCSV(trip, timetable) {
 }
 
 // package.json
-var version = "2.9.14";
+var version = "2.10.0";
 
 // src/lib/utils.ts
 var isTimepoint = (stoptime) => {
@@ -388,12 +388,12 @@ var deduplicateTrips = (trips, commonStopId) => {
     }) : trip.stoptimes[0];
     const similarTrips = deduplicatedTrips.filter((trip2) => {
       const stoptime = find(trip2.stoptimes, {
-        stop_id: selectedStoptime.stop_id
+        stop_id: selectedStoptime?.stop_id
       });
       if (!stoptime) {
         return false;
       }
-      return stoptime.departure_time === selectedStoptime.departure_time;
+      return stoptime.departure_time === selectedStoptime?.departure_time;
     });
     const tripIsUnique = every2(similarTrips, (similarTrip) => {
       const similarTripStoptimes = similarTrip.stoptimes.map(
@@ -425,8 +425,10 @@ var sortTrips = (trips, config) => {
       if (trip.stoptimes.length === 0) {
         continue;
       }
-      trip.firstStoptime = timeToSeconds(first(trip.stoptimes).departure_time);
-      trip.lastStoptime = timeToSeconds(last(trip.stoptimes).departure_time);
+      trip.firstStoptime = timeToSeconds(trip.stoptimes[0].departure_time);
+      trip.lastStoptime = timeToSeconds(
+        trip.stoptimes[trip.stoptimes.length - 1].departure_time
+      );
     }
     sortedTrips = sortBy(
       trips,
@@ -438,8 +440,10 @@ var sortTrips = (trips, config) => {
       if (trip.stoptimes.length === 0) {
         continue;
       }
-      trip.firstStoptime = timeToSeconds(first(trip.stoptimes).departure_time);
-      trip.lastStoptime = timeToSeconds(last(trip.stoptimes).departure_time);
+      trip.firstStoptime = timeToSeconds(trip.stoptimes[0].departure_time);
+      trip.lastStoptime = timeToSeconds(
+        trip.stoptimes[trip.stoptimes.length - 1].departure_time
+      );
     }
     sortedTrips = sortBy(
       trips,
@@ -505,8 +509,8 @@ var getDaysFromCalendars = (calendars) => {
     sunday: 0
   };
   for (const calendar of calendars) {
-    for (const [day, value] of Object.entries(days2)) {
-      days2[day] = value | calendar[day];
+    for (const day of Object.keys(days2)) {
+      days2[day] = days2[day] | calendar[day];
     }
   }
   return days2;
@@ -781,20 +785,27 @@ var getStopOrder = (timetable, config) => {
         stopGraph.push([stopId, sortedStopIds[index + 1]]);
       }
     }
-    const stopIds2 = toposort(stopGraph);
+    const stopIds = toposort(stopGraph);
     return duplicateStopsForDifferentArrivalDeparture(
-      stopIds2,
+      stopIds,
       timetable,
       config
     );
   } catch {
+    const longestTripStoptimes = getLongestTripStoptimes(
+      timetable.orderedTrips,
+      config
+    );
+    const stopIds = longestTripStoptimes.map((stoptime) => stoptime.stop_id);
+    config.logWarning(
+      `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 can result in timetables with some stops missing. Try manually specifying stops with \`timetable_stop_order.txt\`.`
+    );
+    return duplicateStopsForDifferentArrivalDeparture(
+      stopIds,
+      timetable,
+      config
+    );
   }
-  const longestTripStoptimes = getLongestTripStoptimes(
-    timetable.orderedTrips,
-    config
-  );
-  const stopIds = longestTripStoptimes.map((stoptime) => stoptime.stop_id);
-  return duplicateStopsForDifferentArrivalDeparture(stopIds, timetable, config);
 };
 var getStopsForTimetable = (timetable, config) => {
   if (timetable.orderedTrips.length === 0) {
@@ -1277,6 +1288,7 @@ function setDefaultConfig(initialConfig) {
     interpolatedStopText: "Estimated time of arrival",
     gtfsToHtmlVersion: version,
     linkStopUrls: false,
+    mapStyleUrl: "https://tiles.openfreemap.org/styles/liberty",
     menuType: "jump",
     noDropoffSymbol: "\u2021",
     noDropoffText: "No drop off available",