gtfs-to-html 2.6.9 → 2.6.10

package/CHANGELOG.md

@@ -5,6 +5,15 @@ 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.6.10] - 2024-07-15
+
+### Updated
+- Better date format in timetable comment
+- favicon
+- Improved timetable_page_name fallback
+- Overview template formatting
+- Update mapbox version
+
 ## [2.6.9] - 2024-07-11
 
 ### Added

package/lib/formatters.js

@@ -512,22 +512,16 @@ export function formatTimetablePageLabel(timetablePage) {
     timetablePage.consolidatedTimetables &&
     timetablePage.consolidatedTimetables.length > 0
   ) {
-    if (timetablePage.consolidatedTimetables.length === 1) {
-      // Get label from first timetable if there is only one
-      return timetablePage.consolidatedTimetables[0].timetable_label;
-    } else {
-      // Otherwise, use route names from all timetables
-      const routes = uniqBy(
-        flatMap(
-          timetablePage.consolidatedTimetables,
-          (timetable) => timetable.routes,
-        ),
-        'route_id',
-      );
-      const timetablePageLabel = routes.map((route) => formatRouteName(route));
+    // Use route names from all timetables
+    const routes = uniqBy(
+      flatMap(
+        timetablePage.consolidatedTimetables,
+        (timetable) => timetable.routes,
+      ),
+      'route_id',
+    );
 
-      return timetablePageLabel.join(' and ');
-    }
+    return routes.map((route) => formatRouteName(route)).join(' and ');
   }
 
   return 'Unknown';

package/lib/log-utils.js

