gtfs 3.3.0 → 3.5.0

package/models/gtfs-realtime/trip-updates.js

@@ -0,0 +1,50 @@
+const model = {
+  filenameBase: 'trip_updates',
+  extension: 'gtfs-realtime',
+  schema: [
+    {
+      name: 'update_id',
+      type: 'varchar(255)',
+      required: true,
+      primary: true,
+      index: true,
+      source: 'id',
+    },
+    {
+      name: 'vehicle_id',
+      type: 'varchar(255)',
+      index: true,
+      source: 'tripUpdate.vehicle.id',
+      default: null,
+    },
+    {
+      name: 'trip_id',
+      type: 'varchar(255)',
+      index: true,
+      source: 'tripUpdate.trip.tripId',
+      default: null,
+    },
+    {
+      name: 'start_date',
+      type: 'varchar(255)',
+      source: 'tripUpdate.trip.startDate',
+      default: null,
+    },
+    {
+      name: 'timestamp',
+      type: 'varchar(255)',
+      source: 'tripUpdate.timestamp',
+      default: null,
+    },
+    {
+      name: 'isUpdated',
+      type: 'integer',
+      required: true,
+      min: 0,
+      max: 1,
+      default: 1,
+    },
+  ],
+};
+
+export default model;

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

@@ -0,0 +1,73 @@
+const model = {
+  filenameBase: 'vehicle_positions',
+  extension: 'gtfs-realtime',
+  schema: [
+    {
+      name: 'update_id',
+      type: 'varchar(255)',
+      required: true,
+      primary: true,
+      index: true,
+      source: 'id',
+    },
+    {
+      name: 'bearing',
+      type: 'real',
+      source: 'vehicle.position.bearing',
+      default: null,
+    },
+    {
+      name: 'latitude',
+      type: 'real',
+      min: -90,
+      max: 90,
+      source: 'vehicle.position.latitude',
+      default: null,
+    },
+    {
+      name: 'longitude',
+      type: 'real',
+      source: 'vehicle.position.longitude',
+      min: -180,
+      max: 180,
+      default: null,
+    },
+    {
+      name: 'speed',
+      type: 'real',
+      min: 0,
+      source: 'vehicle.position.speed',
+      default: null,
+    },
+    {
+      name: 'trip_id',
+      type: 'varchar(255)',
+      index: true,
+      source: 'vehicle.trip.tripId',
+      default: null,
+    },
+    {
+      name: 'vehicle_id',
+      type: 'varchar(255)',
+      index: true,
+      source: 'vehicle.vehicle.id',
+      default: null,
+    },
+    {
+      name: 'timestamp',
+      type: 'varchar(255)',
+      source: 'vehicle.timestamp',
+      default: null,
+    },
+    {
+      name: 'isUpdated',
+      type: 'integer',
+      required: true,
+      min: 0,
+      max: 1,
+      default: 1,
+    },
+  ],
+};
+
+export default model;

package/models/models.js

@@ -23,6 +23,7 @@ import timetablePages from '../models/non-standard/timetable-pages.js';
 import timetableStopOrder from '../models/non-standard/timetable-stop-order.js';
 import timetableNotes from '../models/non-standard/timetable-notes.js';
 import timetableNotesReferences from '../models/non-standard/timetable-notes-references.js';
+import tripsDatedVehicleJourney from '../models/non-standard/trips-dated-vehicle-journey.js';
 
 import boardAlight from '../models/gtfs-ride/board-alight.js';
 import riderTrip from '../models/gtfs-ride/rider-trip.js';
@@ -30,6 +31,12 @@ import ridership from '../models/gtfs-ride/ridership.js';
 import tripCapacity from '../models/gtfs-ride/trip-capacity.js';
 import rideFeedInfo from './gtfs-ride/ride-feed-info.js';
 
