gtfs 3.1.4 → 3.2.0

package/test/mocha/get-attributions.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getAttributions } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getAttributions,
+} from '../../index.js';
 
 describe('getAttributions():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getAttributions():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no attributions exist', async () => {

package/test/mocha/get-board-alights.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getBoardAlights } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getBoardAlights,
+} from '../../index.js';
 
 describe('getBoardAlights():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getBoardAlights():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no board alights (GTFS-ride)', async () => {

package/test/mocha/get-calendar-dates.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getCalendarDates } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getCalendarDates,
+} from '../../index.js';
 
 describe('getCalendarDates():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getCalendarDates():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no calendar dates exist', async () => {

package/test/mocha/get-calendars.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getCalendars } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getCalendars,
+} from '../../index.js';
 
 describe('getCalendars():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getCalendars():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no calendars', async () => {

package/test/mocha/get-db.js

@@ -1,10 +1,21 @@
 /* eslint-env mocha */
 
 import should from 'should';
+import fs from 'fs';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getDb } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getShapes } from '../../index.js';
+
+const db2Config = {
+  ...config,
+  agencies: [
+    {
+      ...config.agencies[0],
+      exclude: ['shapes'],
+    },
+  ],
+  sqlitePath: './tmpdb',
+};
 
 describe('getDb():', () => {
   before(async () => {
@@ -13,7 +24,13 @@ describe('getDb():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
+
+    // Close db2 and then delete it
+    const db2 = getDb(db2Config);
+    await closeDb(db2);
+    fs.unlinkSync(db2Config.sqlitePath);
   });
 
   it('should allow raw db queries: calendar_dates', async () => {
@@ -41,4 +58,46 @@ describe('getDb():', () => {
     should.exists(results);
     results.should.have.length(62);
   });
+
+  it('should allow multiple db connections', async () => {
+    const db2 = await openDb(db2Config);
+    await importGtfs(db2Config);
+
+    const db1 = getDb(config);
+
+    db1.config.filename.should.equal(':memory:');
+    db2.config.filename.should.equal('./tmpdb');
+
+    // Query db1 for shapes
+    const shapeId = 'cal_sf_tam';
+    const results1 = await getShapes({
+      shape_id: shapeId,
+    });
+
+    const expectedResult = {
+      id: 1424,
+      shape_id: 'cal_sf_tam',
+      shape_pt_lat: 37.45375587083584,
+      shape_pt_lon: -122.18063950538635,
+      shape_pt_sequence: 279,
+      shape_dist_traveled: null,
+    };
+
+    should.exist(results1);
+    results1.length.should.equal(401);
+    results1.should.containEql(expectedResult);
+
+    // Query db2 for shapes, none should exist
+    const results2 = await getShapes(
+      {
+        shape_id: shapeId,
+      },
+      [],
+      [],
+      { db: db2 }
+    );
+
+    should.exist(results2);
+    results2.length.should.equal(0);
+  });
 });

package/test/mocha/get-directions.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getDirections } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getDirections,
+} from '../../index.js';
 
 describe('getDirections():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getDirections():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no directions', async () => {

package/test/mocha/get-fare-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, getFareAttributes } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getFareAttributes,
+} from '../../index.js';
 
 describe('getFareAttributes():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getFareAttributes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no fare_attributes', async () => {

package/test/mocha/get-fare-rules.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getFareRules } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getFareRules,
+} from '../../index.js';
 
 describe('getFareRules():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getFareRules():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no fare_rules', async () => {

package/test/mocha/get-feed-info.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getFeedInfo } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getFeedInfo,
+} from '../../index.js';
 
 describe('getFeedInfo():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getFeedInfo():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no feed info', async () => {

package/test/mocha/get-frequencies.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getFrequencies } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getFrequencies,
+} from '../../index.js';
 
 describe('getFrequencies():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getFrequencies():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no frequencies', async () => {

package/test/mocha/get-levels.js

@@ -2,9 +2,8 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getLevels } from '../../index.js';
+import { openDb, getDb, closeDb, importGtfs, getLevels } from '../../index.js';
 
 describe('getLevels():', () => {
   before(async () => {
@@ -13,7 +12,8 @@ describe('getLevels():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no levels', async () => {

package/test/mocha/get-pathways.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getPathways } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getPathways,
+} from '../../index.js';
 
 describe('getPathways():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getPathways():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no pathways', async () => {

package/test/mocha/get-ride-feed-infos.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getRideFeedInfos } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getRideFeedInfos,
+} from '../../index.js';
 
 describe('getRideFeedInfos():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getRideFeedInfos():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no ride-feed-infos (GTFS-ride)', async () => {

package/test/mocha/get-rider-trips.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getRiderTrips } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getRiderTrips,
+} from '../../index.js';
 
 describe('getRiderTrips():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getRiderTrips():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no rider trips (GTFS-ride)', async () => {

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,7 +18,8 @@ describe('getRiderships():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no riderships (GTFS-ride)', async () => {

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,7 +12,8 @@ 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 () => {

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,7 +18,8 @@ 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 () => {

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,7 +12,8 @@ describe('getShapes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return an empty array if no shapes exist', async () => {

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,7 +18,8 @@ describe('getStopAttributes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no stop attributes', async () => {

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,7 +18,8 @@ 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 () => {

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,7 +12,8 @@ describe('getStops():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return an empty array if no stops exist', async () => {

package/test/mocha/get-stoptimes.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getStoptimes } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getStoptimes,
+} from '../../index.js';
 
 describe('getStoptimes():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getStoptimes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return an empty array if no stoptimes exist for given agency', async () => {

package/test/mocha/get-timetable-pages.js

@@ -2,9 +2,14 @@
 
 import should from 'should';
 
-import { openDb, closeDb } from '../../lib/db.js';
 import config from '../test-config.js';
-import { importGtfs, getTimetablePages } from '../../index.js';
+import {
+  openDb,
+  getDb,
+  closeDb,
+  importGtfs,
+  getTimetablePages,
+} from '../../index.js';
 
 describe('getTimetablePages():', () => {
   before(async () => {
@@ -13,7 +18,8 @@ describe('getTimetablePages():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no timetable pages (GTFS-to-HTML timetables)', async () => {