gtfs-to-html 2.7.0 → 2.7.1

package/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.7.1] - 2024-08-13
+
+### Fixed
+- Handle MultiLineString geojson
+
+### Updated
+- Warning about invalid timetable start/end dates
+- Deduplicate timetablePage agency_ids
+- Don't show drop_off_type info for first stoptime of a trip, don't show pickup_type info for last stoptime of a trip.
+- Dependency updates
+
 ## [2.7.0] - 2024-07-27
 
 ### Fixed

package/lib/formatters.js

@@ -313,6 +313,16 @@ export function formatStops(timetable, config) {
         continue;
       }
 
+      // If first stoptime of the trip, remove drop_off_type information
+      if (idx === 0) {
+        stoptime.drop_off_type = 0;
+      }
+
+      // If last stoptime of the trip, remove pickup_type information
+      if (idx === trip.stoptimes.length - 1) {
+        stoptime.pickup_type = 0;
+      }
+
       // If showing arrival and departure times as separate columns/rows, add
       // trip to the departure stop, unless it is the last stoptime of the trip.
       if (stop.type === 'arrival' && idx < trip.stoptimes.length - 1) {

package/lib/geojson-utils.js

@@ -1,7 +1,7 @@
 import { getShapesAsGeoJSON, getStopsAsGeoJSON } from 'gtfs';
 import { flatMap } from 'lodash-es';
 import simplify from '@turf/simplify';
-import { featureCollection } from '@turf/helpers';
+import { featureCollection, round } from '@turf/helpers';
 
 /*
  * Merge any number of geojson objects into one. Only works for `FeatureCollection`.
@@ -9,14 +9,6 @@ import { featureCollection } from '@turf/helpers';
 const mergeGeojson = (...geojsons) =>
   featureCollection(flatMap(geojsons, (geojson) => geojson.features));
 
-/*
- * Truncate a coordinate to a specific number of decimal places.
- */
-const truncateCoordinate = (coordinate, precision) => [
-  Math.round(coordinate[0] * 10 ** precision) / 10 ** precision,
-  Math.round(coordinate[1] * 10 ** precision) / 10 ** precision,
-];
-
 /*
  * Truncate a geojson coordinates to a specific number of decimal places.
  */
@@ -24,14 +16,24 @@ const truncateGeoJSONDecimals = (geojson, config) => {
   for (const feature of geojson.features) {
     if (feature.geometry.coordinates) {
       if (feature.geometry.type.toLowerCase() === 'point') {
-        feature.geometry.coordinates = truncateCoordinate(
-          feature.geometry.coordinates,
-          config.coordinatePrecision
+        feature.geometry.coordinates = feature.geometry.coordinates.map(
+          (number) => round(number, config.coordinatePrecision),
         );
       } else if (feature.geometry.type.toLowerCase() === 'linestring') {
         feature.geometry.coordinates = feature.geometry.coordinates.map(
           (coordinate) =>
-            truncateCoordinate(coordinate, config.coordinatePrecision)
+            coordinate.map((number) =>
+              round(number, config.coordinatePrecision),
+            ),
+        );
+      } else if (feature.geometry.type.toLowerCase() === 'multilinestring') {
+        feature.geometry.coordinates = feature.geometry.coordinates.map(
+          (linestring) =>
+            linestring.map((coordinate) =>
+              coordinate.map((number) =>
+                round(number, config.coordinatePrecision),
+              ),
+            ),
         );
       }
     }
@@ -67,7 +69,7 @@ export function getTimetableGeoJSON(timetable, config) {
       route_id: routeId,
       direction_id: timetable.direction_id,
       trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
-    })
+    }),
   );
 
   const stopsGeojsons = timetable.route_ids.map((routeId) =>
@@ -75,7 +77,7 @@ export function getTimetableGeoJSON(timetable, config) {
       route_id: routeId,
       direction_id: timetable.direction_id,
       trip_id: timetable.orderedTrips.map((trip) => trip.trip_id),
-    })
+    }),
   );
 
   const geojson = mergeGeojson(...shapesGeojsons, ...stopsGeojsons);

package/lib/utils.js