+import tripUpdates from './gtfs-realtime/trip-updates.js';
+import stopTimesUpdates from './gtfs-realtime/stop-times-updates.js';
+import vehiclePositions from './gtfs-realtime/vehicle-positions.js';
+import serviceAlerts from './gtfs-realtime/service-alerts.js';
+import serviceAlertTargets from './gtfs-realtime/service-alert-targets.js';
+
 const models = [
   agency,
   attributions,
@@ -55,11 +62,17 @@ const models = [
   timetableStopOrder,
   timetableNotes,
   timetableNotesReferences,
+  tripsDatedVehicleJourney,
   boardAlight,
   rideFeedInfo,
   riderTrip,
   ridership,
   tripCapacity,
+  tripUpdates,
+  stopTimesUpdates,
+  vehiclePositions,
+  serviceAlerts,
+  serviceAlertTargets,
 ];
 
 export default models;

package/models/non-standard/timetable-pages.js

@@ -14,7 +14,6 @@ const model = {
     {
       name: 'filename',
       type: 'varchar(255)',
-      nocase: true,
     },
   ],
 };

package/models/non-standard/trips-dated-vehicle-journey.js

@@ -0,0 +1,32 @@
+const model = {
+  filenameBase: 'trips_dated_vehicle_journeys',
+  nonstandard: true,
+  schema: [
+    {
+      name: 'trip_id',
+      type: 'varchar(255)',
+      required: true,
+      index: true,
+    },
+    {
+      name: 'operating_day_date',
+      type: 'varchar(255)',
+      index: true,
+      required: true,
+    },
+    {
+      name: 'dated_vehicle_journey_gid',
+      type: 'varchar(255)',
+      required: true,
+    },
+    {
+      name: 'journey_number',
+      type: 'integer',
+      min: 0,
+      max: 65535,
+      index: true,
+    },
+  ],
+};
+
+export default model;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -60,7 +60,8 @@
   "main": "index.js",
   "bin": {
     "gtfs-export": "bin/gtfs-export.js",
-    "gtfs-import": "bin/gtfs-import.js"
+    "gtfs-import": "bin/gtfs-import.js",
+    "gtfsrealtime-update": "bin/gtfsrealtime-update.js"
   },
   "types": "@types",
   "scripts": {
@@ -71,33 +72,35 @@
   },
   "dependencies": {
     "@turf/helpers": "^6.5.0",
-    "chalk": "^5.0.1",
-    "csv-parse": "^5.0.4",
-    "csv-stringify": "^6.0.5",
+    "csv-parse": "^5.2.2",
+    "csv-stringify": "^6.1.3",
+    "gtfs-realtime-bindings": "^0.0.6",
     "lodash-es": "^4.17.21",
-    "node-fetch": "^3.2.3",
+    "long": "^5.2.0",
+    "node-fetch": "^3.2.6",
     "pluralize": "^8.0.0",
     "pretty-error": "^4.0.0",
     "promise-map-series": "^0.3.0",
     "recursive-copy": "^2.0.14",
     "sanitize-filename": "^1.6.3",
     "sqlite": "^4.1.1",
-    "sqlite3": "^5.0.5",
+    "sqlite3": "^5.0.8",
     "sqlstring-sqlite": "^0.1.1",
     "strip-bom-stream": "^5.0.0",
     "tmp-promise": "^3.0.3",
     "untildify": "^4.0.0",
     "unzipper": "^0.10.11",
-    "yargs": "^17.4.1"
+    "yargs": "^17.5.1",
+    "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
-    "dtslint": "^3.4.2",
-    "eslint": "^8.14.0",
+    "dtslint": "^4.2.1",
+    "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-config-xo": "^0.40.0",
-    "husky": "^7.0.4",
-    "mocha": "^9.2.2",
-    "prettier": "^2.6.2",
+    "eslint-config-xo": "^0.41.0",
+    "husky": "^8.0.1",
+    "mocha": "^10.0.0",
+    "prettier": "^2.7.1",
     "pretty-quick": "^3.1.3",
     "should": "^13.2.3"
   },

package/test/mocha/advanced-query.js

