gtfs-to-html 2.11.5 → 2.12.1

package/dist/index.js

@@ -12,6 +12,7 @@ import sanitize2 from "sanitize-filename";
 
 // src/lib/file-utils.ts
 import { dirname, join, resolve } from "path";
+import cssEscape from "css.escape";
 import { createWriteStream } from "fs";
 import { fileURLToPath } from "url";
 import {
@@ -383,7 +384,6 @@ function getAgencyGeoJSON(config) {
 // src/lib/template-functions.ts
 var template_functions_exports = {};
 __export(template_functions_exports, {
-  formatHtmlId: () => formatHtmlId,
   formatTripName: () => formatTripName,
   formatTripNameForCSV: () => formatTripNameForCSV,
   getNotesForStop: () => getNotesForStop,
@@ -396,9 +396,6 @@ __export(template_functions_exports, {
   timetablePageHasDifferentLabels: () => timetablePageHasDifferentLabels
 });
 import { every } from "lodash-es";
-function formatHtmlId(id) {
-  return id.replace(/([^\w[\]{}.:-])\s?/g, "");
-}
 function timetableHasDifferentDays(timetable) {
   return !every(timetable.orderedTrips, (trip, idx) => {
     if (idx === 0) {
@@ -497,7 +494,7 @@ function formatTripNameForCSV(trip, timetable) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.11.5",
+  version: "2.12.1",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -544,23 +541,26 @@ var package_default = {
     prepare: "husky"
   },
   dependencies: {
-    "@turf/helpers": "^7.2.0",
-    "@turf/simplify": "^7.2.0",
+    "@maplibre/maplibre-gl-geocoder": "^1.9.1",
+    "@turf/helpers": "^7.3.0",
+    "@turf/simplify": "^7.3.0",
     anchorme: "^3.0.8",
     archiver: "^7.0.1",
     "cli-table": "^0.3.11",
+    "css.escape": "^1.5.1",
     "csv-stringify": "^6.6.0",
     express: "^5.1.0",
     gtfs: "^4.18.1",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
     "lodash-es": "^4.17.21",
-    marked: "^16.4.1",
+    "maplibre-gl": "^5.13.0",
+    marked: "^17.0.0",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.3",
-    puppeteer: "^24.29.0",
+    puppeteer: "^24.30.0",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     sqlstring: "^2.3.3",
@@ -581,11 +581,11 @@ var package_default = {
     "@types/sanitize-html": "^2.16.0",
     "@types/sqlstring": "^2.3.2",
     "@types/toposort": "^2.0.7",
-    "@types/yargs": "^17.0.34",
+    "@types/yargs": "^17.0.35",
     husky: "^9.1.7",
-    "lint-staged": "^16.2.6",
+    "lint-staged": "^16.2.7",
     prettier: "^3.6.2",
-    tsup: "^8.5.0",
+    tsup: "^8.5.1",
     typescript: "^5.9.3"
   },
   engines: {
@@ -732,7 +732,12 @@ var getCalendarDatesForTimetable = (timetable, config) => {
   const excludedDates = /* @__PURE__ */ new Set();
   const includedDates = /* @__PURE__ */ new Set();
   for (const calendarDate of calendarDates) {
-    if (moment2(calendarDate.date, "YYYYMMDD").isBetween(start, end, "day", "[]")) {
+    if (moment2(calendarDate.date, "YYYYMMDD").isBetween(
+      start,
+      end,
+      void 0,
+      "[]"
+    )) {
       if (calendarDate.exception_type === 1) {
         includedDates.add(formatDate(calendarDate, config.dateFormat));
       } else if (calendarDate.exception_type === 2) {
@@ -2254,10 +2259,10 @@ function formatTimetableLabel(timetable) {
   return timetableLabel;
 }
 var formatRouteName = (route) => {
-  if (route.route_long_name) {
-    return `Route ${route.route_long_name}`;
+  if (route.route_long_name === null || route.route_long_name === "") {
+    return `Route ${route.route_short_name}`;
   }
-  return route.route_short_name ?? "Unknown";
+  return route.route_long_name ?? "Unknown";
 };
 var formatRouteNameForFilename = (route) => {
   if (route.route_short_name) {
@@ -2373,6 +2378,46 @@ async function copyStaticAssets(config, outputPath) {
       join(outputPath, "js/anchorme.min.js")
     );
   }
+  if (config.showMap) {
+    await copyFile(
+      join(
+        dirname(findPackageJSON("maplibre-gl", import.meta.url)),
+        "dist/maplibre-gl.js"
+      ),
+      join(outputPath, "js/maplibre-gl.js")
+    );
+    await copyFile(
+      join(
+        dirname(findPackageJSON("maplibre-gl", import.meta.url)),
+        "dist/maplibre-gl.css"
+      ),
+      join(outputPath, "css/maplibre-gl.css")
+    );
+    await copyFile(
+      join(
+        dirname(
+          findPackageJSON(
+            "@maplibre/maplibre-gl-geocoder",
+            import.meta.url
+          )
+        ),
+        "dist/maplibre-gl-geocoder.js"
+      ),
+      join(outputPath, "js/maplibre-gl-geocoder.js")
+    );
+    await copyFile(
+      join(
+        dirname(
+          findPackageJSON(
+            "@maplibre/maplibre-gl-geocoder",
+            import.meta.url
+          )
+        ),
+        "dist/maplibre-gl-geocoder.css"
+      ),
+      join(outputPath, "css/maplibre-gl-geocoder.css")
+    );
+  }
 }
 function zipFolder(outputPath) {
   const output = createWriteStream(join(outputPath, "timetables.zip"));
@@ -2433,6 +2478,7 @@ async function renderTemplate(templateFileName, templateVars, config) {
   const templatePath = getPathToTemplateFile(templateFileName, config);
   const html = await renderFile(templatePath, {
     _,
+    cssEscape,
     md: (text) => sanitizeHtml(marked.parseInline(text)),
     ...template_functions_exports,
     formatRouteColor,