gtfs-to-html 2.3.3 → 2.4.0

package/CHANGELOG.md

@@ -5,6 +5,30 @@ 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.4.0] - 2022-06-07
+
+### Updated
+
+- Dependency updates
+- Add route labels and stops to system map
+- Turn off points of interest labels on all maps
+- Better map data styles
+- Improved system map route and stop highlighting
+- Updated to tailwindcss 3
+
+## [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

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/geojson-utils.js

@@ -91,6 +91,11 @@ export async function getTimetableGeoJSON(timetable, config) {
  * Get the geoJSON for an agency (all routes and stops).
  */
 export async function getAgencyGeoJSON(config) {
-  const geojson = await getShapesAsGeoJSON();
+  const [shapesGeojsons, stopsGeojsons] = await Promise.all([
+    getShapesAsGeoJSON(),
+    getStopsAsGeoJSON(),
+  ]);
+
+  const geojson = mergeGeojson(shapesGeojsons, stopsGeojsons);
   return simplifyGeoJSON(geojson, config);
 }

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.3",
+  "version": "2.4.0",
   "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.5",
-    "express": "^4.17.2",
-    "gtfs": "^3.2.4",
-    "js-beautify": "^1.14.0",
+    "csv-stringify": "^6.1.0",
+    "express": "^4.18.1",
+    "gtfs": "^3.3.1",
+    "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.1.1",
+    "puppeteer": "^14.2.1",
     "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.5.1"
   },
   "devDependencies": {
-    "eslint": "^8.7.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-config-xo": "^0.39.0",
-    "husky": "^7.0.4",
-    "prettier": "^2.5.1",
+    "eslint": "^8.17.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-xo": "^0.41.0",
+    "husky": "^8.0.1",
+    "prettier": "^2.6.2",
     "pretty-quick": "^3.1.3"
   },
   "engines": {

package/public/css/timetable_styles.css

@@ -70,7 +70,7 @@ a:hover {
 
 .timetable .table-container {
   overflow-x: scroll;
-  margin-bottom: 1rem;
+  margin: 20px 0;
 }
 
 .timetable .table-container .table {
@@ -93,11 +93,12 @@ a:hover {
 }
 
 .timetable thead tr {
-  background: #72b1e6;
+  background: #aed9fb;
 }
 
+.timetable thead tr,
 .timetable thead tr a {
-  color: #333333;
+  color: #222222;
 }
 
 .timetable th {
@@ -257,16 +258,3 @@ a:hover {
   align-items: center;
   line-height: 1;
 }
-
-/* Overview  page */
-
-.overview-menu-item {
-  display: block;
-  text-decoration: none;
-  padding: 5px;
-}
-
-.overview-menu-item:hover {
-  text-decoration: none;
-  background: #bdd5fa;
-}