gtfs-to-html 2.4.2 → 2.4.4

package/CHANGELOG.md

@@ -5,6 +5,23 @@ 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.4] - 2022-12-22
+
+### Updated
+
+- Use adjacent duplicate stoptimes as arrival/depart if different times
+- Updates to gtfstohtml.com documentation website dependencies
+- Dependency updates
+
+## [2.4.3] - 2022-11-10
+
+### Updated
+
+- Initialize Map with bounds padding
+- Omit unneeded fields from geojson
+- Remove adjacent stoptimes with the same stop_id
+- Dependency updates
+
 ## [2.4.2] - 2022-07-26
 
 ### Updated

package/lib/utils.js

@@ -984,6 +984,26 @@ const addTripContinuation = async (trip, timetable) => {
 const filterTrips = (timetable) => {
   let filteredTrips = timetable.orderedTrips;
 
+  // Combine adjacent stoptimes with the same `stop_id`
+  for (const trip of filteredTrips) {
+    const combinedStoptimes = [];
+
+    for (const [index, stoptime] of trip.stoptimes.entries()) {
+      if (
+        index === 0 ||
+        stoptime.stop_id !== trip.stoptimes[index - 1].stop_id
+      ) {
+        combinedStoptimes.push(stoptime);
+      } else {
+        // The `stoptime` is the same as previous, use `arrival_time` from previous and `departure_time` from this stoptime
+        combinedStoptimes[combinedStoptimes.length - 1].departure_time =
+          stoptime.departure_time;
+      }
+    }
+
+    trip.stoptimes = combinedStoptimes;
+  }
+
   // Remove stoptimes for stops not used in timetable
   const timetableStopIds = new Set(timetable.stops.map((stop) => stop.stop_id));
   for (const trip of filteredTrips) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs-to-html",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "private": false,
   "description": "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   "keywords": [
@@ -40,30 +40,30 @@
     "archiver": "^5.3.1",
     "cli-table": "^0.3.11",
     "copy-dir": "^1.3.0",
-    "csv-stringify": "^6.2.0",
-    "express": "^4.18.1",
-    "gtfs": "^3.5.1",
-    "js-beautify": "^1.14.4",
+    "csv-stringify": "^6.2.3",
+    "express": "^4.18.2",
+    "gtfs": "^3.8.0",
+    "js-beautify": "^1.14.7",
     "lodash-es": "^4.17.21",
     "moment": "^2.29.4",
     "morgan": "^1.10.0",
     "pretty-error": "^4.0.0",
     "pug": "^3.0.2",
-    "puppeteer": "^15.5.0",
+    "puppeteer": "^19.4.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.5.1",
+    "yargs": "^17.6.2",
     "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
-    "eslint": "^8.20.0",
+    "eslint": "^8.30.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-config-xo": "^0.41.0",
-    "husky": "^8.0.1",
-    "prettier": "^2.7.1",
+    "eslint-config-xo": "^0.43.1",
+    "husky": "^8.0.2",
+    "prettier": "^2.8.1",
     "pretty-quick": "^3.1.3"
   },
   "engines": {

package/public/js/timetable-map.js

@@ -82,6 +82,17 @@ function createMap(id, geojson, routes) {
     preserveDrawingBuffer: true,
   });
 
+  map.initialize = () =>
+    map.fitBounds(bounds, {
+      padding: {
+        top: 40,
+        bottom: 40,
+        left: 20,
+        right: 40,
+      },
+      duration: 0,
+    });
+
   map.scrollZoom.disable();
   map.addControl(new mapboxgl.NavigationControl());
 

package/views/default/formatting_functions.pug

@@ -86,7 +86,7 @@
 
         feature.properties.routes = feature.properties.routes.map(route => route.route_id)
 
-        minifiedGeojson.features.push(feature)
+        minifiedGeojson.features.push(_.omit(feature, ['location_type', 'tts_stop_name']))
       }
     }
     

package/www/package.json

@@ -9,8 +9,8 @@
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-rc.1",
-    "@docusaurus/preset-classic": "^2.0.0-rc.1",
+    "@docusaurus/core": "^2.2.0",
+    "@docusaurus/preset-classic": "^2.2.0",
     "clsx": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

package/www/src/pages/index.js

@@ -48,7 +48,7 @@ function Feature({ imageUrl, title, description }) {
     <div className={clsx('col col--4', styles.feature)}>
       {imgUrl && (
         <div className="text--center">
-          <img className={styles.featureImage} src={imgUrl} alt="" />
+          <img className={styles['feature-image']} src={imgUrl} alt="" />
         </div>
       )}
       <h3>{title}</h3>
@@ -65,7 +65,7 @@ function Home() {
       title="GTFS-to-HTML"
       description="GTFS-to-HTML creates human-readable, user-friendly transit timetables in HTML format directly from GTFS transit data."
     >
-      <header className={clsx('hero hero--dark', styles.heroBanner)}>
+      <header className={clsx('hero hero--dark', styles['hero-banner'])}>
         <div className="container">
           <div className="row">
             <div className="col col--4">
@@ -88,7 +88,7 @@ function Home() {
                 <Link
                   className={clsx(
                     'button button--outline button--secondary button--lg',
-                    styles.heroButton
+                    styles['hero-button']
                   )}
                   to={useBaseUrl('docs/')}
                 >
@@ -112,10 +112,7 @@ function Home() {
           </section>
         )}
 
-        <section
-          style={{ backgroundColor: 'hsl(0, 0%, 85%)' }}
-          className="padding--lg"
-        >
+        <section className={clsx('padding--lg', styles['gray-section'])}>
           <div className="container">
             <div className="row">
               <div className="col"></div>

package/www/src/pages/styles.module.css

@@ -5,7 +5,7 @@
  * and scoped locally.
  */
 
-.heroBanner {
+.hero-banner {
   padding: 4rem 0;
   text-align: center;
   position: relative;
@@ -13,7 +13,7 @@
 }
 
 @media screen and (max-width: 966px) {
-  .heroBanner {
+  .hero-banner {
     padding: 2rem;
   }
 }
@@ -24,12 +24,20 @@
   justify-content: center;
 }
 
-.heroButton {
-  color: #FFFFFF!important;
+.hero-button {
+  color: #ffffff !important;
 }
 
-.heroButton:hover {
-  color: #333!important;
+.hero-button:hover {
+  color: #333 !important;
+}
+
+.gray-section {
+  background-color: hsl(0, 0%, 85%);
+}
+
+[data-theme='dark'] .gray-section {
+  background-color: rgb(94, 94, 94);
 }
 
 .features {
@@ -39,7 +47,7 @@
   width: 100%;
 }
 
-.featureImage {
+.feature-image {
   height: 200px;
   width: 200px;
 }