kbruen/db-vendo-client
1
0
Fork 0
mirror of https://github.com/public-transport/db-vendo-client.git synced 2025-02-23 07:09:35 +02:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

date & time should be in ISO 8601 strings

Browse source 
FPTF introduced that to have consistent timezone support.
This commit is contained in:
Jannis R 2017-05-16 13:11:43 +02:00
parent 86a8e2300a
commit ced7ed9a1b
No known key found for this signature in database
GPG key ID: 0FE83946296A88A5
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
parse.js
View file

@ -13,7 +13,6 @@ const dateTime = (tz, date, time) => {
} }
return moment.tz(date + 'T' + time, tz) return moment.tz(date + 'T' + time, tz)
.add(offset, 'days') .add(offset, 'days')
.valueOf()
} }
@ -69,10 +68,10 @@ const operator = (a) => ({
const stop = (tz, s, ln, r, c) => (st) => { const stop = (tz, s, ln, r, c) => (st) => {
const result = {station: s[parseInt(st.locX)]} const result = {station: s[parseInt(st.locX)]}
if (st.aTimeR || st.aTimeS) { if (st.aTimeR || st.aTimeS) {
result.arrival = dateTime(tz, c.date, st.aTimeR || st.aTimeS) result.arrival = dateTime(tz, c.date, st.aTimeR || st.aTimeS).format()
} }
if (st.dTimeR || st.dTimeS) { if (st.dTimeR || st.dTimeS) {
result.departure = dateTime(tz, c.date, st.dTimeR || st.dTimeS) result.departure = dateTime(tz, c.date, st.dTimeR || st.dTimeS).format()
} }
return result return result
} }
@ -90,11 +89,15 @@ const part = (tz, s, ln, r, c) => (pt) => {
const result = { const result = {
origin: Object.assign({}, s[parseInt(pt.dep.locX)]) origin: Object.assign({}, s[parseInt(pt.dep.locX)])
, destination: Object.assign({}, s[parseInt(pt.arr.locX)]) , destination: Object.assign({}, s[parseInt(pt.arr.locX)])
, departure: dateTime(tz, c.date, pt.dep.dTimeR || pt.dep.dTimeS) , departure: dateTime(tz, c.date, pt.dep.dTimeR || pt.dep.dTimeS).format()
, arrival: dateTime(tz, c.date, pt.arr.aTimeR || pt.arr.aTimeS) , arrival: dateTime(tz, c.date, pt.arr.aTimeR || pt.arr.aTimeS).format()
} }
if (pt.dep.dTimeR && pt.dep.dTimeS) result.delay = if (pt.dep.dTimeR && pt.dep.dTimeS) {
dateTime(tz, c.date, pt.dep.dTimeR) - dateTime(tz, c.date, pt.dep.dTimeS) const realtime = dateTime(tz, c.date, pt.dep.dTimeR)
const planned = dateTime(tz, c.date, pt.dep.dTimeS)
result.delay = realtime - planned
}
if (pt.type === 'WALK') result.mode = 'walking' if (pt.type === 'WALK') result.mode = 'walking'
else if (pt.type === 'JNY') { else if (pt.type === 'JNY') {
result.line = ln[parseInt(pt.jny.prodX)] result.line = ln[parseInt(pt.jny.prodX)]
@ -112,7 +115,7 @@ const part = (tz, s, ln, r, c) => (pt) => {
.filter((a) => a.stopL[0].locX === pt.dep.locX) .filter((a) => a.stopL[0].locX === pt.dep.locX)
.map((a) => ({ .map((a) => ({
line: ln[parseInt(a.prodX)], line: ln[parseInt(a.prodX)],
when: dateTime(tz, c.date, a.stopL[0].dTimeS) when: dateTime(tz, c.date, a.stopL[0].dTimeS).format()
})) }))
} }
return result return result
@ -142,14 +145,17 @@ const route = (tz, s, ln, r) => (c) => {
const departure = (tz, s, ln, r) => (d) => { const departure = (tz, s, ln, r) => (d) => {
const result = { const result = {
station: s[parseInt(d.stbStop.locX)] station: s[parseInt(d.stbStop.locX)]
, when: dateTime(tz, d.date, d.stbStop.dTimeR || d.stbStop.dTimeS) , when: dateTime(tz, d.date, d.stbStop.dTimeR || d.stbStop.dTimeS).format()
, direction: d.dirTxt , direction: d.dirTxt
, line: ln[parseInt(d.prodX)] , line: ln[parseInt(d.prodX)]
, remarks: d.remL ? d.remL.map((rm) => r[parseInt(rm.remX)]) : null , remarks: d.remL ? d.remL.map((rm) => r[parseInt(rm.remX)]) : null
, trip: +d.jid.split('|')[1] , trip: +d.jid.split('|')[1]
}
if (d.stbStop.dTimeR && d.stbStop.dTimeS) {
const realtime = dateTime(tz, d.date, d.stbStop.dTimeR)
const planned = dateTime(tz, d.date, d.stbStop.dTimeS)
result.delay = realtime - planned
} }
if (d.stbStop.dTimeR && d.stbStop.dTimeS) result.delay =
dateTime(tz, d.date, d.stbStop.dTimeR) - dateTime(tz, d.date, d.stbStop.dTimeS)
return result return result
} }
@ -183,10 +189,10 @@ const movement = (tz, l, ln, r) => (m) => {
, nextStops: m.stopL.map((s) => ({ , nextStops: m.stopL.map((s) => ({
station: l[s.locX] station: l[s.locX]
, departure: s.dTimeR || s.dTimeS , departure: s.dTimeR || s.dTimeS
? dateTime(tz, m.date, s.dTimeR || s.dTimeS) ? dateTime(tz, m.date, s.dTimeR || s.dTimeS).format()
: null : null
, arrival: s.aTimeR || s.aTimeS , arrival: s.aTimeR || s.aTimeS
? dateTime(tz, m.date, s.aTimeR || s.aTimeS) ? dateTime(tz, m.date, s.aTimeR || s.aTimeS).format()
: null : null
})) }))
, frames: [] , frames: []