gtfs-to-html 2.12.6 → 2.12.8

package/README.md

@@ -66,6 +66,7 @@ Many transit agencies use `gtfs-to-html` to generate the schedule pages used on
 | [Brockton Area Transit Authority](https://ridebat.com)                        | Brockton, Massachusetts             |
 | [Cape Ann Transportation Authority](https://canntran.com)                     | Gloucester, Massachusetts           |
 | [Capital Transit](https://juneaucapitaltransit.org)                           | Juneau, Alaska                      |
+| [Cascades East Transit](https://cascadeseasttransit.com)                      | Bend, Oregon                        |
 | [Central Transit](https://centraltransit.org)                                 | Ellensburg, Washington              |
 | [Citibus](https://citibus.com)                                                | Lubbock, Texas                      |
 | [Commute.org](https://commute.org)                                            | San Mateo County, California        |
@@ -77,7 +78,7 @@ Many transit agencies use `gtfs-to-html` to generate the schedule pages used on
 | [Kings Area Rural Transit (KART)](https://www.kartbus.org)                    | Kings County, California            |
 | [Lowell Regional Transit Authority](https://lrta.com)                         | Lowell, Massachusetts               |
 | [Madera County Connection](https://mcctransit.com)                            | Madera County, California           |
-| [Marin Transit](https://marintransit.org)                                     | Marin County, California            |
+| [Marin Transit](https://marintransit.gov)                                     | Marin County, California            |
 | [Morongo Basin Transit Authority](https://mbtabus.com)                        | Morongo Basin, California           |
 | [Mountain Transit](https://mountaintransit.org)                               | Big Bear Valley, California         |
 | [Mountain View Community Shuttle](https://mvcommunityshuttle.com)             | Mountain View, California           |

package/config-sample.json

@@ -2,15 +2,15 @@
   "agencies": [
     {
       "agencyKey": "marintransit",
-      "url": "https://marintransit.org/data/google_transit.zip",
+      "url": "https://marintransit.gov/data/google_transit.zip",
       "realtimeAlerts": {
-        "url": "https://api.marintransit.org/alerts"
+        "url": "https://api.marintransit.gov/alerts"
       },
       "realtimeTripUpdates": {
-        "url": "https://api.marintransit.org/tripupdates"
+        "url": "https://api.marintransit.gov/tripupdates"
       },
       "realtimeVehiclePositions": {
-        "url": "https://api.marintransit.org/vehiclepositions"
+        "url": "https://api.marintransit.gov/vehiclepositions"
       }
     }
   ],

package/dist/app/index.js

@@ -330,6 +330,27 @@ function isGtfsToHtmlError(error) {
   return candidate.name === "GtfsToHtmlError" && typeof candidate.message === "string" && typeof candidate.code === "string" && typeof candidate.category === "string" && typeof candidate.isOperational === "boolean";
 }
 
+// src/lib/log-utils.ts
+import { clearLine, cursorTo } from "readline";
+import { noop } from "lodash-es";
+import * as colors from "yoctocolors";
+import { getAgencies, getFeedInfo, isGtfsError as isGtfsError2, formatGtfsError } from "gtfs";
+import Table from "cli-table";
+function logWarning(config2) {
+  if (config2.logFunction) {
+    return config2.logFunction;
+  }
+  return (text) => {
+    process.stdout.write(`
+${formatWarning(text)}
+`);
+  };
+}
+function formatWarning(text) {
+  const warningMessage = `${colors.underline("Warning")}: ${text}`;
+  return colors.yellow(warningMessage);
+}
+
 // src/lib/file-utils.ts
 var homeDirectory = homedir();
 function getPathToThisModuleFolder() {
@@ -405,26 +426,9 @@ import { getShapesAsGeoJSON, getStopsAsGeoJSON } from "gtfs";
 import simplify from "@turf/simplify";
 import { featureCollection, round } from "@turf/helpers";
 
-// src/lib/log-utils.ts
-import { clearLine, cursorTo } from "readline";
-import { noop } from "lodash-es";
-import * as colors from "yoctocolors";
-import { getAgencies, getFeedInfo, isGtfsError as isGtfsError2, formatGtfsError } from "gtfs";
-import Table from "cli-table";
-function logWarning(config2) {
-  if (config2.logFunction) {
-    return config2.logFunction;
-  }
-  return (text) => {
-    process.stdout.write(`
-${formatWarning(text)}
-`);
-  };
-}
-function formatWarning(text) {
-  const warningMessage = `${colors.underline("Warning")}: ${text}`;
-  return colors.yellow(warningMessage);
-}
+// src/lib/trip-id-utils.ts
+var getBaseTripId = (tripId) => tripId.replace(/_freq_\d+$/, "");
+var getBaseTripIds = (trips) => Array.from(new Set(trips.map((trip) => getBaseTripId(trip.trip_id))));
 
 // src/lib/geojson-utils.ts
 var mergeGeojson = (...geojsons) => featureCollection(geojsons.flatMap((geojson) => geojson.features));
@@ -455,18 +459,19 @@ var truncateGeoJSONDecimals = (geojson, config2) => {
   return geojson;
 };
 function getTimetableGeoJSON(timetable, config2) {
+  const tripIds = getBaseTripIds(timetable.orderedTrips);
   const shapesGeojsons = timetable.route_ids.map(
     (routeId) => getShapesAsGeoJSON({
       route_id: routeId,
       direction_id: timetable.direction_id,
-      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id)
+      trip_id: tripIds
     })
   );
   const stopsGeojsons = timetable.route_ids.map(
     (routeId) => getStopsAsGeoJSON({
       route_id: routeId,
       direction_id: timetable.direction_id,
-      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id)
+      trip_id: tripIds
     })
   );
   const geojson = mergeGeojson(...shapesGeojsons, ...stopsGeojsons);
@@ -504,7 +509,7 @@ function getAgencyGeoJSON(config2) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.12.6",
+  version: "2.12.8",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -563,12 +568,12 @@ var package_default = {
     "css.escape": "^1.5.1",
     "csv-stringify": "^6.7.0",
     express: "^5.2.1",
-    gtfs: "^4.18.4",
+    gtfs: "^4.18.5",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
-    "lodash-es": "^4.17.23",
-    "maplibre-gl": "^5.21.0",
-    marked: "^17.0.5",
+    "lodash-es": "^4.18.1",
+    "maplibre-gl": "^5.23.0",
+    marked: "^18.0.0",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
@@ -595,9 +600,9 @@ var package_default = {
     "@types/yargs": "^17.0.35",
     husky: "^9.1.7",
     "lint-staged": "^16.4.0",
-    prettier: "^3.8.1",
+    prettier: "^3.8.2",
     tsup: "^8.5.1",
-    typescript: "^5.9.3"
+    typescript: "^6.0.2"
   },
   engines: {
     node: ">= 22"
@@ -619,9 +624,13 @@ var package_default = {
     singleQuote: true
   },
   "lint-staged": {
-    "*.js": "prettier --write",
-    "*.ts": "prettier --write",
-    "*.json": "prettier --write"
+    "*.{js,ts,json}": "prettier --write"
+  },
+  pnpm: {
+    onlyBuiltDependencies: [
+      "better-sqlite3",
+      "puppeteer"
+    ]
   }
 };
 
@@ -827,7 +836,7 @@ var getTimetableNotesForTimetable = (timetable, config2) => {
     }),
     // Get all notes for all trips in this timetable.
     ...getTimetableNotesReferences({
-      trip_id: timetable.orderedTrips.map((trip) => trip.trip_id)
+      trip_id: getBaseTripIds(timetable.orderedTrips)
     }),
     // Get all notes for all stops in this timetable.
     ...getTimetableNotesReferences({
@@ -1021,7 +1030,7 @@ var convertRoutesToTimetablePages = (config2) => {
     if (config2.groupTimetablesIntoPages === true) {
       timetablePages.push(
         createTimetablePage({
-          timetablePageId: `route_${route.route_short_name ?? route.route_long_name}`,
+          timetablePageId: `route_${route.route_id}`,
           timetables,
           config: config2
         })
@@ -1246,9 +1255,8 @@ var getCalendarsFromConfig = (config2) => {
   }
   const calendars = db.prepare(`SELECT * FROM calendar ${whereClause}`).all();
   const serviceIds = calendars.map((calendar) => calendar.service_id);
-  const calendarDates = db.prepare(
-    `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds.map((serviceId) => `'${serviceId}'`).join(", ")})`
-  ).all();
+  const calendarDatesQuery = serviceIds.length > 0 ? `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds.map((serviceId) => sqlString.escape(serviceId)).join(", ")})` : "SELECT * FROM calendar_dates WHERE exception_type = 1";
+  const calendarDates = db.prepare(calendarDatesQuery).all();
   return {
     calendars,
     calendarDates
@@ -1320,10 +1328,9 @@ var getCalendarDatesForDateRange = (startDate, endDate) => {
   if (startDate) {
     whereClauses.push(`date >= ${sqlString.escape(startDate)}`);
   }
+  const whereClause = whereClauses.length > 0 ? ` WHERE ${whereClauses.join(" AND ")}` : "";
   const calendarDates = db.prepare(
-    `SELECT service_id, date, exception_type FROM calendar_dates WHERE ${whereClauses.join(
-      " AND "
-    )}`
+    `SELECT service_id, date, exception_type FROM calendar_dates${whereClause}`
   ).all();
   return calendarDates;
 };
@@ -1636,9 +1643,7 @@ var formatTimetables = (timetables, config2) => {
     if (config2.showMap) {
       timetable.geojson = getTimetableGeoJSON(timetable, config2);
     }
-    timetable.trip_ids = uniq(
-      timetable.orderedTrips.map((trip) => trip.trip_id)
-    );
+    timetable.trip_ids = uniq(getBaseTripIds(timetable.orderedTrips));
     timetable.orderedTrips = filterTrips(timetable, calendars, config2);
     timetable.stops = formatStops(timetable, config2);
     return timetable;
@@ -1804,7 +1809,7 @@ var getTimetablePageById = (timetablePageId, config2) => {
   }
   if (timetablePageId.startsWith("route_")) {
     const routes = getRoutes({
-      route_short_name: timetablePageId.split("_")[1]
+      route_id: timetablePageId.slice("route_".length)
     });
     if (routes.length === 0) {
       throw new GtfsToHtmlError(