gtfs-to-html 2.10.0 → 2.10.1

package/dist/app/index.js

@@ -85,6 +85,7 @@ import {
   cloneDeep,
   compact,
   countBy,
+  difference,
   entries,
   every as every2,
   find,
@@ -310,6 +311,28 @@ import { getShapesAsGeoJSON, getStopsAsGeoJSON } from "gtfs";
 import { flatMap } from "lodash-es";
 import simplify from "@turf/simplify";
 import { featureCollection, round } from "@turf/helpers";
+
+// src/lib/log-utils.ts
+import { noop } from "lodash-es";
+import * as colors from "yoctocolors";
+import { getFeedInfo } 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/geojson-utils.ts
 var mergeGeojson = (...geojsons) => featureCollection(flatMap(geojsons, (geojson) => geojson.features));
 var truncateGeoJSONDecimals = (geojson, config2) => {
   for (const feature of geojson.features) {
@@ -337,18 +360,6 @@ var truncateGeoJSONDecimals = (geojson, config2) => {
   }
   return geojson;
 };
-var simplifyGeoJSON = (geojson, config2) => {
-  try {
-    const simplifiedGeojson = simplify(geojson, {
-      tolerance: 1 / 10 ** config2.coordinatePrecision,
-      highQuality: true
-    });
-    return truncateGeoJSONDecimals(simplifiedGeojson, config2);
-  } catch {
-    config2.logWarning("Unable to simplify geojson");
-    return truncateGeoJSONDecimals(geojson, config2);
-  }
-};
 function getTimetableGeoJSON(timetable, config2) {
   const shapesGeojsons = timetable.route_ids.map(
     (routeId) => getShapesAsGeoJSON({
@@ -365,17 +376,39 @@ function getTimetableGeoJSON(timetable, config2) {
     })
   );
   const geojson = mergeGeojson(...shapesGeojsons, ...stopsGeojsons);
-  return simplifyGeoJSON(geojson, config2);
+  let simplifiedGeojson;
+  try {
+    simplifiedGeojson = simplify(geojson, {
+      tolerance: 1 / 10 ** config2.coordinatePrecision,
+      highQuality: true
+    });
+  } catch {
+    timetable.warnings.push(
+      `Timetable ${timetable.timetable_id} - Unable to simplify geojson`
+    );
+    simplifiedGeojson = geojson;
+  }
+  return truncateGeoJSONDecimals(simplifiedGeojson, config2);
 }
 function getAgencyGeoJSON(config2) {
   const shapesGeojsons = getShapesAsGeoJSON();
   const stopsGeojsons = getStopsAsGeoJSON();
   const geojson = mergeGeojson(shapesGeojsons, stopsGeojsons);
-  return simplifyGeoJSON(geojson, config2);
+  let simplifiedGeojson;
+  try {
+    simplifiedGeojson = simplify(geojson, {
+      tolerance: 1 / 10 ** config2.coordinatePrecision,
+      highQuality: true
+    });
+  } catch {
+    logWarning(config2)("Unable to simplify geojson");
+    simplifiedGeojson = geojson;
+  }
+  return truncateGeoJSONDecimals(simplifiedGeojson, config2);
 }
 
 // package.json
-var version = "2.10.0";
+var version = "2.10.1";
 
 // src/lib/utils.ts
 var isTimepoint = (stoptime) => {
@@ -605,7 +638,7 @@ var getTimetableNotesForTimetable = (timetable, config2) => {
       continue;
     }
     if (noteReference.stop_id === "" || noteReference.stop_id === null) {
-      config2.logWarning(
+      timetable.warnings.push(
         `Timetable Note Reference for note_id=${noteReference.note_id} has a \`stop_sequence\` but no \`stop_id\` - ignoring`
       );
       continue;
@@ -838,9 +871,19 @@ var getStopOrder = (timetable, config2) => {
       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\`.`
+    const missingStopIds = difference(
+      uniq(
+        timetable.orderedTrips.flatMap(
+          (trip) => trip.stoptimes.map((stoptime) => stoptime.stop_id)
+        )
+      ),
+      uniq(stopIds)
     );
+    if (missingStopIds.length > 0) {
+      timetable.warnings.push(
+        `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 does not include stop_ids ${new Intl.ListFormat("en", { style: "long", type: "conjunction" }).format(missingStopIds)}. Try manually specifying stops with \`timetable_stop_order.txt\`. Read more at https://gtfstohtml.com/docs/timetable-stop-order`
+      );
+    }
     return duplicateStopsForDifferentArrivalDeparture(
       stopIds,
       timetable,
@@ -1831,17 +1874,13 @@ var selectedConfig = JSON.parse(readFileSync(configPath, "utf8"));
 var config = setDefaultConfig(selectedConfig);
 config.noHead = false;
 config.assetPath = "/";
-config.log = console.log;
-config.logWarning = console.warn;
-config.logError = console.error;
+config.logFunction = console.log;
 try {
   openDb2(config);
 } catch (error) {
-  if (error?.code === "SQLITE_CANTOPEN") {
-    config.logError(
-      `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
-    );
-  }
+  console.error(
+    `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists and run gtfs-to-html to import GTFS before running this app.`
+  );
   throw error;
 }
 app.set("views", getPathToViewsFolder(config));