diff --git a/docs/radar.md b/docs/radar.md index 4ffe388d..d19624f2 100644 --- a/docs/radar.md +++ b/docs/radar.md @@ -68,7 +68,7 @@ The response may look like this: }, direction: 'S Flughafen Berlin-Schönefeld', trip: 31463, - nextStops: [ { + nextStopovers: [ { stop: { type: 'stop', id: '900000029101', @@ -141,7 +141,7 @@ The response may look like this: }, direction: 'Heinersdorf', trip: 26321, - nextStops: [ { + nextStopovers: [ { stop: { /* S+U Alexanderplatz/Dircksenstr. */ }, arrival: null, arrivalDelay: null, diff --git a/p/nahsh/index.js b/p/nahsh/index.js index 4e6c142b..ad6fb562 100644 --- a/p/nahsh/index.js +++ b/p/nahsh/index.js @@ -82,8 +82,8 @@ const createParseMovement = (profile, opt, data) => { const _parseMovement = _createParseMovement(profile, opt, data) const parseMovement = (m) => { const res = _parseMovement(m) - // filter out empty nextStops entries - res.nextStops = res.nextStops.filter((f) => { + // filter out empty nextStopovers entries + res.nextStopovers = res.nextStopovers.filter((f) => { return f.stop !== null || f.arrival !== null || f.departure !== null }) return res diff --git a/p/oebb/index.js b/p/oebb/index.js index 0d0e5ec5..d7cf76eb 100644 --- a/p/oebb/index.js +++ b/p/oebb/index.js @@ -50,7 +50,7 @@ const createParseMovement = (profile, opt, data) => { const res = _parseMovement(m) // filter out POIs // todo: make use of them, as some of them specify fare zones - res.nextStops = res.nextStops.filter(st => { + res.nextStopovers = res.nextStopovers.filter(st => { const s = st.stop || {} if (s.station) { s = s.station diff --git a/p/saarfahrplan/index.js b/p/saarfahrplan/index.js index e1a223e0..d1580af0 100644 --- a/p/saarfahrplan/index.js +++ b/p/saarfahrplan/index.js @@ -23,7 +23,7 @@ const createParseMovement = (profile, opt, data) => { const parseMovement = (m) => { const res = _parseMovement(m) // filter out empty stopovers - res.nextStops = res.nextStops.filter(st => !!st.stop) + res.nextStopovers = res.nextStopovers.filter(st => !!st.stop) return res } return parseMovement diff --git a/parse/movement.js b/parse/movement.js index bc837763..6a89e88a 100644 --- a/parse/movement.js +++ b/parse/movement.js @@ -22,7 +22,7 @@ const createParseMovement = (profile, opt, data) => { latitude: m.pos.y / 1000000, longitude: m.pos.x / 1000000 } : null, - nextStops: m.stopL.map(pStopover), + nextStopovers: m.stopL.map(pStopover), frames: [] } diff --git a/test/lib/validators.js b/test/lib/validators.js index 05924449..6d3b21e2 100644 --- a/test/lib/validators.js +++ b/test/lib/validators.js @@ -403,10 +403,10 @@ const createValidateMovement = (cfg) => { a.ok(m.location.longitude >= minLongitude, lName + '.longitude is too small') } - a.ok(Array.isArray(m.nextStops), name + '.nextStops must be an array') - for (let i = 0; i < m.nextStops.length; i++) { - const st = m.nextStops[i] - val.stopover(val, st, name + `.nextStops[${i}]`) + a.ok(Array.isArray(m.nextStopovers), name + '.nextStopovers must be an array') + for (let i = 0; i < m.nextStopovers.length; i++) { + const st = m.nextStopovers[i] + val.stopover(val, st, name + `.nextStopovers[${i}]`) } a.ok(Array.isArray(m.frames), name + '.frames must be an array')