gtfs 3.1.3 → 3.2.2

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,14 +18,15 @@ describe('getCalendarDates():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no calendar dates exist', async () => {
     const serviceId = 'fake-service-id';
 
     const results = await getCalendarDates({
-      service_id: serviceId
+      service_id: serviceId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -30,7 +36,7 @@ describe('getCalendarDates():', () => {
     const serviceId = 'CT-16APR-Caltrain-Weekday-01';
 
     const results = await getCalendarDates({
-      service_id: serviceId
+      service_id: serviceId,
     });
 
     should.exists(results);
@@ -42,29 +48,29 @@ describe('getCalendarDates():', () => {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20161124,
         exception_type: 2,
-        holiday_name: null
+        holiday_name: null,
       },
       {
         id: 4,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160905,
         exception_type: 2,
-        holiday_name: null
+        holiday_name: null,
       },
       {
         id: 6,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160704,
         exception_type: 2,
-        holiday_name: null
+        holiday_name: null,
       },
       {
         id: 8,
         service_id: 'CT-16APR-Caltrain-Weekday-01',
         date: 20160530,
         exception_type: 2,
-        holiday_name: null
-      }
+        holiday_name: null,
+      },
     ];
 
     for (const result of results) {
@@ -75,33 +81,34 @@ describe('getCalendarDates():', () => {
   it('should return only specific keys for expected calendar dates, sorted by date', async () => {
     const serviceId = 'CT-16APR-Caltrain-Weekday-01';
 
-    const results = await getCalendarDates({
-      service_id: serviceId
-    }, [
-      'service_id',
-      'date'
-    ], [
-      ['date', 'ASC'],
-      ['service_id', 'ASC']
-    ]);
+    const results = await getCalendarDates(
+      {
+        service_id: serviceId,
+      },
+      ['service_id', 'date'],
+      [
+        ['date', 'ASC'],
+        ['service_id', 'ASC'],
+      ]
+    );
 
     const expectedResults = [
       {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
-        date: 20160530
+        date: 20160530,
       },
       {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
-        date: 20160704
+        date: 20160704,
       },
       {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
-        date: 20160905
+        date: 20160905,
       },
       {
         service_id: 'CT-16APR-Caltrain-Weekday-01',
-        date: 20161124
-      }
+        date: 20161124,
+      },
     ];
 
     results.length.should.equal(4);

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,14 +18,15 @@ describe('getCalendars():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no calendars', async () => {
     const serviceId = 'fake-service-id';
 
     const results = await getCalendars({
-      service_id: serviceId
+      service_id: serviceId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -28,7 +34,7 @@ describe('getCalendars():', () => {
 
   it('should return expected calendars by day', async () => {
     const results = await getCalendars({
-      sunday: 1
+      sunday: 1,
     });
 
     const expectedResult = {
@@ -41,7 +47,7 @@ describe('getCalendars():', () => {
       saturday: 0,
       sunday: 1,
       start_date: 20140323,
-      end_date: 20190331
+      end_date: 20190331,
     };
 
     should.exist(results);
@@ -53,8 +59,8 @@ describe('getCalendars():', () => {
     const results = await getCalendars({
       service_id: [
         'CT-16APR-Caltrain-Saturday-02',
-        'CT-16APR-Caltrain-Sunday-02'
-      ]
+        'CT-16APR-Caltrain-Sunday-02',
+      ],
     });
 
     const expectedResults = [
@@ -68,7 +74,7 @@ describe('getCalendars():', () => {
         saturday: 1,
         sunday: 0,
         start_date: 20140329,
-        end_date: 20190331
+        end_date: 20190331,
       },
       {
         service_id: 'CT-16APR-Caltrain-Sunday-02',
@@ -80,8 +86,8 @@ describe('getCalendars():', () => {
         saturday: 0,
         sunday: 1,
         start_date: 20140323,
-        end_date: 20190331
-      }
+        end_date: 20190331,
+      },
     ];
 
     should.exist(results);

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,13 +24,23 @@ 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 () => {
     const serviceIds = ['CT-16APR-Caltrain-Weekday-01'];
     const db = getDb();
-    const results = await db.all(`SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds.map(serviceId => `'${serviceId}'`).join(', ')})`);
+    const results = await db.all(
+      `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds
+        .map((serviceId) => `'${serviceId}'`)
+        .join(', ')})`
+    );
 
     should.exists(results);
     results.should.have.length(4);
@@ -30,8 +51,53 @@ describe('getDb():', () => {
     const startStopId = '70261';
     const endStopId = '70131';
     const db = getDb();
-    const results = await db.all('SELECT * from trips where trips.trip_id IN (SELECT start_stop_times.trip_id FROM stop_times as start_stop_times WHERE stop_id = ? AND start_stop_times.stop_sequence < (SELECT end_stop_times.stop_sequence FROM stop_times as end_stop_times WHERE end_stop_times.stop_sequence > start_stop_times.stop_sequence AND end_stop_times.trip_id = start_stop_times.trip_id AND end_stop_times.stop_id = ? ))', [startStopId, endStopId]);
+    const results = await db.all(
+      'SELECT * from trips where trips.trip_id IN (SELECT start_stop_times.trip_id FROM stop_times as start_stop_times WHERE stop_id = ? AND start_stop_times.stop_sequence < (SELECT end_stop_times.stop_sequence FROM stop_times as end_stop_times WHERE end_stop_times.stop_sequence > start_stop_times.stop_sequence AND end_stop_times.trip_id = start_stop_times.trip_id AND end_stop_times.stop_id = ? ))',
+      [startStopId, endStopId]
+    );
     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,14 +18,15 @@ describe('getDirections():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no directions', async () => {
     const fareRouteId = 'not_real';
 
     const results = await getDirections({
-      route_id: fareRouteId
+      route_id: fareRouteId,
     });
     should.exists(results);
     results.should.have.length(0);

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,14 +18,15 @@ describe('getFareAttributes():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no fare_attributes', async () => {
     const fareId = 'not_real';
 
     const results = await getFareAttributes({
-      fare_id: fareId
+      fare_id: fareId,
     });
 
     should.exists(results);
@@ -31,7 +37,7 @@ describe('getFareAttributes():', () => {
     const fareId = 'OW_1_20160228';
 
     const results = await getFareAttributes({
-      fare_id: fareId
+      fare_id: fareId,
     });
 
     const expectedResult = {
@@ -41,7 +47,7 @@ describe('getFareAttributes():', () => {
       payment_method: 1,
       transfers: 0,
       agency_id: null,
-      transfer_duration: null
+      transfer_duration: null,
     };
 
     should.exist(results);

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,14 +18,15 @@ describe('getFareRules():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no fare_rules', async () => {
     const routeId = 'not_real';
 
     const results = await getFareRules({
-      route_id: routeId
+      route_id: routeId,
     });
     should.exists(results);
     results.should.have.length(0);
@@ -29,20 +35,18 @@ describe('getFareRules():', () => {
   it('should return expected fare_rules', async () => {
     const routeId = 'Bu-16APR';
 
-    const results = await getFareRules({
-      route_id: routeId
-    }, [
-      'fare_id',
-      'route_id',
-      'origin_id',
-      'destination_id'
-    ]);
+    const results = await getFareRules(
+      {
+        route_id: routeId,
+      },
+      ['fare_id', 'route_id', 'origin_id', 'destination_id']
+    );
 
     const expectedResult = {
       fare_id: 'OW_2_20160228',
       route_id: 'Bu-16APR',
       origin_id: '6',
-      destination_id: '5'
+      destination_id: '5',
     };
 
     should.exist(results);

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,14 +18,15 @@ describe('getFeedInfo():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no feed info', async () => {
     const feedPublisherName = 'not_real';
 
     const results = await getFeedInfo({
-      feed_publisher_name: feedPublisherName
+      feed_publisher_name: feedPublisherName,
     });
     should.exists(results);
     results.should.have.length(0);

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,14 +18,15 @@ describe('getFrequencies():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no frequencies', async () => {
     const tripId = 'not_real';
 
     const results = await getFrequencies({
-      trip_id: tripId
+      trip_id: tripId,
     });
     should.exists(results);
     results.should.have.length(0);

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,14 +12,15 @@ describe('getLevels():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no levels', async () => {
     const levelId = 'not_real';
 
     const results = await getLevels({
-      level_id: levelId
+      level_id: levelId,
     });
     should.exists(results);
     results.should.have.length(0);

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,14 +18,15 @@ describe('getPathways():', () => {
   });
 
   after(async () => {
-    await closeDb();
+    const db = getDb(config);
+    await closeDb(db);
   });
 
   it('should return empty array if no pathways', async () => {
     const pathwayId = 'not_real';
 
     const results = await getPathways({
-      pathway_id: pathwayId
+      pathway_id: pathwayId,
     });
     should.exists(results);
     results.should.have.length(0);

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,14 +18,15 @@ 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 () => {
     const tripId = 'fake-trip-id';
 
     const results = await getRiderTrips({
-      trip_id: tripId
+      trip_id: tripId,
     });
     should.exists(results);
     results.should.have.length(0);