@@ -0,0 +1,80 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  advancedQuery,
+} from '../../index.js';
+
+describe('advancedQuery():', () => {
+  before(async () => {
+    await openDb(config);
+    await importGtfs(config);
+  });
+
+  after(async () => {
+    const db = getDb(config);
+    await closeDb(db);
+  });
+
+  it('should return empty array if no trips', async () => {
+    const routeId = 'fake-route-id';
+
+    const advancedQueryOptions = {
+      query: {
+        route_id: routeId,
+      },
+      fields: ['stop_times.trip_id', 'arrival_time'],
+      join: [
+        {
+          type: 'INNER',
+          table: 'trips',
+          on: 'stop_times.trip_id=trips.trip_id',
+        },
+      ],
+    };
+    const results = await advancedQuery('stop_times', advancedQueryOptions);
+
+    should.exists(results);
+    results.should.have.length(0);
+  });
+
+  it('should return expected trips with joined trip', async () => {
+    const tripId = '329';
+
+    const advancedQueryOptions = {
+      query: {
+        'stop_times.trip_id': tripId,
+      },
+      fields: ['stop_times.trip_id', 'arrival_time'],
+      join: [
+        {
+          type: 'INNER',
+          table: 'trips',
+          on: 'stop_times.trip_id=trips.trip_id',
+        },
+      ],
+    };
+    const results = await advancedQuery('stop_times', advancedQueryOptions);
+
+    const expectedResults = [
+      { trip_id: '329', arrival_time: '9:09:00' },
+      { trip_id: '329', arrival_time: '8:52:00' },
+      { trip_id: '329', arrival_time: '8:44:00' },
+      { trip_id: '329', arrival_time: '8:35:00' },
+      { trip_id: '329', arrival_time: '8:27:00' },
+      { trip_id: '329', arrival_time: '8:16:00' },
+      { trip_id: '329', arrival_time: '8:03:00' },
+      { trip_id: '329', arrival_time: '7:56:00' },
+    ];
+
+    should.exist(results);
+    results.length.should.equal(8);
+    expectedResults.should.match(results);
+  });
+});

package/test/mocha/exec-raw-query.js

@@ -0,0 +1,39 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  execRawQuery,
+  runRawQuery,
+} from '../../index.js';
+
+describe('execRawQuery():', () => {
+  before(async () => {
+    await openDb(config);
+    await importGtfs(config);
+  });
+
+  after(async () => {
+    const db = getDb(config);
+    await closeDb(db);
+  });
+
+  it('should DELETE a trip', async () => {
+    const results = await runRawQuery('SELECT count(*) FROM trips');
+
+    should.exists(results);
+    results[0]['count(*)'].should.equal(218);
+
+    await execRawQuery('DELETE FROM trips where trip_id = "329"');
+
+    const newResults = await runRawQuery('SELECT count(*) FROM trips');
+
+    should.exists(newResults);
+    newResults[0]['count(*)'].should.equal(217);
+  });
+});

package/test/mocha/get-shapes-as-geojson.js

@@ -75,4 +75,19 @@ describe('getShapesAsGeoJSON():', () => {
     geojson.features[0].geometry.coordinates[0].length.should.equal(2);
     geojson.features[0].properties.route_color.should.startWith('#');
   });
+
+  it('should return geojson with shapes for a specific shapeId', async () => {
+    const shapeId = 'cal_sf_tam';
+
+    const geojson = await getShapesAsGeoJSON({
+      shape_id: shapeId,
+    });
+
+    should.exist(geojson);
+    geojson.type.should.equal('FeatureCollection');
+    geojson.features.length.should.equal(3);
+    should.exist(geojson.features[0].geometry.coordinates);
+    geojson.features[0].geometry.coordinates[0].length.should.equal(2);
+    geojson.features[0].properties.route_color.should.startWith('#');
+  });
 });

package/test/mocha/get-shapes.js

@@ -209,4 +209,32 @@ describe('getShapes():', () => {
     results.length.should.equal(713);
     results.should.containEql(expectedResult);
   });
