Merge pull request #136 from linkedconnections/development

v2.1.3

lib/stoptimes/st2c.js

@@ -144,15 +144,10 @@
 		 } catch (err) {
 			 if (err.code === 'LEVEL_NOT_FOUND') {
 				 // Is a completely new Connection rule, create history structure
-				 // for this connection rule and add parameters that could only be
-				 // updated in GTFS-realtime data updates.
+				 // for this connection rule.
 				 const history = {};
 				 serviceDates.forEach(sd => {
-					 history[sd] = {
-						 type: 'Connection',
-						 departureDelay: 0,
-						 arrivalDelay: 0
-					 };
+					 history[sd] = { type: 'Connection' };
 				 });
 				 await this.historyDB.put(id, history);
 				 return serviceDates;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs2lc",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Mapping script from gtfs to (linked) connections",
   "main": "lib/gtfs2lc.js",
   "bin": {

test/URIStrategy.test.js

@@ -85,17 +85,19 @@ describe('URIStrategy', () => {
       it('should resolve expression using date-fns.format function', () => {
          const strategy = new URIStrategy({
             connection:
-               'http://example.org/connections/{trip_startTime}/{departureStop}/{trip_id}{connection.something}',
+               'http://example.org/connections/{trip_startTime}/{departureStop}/{connection.departureStop}/{connection.arrivalStop}/{trip_id}{connection.something}',
             resolve: {
                trip_id: 'connection.trip.trip_id',
                trip_startTime: 'format(connection.trip.startTime, "yyyyMMdd\'T\'HHmm");',
-               departureStop: 'connection.departureStop',
+               departureStop: 'connection.stopId',
             },
          });
 
          const connection = {
             something: 'some',
-            departureStop: '1234',
+            stopId: '1234',
+            departureStop: { stop_id: '1234' },
+            arrivalStop: { stop_id: '4321' },
             trip: {
                trip_id: '5678',
                startTime: new Date('2018-09-21T10:25:12'),
@@ -104,7 +106,7 @@ describe('URIStrategy', () => {
 
          assert.equal(
             strategy.getId(connection),
-            'http://example.org/connections/20180921T1025/1234/5678some'
+            'http://example.org/connections/20180921T1025/1234/1234/4321/5678some'
          );
       });
    });