gtfs 4.10.0 → 4.10.2

package/.github/workflows/nodejs.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ 18, 20 ]
+        node: [ 20, 21 ]
     name: Use Node.js ${{ matrix.node }}
     steps:
       - uses: actions/checkout@v4

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).
 
+## [4.10.2] - 2024-04-02
+
+### Added
+
+- Better error message for `gtfsrealtime-update` command
+- Support additional fields for vehiclePosition GTFS-Realtime data
+
+### Updated
+
+- Dependency updates
+
+## [4.10.1] - 2024-03-29
+
+### Updated
+
+- Dependency updates
+
 ## [4.10.0] - 2024-03-29
 
 ### Added

package/lib/import.js

@@ -107,22 +107,39 @@ function getDescendantProp(obj, desc, defaultvalue) {
   return obj;
 }
 
-const markRealtimeDataStale = (config, log) => {
-  const db = openDb(config);
+const markRealtimeDataStale = (config) => {
+  const log = _log(config);
+  const logError = _logError(config);
 
-  log(`Marking GTFS-Realtime data as stale..`);
-  db.prepare(`UPDATE vehicle_positions SET is_updated=0`).run();
-  db.prepare(`UPDATE trip_updates SET is_updated=0`).run();
-  db.prepare(`UPDATE stop_time_updates SET is_updated=0`).run();
-  db.prepare(`UPDATE service_alerts SET is_updated=0`).run();
-  db.prepare(`UPDATE service_alert_targets SET is_updated=0`).run();
-  log(`Marked GTFS-Realtime data as stale\r`, true);
+  try {
+    const db = openDb(config);
+
+    log(`Marking GTFS-Realtime data as stale`);
+    db.prepare(`UPDATE vehicle_positions SET is_updated=0`).run();
+    db.prepare(`UPDATE trip_updates SET is_updated=0`).run();
+    db.prepare(`UPDATE stop_time_updates SET is_updated=0`).run();
+    db.prepare(`UPDATE service_alerts SET is_updated=0`).run();
+    db.prepare(`UPDATE service_alert_targets SET is_updated=0`).run();
+    log(`Marked GTFS-Realtime data as stale\r`, true);
+  } catch (error) {
+    if (
+      error instanceof Error &&
+      error.code === 'SQLITE_ERROR' &&
+      error.message?.startsWith('no such table')
+    ) {
+      logError(
+        'Run `gtfs-import` before running the `gtfsrealtime-update` command to set up tables.',
+      );
+      throw error;
+    }
+  }
 };
 
-const cleanStaleRealtimeData = (config, log) => {
+const cleanStaleRealtimeData = (config) => {
+  const log = _log(config);
   const db = openDb(config);
 
-  log(`Cleaning stale GTFS-RT data..`);
+  log(`Cleaning stale GTFS-RT data`);
   db.prepare(`DELETE FROM vehicle_positions WHERE is_updated=0`).run();
   db.prepare(`DELETE FROM trip_updates WHERE is_updated=0`).run();
   db.prepare(`DELETE FROM stop_time_updates WHERE is_updated=0`).run();
@@ -708,7 +725,7 @@ export async function updateGtfsRealtime(initialConfig) {
       )} using SQLite database at ${config.sqlitePath}`,
     );
 
-    markRealtimeDataStale(config, log);
+    markRealtimeDataStale(config);
 
     await Promise.all(
       config.agencies.map(async (agency) => {
@@ -729,7 +746,7 @@ export async function updateGtfsRealtime(initialConfig) {
       }),
     );
 
-    cleanStaleRealtimeData(config, log);
+    cleanStaleRealtimeData(config);
     log(
       `Completed GTFS-Realtime refresh for ${pluralize(
         'agencies',

package/models/gtfs-realtime/vehicle-positions.js

@@ -39,6 +39,12 @@ const model = {
       source: 'vehicle.position.speed',
       default: null,
     },
+    {
+      name: 'current_stop_sequence',
+      type: 'integer',
+      source: 'vehicle.currentStopSequence',
+      default: null,
+    },
     {
       name: 'trip_id',
       type: 'varchar(255)',
@@ -46,6 +52,20 @@ const model = {
       source: 'vehicle.trip.tripId',
       default: null,
     },
+    {
+      name: 'trip_start_date',
+      type: 'varchar(255)',
+      index: true,
+      source: 'vehicle.trip.startDate',
+      default: null,
+    },
+    {
+      name: 'trip_start_time',
+      type: 'varchar(255)',
+      index: true,
+      source: 'vehicle.trip.startTime',
+      default: null,
+    },
     {
       name: 'vehicle_id',
       type: 'varchar(255)',
@@ -53,6 +73,24 @@ const model = {
       source: 'vehicle.vehicle.id',
       default: null,
     },
+    {
+      name: 'congestion_level',
+      type: 'varchar(255)',
+      source: 'vehicle.congestionLevel',
+      default: null,
+    },
+    {
+      name: 'occupancy_status',
+      type: 'varchar(255)',
+      source: 'vehicle.occupancyStatus',
+      default: null,
+    },
+    {
+      name: 'occupancy_percentage',
+      type: 'integer',
+      source: 'vehicle.occupancyPercentage',
+      default: null,
+    },
     {
       name: 'timestamp',
       type: 'varchar(255)',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.10.0",
+  "version": "4.10.2",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -77,7 +77,7 @@
   },
   "dependencies": {
     "@turf/helpers": "^6.5.0",
-    "better-sqlite3": "^9.4.3",
+    "better-sqlite3": "^9.4.4",
     "csv-parse": "^5.5.5",
     "csv-stringify": "^6.4.6",
     "gtfs-realtime-bindings": "^1.1.1",
@@ -100,7 +100,7 @@
   "devDependencies": {
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
-    "mocha": "^10.3.0",
+    "mocha": "^10.4.0",
     "prettier": "^3.2.5",
     "should": "^13.2.3"
   },