Merge pull request #64 from linkedconnections/development

v2.0.3

lib/Gtfsrt2LC.js

@@ -150,14 +150,14 @@ class Gtfsrt2LC {
 
  // Check if this is a new update based on recorded Connections history (if any)
  // and skip it if is not new.
- if (this.historyDB && !(await this.differentiaUpdate({
+ if (this.historyDB && !(await this.differentialUpdate({
  route: r,
  trip: t,
  stopTimes: st,
- cu,
- ncu: completedUpdates[j + 1],
+ cu: await this.getStop(cu.stopId),
+ ncu: await this.getStop(completedUpdates[j + 1].stopId),
  pdIndex,
- startTime: tripUpdate.trip.startTime,
+ startTime: format(tripStartTime, 'H:mm:ss'),
  startDate,
  departureDelay,
  arrivalDelay,
@@ -626,7 +626,7 @@ class Gtfsrt2LC {
  return update;
  }
 
- async differentiaUpdate(params) {
+ async differentialUpdate(params) {
  const {
  route,
  trip,
@@ -642,11 +642,16 @@ class Gtfsrt2LC {
  } = params;
 
  // Build Connection's original rule as in gtfs2lc
+ const depStopId = cu['stop_code'] && cu['stop_code'] !== '' ?
+ cu['stop_code'] : cu['stop_id'];
+ const arrStopId = ncu['stop_code'] && ncu['stop_code'] !== '' ?
+ ncu['stop_code'] : ncu['stop_id'];
+
  const uniqueId = [
  route['route_long_name'].replace(/\s/g, ''),
  trip['trip_short_name'],
- cu['stopId'],
- ncu['stopId'],
+ depStopId,
+ arrStopId,
  startTime,
  stopTimes[pdIndex]['departure_time'],
  stopTimes[pdIndex + 1]['arrival_time'],

package.json

@@ -1,6 +1,6 @@
 {
  "name": "gtfsrt2lc",
- "version": "2.0.2",
+ "version": "2.0.3",
  "description": "Converts the GTFS-RT to Linked Connections",
  "main": "./Gtfsrt2LC.js",
  "bin": {

test/gtfsrt2lc.test.js

@@ -582,4 +582,19 @@ test('Cover GtfsIndex functions', async () => {
  try {
  await gti.getIndexes();
  } catch (err) { }
+});
+
+test('Cover Gtfsrt2LC functions', async () => {
+ grt = new Gtfsrt2lc({ path: rt_path, uris: mock_uris, headers: {} });
+ // Test for resolveScheduleRelationship
+ const notAvailable = grt.resolveScheduleRelationship(1, 1);
+ const mustPhone = grt.resolveScheduleRelationship(0, 2);
+ const mustCoordinate = grt.resolveScheduleRelationship(0, 3);
+ // Test for getting headers
+ const headers = grt.headers;
+
+ expect(notAvailable).toBe('gtfs:NotAvailable');
+ expect(mustPhone).toBe('gtfs:MustPhone');
+ expect(mustCoordinate).toBe('gtfs:MustCoordinateWithDriver');
+ expect(headers).toBeDefined();
 });