From 005f3f8e4d2305436d6b9cdbd4dab6b71a25f78b Mon Sep 17 00:00:00 2001 From: Jannis R Date: Wed, 21 Mar 2018 01:15:43 +0100 Subject: [PATCH] =?UTF-8?q?remove=20journey.departure,=20.arrival,=20?= =?UTF-8?q?=E2=80=A6=20:boom:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes #36 --- index.js | 2 +- parse/journey.js | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/index.js b/index.js index 96e8c9a0..75ddf42a 100644 --- a/index.js +++ b/index.js @@ -157,7 +157,7 @@ const createClient = (profile, request = _request) => { journeys.laterRef = d.outCtxScrF return journeys } - const dep = +new Date(j.departure) + const dep = +new Date(j.legs[0].departure) if (dep > latestDep) latestDep = dep } diff --git a/parse/journey.js b/parse/journey.js index b0a133e9..09155696 100644 --- a/parse/journey.js +++ b/parse/journey.js @@ -8,31 +8,13 @@ const createParseJourney = (profile, stations, lines, remarks) => { const parseLeg = createParseJourneyLeg(profile, stations, lines, remarks) // todo: c.sDays - // todo: c.dep.dProgType, c.arr.dProgType // todo: c.conSubscr // todo: c.trfRes x vbb-parse-ticket const parseJourney = (j) => { const legs = j.secL.map(leg => parseLeg(j, leg)) const res = { type: 'journey', - legs, - origin: legs[0].origin, - destination: legs[legs.length - 1].destination, - departure: legs[0].departure, - arrival: legs[legs.length - 1].arrival - } - if (legs.some(p => p.cancelled)) { - res.cancelled = true - Object.defineProperty(res, 'canceled', {value: true}) - res.departure = res.arrival = null - - const firstLeg = j.secL[0] - const dep = profile.parseDateTime(profile, j.date, firstLeg.dep.dTimeS) - res.formerScheduledDeparture = dep.toISO() - - const lastLeg = j.secL[j.secL.length - 1] - const arr = profile.parseDateTime(profile, j.date, lastLeg.arr.aTimeS) - res.formerScheduledArrival = arr.toISO() + legs } return res