gtfs-to-html 2.3.2 → 2.3.5

package/CHANGELOG.md

@@ -5,6 +5,25 @@ 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.3.5] - 2022-04-26
+
+### Updated
+
+- Dependency updates
+
+## [2.3.4] - 2022-04-09
+
+### Updated
+
+- Remove route info from map geojson
+- Dependency updates
+
+## [2.3.3] - 2022-01-21
+
+### Updated
+
+- Dependency updates
+
 ## [2.3.2] - 2021-12-28
 
 ### Updated

package/app/index.js

@@ -87,6 +87,7 @@ router.get('/', async (request, response, next) => {
     const html = await generateOverviewHTML(timetablePages, config);
     response.send(html);
   } catch (error) {
+    console.error(error);
     next(error);
   }
 });

package/lib/log-utils.js

@@ -205,12 +205,12 @@ export function progressBar(formatString, barTotal, config) {
   config.log(renderProgressString(), true);
 
   return {
-    interrupt: (text) => {
+    interrupt(text) {
       // Log two lines to avoid overwrite by progress bar
       config.logWarning(text);
       config.logWarning('');
     },
-    increment: () => {
+    increment() {
       barProgress += 1;
       config.log(renderProgressString(), true);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.3.2",
+  "version": "2.3.5",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -37,33 +37,33 @@
   "dependencies": {
     "@turf/helpers": "^6.5.0",
     "@turf/simplify": "^6.5.0",
-    "archiver": "^5.3.0",
-    "chalk": "^5.0.0",
+    "archiver": "^5.3.1",
+    "chalk": "^5.0.1",
     "cli-table": "^0.3.11",
     "copy-dir": "^1.3.0",
-    "csv-stringify": "^6.0.4",
-    "express": "^4.17.2",
-    "gtfs": "^3.2.2",
-    "js-beautify": "^1.14.0",
+    "csv-stringify": "^6.0.5",
+    "express": "^4.18.0",
+    "gtfs": "^3.3.0",
+    "js-beautify": "^1.14.3",
     "lodash-es": "^4.17.21",
-    "moment": "^2.29.1",
+    "moment": "^2.29.3",
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.2",
-    "puppeteer": "^13.0.1",
+    "puppeteer": "^13.6.0",
     "sanitize-filename": "^1.6.3",
-    "sqlstring": "^2.3.2",
+    "sqlstring": "^2.3.3",
     "timer-machine": "^1.1.0",
     "toposort": "^2.0.2",
     "untildify": "^4.0.0",
-    "yargs": "^17.3.1"
+    "yargs": "^17.4.1"
   },
   "devDependencies": {
-    "eslint": "^8.5.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-config-xo": "^0.39.0",
+    "eslint": "^8.14.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-xo": "^0.40.0",
     "husky": "^7.0.4",
-    "prettier": "^2.5.1",
+    "prettier": "^2.6.2",
     "pretty-quick": "^3.1.3"
   },
   "engines": {

package/public/js/timetable-map.js

@@ -24,8 +24,8 @@ function formatRoute(route) {
   return html.prop('outerHTML');
 }
 
-function formatStopPopup(feature) {
-  const routes = JSON.parse(feature.properties.routes);
+function formatStopPopup(feature, routes) {
+  const routeIds = JSON.parse(feature.properties.routes);
   const html = $('<div>');
 
   $('<div>')
@@ -41,7 +41,7 @@ function formatStopPopup(feature) {
 
   $('<div>').text('Routes Served:').appendTo(html);
 
-  $(html).append(routes.map((route) => formatRoute(route)));
+  $(html).append(routeIds.map((routeId) => formatRoute(routes[routeId])));
 
   return html.prop('outerHTML');
 }
@@ -61,7 +61,7 @@ function getBounds(geojson) {
   return bounds;
 }
 
-function createMap(id, geojson) {
+function createMap(id, geojson, routes) {
   const defaultRouteColor = '#FF4728';
 
   if (!geojson || geojson.features.length === 0) {
@@ -228,7 +228,7 @@ function createMap(id, geojson) {
 
       new mapboxgl.Popup()
         .setLngLat(feature.geometry.coordinates)
-        .setHTML(formatStopPopup(feature))
+        .setHTML(formatStopPopup(feature, routes))
         .addTo(map);
     });
 

package/views/default/formatting_functions.pug

@@ -65,3 +65,34 @@
       };
     }), timetableGroup => timetableGroup.agency.agency_name.toLowerCase());
   }
+
+  function prepareMapData(timetable) {
+    const routes = {}
+    const minifiedGeojson = {
+      type: 'FeatureCollection',
+      features: []
+    }
+
+    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') {
+        for (const route of feature.properties.routes) {
+          routes[route.route_id] = route
+        }
+
+        feature.properties.routes = feature.properties.routes.map(route => route.route_id)
+
+        minifiedGeojson.features.push(feature)
+      }
+    }
+    
+    return {
+      id: `timetable_id_${formatHtmlId(timetable.timetable_id)}`,
+      routes,
+      geojson: minifiedGeojson
+    }
+  }

package/views/default/timetablepage.pug

@@ -24,13 +24,10 @@ include formatting_functions.pug
 
         if config.showMap
           .map(id=`map_timetable_id_${formatHtmlId(timetable.timetable_id)}`)
-          
-          //- Use #{variable} format to inject values from pug to client side js
           script.
             (function() {
-              const id = 'timetable_id_#{formatHtmlId(timetable.timetable_id)}';
-              const geojson = !{JSON.stringify(timetable.geojson)};
-              createMap(id, geojson);
+              const { id, geojson, routes } = !{JSON.stringify(prepareMapData(timetable))};
+              createMap(id, geojson, routes);
             })();
 
         if timetable.orientation === 'horizontal'

package/www/package.json

@@ -9,11 +9,11 @@
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-beta.14",
-    "@docusaurus/preset-classic": "^2.0.0-beta.14",
+    "@docusaurus/core": "^2.0.0-beta.18",
+    "@docusaurus/preset-classic": "^2.0.0-beta.18",
     "clsx": "^1.1.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "browserslist": {
     "production": [