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

parseJourneyLeg: fix remarks indices 🐛

Browse source
This commit is contained in:
Jannis R 2018-06-25 13:54:30 +02:00
parent 0db84ce644
commit a8aa2652df
No known key found for this signature in database
GPG key ID: 0FE83946296A88A5
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
parse/journey-leg.js
View file

@ -5,12 +5,21 @@ const findRemark = require('./find-remark')
const clone = obj => Object.assign({}, obj) const clone = obj => Object.assign({}, obj)
const locX = Symbol('locX')
const applyRemarks = (leg, hints, warnings, refs) => { const applyRemarks = (leg, hints, warnings, refs) => {
for (let ref of refs) { for (let ref of refs) {
const remark = findRemark(hints, warnings, ref) const remark = findRemark(hints, warnings, ref)
if (!remark) continue
if ('number' === typeof ref.fLocX && 'number' === typeof ref.tLocX) { if ('number' === typeof ref.fLocX && 'number' === typeof ref.tLocX) {
for (let i = ref.fLocX; i <= ref.tLocX; i++) { const fromI = leg.stopovers.findIndex(s => s[locX] === ref.fLocX)
const stopover = leg.passed[i] const toI = leg.stopovers.findIndex(s => s[locX] === ref.tLocX)
if (fromI < 0 || toI < 0) continue
for (let i = fromI; i <= toI; i++) {
const stopover = leg.stopovers[i]
if (!stopover) continue
if (Array.isArray(stopover.remarks)) { if (Array.isArray(stopover.remarks)) {
stopover.remarks.push(remark) stopover.remarks.push(remark)
} else { } else {
@ -79,15 +88,22 @@ const createParseJourneyLeg = (profile, stations, lines, hints, warnings, polyli
if (pt.arr.aPlatfS) res.arrivalPlatform = pt.arr.aPlatfS if (pt.arr.aPlatfS) res.arrivalPlatform = pt.arr.aPlatfS
if (parseStopovers && pt.jny.stopL) { if (parseStopovers && pt.jny.stopL) {
const parse = profile.parseStopover(profile, stations, lines, remarks, j.date) const parse = profile.parseStopover(profile, stations, lines, hints, warnings, j.date)
const stopovers = pt.jny.stopL.map(parse) const stopL = pt.jny.stopL
// filter stations the train passes without stopping, as this doesn't comply with fptf (yet) res.stopovers = stopL.map(parse)
res.stopovers = stopovers.filter((x) => !x.passBy)
// todo: is there a `pt.jny.remL`? // todo: is there a `pt.jny.remL`?
if (Array.isArray(pt.jny.msgL)) { if (Array.isArray(pt.jny.msgL)) {
for (let i = 0; i < stopL.length; i++) {
Object.defineProperty(res.stopovers[i], locX, {
value: stopL[i].locX
})
}
applyRemarks(res, hints, warnings, pt.jny.msgL) applyRemarks(res, hints, warnings, pt.jny.msgL)
} }
// filter stations the train passes without stopping, as this doesn't comply with fptf (yet)
res.stopovers = res.stopovers.filter((x) => !x.passBy)
} }
const freq = pt.jny.freq || {} const freq = pt.jny.freq || {}