gtfs-to-html 2.3.5 → 2.4.2

package/CHANGELOG.md

@@ -5,6 +5,35 @@ 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.2] - 2022-07-26
+
+### Updated
+
+- Dependency updates
+
+### Fixed
+
+- Moved tailwindcss include to header
+
+## [2.4.1] - 2022-07-10
+
+### Updated
+
+- Update Dockerfile to node 16
+- Dependency updates
+- Use yoctocolors instead of chalk
+
+## [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

package/docker/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM node:14
+FROM node:16
 
 RUN apt update
 RUN apt install -y chromium

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

@@ -1,7 +1,7 @@
 import { clearLine, cursorTo } from 'node:readline';
 import PrettyError from 'pretty-error';
 import { noop } from 'lodash-es';
-import chalk from 'chalk';
+import * as colors from 'yoctocolors';
 import { getFeedInfo } from 'gtfs';
 import Table from 'cli-table';
 
@@ -99,19 +99,20 @@ export function logError(config) {
  * Format console warning text
  */
 export function formatWarning(text) {
-  return `${chalk.yellow.underline('Warning')}${chalk.yellow(
-    ':'
-  )} ${chalk.yellow(text)}`;
+  const warningMessage = `${colors.underline('Warning')}: ${text}`;
+  return colors.yellow(warningMessage);
 }
 
 /*
  * Format console error text
  */
 export function formatError(error) {
-  const message = error instanceof Error ? error.message : error;
-  return `${chalk.red.underline('Error')}${chalk.red(':')} ${chalk.red(
-    message.replace('Error: ', '')
+  const messageText = error instanceof Error ? error.message : error;
+  const errorMessage = `${colors.underline('Error')}: ${messageText.replace(
+    'Error: ',
+    ''
   )}`;
+  return colors.red(errorMessage);
 }
 
 /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.3.5",
+  "version": "2.4.2",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -38,32 +38,32 @@
     "@turf/helpers": "^6.5.0",
     "@turf/simplify": "^6.5.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.18.0",
-    "gtfs": "^3.3.0",
-    "js-beautify": "^1.14.3",
+    "csv-stringify": "^6.2.0",
+    "express": "^4.18.1",
+    "gtfs": "^3.5.1",
+    "js-beautify": "^1.14.4",
     "lodash-es": "^4.17.21",
-    "moment": "^2.29.3",
+    "moment": "^2.29.4",
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.2",
-    "puppeteer": "^13.6.0",
+    "puppeteer": "^15.5.0",
     "sanitize-filename": "^1.6.3",
     "sqlstring": "^2.3.3",
     "timer-machine": "^1.1.0",
     "toposort": "^2.0.2",
     "untildify": "^4.0.0",
-    "yargs": "^17.4.1"
+    "yargs": "^17.5.1",
+    "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
-    "eslint": "^8.14.0",
+    "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-config-xo": "^0.40.0",
-    "husky": "^7.0.4",
-    "prettier": "^2.6.2",
+    "eslint-config-xo": "^0.41.0",
+    "husky": "^8.0.1",
+    "prettier": "^2.7.1",
     "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;
-}