+
+  it('should return array of shapes for specific shape_id', async () => {
+    const shapeId = 'cal_sf_tam';
+    const results = await getShapes(
+      {
+        shape_id: shapeId,
+      },
+      [
+        'shape_id',
+        'shape_pt_lat',
+        'shape_pt_lon',
+        'shape_pt_sequence',
+        'shape_dist_traveled',
+      ]
+    );
+
+    const expectedResult = {
+      shape_id: 'cal_sf_tam',
+      shape_pt_lat: 37.682971245836484,
+      shape_pt_lon: -122.39507675170898,
+      shape_pt_sequence: 88,
+      shape_dist_traveled: null,
+    };
+
+    should.exist(results);
+    results.length.should.equal(401);
+    results.should.containEql(expectedResult);
+  });
 });

package/test/mocha/get-stops-as-geojson.js

@@ -56,4 +56,18 @@ describe('getStopsAsGeoJSON(): ', () => {
     should.exist(geojson.features[0].geometry.coordinates);
     geojson.features[0].geometry.coordinates.length.should.equal(2);
   });
+
+  it('should return geojson with stops if they exist for a specific shapeId', async () => {
+    const shapeId = 'cal_sf_tam';
+
+    const geojson = await getStopsAsGeoJSON({
+      shape_id: shapeId,
+    });
+
+    should.exist(geojson);
+    geojson.type.should.equal('FeatureCollection');
+    geojson.features.length.should.equal(25);
+    should.exist(geojson.features[0].geometry.coordinates);
+    geojson.features[0].geometry.coordinates.length.should.equal(2);
+  });
 });

package/test/mocha/get-stops.js

@@ -217,4 +217,53 @@ describe('getStops():', () => {
       );
     }
   });
+
+  it('should return array of stops if it exists for a specific shape_id', async () => {
+    const shapeId = 'cal_sf_tam';
+
+    const results = await getStops(
+      {
+        shape_id: shapeId,
+      },
+      [],
+      [['stop_id', 'ASC']]
+    );
+
+    const expectedStopIds = [
+      '70012',
+      '70021',
+      '70022',
+      '70032',
+      '70042',
+      '70052',
+      '70062',
+      '70082',
+      '70092',
+      '70102',
+      '70112',
+      '70122',
+      '70132',
+      '70142',
+      '70162',
+      '70172',
+      '70192',
+      '70202',
+      '70212',
+      '70222',
+      '70232',
+      '70242',
+      '70252',
+      '70262',
+      '70272',
+    ];
+
+    should.exist(results);
+    results.length.should.equal(25);
+    for (const [idx, stop] of results.entries()) {
+      expectedStopIds[idx].should.equal(
+        stop.stop_id,
+        'The order of stops are expected to be the same'
+      );
+    }
+  });
 });

package/test/mocha/run-raw-query.js

@@ -0,0 +1,54 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  runRawQuery,
+} from '../../index.js';
+
+describe('runRawQuery():', () => {
+  before(async () => {
+    await openDb(config);
+    await importGtfs(config);
+  });
+
+  after(async () => {
+    const db = getDb(config);
+    await closeDb(db);
+  });
+
+  it('should return empty array if no trips', async () => {
+    const results = await runRawQuery(
+      'SELECT * FROM trips WHERE trip_id = "fake-trip-id"'
+    );
+
+    should.exists(results);
+    results.should.have.length(0);
+  });
+
+  it('should return expected results', async () => {
+    const results = await runRawQuery(
+      'SELECT "trip_id", "arrival_time" FROM stop_times WHERE trip_id = "329"'
+    );
+
+    const expectedResults = [
+      { trip_id: '329', arrival_time: '9:09:00' },
+      { trip_id: '329', arrival_time: '8:52:00' },
+      { trip_id: '329', arrival_time: '8:44:00' },
+      { trip_id: '329', arrival_time: '8:35:00' },
+      { trip_id: '329', arrival_time: '8:27:00' },
+      { trip_id: '329', arrival_time: '8:16:00' },
+      { trip_id: '329', arrival_time: '8:03:00' },
+      { trip_id: '329', arrival_time: '7:56:00' },
+    ];
+
+    should.exist(results);
+    results.length.should.equal(8);
+    expectedResults.should.match(results);
+  });
+});