@@ -17,7 +17,7 @@ export function generateLogText(outputStats, config) {
   const logText = [
     `Feed Version: ${feedVersion}`,
     `GTFS-to-HTML Version: ${config.gtfsToHtmlVersion}`,
-    `Date Generated: ${new Date()}`,
+    `Date Generated: ${new Date().toISOString()}`,
     `Timetable Page Count: ${outputStats.timetablePages}`,
     `Timetable Count: ${outputStats.timetables}`,
     `Calendar Service ID Count: ${outputStats.calendars}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [

package/public/css/timetable_styles.css

@@ -186,7 +186,7 @@ a:hover {
   font-size: 20px;
   font-weight: bold;
   letter-spacing: -1px;
-  padding: 0 8px;
+  padding: 0 6px;
 }
 
 @media screen and (max-width: 767px) {

package/views/default/formatting_functions.pug

@@ -11,14 +11,8 @@
     return summary;
   }
 
-  function formatRouteName(route) {
-    const hasLongName = route.route_long_name !== '' && route.route_long_name !== null;
-
-    if (hasLongName) {
-      return route.route_long_name;
-    }
-
-    return route.route_short_name;
+  function isNullOrEmpty(value) {
+    return value === null || value === '';
   }
 
   function formatFrequencyWarning(frequencies) {

package/views/default/overview.pug

@@ -1,28 +1,28 @@
 include formatting_functions.pug
 
-.container.mx-4.h-screen.items-stretch(class="md:mx-auto md:flex")
+.h-screen.items-stretch(class="md:flex")
   if !timetablePages || !timetablePages.length
     .flex.justify-center
       .bg-blue-700.text-white.font-bold.rounded-lg.border.shadow-lg.text-lg.p-8(class="w-1/2") No timetables found
   else
-    .overview-list.flex-none(class="md:overflow-y-scroll")
+    .overview-list.flex-none(class="md:overflow-y-scroll md:max-w-96")
       each timetablePageGroup in getAgencyTimetableGroups(timetablePages, agencies)
-        h1.text-2xl.pt-4.pb-2= `${formatAgencyName(timetablePageGroup.agency)} Routes`
+        h1.text-2xl.mx-4.py-3= `${formatAgencyName(timetablePageGroup.agency)} Routes`
+  
         each timetablePage in timetablePageGroup.timetablePages
           if config.allowEmptyTimetables || timetablePage.consolidatedTimetables.length > 0
-            a.block.p-2.border-b.border-slate-200(class="hover:bg-slate-100 hover:no-underline" href=`${timetablePage.relativePath}` data-route-ids=`${timetablePage.route_ids ? timetablePage.route_ids.join(',') : ''}`)
-              .text-lg.text-gray-800.leading-none= timetablePage.timetable_page_label
+            a.timetable-overview-label.flex.items-center.gap-2.block.p-2.border-b.border-slate-200(class="hover:bg-slate-100 hover:no-underline" href=`${timetablePage.relativePath}` data-route-ids=`${timetablePage.route_ids ? timetablePage.route_ids.join(',') : ''}`)
               each route in _.uniqBy(_.flatMap(timetablePage.consolidatedTimetables, timetable => timetable.routes), 'route_id')
-                .flex.my-1.items-center.gap-1
-                  .route-color-swatch.flex-none(style=`background-color: ${formatRouteColor(route)}; color: ${formatRouteTextColor(route)};`)= route.route_short_name || ''
-                  .text-gray-600.leading-none= formatRouteName(route)
-              .inline-flex.items-center.justify-center.px-2.py-1.text-xs.font-bold.leading-none.text-slate-800.bg-slate-200.rounded-full= timetablePage.dayList
+                .route-color-swatch-large.flex-none(style=`background-color: ${formatRouteColor(route)}; color: ${formatRouteTextColor(route)};`)= route.route_short_name || ''
+              div
+                .text-xl.leading-none.text-slate-800= timetablePage.timetable_page_label
+                .inline-flex.items-center.justify-center.px-2.py-1.text-xs.font-bold.leading-none.text-slate-800.bg-slate-200.rounded-full= timetablePage.dayList
     if config.showMap
-      .map.ml-4.h-full.w-full(id="system_map")
+      .map.h-full.w-full(id="system_map")
 
       //- Use #{variable} format to inject values from pug to client side js
       script.
         (function() {
-          var geojson = !{JSON.stringify(geojson) || '\'\''};
+          const geojson = !{JSON.stringify(geojson) || '\'\''};
           createSystemMap('system_map', geojson);
         })();

package/views/default/overview_full.pug

@@ -6,9 +6,9 @@ block extraHeader
   if config.showMap
     script(src="https://unpkg.com/jquery@3.7.1/dist/jquery.min.js" crossorigin="anonymous")
     script(src="https://unpkg.com/lodash@4.17.21/lodash.min.js" crossorigin="anonymous")
-    script(src="https://api.mapbox.com/mapbox-gl-js/v3.3.0/mapbox-gl.js")
+    script(src="https://api.mapbox.com/mapbox-gl-js/v3.5.1/mapbox-gl.js")
     script.
       mapboxgl.accessToken = '#{config.mapboxAccessToken}';
     script(src=`${config.assetPath}js/system-map.js`)
 
-    link(href="https://api.mapbox.com/mapbox-gl-js/v3.3.0/mapbox-gl.css" rel="stylesheet")
+    link(href="https://api.mapbox.com/mapbox-gl-js/v3.5.1/mapbox-gl.css" rel="stylesheet")

package/views/default/timetablepage.pug

@@ -1,6 +1,6 @@
 include formatting_functions.pug
 
-<!-- Timetable generated on #{Date()} using GTFS-to-HTML version #{config.gtfsToHtmlVersion} -->
+<!-- Timetable generated on #{new Date().toISOString()} using GTFS-to-HTML version #{config.gtfsToHtmlVersion} -->
 .timetable-page(class=`menu-type-${config.menuType}`)
   .container.mx-4(class="md:mx-auto")
     if config.showRouteTitle

package/views/default/timetablepage_full.pug

@@ -9,10 +9,10 @@ block extraHeader
     script(src=`${config.assetPath}js/timetable-menu.js`)
 
   if config.showMap
-    script(src="https://api.mapbox.com/mapbox-gl-js/v3.3.0/mapbox-gl.js")
+    script(src="https://api.mapbox.com/mapbox-gl-js/v3.5.1/mapbox-gl.js")
     script.
       mapboxgl.accessToken = '#{config.mapboxAccessToken}';
     script(src=`${config.assetPath}js/timetable-map.js`)
 
-    link(href="https://api.mapbox.com/mapbox-gl-js/v3.3.0/mapbox-gl.css" rel="stylesheet")
+    link(href="https://api.mapbox.com/mapbox-gl-js/v3.5.1/mapbox-gl.css" rel="stylesheet")