From abf323d27c13669404baad6ccafcb914c24e1a6c Mon Sep 17 00:00:00 2001 From: Jannis R Date: Mon, 18 Dec 2017 20:59:20 +0100 Subject: [PATCH] =?UTF-8?q?fix=20cancelled=20journey=20legs=20=F0=9F=90=9B?= =?UTF-8?q?,=20cancelled=20departures=20&=20passed=20stations,=201.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- parse.js | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b38f2150..b05a85ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hafas-client", "description": "JavaScript client for HAFAS mobile APIs.", - "version": "1.3.0", + "version": "1.3.1", "main": "index.js", "files": [ "index.js", diff --git a/parse.js b/parse.js index 66a96c18..d832bb1a 100644 --- a/parse.js +++ b/parse.js @@ -73,6 +73,9 @@ const stopover = (tz, s, ln, r, c) => (st) => { if (st.dTimeR || st.dTimeS) { result.departure = dateTime(tz, c.date, st.dTimeR || st.dTimeS).format() } + if (st.aCncl && st.dCncl) { + result.cancelled = true + } return result } @@ -121,7 +124,9 @@ const part = (tz, s, ln, r, c) => (pt) => { } // todo: follow public-transport/friendly-public-transport-format#27 here - if (pt.dep.dCncl && pt.arr.dCncl) result.cancelled = true + if (pt.dep.dCncl && pt.arr.aCncl) { + result.cancelled = true + } return result } @@ -144,7 +149,6 @@ const journey = (tz, s, ln, r, p = part) => (c) => { } // todos from derhuerst/hafas-client#2 -// - stdStop.dCncl // - stdStop.dPlatfS, stdStop.dPlatfR // todo: what is d.jny.dirFlg? // todo: d.stbStop.dProgType @@ -164,6 +168,12 @@ const departure = (tz, s, ln, r) => (d) => { const planned = dateTime(tz, d.date, d.stbStop.dTimeS) result.delay = Math.round((realtime - planned) / 1000) } else result.delay = null + + // todo: follow public-transport/friendly-public-transport-format#27 here + if (d.stbStop.dCncl) { + result.cancelled = true + } + return result }