gtfs 3.1.1 → 3.2.0

package/test/mocha/get-riderships.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getRiderships } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getRiderships,
+} from '../../index.js';
 
 describe('getRiderships():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getRiderships():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no riderships (GTFS-ride)', async () => {
     const routeId = 'fake-route-id';
 
     const results = await getRiderships({
-      route_id: routeId
+      route_id: routeId,
     });
     should.exists(results);
     results.should.have.length(0);

package/test/mocha/get-routes.js

@@ -2,9 +2,8 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getRoutes } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getRoutes } from '../../index.js';
 
 describe('getRoutes():', () => {
   before(async () => {
@@ -13,25 +12,22 @@ describe('getRoutes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no routes for given agency exist', async () => {
     const routeId = 'fake-route-id';
 
     const results = await getRoutes({
-      route_id: routeId
+      route_id: routeId,
     });
     should.exists(results);
     results.should.have.length(0);
   });
 
   it('should return expected routes', async () => {
-    const results = await getRoutes(
-      {},
-      [],
-      [['route_long_name', 'ASC']]
-    );
+    const results = await getRoutes({}, [], [['route_long_name', 'ASC']]);
 
     const expectedResults = [
       {
@@ -46,7 +42,7 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
+        continuous_drop_off: null,
       },
       {
         route_id: 'Li-16APR',
@@ -60,7 +56,7 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
+        continuous_drop_off: null,
       },
       {
         route_id: 'Lo-16APR',
@@ -74,7 +70,7 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
+        continuous_drop_off: null,
       },
       {
         route_id: 'TaSj-16APR',
@@ -88,8 +84,8 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
-      }
+        continuous_drop_off: null,
+      },
     ];
 
     should.exist(results);
@@ -117,8 +113,8 @@ describe('getRoutes():', () => {
         route_text_color: null,
         route_sort_order: null,
         continuous_pickup: null,
-        continuous_drop_off: null
-      }
+        continuous_drop_off: null,
+      },
     ];
 
     should.exist(results);

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

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getShapesAsGeoJSON } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getShapesAsGeoJSON,
+} from '../../index.js';
 
 describe('getShapesAsGeoJSON():', () => {
   before(async () => {
@@ -13,13 +18,14 @@ describe('getShapesAsGeoJSON():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return geojson with an empty features array if no shapes exist', async () => {
     const shapeId = 'fake-shape-id';
     const geojson = await getShapesAsGeoJSON({
-      shape_id: shapeId
+      shape_id: shapeId,
     });
 
     should.exist(geojson);
@@ -42,7 +48,7 @@ describe('getShapesAsGeoJSON():', () => {
     const routeId = 'Lo-16APR';
 
     const geojson = await getShapesAsGeoJSON({
-      route_id: routeId
+      route_id: routeId,
     });
 
     should.exist(geojson);
@@ -59,7 +65,7 @@ describe('getShapesAsGeoJSON():', () => {
 
     const geojson = await getShapesAsGeoJSON({
       route_id: routeId,
-      direction_id: directionId
+      direction_id: directionId,
     });
 
     should.exist(geojson);

package/test/mocha/get-shapes.js

@@ -2,9 +2,8 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getShapes } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getShapes } from '../../index.js';
 
 describe('getShapes():', () => {
   before(async () => {
@@ -13,14 +12,15 @@ describe('getShapes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return an empty array if no shapes exist', async () => {
     const shapeId = 'fake-shape-id';
 
     const results = await getShapes({
-      shape_id: shapeId
+      shape_id: shapeId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -32,30 +32,27 @@ describe('getShapes():', () => {
 
     const results = await getShapes({
       route_id: routeId,
-      service_id: serviceId
+      service_id: serviceId,
     });
     should.exists(results);
     results.should.have.length(0);
   });
 
   it('should return array of shapes', async () => {
-    const results = await getShapes(
-      {},
-      [
-        'shape_id',
-        'shape_pt_lat',
-        'shape_pt_lon',
-        'shape_pt_sequence',
-        'shape_dist_traveled'
-      ]
-    );
+    const results = await getShapes({}, [
+      'shape_id',
+      'shape_pt_lat',
+      'shape_pt_lon',
+      'shape_pt_sequence',
+      'shape_dist_traveled',
+    ]);
 
     const expectedResult = {
       shape_id: 'cal_tam_sf',
       shape_pt_lat: 37.607_687_113_495_64,
       shape_pt_lon: -122.394_679_784_774_78,
       shape_pt_sequence: 244,
-      shape_dist_traveled: null
+      shape_dist_traveled: null,
     };
 
     should.exist(results);
@@ -67,14 +64,14 @@ describe('getShapes():', () => {
     const routeId = 'TaSj-16APR';
     const results = await getShapes(
       {
-        route_id: routeId
+        route_id: routeId,
       },
       [
         'shape_id',
         'shape_pt_lat',
         'shape_pt_lon',
         'shape_pt_sequence',
-        'shape_dist_traveled'
+        'shape_dist_traveled',
       ]
     );
 
@@ -83,7 +80,7 @@ describe('getShapes():', () => {
       shape_pt_lat: 37.323558,
       shape_pt_lon: -121.8919,
       shape_pt_sequence: 10051,
-      shape_dist_traveled: null
+      shape_dist_traveled: null,
     };
 
     should.exist(results);
@@ -94,17 +91,14 @@ describe('getShapes():', () => {
   it('should return array of shapes for multiple routes', async () => {
     const results = await getShapes(
       {
-        route_id: [
-          'Lo-16APR',
-          'Li-16APR'
-        ]
+        route_id: ['Lo-16APR', 'Li-16APR'],
       },
       [
         'shape_id',
         'shape_pt_lat',
         'shape_pt_lon',
         'shape_pt_sequence',
-        'shape_dist_traveled'
+        'shape_dist_traveled',
       ]
     );
 
@@ -113,7 +107,7 @@ describe('getShapes():', () => {
       shape_pt_lat: 37.694_407_548_683_614,
       shape_pt_lon: -122.401_739_358_901_98,
       shape_pt_sequence: 306,
-      shape_dist_traveled: null
+      shape_dist_traveled: null,
     };
 
     should.exist(results);
@@ -122,11 +116,9 @@ describe('getShapes():', () => {
   });
 
   it('should return empty array of for invalid route', async () => {
-    const results = await getShapes(
-      {
-        route_id: 'not-valid'
-      }
-    );
+    const results = await getShapes({
+      route_id: 'not-valid',
+    });
 
     should.exist(results);
     results.length.should.equal(0);
@@ -138,14 +130,14 @@ describe('getShapes():', () => {
     const results = await getShapes(
       {
         route_id: routeId,
-        direction_id: directionId
+        direction_id: directionId,
       },
       [
         'shape_id',
         'shape_pt_lat',
         'shape_pt_lon',
         'shape_pt_sequence',
-        'shape_dist_traveled'
+        'shape_dist_traveled',
       ]
     );
 
@@ -154,7 +146,7 @@ describe('getShapes():', () => {
       shape_pt_lat: 37.323558,
       shape_pt_lon: -121.8919,
       shape_pt_sequence: 10051,
-      shape_dist_traveled: null
+      shape_dist_traveled: null,
     };
 
     should.exist(results);
@@ -166,14 +158,14 @@ describe('getShapes():', () => {
     const tripId = '329';
     const results = await getShapes(
       {
-        trip_id: tripId
+        trip_id: tripId,
       },
       [
         'shape_id',
         'shape_pt_lat',
         'shape_pt_lon',
         'shape_pt_sequence',
-        'shape_dist_traveled'
+        'shape_dist_traveled',
       ]
     );
 
@@ -182,7 +174,7 @@ describe('getShapes():', () => {
       shape_pt_lat: 37.337_664_044_379_544,
       shape_pt_lon: -121.908_105_611_801_15,
       shape_pt_sequence: 25,
-      shape_dist_traveled: null
+      shape_dist_traveled: null,
     };
 
     should.exist(results);
@@ -194,14 +186,14 @@ describe('getShapes():', () => {
     const serviceId = 'CT-16APR-Caltrain-Sunday-02';
     const results = await getShapes(
       {
-        service_id: serviceId
+        service_id: serviceId,
       },
       [
         'shape_id',
         'shape_pt_lat',
         'shape_pt_lon',
         'shape_pt_sequence',
-        'shape_dist_traveled'
+        'shape_dist_traveled',
       ]
     );
 
@@ -210,7 +202,7 @@ describe('getShapes():', () => {
       shape_pt_lat: 37.294079,
       shape_pt_lon: -121.874108,
       shape_pt_sequence: 10154,
-      shape_dist_traveled: null
+      shape_dist_traveled: null,
     };
 
     should.exist(results);

package/test/mocha/get-stop-attributes.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getStopAttributes } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getStopAttributes,
+} from '../../index.js';
 
 describe('getStopAttributes():', () => {
   before(async () => {
@@ -13,14 +18,15 @@ describe('getStopAttributes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no stop attributes', async () => {
     const stopId = 'fake-stop-id';
 
     const results = await getStopAttributes({
-      stop_id: stopId
+      stop_id: stopId,
     });
     should.exists(results);
     results.should.have.length(0);

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

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getStopsAsGeoJSON } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getStopsAsGeoJSON,
+} from '../../index.js';
 
 describe('getStopsAsGeoJSON(): ', () => {
   before(async () => {
@@ -13,13 +18,14 @@ describe('getStopsAsGeoJSON(): ', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return geojson with an empty features array if no stops exist', async () => {
     const stopId = 'fake-stop-id';
     const geojson = await getStopsAsGeoJSON({
-      stop_id: stopId
+      stop_id: stopId,
     });
 
     should.exist(geojson);
@@ -41,7 +47,7 @@ describe('getStopsAsGeoJSON(): ', () => {
     const stopId = '70031';
 
     const geojson = await getStopsAsGeoJSON({
-      stop_id: stopId
+      stop_id: stopId,
     });
 
     should.exist(geojson);

package/test/mocha/get-stops.js

@@ -2,9 +2,8 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getStops } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getStops } from '../../index.js';
 
 describe('getStops():', () => {
   before(async () => {
@@ -13,14 +12,15 @@ describe('getStops():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return an empty array if no stops exist', async () => {
     const stopId = 'fake-stop-id';
 
     const results = await getStops({
-      stop_id: stopId
+      stop_id: stopId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -44,7 +44,7 @@ describe('getStops():', () => {
       stop_timezone: null,
       wheelchair_boarding: 1,
       level_id: null,
-      platform_code: null
+      platform_code: null,
     };
 
     should.exist(results);
@@ -56,26 +56,28 @@ describe('getStops():', () => {
     const stopId = '70031';
 
     const results = await getStops({
-      stop_id: stopId
+      stop_id: stopId,
     });
 
-    const expectedResult = [{
-      stop_id: '70031',
-      stop_code: '70031',
-      stop_name: 'Bayshore Caltrain',
-      tts_stop_name: null,
-      stop_desc: null,
-      stop_lat: 37.709537,
-      stop_lon: -122.401586,
-      zone_id: '1',
-      stop_url: 'http://www.caltrain.com/stations/bayshorestation.html',
-      location_type: 0,
-      parent_station: 'ctba',
-      stop_timezone: null,
-      wheelchair_boarding: 1,
-      level_id: null,
-      platform_code: 'NB'
-    }];
+    const expectedResult = [
+      {
+        stop_id: '70031',
+        stop_code: '70031',
+        stop_name: 'Bayshore Caltrain',
+        tts_stop_name: null,
+        stop_desc: null,
+        stop_lat: 37.709537,
+        stop_lon: -122.401586,
+        zone_id: '1',
+        stop_url: 'http://www.caltrain.com/stations/bayshorestation.html',
+        location_type: 0,
+        parent_station: 'ctba',
+        stop_timezone: null,
+        wheelchair_boarding: 1,
+        level_id: null,
+        platform_code: 'NB',
+      },
+    ];
 
     should.exist(results);
     results.length.should.equal(1);
@@ -85,13 +87,13 @@ describe('getStops():', () => {
   it('should return array of stops if it exists for a specific route_id', async () => {
     const routeId = 'Bu-16APR';
 
-    const results = await getStops({
-      route_id: routeId
-    },
-    [],
-    [
-      ['stop_id', 'ASC']
-    ]);
+    const results = await getStops(
+      {
+        route_id: routeId,
+      },
+      [],
+      [['stop_id', 'ASC']]
+    );
 
     const expectedStopIds = [
       '70011',
@@ -117,13 +119,16 @@ describe('getStops():', () => {
       '70261',
       '70262',
       '70271',
-      '70272'
+      '70272',
     ];
 
     should.exist(results);
     results.length.should.equal(24);
     for (const [idx, stop] of results.entries()) {
-      expectedStopIds[idx].should.equal(stop.stop_id, 'The order of stops are expected to be the same');
+      expectedStopIds[idx].should.equal(
+        stop.stop_id,
+        'The order of stops are expected to be the same'
+      );
     }
   });
 
@@ -131,14 +136,14 @@ describe('getStops():', () => {
     const routeId = 'Bu-16APR';
     const directionId = 1;
 
-    const results = await getStops({
-      route_id: routeId,
-      direction_id: directionId
-    },
-    [],
-    [
-      ['stop_id', 'ASC']
-    ]);
+    const results = await getStops(
+      {
+        route_id: routeId,
+        direction_id: directionId,
+      },
+      [],
+      [['stop_id', 'ASC']]
+    );
 
     const expectedStopIds = [
       '70012',
@@ -152,26 +157,29 @@ describe('getStops():', () => {
       '70212',
       '70222',
       '70262',
-      '70272'
+      '70272',
     ];
 
     should.exist(results);
     results.length.should.equal(12);
     for (const [idx, stop] of results.entries()) {
-      expectedStopIds[idx].should.equal(stop.stop_id, 'The order of stops are expected to be the same');
+      expectedStopIds[idx].should.equal(
+        stop.stop_id,
+        'The order of stops are expected to be the same'
+      );
     }
   });
 
   it('should return array of stops for a specific trip_id', async () => {
     const tripId = '427a';
 
-    const results = await getStops({
-      trip_id: tripId
-    },
-    [],
-    [
-      ['stop_id', 'ASC']
-    ]);
+    const results = await getStops(
+      {
+        trip_id: tripId,
+      },
+      [],
+      [['stop_id', 'ASC']]
+    );
 
     const expectedStopIds = [
       '70011',
@@ -197,13 +205,16 @@ describe('getStops():', () => {
       '70221',
       '70231',
       '70241',
-      '70261'
+      '70261',
     ];
 
     should.exist(results);
     results.length.should.equal(24);
     for (const [idx, stop] of results.entries()) {
-      expectedStopIds[idx].should.equal(stop.stop_id, 'The order of stops are expected to be the same');
+      expectedStopIds[idx].should.equal(
+        stop.stop_id,
+        'The order of stops are expected to be the same'
+      );
     }
   });
 });