@@ -823,10 +823,24 @@ const getCalendarsFromTimetable = (timetable) => {
   const whereClauses = [];
 
   if (timetable.end_date) {
+    // Validate timetable.end_date is a valid date
+    if (!moment(timetable.end_date, 'YYYYMMDD', true).isValid()) {
+      throw new Error(
+        `Invalid end_date=${timetable.end_date} for timetable_id=${timetable.timetable_id}`,
+      );
+    }
+
     whereClauses.push(`start_date <= ${sqlString.escape(timetable.end_date)}`);
   }
 
   if (timetable.start_date) {
+    // Validate timetable.start_date is a valid date
+    if (!moment(timetable.start_date, 'YYYYMMDD', true).isValid()) {
+      throw new Error(
+        `Invalid start_date=${timetable.start_date} for timetable_id=${timetable.timetable_id}`,
+      );
+    }
+
     whereClauses.push(`end_date >= ${sqlString.escape(timetable.start_date)}`);
   }
 
@@ -1519,11 +1533,11 @@ export function getFormattedTimetablePage(timetablePageId, config) {
     {
       route_id: timetablePage.route_ids,
     },
-    ['route_color', 'route_text_color', 'agency_id'],
+    ['agency_id'],
   );
 
-  timetablePage.agency_ids = compact(
-    timetableRoutes.map((route) => route.agency_id),
+  timetablePage.agency_ids = uniq(
+    compact(timetableRoutes.map((route) => route.agency_id)),
   );
 
   // Set default filename.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -35,23 +35,23 @@
     "start": "node ./app"
   },
   "dependencies": {
-    "@turf/helpers": "^7.0.0",
-    "@turf/simplify": "^7.0.0",
+    "@turf/helpers": "^7.1.0",
+    "@turf/simplify": "^7.1.0",
     "archiver": "^7.0.1",
     "cli-table": "^0.3.11",
     "copy-dir": "^1.3.0",
     "csv-stringify": "^6.5.1",
     "express": "^4.19.2",
-    "gtfs": "^4.13.2",
+    "gtfs": "^4.13.4",
     "insane": "^2.6.2",
     "js-beautify": "^1.15.1",
     "lodash-es": "^4.17.21",
-    "marked": "^13.0.2",
+    "marked": "^14.0.0",
     "moment": "^2.30.1",
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.3",
-    "puppeteer": "^22.14.0",
+    "puppeteer": "^23.0.2",
     "sanitize-filename": "^1.6.3",
     "sqlstring": "^2.3.3",
     "timer-machine": "^1.1.0",
@@ -61,8 +61,8 @@
     "yoctocolors": "^2.1.1"
   },
   "devDependencies": {
-    "husky": "^9.1.3",
-    "lint-staged": "^15.2.7",
+    "husky": "^9.1.4",
+    "lint-staged": "^15.2.9",
     "prettier": "^3.3.3"
   },
   "engines": {

package/views/default/formatting_functions.pug

@@ -68,12 +68,7 @@
     }
 
     for (const feature of timetable.geojson.features) {
-      if (feature.geometry.type === 'LineString') {
-        feature.properties = {
-          route_color: feature.properties.route_color
-        }
-        minifiedGeojson.features.push(feature)
-      } else if (feature.geometry.type === 'Point') {
+      if (feature.geometry.type.toLowerCase() === 'point') {
         for (const route of feature.properties.routes) {
           routes[route.route_id] = route
         }
@@ -81,6 +76,16 @@
         feature.properties.routes = feature.properties.routes.map(route => route.route_id)
 
         minifiedGeojson.features.push(_.omit(feature, ['location_type', 'tts_stop_name']))
+      } else if (feature.geometry.type.toLowerCase() === 'linestring') {
+        feature.properties = {
+          route_color: feature.properties.route_color
+        }
+        minifiedGeojson.features.push(feature)
+      } else if (feature.geometry.type.toLowerCase() === 'multilinestring') {
+        feature.properties = {
+          route_color: feature.properties.route_color
+        }
+        minifiedGeojson.features.push(feature)
       }
     }
     

package/views/default/js/system-map.js

@@ -96,12 +96,18 @@ function formatStopPopup(feature) {
 function getBounds(geojson) {
   const bounds = new mapboxgl.LngLatBounds();
   for (const feature of geojson.features) {
-    if (feature.geometry.type === 'Point') {
+    if (feature.geometry.type.toLowerCase() === 'point') {
       bounds.extend(feature.geometry.coordinates);
-    } else if (feature.geometry.type === 'LineString') {
+    } else if (feature.geometry.type.toLowerCase() === 'linestring') {
       for (const coordinate of feature.geometry.coordinates) {
         bounds.extend(coordinate);
       }
+    } else if (feature.geometry.type.toLowerCase() === 'multilinestring') {
+      for (const linestring of feature.geometry.coordinates) {
+        for (const coordinate of linestring) {
+          bounds.extend(coordinate);
+        }
+      }
     }
   }
 

package/views/default/js/timetable-map.js

@@ -84,12 +84,18 @@ function formatStopPopup(feature, routes) {
 function getBounds(geojson) {
   const bounds = new mapboxgl.LngLatBounds();
   for (const feature of geojson.features) {
-    if (feature.geometry.type === 'Point') {
+    if (feature.geometry.type.toLowerCase() === 'point') {
       bounds.extend(feature.geometry.coordinates);
-    } else if (feature.geometry.type === 'LineString') {
+    } else if (feature.geometry.type.toLowerCase() === 'linestring') {
       for (const coordinate of feature.geometry.coordinates) {
         bounds.extend(coordinate);
       }
+    } else if (feature.geometry.type.toLowerCase() === 'multilinestring') {
+      for (const linestring of feature.geometry.coordinates) {
+        for (const coordinate of linestring) {
+          bounds.extend(coordinate);
+        }
+      }
     }
   }
 

package/www/package.json

@@ -9,8 +9,8 @@
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^3.4.0",
-    "@docusaurus/preset-classic": "^3.4.0",
+    "@docusaurus/core": "^3.5.2",
+    "@docusaurus/preset-classic": "^3.5.2",
     "clsx": "^2.1.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"