diff --git a/parse/arrival-or-departure.js b/parse/arrival-or-departure.js index 4d847412..995fdec6 100644 --- a/parse/arrival-or-departure.js +++ b/parse/arrival-or-departure.js @@ -27,6 +27,7 @@ const createParseArrOrDep = (prefix) => { stop: d.stbStop.location || null, ...profile.parseWhen(ctx, d.date, tPlanned, tPrognosed, tzOffset, cancelled), ...profile.parsePlatform(ctx, plPlanned, plPrognosed, cancelled), + prognosisType: profile.parsePrognosisType(ctx, d.stbStop[prefix + 'ProgType']) || null, // todo: for arrivals, this is the *origin*, not the *direction* direction: prefix === DEPARTURE && d.dirTxt && profile.parseStationName(ctx, d.dirTxt) || null, provenance: prefix === ARRIVAL && d.dirTxt && profile.parseStationName(ctx, d.dirTxt) || null, diff --git a/test/fixtures/bvg-arrivals.js b/test/fixtures/bvg-arrivals.js index 22c22507..47b3d1bd 100644 --- a/test/fixtures/bvg-arrivals.js +++ b/test/fixtures/bvg-arrivals.js @@ -370,6 +370,7 @@ module.exports = [ delay: 240, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: null, provenance: 'Clara-Jaschke-Str.', origin: null, @@ -411,6 +412,7 @@ module.exports = [ delay: 60, platform: null, plannedPlatform: null, + prognosisType: 'calculated', direction: null, provenance: 'Ahrensfelde/Stadtgrenze', origin: null, @@ -452,6 +454,7 @@ module.exports = [ delay: 240, platform: null, plannedPlatform: null, + prognosisType: 'calculated', direction: null, provenance: 'Clara-Jaschke-Str.', origin: null, @@ -493,6 +496,7 @@ module.exports = [ delay: -180, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: null, provenance: 'Riesaer Str.', origin: null, @@ -534,6 +538,7 @@ module.exports = [ delay: 0, platform: '2', plannedPlatform: '2', + prognosisType: 'prognosed', direction: null, provenance: 'S Grünau', origin: null, @@ -576,6 +581,7 @@ module.exports = [ delay: 0, platform: '1', plannedPlatform: '1', + prognosisType: 'prognosed', direction: null, provenance: 'S Südkreuz', origin: null, @@ -619,6 +625,7 @@ module.exports = [ delay: null, platform: '2', plannedPlatform: '2', + prognosisType: null, direction: null, provenance: 'S Südkreuz', origin: null, @@ -662,6 +669,7 @@ module.exports = [ delay: 60, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: null, provenance: 'S Hackescher Markt', origin: null, @@ -703,6 +711,7 @@ module.exports = [ delay: 0, platform: '2', plannedPlatform: '2', + prognosisType: 'prognosed', direction: null, provenance: 'S Südkreuz', origin: null, @@ -746,6 +755,7 @@ module.exports = [ delay: 0, platform: null, plannedPlatform: null, + prognosisType: 'calculated', direction: null, provenance: 'Scharnweberstr./Weichselstr.', origin: null, @@ -787,6 +797,7 @@ module.exports = [ delay: 0, platform: '1', plannedPlatform: '1', + prognosisType: 'prognosed', direction: null, provenance: 'S Südkreuz', origin: null, @@ -828,6 +839,7 @@ module.exports = [ delay: null, platform: '2', plannedPlatform: '2', + prognosisType: null, direction: null, provenance: 'S Südkreuz', origin: null, @@ -869,6 +881,7 @@ module.exports = [ delay: -60, platform: null, plannedPlatform: null, + prognosisType: 'calculated', direction: null, provenance: 'Clara-Jaschke-Str.', origin: null, @@ -912,6 +925,7 @@ module.exports = [ platform: null, plannedPlatform: null, prognosedPlatform: null, + prognosisType: null, direction: null, provenance: 'S Birkenwerder', origin: null, @@ -964,6 +978,7 @@ module.exports = [ delay: 180, platform: null, plannedPlatform: null, + prognosisType: 'calculated', direction: null, provenance: 'Ahrensfelde/Stadtgrenze', origin: null, @@ -1005,6 +1020,7 @@ module.exports = [ delay: -60, platform: null, plannedPlatform: null, + prognosisType: 'calculated', direction: null, provenance: 'Clara-Jaschke-Str.', origin: null, @@ -1046,6 +1062,7 @@ module.exports = [ delay: 180, platform: null, plannedPlatform: null, + prognosisType: 'calculated', direction: null, provenance: 'Riesaer Str.', origin: null, @@ -1089,6 +1106,7 @@ module.exports = [ platform: null, plannedPlatform: null, prognosedPlatform: null, + prognosisType: null, direction: null, provenance: 'S Grünau', origin: null, @@ -1163,6 +1181,7 @@ module.exports = [ delay: 0, platform: '1', plannedPlatform: '1', + prognosisType: 'prognosed', direction: null, provenance: 'S Südkreuz', origin: null, @@ -1206,6 +1225,7 @@ module.exports = [ delay: null, platform: '2', plannedPlatform: '2', + prognosisType: null, direction: null, provenance: 'S Südkreuz', origin: null, @@ -1249,6 +1269,7 @@ module.exports = [ delay: null, platform: '2', plannedPlatform: '2', + prognosisType: null, direction: null, provenance: 'S Südkreuz', origin: null, @@ -1292,6 +1313,7 @@ module.exports = [ delay: null, platform: '2', plannedPlatform: '2', + prognosisType: null, direction: null, provenance: 'S Südkreuz', origin: null, @@ -1335,6 +1357,7 @@ module.exports = [ delay: null, platform: '2', plannedPlatform: '2', + prognosisType: null, direction: null, provenance: 'S Südkreuz', origin: null, @@ -1378,6 +1401,7 @@ module.exports = [ delay: null, platform: '2', plannedPlatform: '2', + prognosisType: null, direction: null, provenance: 'S Südkreuz', origin: null, diff --git a/test/fixtures/db-arrivals.js b/test/fixtures/db-arrivals.js index ec18db9a..1de02693 100644 --- a/test/fixtures/db-arrivals.js +++ b/test/fixtures/db-arrivals.js @@ -247,6 +247,7 @@ module.exports = [ delay: 1020, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: null, provenance: 'Rathaus Spandau (S+U), Berlin', origin: null, diff --git a/test/fixtures/vbb-departures.js b/test/fixtures/vbb-departures.js index 854fd193..9ac380c7 100644 --- a/test/fixtures/vbb-departures.js +++ b/test/fixtures/vbb-departures.js @@ -196,6 +196,7 @@ module.exports = [ delay: 0, platform: '3', plannedPlatform: '3', + prognosisType: 'calculated', direction: 'S Erkner', origin: null, destination: { @@ -470,6 +471,7 @@ module.exports = [ delay: 0, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: 'Tiergarten, Philharmonie', provenance: null, line: { @@ -743,6 +745,7 @@ module.exports = [ delay: 0, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: 'S+U Hermannstr.', provenance: null, line: { @@ -1017,6 +1020,7 @@ module.exports = [ delay: 0, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: 'S+U Wittenau', provenance: null, line: { @@ -1291,6 +1295,7 @@ module.exports = [ delay: 0, platform: '4', plannedPlatform: '4', + prognosisType: 'calculated', direction: 'S Westkreuz', provenance: null, line: { @@ -1565,6 +1570,7 @@ module.exports = [ delay: 0, platform: '3', plannedPlatform: '3', + prognosisType: 'calculated', direction: 'S Ahrensfelde', provenance: null, line: { @@ -1839,6 +1845,7 @@ module.exports = [ delay: 0, platform: '4', plannedPlatform: '4', + prognosisType: 'calculated', direction: 'S Potsdam Hauptbahnhof', provenance: null, line: { @@ -2113,6 +2120,7 @@ module.exports = [ delay: 0, platform: '3', plannedPlatform: '3', + prognosisType: 'calculated', direction: 'S Strausberg', provenance: null, line: { @@ -2387,6 +2395,7 @@ module.exports = [ delay: 0, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: 'S+U Hermannstr.', provenance: null, line: { @@ -2661,6 +2670,7 @@ module.exports = [ delay: 0, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: 'U Paracelsus-Bad', provenance: null, line: { @@ -2935,6 +2945,7 @@ module.exports = [ delay: 0, platform: null, plannedPlatform: null, + prognosisType: 'prognosed', direction: 'S+U Warschauer Str.', provenance: null, line: { @@ -3208,6 +3219,7 @@ module.exports = [ delay: 0, platform: '4', plannedPlatform: '4', + prognosisType: 'calculated', direction: 'S Spandau', provenance: null, line: { diff --git a/test/fixtures/vsn-departures.js b/test/fixtures/vsn-departures.js index beac6496..a8c51553 100644 --- a/test/fixtures/vsn-departures.js +++ b/test/fixtures/vsn-departures.js @@ -54,6 +54,7 @@ module.exports = { delay: 3480, platform: '8', plannedPlatform: '8', + prognosisType: 'prognosed', direction: 'Frankfurt(Main) Hbf', provenance: null, origin: null,