From 8985f8ccd2d8ffa32b09189154174b9c230cc91c Mon Sep 17 00:00:00 2001 From: Jannis R Date: Thu, 28 Dec 2017 16:56:27 +0100 Subject: [PATCH] rename journey.parts -> journey.legs --- index.js | 10 +++++----- lib/default-profile.js | 6 +++--- lib/validate-profile.js | 2 +- p/vbb/index.js | 2 +- parse/index.js | 2 +- parse/{journey-part.js => journey-leg.js} | 8 ++++---- parse/journey.js | 18 +++++++++--------- 7 files changed, 24 insertions(+), 24 deletions(-) rename parse/{journey-part.js => journey-leg.js} (91%) diff --git a/index.js b/index.js index 93409c1c..616e6a0c 100644 --- a/index.js +++ b/index.js @@ -169,7 +169,7 @@ const createClient = (profile) => { }) } - const journeyPart = (ref, lineName, opt = {}) => { + const journeyLeg = (ref, lineName, opt = {}) => { opt = Object.assign({ passedStations: true // return stations on the way? }, opt) @@ -185,15 +185,15 @@ const createClient = (profile) => { } }) .then((d) => { - const parse = profile.parseJourneyPart(profile, d.locations, d.lines, d.remarks) + const parse = profile.parseJourneyLeg(profile, d.locations, d.lines, d.remarks) - const part = { // pretend the part is contained in a journey + const leg = { // pretend the leg is contained in a journey type: 'JNY', dep: minBy(d.journey.stopL, 'idx'), arr: maxBy(d.journey.stopL, 'idx'), jny: d.journey } - return parse(d.journey, part, !!opt.passedStations) + return parse(d.journey, leg, !!opt.passedStations) }) } @@ -239,7 +239,7 @@ const createClient = (profile) => { } const client = {departures, journeys, locations, nearby} - if (profile.journeyPart) client.journeyPart = journeyPart + if (profile.journeyLeg) client.journeyLeg = journeyLeg if (profile.radar) client.radar = radar Object.defineProperty(client, 'profile', {value: profile}) return client diff --git a/lib/default-profile.js b/lib/default-profile.js index a26fbb67..ec2a09fe 100644 --- a/lib/default-profile.js +++ b/lib/default-profile.js @@ -2,7 +2,7 @@ const parseDateTime = require('../parse/date-time') const parseDeparture = require('../parse/departure') -const parseJourneyPart = require('../parse/journey-part') +const parseJourneyLeg = require('../parse/journey-leg') const parseJourney = require('../parse/journey') const parseLine = require('../parse/line') const parseLocation = require('../parse/location') @@ -33,7 +33,7 @@ const defaultProfile = { parseDateTime, parseDeparture, - parseJourneyPart, + parseJourneyLeg, parseJourney, parseLine, parseStationName: id, @@ -55,7 +55,7 @@ const defaultProfile = { formatRectangle, filters, - journeyPart: false, + journeyLeg: false, radar: false } diff --git a/lib/validate-profile.js b/lib/validate-profile.js index 7d875c74..cfa8a840 100644 --- a/lib/validate-profile.js +++ b/lib/validate-profile.js @@ -11,7 +11,7 @@ const types = { parseDateTime: 'function', parseDeparture: 'function', - parseJourneyPart: 'function', + parseJourneyLeg: 'function', parseJourney: 'function', parseLine: 'function', parseStationName: 'function', diff --git a/p/vbb/index.js b/p/vbb/index.js index a1018930..dce6261a 100644 --- a/p/vbb/index.js +++ b/p/vbb/index.js @@ -178,7 +178,7 @@ const vbbProfile = { formatStation, formatProducts, - journeyPart: true, + journeyLeg: true, radar: true } diff --git a/parse/index.js b/parse/index.js index af61cf55..11a5bd0f 100644 --- a/parse/index.js +++ b/parse/index.js @@ -7,7 +7,7 @@ module.exports = { remark: require('./remark'), operator: require('./operator'), stopover: require('./stopover'), - journeyPart: require('./journey-part'), + journeyLeg: require('./journey-leg'), journey: require('./journey'), nearby: require('./nearby'), movement: require('./movement') diff --git a/parse/journey-part.js b/parse/journey-leg.js similarity index 91% rename from parse/journey-part.js rename to parse/journey-leg.js index 9d66d792..cf8a4f7a 100644 --- a/parse/journey-part.js +++ b/parse/journey-leg.js @@ -4,7 +4,7 @@ const parseDateTime = require('./date-time') const clone = obj => Object.assign({}, obj) -const createParseJourneyPart = (profile, stations, lines, remarks) => { +const createParseJourneyLeg = (profile, stations, lines, remarks) => { // todo: finish parse/remark.js first const applyRemark = (j, rm) => {} @@ -13,7 +13,7 @@ const createParseJourneyPart = (profile, stations, lines, remarks) => { // todo: what is pt.jny.dirFlg? // todo: how does pt.freq work? // todo: what is pt.himL? - const parseJourneyPart = (j, pt, passed = true) => { // j = journey, pt = part + const parseJourneyLeg = (j, pt, passed = true) => { // j = journey, pt = part const dep = profile.parseDateTime(profile, j.date, pt.dep.dTimeR || pt.dep.dTimeS) const arr = profile.parseDateTime(profile, j.date, pt.arr.aTimeR || pt.arr.aTimeS) const res = { @@ -79,7 +79,7 @@ const createParseJourneyPart = (profile, stations, lines, remarks) => { return res } - return parseJourneyPart + return parseJourneyLeg } -module.exports = createParseJourneyPart +module.exports = createParseJourneyLeg diff --git a/parse/journey.js b/parse/journey.js index 7dc9c737..2463c114 100644 --- a/parse/journey.js +++ b/parse/journey.js @@ -1,26 +1,26 @@ 'use strict' -const createParseJourneyPart = require('./journey-part') +const createParseJourneyLeg = require('./journey-leg') const clone = obj => Object.assign({}, obj) const createParseJourney = (profile, stations, lines, remarks) => { - const parsePart = createParseJourneyPart(profile, stations, lines, remarks) + const parseLeg = createParseJourneyLeg(profile, stations, lines, remarks) // todo: c.sDays // todo: c.dep.dProgType, c.arr.dProgType // todo: c.conSubscr // todo: c.trfRes x vbb-parse-ticket const parseJourney = (j) => { - const parts = j.secL.map(part => parsePart(j, part)) + const legs = j.secL.map(leg => parseLeg(j, leg)) const res = { - parts, - origin: parts[0].origin, - destination: parts[parts.length - 1].destination, - departure: parts[0].departure, - arrival: parts[parts.length - 1].arrival + legs, + origin: legs[0].origin, + destination: legs[legs.length - 1].destination, + departure: legs[0].departure, + arrival: legs[legs.length - 1].arrival } - if (parts.some(p => p.cancelled)) { + if (legs.some(p => p.cancelled)) { res.cancelled = true res.departure = res.arrival = null }