gtfs-to-html 2.9.13 → 2.9.15

package/README.md

@@ -59,8 +59,10 @@ You can now use `gtfs-to-html` without actually downloading any code or doing an
 
 Many transit agencies use `gtfs-to-html` to generate the schedule pages used on their websites, including:
 
-- [Advance Transit](https://advancetransit.com)
+- [Advance Transit (Vermont)](https://advancetransit.com)
+- [Basin Transit (Morongo Basin, California)](https://basin-transit.com/)
 - [Brockton Area Transit Authority](https://ridebat.com)
+- [BusWay – CIRA (Aveiro, Portugal)](https://busway-cira.pt)
 - [Capital Transit (Helena, Montana)](http://www.ridethecapitalt.org)
 - [Capital Transit (Juneau, Alaska)](https://juneaucapitaltransit.org)
 - [Central Transit (Ellensburg, Washington)](https://centraltransit.org)
@@ -69,6 +71,7 @@ Many transit agencies use `gtfs-to-html` to generate the schedule pages used on
 - [Greater Attleboro-Taunton Regional Transit Authority](https://www.gatra.org)
 - [Humboldt Transit Authority](http://hta.org)
 - [Kings Area Rural Transit (KART)](https://www.kartbus.org)
+- [Lowell Regional Transit Authority](https://lrta.com)
 - [Madera County Connection](http://mcctransit.com)
 - [Marin Transit](https://marintransit.org)
 - [Morongo Basin Transit Authority](https://mbtabus.com)

package/dist/app/index.js

@@ -13,7 +13,6 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { openDb as openDb2 } from "gtfs";
 import express from "express";
-import logger from "morgan";
 import untildify2 from "untildify";
 
 // src/lib/formatters.ts
@@ -133,7 +132,7 @@ import toposort from "toposort";
 // src/lib/file-utils.ts
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import _ from "lodash-es";
+import * as _ from "lodash-es";
 import archiver from "archiver";
 import beautify from "js-beautify";
 import { renderFile } from "pug";
@@ -376,7 +375,7 @@ function getAgencyGeoJSON(config2) {
 }
 
 // package.json
-var version = "2.9.13";
+var version = "2.9.15";
 
 // src/lib/utils.ts
 var isTimepoint = (stoptime) => {
@@ -430,12 +429,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(
@@ -467,8 +466,10 @@ var sortTrips = (trips, config2) => {
       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,
@@ -480,8 +481,10 @@ var sortTrips = (trips, config2) => {
       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,
@@ -547,8 +550,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;
@@ -823,20 +826,27 @@ var getStopOrder = (timetable, config2) => {
         stopGraph.push([stopId, sortedStopIds[index + 1]]);
       }
     }
-    const stopIds2 = toposort(stopGraph);
+    const stopIds = toposort(stopGraph);
     return duplicateStopsForDifferentArrivalDeparture(
-      stopIds2,
+      stopIds,
       timetable,
       config2
     );
   } catch {
+    const longestTripStoptimes = getLongestTripStoptimes(
+      timetable.orderedTrips,
+      config2
+    );
+    const stopIds = longestTripStoptimes.map((stoptime) => stoptime.stop_id);
+    config2.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,
+      config2
+    );
   }
-  const longestTripStoptimes = getLongestTripStoptimes(
-    timetable.orderedTrips,
-    config2
-  );
-  const stopIds = longestTripStoptimes.map((stoptime) => stoptime.stop_id);
-  return duplicateStopsForDifferentArrivalDeparture(stopIds, timetable, config2);
 };
 var getStopsForTimetable = (timetable, config2) => {
   if (timetable.orderedTrips.length === 0) {
@@ -1328,6 +1338,7 @@ function setDefaultConfig(initialConfig) {
     noServiceSymbol: "-",
     noServiceText: "No service at this stop",
     outputFormat: "html",
+    overwriteExistingFiles: true,
     requestDropoffSymbol: "\u2020",
     requestDropoffText: "Must request drop off",
     requestPickupSymbol: "***",
@@ -1814,7 +1825,6 @@ var argv = yargs(hideBin(process.argv)).option("c", {
   type: "string"
 }).parseSync();
 var app = express();
-var router = express.Router();
 var configPath = argv.configPath || join2(process.cwd(), "config.json");
 var selectedConfig = JSON.parse(readFileSync(configPath, "utf8"));
 var config = setDefaultConfig(selectedConfig);
@@ -1833,7 +1843,36 @@ try {
   }
   throw error;
 }
-router.get("/", async (request, response, next) => {
+app.set("views", getPathToViewsFolder(config));
+app.set("view engine", "pug");
+app.use((req, res, next) => {
+  console.log(`${req.method} ${req.url}`);
+  next();
+});
+var staticAssetPath = config.templatePath === void 0 ? getPathToViewsFolder(config) : untildify2(config.templatePath);
+app.use(express.static(staticAssetPath));
+app.use(
+  "/js",
+  express.static(
+    join2(dirname2(fileURLToPath2(import.meta.resolve("pbf"))), "dist")
+  )
+);
+app.use(
+  "/js",
+  express.static(
+    dirname2(fileURLToPath2(import.meta.resolve("gtfs-realtime-pbf-js-module")))
+  )
+);
+app.use(
+  "/js",
+  express.static(
+    join2(
+      dirname2(fileURLToPath2(import.meta.resolve("anchorme"))),
+      "../../dist/browser"
+    )
+  )
+);
+app.get("/", async (req, res, next) => {
   try {
     const timetablePages = [];
     const timetablePageIds = map(
@@ -1849,6 +1888,7 @@ router.get("/", async (request, response, next) => {
         console.error(
           `No timetables found for timetable_page_id=${timetablePage.timetable_page_id}`
         );
+        continue;
       }
       timetablePage.relativePath = `/timetables/${timetablePage.timetable_page_id}`;
       for (const timetable of timetablePage.consolidatedTimetables) {
@@ -1857,57 +1897,66 @@ router.get("/", async (request, response, next) => {
       timetablePages.push(timetablePage);
     }
     const html = await generateOverviewHTML(timetablePages, config);
-    response.send(html);
+    res.send(html);
   } catch (error) {
-    console.error(error);
     next(error);
   }
 });
-router.get("/timetables/:timetablePageId", async (request, response, next) => {
-  const { timetablePageId } = request.params;
+app.get("/timetables/:timetablePageId", async (req, res, next) => {
+  const { timetablePageId } = req.params;
   if (!timetablePageId) {
-    return next(new Error("No timetablePageId provided"));
+    res.status(400).send("No timetablePageId provided");
+    return;
   }
   try {
     const timetablePage = await getFormattedTimetablePage(
       timetablePageId,
       config
     );
+    if (!timetablePage || !timetablePage.consolidatedTimetables || timetablePage.consolidatedTimetables.length === 0) {
+      res.status(404).send("Timetable page not found");
+      return;
+    }
     const html = await generateTimetableHTML(timetablePage, config);
-    response.send(html);
+    res.send(html);
   } catch (error) {
+    if (error?.message.startsWith("No timetable found")) {
+      res.status(404).send("Timetable page not found");
+      return;
+    }
     next(error);
   }
 });
-app.set("views", getPathToViewsFolder(config));
-app.set("view engine", "pug");
-app.use(logger("dev"));
-var staticAssetPath = config.templatePath === void 0 ? getPathToViewsFolder(config) : untildify2(config.templatePath);
-app.use(express.static(staticAssetPath));
-app.use(
-  "/js",
-  express.static(
-    join2(dirname2(fileURLToPath2(import.meta.resolve("pbf"))), "dist")
-  )
-);
-app.use(
-  "/js",
-  express.static(
-    dirname2(fileURLToPath2(import.meta.resolve("gtfs-realtime-pbf-js-module")))
-  )
-);
+app.use((req, res) => {
+  res.status(404).send("Not Found");
+});
 app.use(
-  "/js",
-  express.static(
-    join2(
-      dirname2(fileURLToPath2(import.meta.resolve("anchorme"))),
-      "../../dist/browser"
-    )
-  )
+  (err, req, res, next) => {
+    console.error(err.stack);
+    res.status(500).send("Something broke!");
+  }
 );
-app.use("/", router);
-app.set("port", process.env.PORT || 3e3);
-var server = app.listen(app.get("port"), () => {
-  console.log(`Express server listening on port ${app.get("port")}`);
-});
+var startServer = async (port2) => {
+  try {
+    await new Promise((resolve2, reject) => {
+      const server = app.listen(port2).once("listening", () => {
+        console.log(`Express server listening on port ${port2}`);
+        resolve2();
+      }).once("error", (err) => {
+        if (err.code === "EADDRINUSE") {
+          console.log(`Port ${port2} is in use, trying ${port2 + 1}`);
+          server.close();
+          resolve2(startServer(port2 + 1));
+        } else {
+          reject(err);
+        }
+      });
+    });
+  } catch (err) {
+    console.error("Failed to start server:", err);
+    process.exit(1);
+  }
+};
+var port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3e3;
+startServer(port);
 //# sourceMappingURL=index.js.map