gtfs-to-html 2.3.5 → 2.4.0

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.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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.3.5",
+  "version": "2.4.0",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -41,28 +41,28 @@
     "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",
+    "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.3",
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.2",
-    "puppeteer": "^13.6.0",
+    "puppeteer": "^14.2.1",
     "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"
   },
   "devDependencies": {
-    "eslint": "^8.14.0",
+    "eslint": "^8.17.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-config-xo": "^0.40.0",
-    "husky": "^7.0.4",
+    "eslint-config-xo": "^0.41.0",
+    "husky": "^8.0.1",
     "prettier": "^2.6.2",
     "pretty-quick": "^3.1.3"
   },

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;
-}

package/public/js/system-map.js

@@ -36,6 +36,28 @@ function formatRoutePopup(features) {
   return html.prop('outerHTML');
 }
 
+function formatStopPopup(feature) {
+  const routes = JSON.parse(feature.properties.routes);
+  const html = $('<div>');
+
+  $('<div>')
+    .addClass('popup-title')
+    .text(feature.properties.stop_name)
+    .appendTo(html);
+
+  if (feature.properties.stop_code ?? false) {
+    $('<label>').addClass('mr-1').text('Stop Code:').appendTo(html);
+
+    $('<strong>').text(feature.properties.stop_code).appendTo(html);
+  }
+
+  $('<div>').text('Routes Served:').appendTo(html);
+
+  $(html).append(routes.map((route) => formatRoute(route)));
+
+  return html.prop('outerHTML');
+}
+
 function getBounds(geojson) {
   const bounds = new mapboxgl.LngLatBounds();
   for (const feature of geojson.features) {
@@ -53,8 +75,10 @@ function getBounds(geojson) {
 
 function createSystemMap(id, geojson) {
   const defaultRouteColor = '#FF4728';
-  const routeLayerIds = [];
-  const routeBackgroundLayerIds = [];
+  const lineLayout = {
+    'line-join': 'round',
+    'line-cap': 'round',
+  };
 
   if (!geojson || geojson.features.length === 0) {
     $('#' + id).hide();
@@ -83,6 +107,9 @@ function createSystemMap(id, geojson) {
       duration: 0,
     });
 
+    // Turn of Points of Interest labels
+    map.setLayoutProperty('poi-label', 'visibility', 'none');
+
     // Find the index of the first symbol layer in the map style
     let firstSymbolId;
     for (const layer of map.getStyle().layers) {
@@ -92,120 +119,400 @@ function createSystemMap(id, geojson) {
       }
     }
 
-    // Add white outlines to routes first
-    for (const routeId of Object.keys(routes)) {
-      routeBackgroundLayerIds.push(`${routeId}outline`);
-      map.addLayer(
-        {
-          id: `${routeId}outline`,
-          type: 'line',
-          source: {
-            type: 'geojson',
-            data: geojson,
+    // Add route drop shadow outline first
+    map.addLayer(
+      {
+        id: 'route-line-shadows',
+        type: 'line',
+        source: {
+          type: 'geojson',
+          data: geojson,
+        },
+        paint: {
+          'line-color': '#000000',
+          'line-opacity': 0.3,
+          'line-width': {
+            base: 12,
+            stops: [
+              [14, 20],
+              [18, 42],
+            ],
           },
-          paint: {
-            'line-color': '#FFFFFF',
-            'line-opacity': 1,
-            'line-width': 6,
+          'line-blur': {
+            base: 12,
+            stops: [
+              [14, 20],
+              [18, 42],
+            ],
           },
-          layout: {
-            'line-join': 'round',
-            'line-cap': 'round',
+        },
+        layout: lineLayout,
+        filter: ['!has', 'stop_id'],
+      },
+      firstSymbolId
+    );
+
+    // Add highlighted route drop shadow outlines next
+    map.addLayer(
+      {
+        id: 'highlighted-route-line-shadows',
+        type: 'line',
+        source: {
+          type: 'geojson',
+          data: geojson,
+        },
+        paint: {
+          'line-color': '#000000',
+          'line-opacity': 0.3,
+          'line-width': {
+            base: 16,
+            stops: [
+              [14, 24],
+              [18, 50],
+            ],
+          },
+          'line-blur': {
+            base: 16,
+            stops: [
+              [14, 24],
+              [18, 50],
+            ],
           },
-          filter: ['==', 'route_id', routeId],
         },
-        firstSymbolId
-      );
-    }
+        layout: lineLayout,
+        filter: ['==', ['get', 'route_id'], 'none'],
+      },
+      firstSymbolId
+    );
+
+    // Add white outlines to routes next
+    map.addLayer(
+      {
+        id: `route-outlines`,
+        type: 'line',
+        source: {
+          type: 'geojson',
+          data: geojson,
+        },
+        paint: {
+          'line-color': '#FFFFFF',
+          'line-opacity': 1,
+          'line-width': {
+            base: 8,
+            stops: [
+              [14, 12],
+              [18, 32],
+            ],
+          },
+        },
+        layout: lineLayout,
+        filter: ['has', 'route_id'],
+      },
+      firstSymbolId
+    );
+
+    // Add highlighted route white outlines next
+    map.addLayer(
+      {
+        id: `highlighted-route-outlines`,
+        type: 'line',
+        source: {
+          type: 'geojson',
+          data: geojson,
+        },
+        paint: {
+          'line-color': '#FFFFFF',
+          'line-opacity': 1,
+          'line-width': {
+            base: 10,
+            stops: [
+              [14, 16],
+              [18, 40],
+            ],
+          },
+        },
+        layout: lineLayout,
+        filter: ['==', ['get', 'route_id'], 'none'],
+      },
+      firstSymbolId
+    );
 
     // Add route lines next
-    for (const routeId of Object.keys(routes)) {
-      routeLayerIds.push(routeId);
-      const routeColor = routes[routeId].route_color || defaultRouteColor;
-      map.addLayer(
-        {
-          id: routeId,
-          type: 'line',
-          source: {
-            type: 'geojson',
-            data: geojson,
+    map.addLayer(
+      {
+        id: 'routes',
+        type: 'line',
+        source: {
+          type: 'geojson',
+          data: geojson,
+        },
+        paint: {
+          'line-color': ['coalesce', ['get', 'route_color'], defaultRouteColor],
+          'line-opacity': 1,
+          'line-width': {
+            base: 4,
+            stops: [
+              [14, 6],
+              [18, 16],
+            ],
+          },
+        },
+        layout: lineLayout,
+        filter: ['has', 'route_id'],
+      },
+      firstSymbolId
+    );
+
+    // Add highlighted route lines next
+    map.addLayer(
+      {
+        id: 'highlighted-routes',
+        type: 'line',
+        source: {
+          type: 'geojson',
+          data: geojson,
+        },
+        paint: {
+          'line-color': ['coalesce', ['get', 'route_color'], defaultRouteColor],
+          'line-opacity': 1,
+          'line-width': {
+            base: 6,
+            stops: [
+              [14, 8],
+              [18, 20],
+            ],
           },
-          paint: {
-            'line-color': routeColor,
-            'line-opacity': 1,
-            'line-width': 2,
+        },
+        layout: lineLayout,
+        filter: ['==', ['get', 'route_id'], 'none'],
+      },
+      firstSymbolId
+    );
+
+    // Add stops when zoomed in
+    map.addLayer(
+      {
+        id: 'stops',
+        type: 'circle',
+        source: {
+          type: 'geojson',
+          data: geojson,
+        },
+        paint: {
+          'circle-color': '#fff',
+          'circle-radius': {
+            base: 1.75,
+            stops: [
+              [12, 4],
+              [22, 100],
+            ],
           },
-          layout: {
-            'line-join': 'round',
-            'line-cap': 'round',
+          'circle-stroke-color': '#3F4A5C',
+          'circle-stroke-width': 2,
+          'circle-opacity': [
+            'interpolate',
+            ['linear'],
+            ['zoom'],
+            13,
+            0,
+            13.5,
+            1,
+          ],
+          'circle-stroke-opacity': [
+            'interpolate',
+            ['linear'],
+            ['zoom'],
+            13,
+            0,
+            13.5,
+            1,
+          ],
+        },
+        filter: ['has', 'stop_id'],
+      },
+      firstSymbolId
+    );
+
+    // Layer for highlighted stops
+    map.addLayer(
+      {
+        id: 'stops-highlighted',
+        type: 'circle',
+        source: {
+          type: 'geojson',
+          data: geojson,
+        },
+        paint: {
+          'circle-color': '#fff',
+          'circle-radius': {
+            base: 1.75,
+            stops: [
+              [12, 5],
+              [22, 125],
+            ],
           },
-          filter: ['==', 'route_id', routeId],
+          'circle-stroke-width': 2,
+          'circle-stroke-color': '#3f4a5c',
+          'circle-opacity': [
+            'interpolate',
+            ['linear'],
+            ['zoom'],
+            13,
+            0,
+            13.5,
+            1,
+          ],
+          'circle-stroke-opacity': [
+            'interpolate',
+            ['linear'],
+            ['zoom'],
+            13,
+            0,
+            13.5,
+            1,
+          ],
         },
-        firstSymbolId
-      );
-    }
+        filter: ['==', 'stop_id', ''],
+      },
+      firstSymbolId
+    );
+
+    // Add labels
+    map.addLayer({
+      id: 'route-labels',
+      type: 'symbol',
+      source: {
+        type: 'geojson',
+        data: geojson,
+      },
+      layout: {
+        'symbol-placement': 'line',
+        'text-field': ['get', 'route_short_name'],
+        'text-size': 14,
+      },
+      paint: {
+        'text-color': '#000000',
+        'text-halo-width': 2,
+        'text-halo-color': '#ffffff',
+      },
+      filter: ['has', 'route_short_name'],
+    });
 
     map.on('mousemove', (event) => {
       const features = map.queryRenderedFeatures(event.point, {
-        layers: [...routeLayerIds, ...routeBackgroundLayerIds],
+        layers: ['routes', 'route-outlines', 'stops-highlighted', 'stops'],
       });
       if (features.length > 0) {
         map.getCanvas().style.cursor = 'pointer';
         highlightRoutes(
-          _.uniq(features.map((feature) => feature.properties.route_id))
+          _.compact(
+            _.uniq(features.map((feature) => feature.properties.route_id))
+          )
         );
+
+        if (features.some((feature) => feature.layer.id === 'stops')) {
+          highlightStop(
+            features.find((feature) => feature.layer.id === 'stops').properties
+              .stop_id
+          );
+        }
       } else {
         map.getCanvas().style.cursor = '';
         unHighlightRoutes();
+        unHighlightStop();
       }
     });
 
     map.on('click', (event) => {
-      // Set bbox as 5px reactangle area around clicked point
+      // Set bbox as 5px rectangle area around clicked point
       const bbox = [
         [event.point.x - 5, event.point.y - 5],
         [event.point.x + 5, event.point.y + 5],
       ];
-      const features = map.queryRenderedFeatures(bbox, {
-        layers: routeLayerIds,
+
+      const stopFeatures = map.queryRenderedFeatures(bbox, {
+        layers: ['stops-highlighted', 'stops'],
       });
 
-      if (!features || features.length === 0) {
-        return;
-      }
+      if (stopFeatures && stopFeatures.length > 0) {
+        // Get the stop feature and show popup
+        const stopFeature = stopFeatures[0];
 
-      const routeFeatures = _.orderBy(
-        _.uniqBy(features, (feature) => feature.properties.route_short_name),
-        (feature) => Number.parseInt(feature.properties.route_short_name, 10)
-      );
+        new mapboxgl.Popup()
+          .setLngLat(stopFeature.geometry.coordinates)
+          .setHTML(formatStopPopup(stopFeature))
+          .addTo(map);
+      } else {
+        const routeFeatures = map.queryRenderedFeatures(bbox, {
+          layers: ['routes', 'route-outlines'],
+        });
 
-      new mapboxgl.Popup()
-        .setLngLat(event.lngLat)
-        .setHTML(formatRoutePopup(routeFeatures))
-        .addTo(map);
+        if (routeFeatures && routeFeatures.length > 0) {
+          const routes = _.orderBy(
+            _.uniqBy(
+              routeFeatures,
+              (feature) => feature.properties.route_short_name
+            ),
+            (feature) =>
+              Number.parseInt(feature.properties.route_short_name, 10)
+          );
+
+          new mapboxgl.Popup()
+            .setLngLat(event.lngLat)
+            .setHTML(formatRoutePopup(routes))
+            .addTo(map);
+        }
+      }
     });
 
+    function highlightStop(stopId) {
+      map.setFilter('stops-highlighted', ['==', 'stop_id', stopId]);
+    }
+
+    function unHighlightStop() {
+      map.setFilter('stops-highlighted', ['==', 'stop_id', '']);
+    }
+
     function highlightRoutes(routeIds, zoom) {
-      for (const layerId of routeBackgroundLayerIds) {
-        const color = routeIds.includes(layerId.replace(/outline/, ''))
-          ? '#FFFD7E'
-          : '#FFFFFF';
-        const width = routeIds.includes(layerId.replace(/outline/, ''))
-          ? 12
-          : 6;
-        map.setPaintProperty(layerId, 'line-color', color);
-        map.setPaintProperty(layerId, 'line-width', width);
-      }
+      map.setFilter('highlighted-routes', [
+        'all',
+        ['has', 'route_short_name'],
+        ['in', ['get', 'route_id'], ['literal', routeIds]],
+      ]);
+      map.setFilter('highlighted-route-outlines', [
+        'all',
+        ['has', 'route_short_name'],
+        ['in', ['get', 'route_id'], ['literal', routeIds]],
+      ]);
+      map.setFilter('highlighted-route-line-shadows', [
+        'all',
+        ['has', 'route_short_name'],
+        ['in', ['get', 'route_id'], ['literal', routeIds]],
+      ]);
+
+      // Show labels only for highlighted route
+      map.setFilter('route-labels', [
+        'in',
+        ['get', 'route_id'],
+        ['literal', routeIds],
+      ]);
+
+      const routeLineOpacity = 0.4;
+
+      // De-emphasize other routes
+      map.setPaintProperty('routes', 'line-opacity', routeLineOpacity);
+      map.setPaintProperty('route-outlines', 'line-opacity', routeLineOpacity);
+      map.setPaintProperty(
+        'route-line-shadows',
+        'line-opacity',
+        routeLineOpacity
+      );
 
       const highlightedFeatures = geojson.features.filter((feature) =>
         routeIds.includes(feature.properties.route_id)
       );
 
-      if (highlightedFeatures.length === 0) {
-        return;
-      }
-
-      if (zoom) {
+      if (highlightedFeatures.length > 0 && zoom) {
         const zoomBounds = getBounds({
           features: highlightedFeatures,
         });
@@ -216,10 +523,31 @@ function createSystemMap(id, geojson) {
     }
 
     function unHighlightRoutes(zoom) {
-      for (const layerId of routeBackgroundLayerIds) {
-        map.setPaintProperty(layerId, 'line-color', '#FFFFFF');
-        map.setPaintProperty(layerId, 'line-width', 6);
-      }
+      map.setFilter('highlighted-routes', ['==', ['get', 'route_id'], 'none']);
+      map.setFilter('highlighted-route-outlines', [
+        '==',
+        ['get', 'route_id'],
+        'none',
+      ]);
+      map.setFilter('highlighted-route-line-shadows', [
+        '==',
+        ['get', 'route_id'],
+        'none',
+      ]);
+
+      // Show labels for all routes
+      map.setFilter('route-labels', ['has', 'route_short_name']);
+
+      const routeLineOpacity = 1;
+
+      // Re-emphasize other routes
+      map.setPaintProperty('routes', 'line-opacity', routeLineOpacity);
+      map.setPaintProperty('route-outlines', 'line-opacity', routeLineOpacity);
+      map.setPaintProperty(
+        'route-line-shadows',
+        'line-opacity',
+        routeLineOpacity
+      );
 
       if (zoom) {
         map.fitBounds(bounds);
@@ -229,7 +557,7 @@ function createSystemMap(id, geojson) {
     // On table hover, highlight route on map
     $(() => {
       $('.overview-list a').hover((event) => {
-        const routeIdString = $(event.target).parents('a').data('route-ids');
+        const routeIdString = $(event.target).data('route-ids');
         if (routeIdString) {
           const routeIds = routeIdString.toString().split(',');
           highlightRoutes(routeIds, true);