diff --git a/.gitignore b/.gitignore index 21bd24e5..e4ed3d2b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,3 @@ node_modules npm-debug.log package-lock.json - -/id.json diff --git a/parse/journey-leg.js b/parse/journey-leg.js index 90b27673..792a68ff 100644 --- a/parse/journey-leg.js +++ b/parse/journey-leg.js @@ -48,18 +48,18 @@ const parseJourneyLeg = (ctx, pt, date) => { // pt = raw leg destination: clone(pt.arr.location) } - const arr = profile.parseWhen(ctx, date, pt.arr.aTimeS, pt.arr.aTimeR, pt.arr.aTZOffset, pt.arr.aCncl) - res.arrival = arr.when - res.plannedArrival = arr.plannedWhen - res.arrivalDelay = arr.delay - if (arr.prognosedWhen) res.prognosedArrival = arr.prognosedWhen - const dep = profile.parseWhen(ctx, date, pt.dep.dTimeS, pt.dep.dTimeR, pt.dep.dTZOffset, pt.dep.dCncl) res.departure = dep.when res.plannedDeparture = dep.plannedWhen res.departureDelay = dep.delay if (dep.prognosedWhen) res.prognosedDeparture = dep.prognosedWhen + const arr = profile.parseWhen(ctx, date, pt.arr.aTimeS, pt.arr.aTimeR, pt.arr.aTZOffset, pt.arr.aCncl) + res.arrival = arr.when + res.plannedArrival = arr.plannedWhen + res.arrivalDelay = arr.delay + if (arr.prognosedWhen) res.prognosedArrival = arr.prognosedWhen + if (pt.jny && ('isRchbl' in pt.jny)) { res.reachable = !!pt.jny.isRchbl } diff --git a/test/e2e/lib/earlier-later-journeys.js b/test/e2e/lib/earlier-later-journeys.js index 7218c311..2b20321e 100644 --- a/test/e2e/lib/earlier-later-journeys.js +++ b/test/e2e/lib/earlier-later-journeys.js @@ -53,7 +53,7 @@ const testEarlierLaterJourneys = async (cfg) => { let earliestDep = Infinity, latestDep = -Infinity for (let j of model.journeys) { if (j.legs[0].departure === null) continue - const dep = +new Date(j.legs[0].departure) + const dep = Date.parse(j.legs[0].departure) if (dep < earliestDep) earliestDep = dep else if (dep > latestDep) latestDep = dep } @@ -65,7 +65,7 @@ const testEarlierLaterJourneys = async (cfg) => { }) for (let j of earlier.journeys) { const firstLeg = j.legs[0] - const dep = new Date(firstLeg.departure || firstLeg.plannedDeparture) + const dep = Date.parse(firstLeg.departure || firstLeg.plannedDeparture) t.ok(dep < earliestDep) } @@ -76,7 +76,7 @@ const testEarlierLaterJourneys = async (cfg) => { }) for (let j of later.journeys) { const firstLeg = j.legs[0] - const dep = new Date(firstLeg.departure || firstLeg.plannedDeparture) + const dep = Date.parse(firstLeg.departure || firstLeg.plannedDeparture) t.ok(dep > latestDep) } }