diff --git a/docs/writing-a-profile.md b/docs/writing-a-profile.md index 5d6955d7..9c9af5fb 100644 --- a/docs/writing-a-profile.md +++ b/docs/writing-a-profile.md @@ -37,8 +37,8 @@ Assuming the endpoint returns all lines names prefixed with `foo `, We can strip // get the default line parser const createParseLine = require('hafas-client/parse/line') -const createParseLineWithoutFoo = (profile, data) => { - const parseLine = createParseLine(profile, data) +const createParseLineWithoutFoo = (profile, opt, data) => { + const parseLine = createParseLine(profile, opt, data) // wrapper function with additional logic const parseLineWithoutFoo = (l) => { diff --git a/index.js b/index.js index 0658e35e..cc81854f 100644 --- a/index.js +++ b/index.js @@ -51,7 +51,7 @@ const createClient = (profile, request = _request) => { }) .then((d) => { if (!Array.isArray(d.jnyL)) return [] // todo: throw err? - const parse = profile.parseDeparture(profile, { + const parse = profile.parseDeparture(profile, opt, { locations: d.locations, lines: d.lines, remarks: d.remarks @@ -167,7 +167,7 @@ const createClient = (profile, request = _request) => { .then((d) => { if (!Array.isArray(d.outConL)) return [] - const parse = profile.parseJourney(profile, { + const parse = profile.parseJourney(profile, opt, { locations: d.locations, lines: d.lines, remarks: d.remarks, @@ -225,7 +225,7 @@ const createClient = (profile, request = _request) => { .then((d) => { if (!d.match || !Array.isArray(d.match.locL)) return [] const parse = profile.parseLocation - return d.match.locL.map(loc => parse(profile, {lines: d.lines}, loc)) + return d.match.locL.map(loc => parse(profile, opt, {lines: d.lines}, loc)) }) } @@ -245,7 +245,7 @@ const createClient = (profile, request = _request) => { // todo: proper stack trace? throw new Error('invalid response') } - return profile.parseLocation(profile, {lines: d.lines}, d.locL[0]) + return profile.parseLocation(profile, opt, {lines: d.lines}, d.locL[0]) }) } @@ -287,7 +287,7 @@ const createClient = (profile, request = _request) => { .then((d) => { if (!Array.isArray(d.locL)) return [] const parse = profile.parseNearby - return d.locL.map(loc => parse(profile, loc)) + return d.locL.map(loc => parse(profile, opt, loc)) }) } @@ -317,7 +317,7 @@ const createClient = (profile, request = _request) => { } }) .then((d) => { - const parse = profile.parseJourneyLeg(profile, { + const parse = profile.parseJourneyLeg(profile, opt, { locations: d.locations, lines: d.lines, remarks: d.remarks, @@ -374,7 +374,7 @@ const createClient = (profile, request = _request) => { .then((d) => { if (!Array.isArray(d.jnyL)) return [] - const parse = profile.parseMovement(profile, { + const parse = profile.parseMovement(profile, opt, { locations: d.locations, lines: d.lines, remarks: d.remarks, diff --git a/lib/request.js b/lib/request.js index fe56efc4..d0e51d53 100644 --- a/lib/request.js +++ b/lib/request.js @@ -88,13 +88,13 @@ const request = (profile, opt, data) => { d.operators = c.opL.map(op => profile.parseOperator(profile, op)) } if (Array.isArray(c.prodL)) { - const parse = profile.parseLine(profile, { + const parse = profile.parseLine(profile, opt, { operators: d.operators }) d.lines = c.prodL.map(parse) } if (Array.isArray(c.locL)) { - const parse = loc => profile.parseLocation(profile, {lines: d.lines}, loc) + const parse = loc => profile.parseLocation(profile, opt, {lines: d.lines}, loc) d.locations = c.locL.map(parse) } return d diff --git a/p/db/index.js b/p/db/index.js index 379c1dc0..8747b6ca 100644 --- a/p/db/index.js +++ b/p/db/index.js @@ -34,8 +34,8 @@ const transformJourneysQuery = (query, opt) => { return query } -const createParseJourney = (profile, data) => { - const parseJourney = _createParseJourney(profile, data) +const createParseJourney = (profile, opt, data) => { + const parseJourney = _createParseJourney(profile, opt, data) // todo: j.sotRating, j.conSubscr, j.isSotCon, j.showARSLink, k.sotCtxt // todo: j.conSubscr, j.showARSLink, j.useableTime diff --git a/p/nahsh/index.js b/p/nahsh/index.js index cec70a63..ca10f853 100644 --- a/p/nahsh/index.js +++ b/p/nahsh/index.js @@ -21,8 +21,8 @@ const transformReqBody = (body) => { return body } -const parseLocation = (profile, data, l) => { - const res = _parseLocation(profile, data, l) +const parseLocation = (profile, opt, data, l) => { + const res = _parseLocation(profile, opt, data, l) // weird fix for empty lines, e.g. IC/EC at Flensburg Hbf if (res.lines) { res.lines = res.lines.filter(x => x.id && x.name) @@ -36,8 +36,8 @@ const parseLocation = (profile, data, l) => { return res } -const createParseJourney = (profile, data) => { - const parseJourney = _createParseJourney(profile, data) +const createParseJourney = (profile, opt, data) => { + const parseJourney = _createParseJourney(profile, opt, data) const parseJourneyWithTickets = (j) => { const res = parseJourney(j) diff --git a/p/oebb/index.js b/p/oebb/index.js index 1cf6b51f..03143463 100644 --- a/p/oebb/index.js +++ b/p/oebb/index.js @@ -25,10 +25,10 @@ const transformReqBody = (body) => { return body } -const parseLocation = (profile, data, l) => { +const parseLocation = (profile, opt, data, l) => { // ÖBB has some 'stations' **in austria** with no departures/products, // like station entrances, that are actually POIs. - const res = _parseLocation(profile, data, l) + const res = _parseLocation(profile, opt, data, l) if ( res.type === 'station' && !res.products && diff --git a/p/vbb/index.js b/p/vbb/index.js index 79149d39..b58f1f19 100644 --- a/p/vbb/index.js +++ b/p/vbb/index.js @@ -23,8 +23,8 @@ const transformReqBody = (body) => { return body } -const createParseLine = (profile, data) => { - const parseLine = _createParseLine(profile, data) +const createParseLine = (profile, opt, data) => { + const parseLine = _createParseLine(profile, opt, data) const parseLineWithMoreDetails = (l) => { const res = parseLine(l) @@ -42,8 +42,8 @@ const createParseLine = (profile, data) => { return parseLineWithMoreDetails } -const parseLocation = (profile, data, l) => { - const res = _parseLocation(profile, data, l) +const parseLocation = (profile, opt, data, l) => { + const res = _parseLocation(profile, opt, data, l) if (res.type === 'station') { res.name = shorten(res.name) @@ -56,8 +56,8 @@ const parseLocation = (profile, data, l) => { return res } -const createParseJourney = (profile, data) => { - const parseJourney = _createParseJourney(profile, data) +const createParseJourney = (profile, opt, data) => { + const parseJourney = _createParseJourney(profile, opt, data) const parseJourneyWithTickets = (j) => { const res = parseJourney(j) @@ -86,8 +86,8 @@ const createParseJourney = (profile, data) => { return parseJourneyWithTickets } -const createParseDeparture = (profile, data) => { - const parseDeparture = _createParseDeparture(profile, data) +const createParseDeparture = (profile, opt, data) => { + const parseDeparture = _createParseDeparture(profile, opt, data) const ringbahnClockwise = /^ringbahn s\s?41$/i const ringbahnAnticlockwise = /^ringbahn s\s?42$/i diff --git a/parse/departure.js b/parse/departure.js index 17ae4a35..89682f70 100644 --- a/parse/departure.js +++ b/parse/departure.js @@ -6,7 +6,7 @@ // todo: d.stbStop.dProgType // todo: d.freq, d.freq.jnyL, see https://github.com/public-transport/hafas-client/blob/9203ed1481f08baacca41ac5e3c19bf022f01b0b/parse.js#L115 -const createParseDeparture = (profile, {stations, lines, remarks}) => { +const createParseDeparture = (profile, opt, {stations, lines, remarks}) => { const findRemark = rm => remarks[parseInt(rm.remX)] || null const parseDeparture = (d) => { diff --git a/parse/journey-leg.js b/parse/journey-leg.js index 6a73aef1..6f7eec3e 100644 --- a/parse/journey-leg.js +++ b/parse/journey-leg.js @@ -4,7 +4,7 @@ const parseDateTime = require('./date-time') const clone = obj => Object.assign({}, obj) -const createParseJourneyLeg = (profile, data) => { +const createParseJourneyLeg = (profile, opt, data) => { const {locations, lines, remarks, polylines} = data // todo: finish parse/remark.js first @@ -42,7 +42,7 @@ const createParseJourneyLeg = (profile, data) => { let p = pt.jny.polyG.polyXL p = Array.isArray(p) && polylines[p[0]] // todo: there can be >1 polyline - const parse = profile.parsePolyline(profile, data) + const parse = profile.parsePolyline(profile, opt, data) res.polyline = p && parse(p) || null } @@ -59,7 +59,7 @@ const createParseJourneyLeg = (profile, data) => { if (pt.arr.aPlatfS) res.arrivalPlatform = pt.arr.aPlatfS if (passed && pt.jny.stopL) { - const parse = profile.parseStopover(profile, data, j.date) + const parse = profile.parseStopover(profile, opt, data, j.date) const passedStations = pt.jny.stopL.map(parse) // filter stations the train passes without stopping, as this doesn't comply with fptf (yet) res.passed = passedStations.filter((x) => !x.passBy) diff --git a/parse/journey.js b/parse/journey.js index dc141f20..c6188da5 100644 --- a/parse/journey.js +++ b/parse/journey.js @@ -2,8 +2,8 @@ const clone = obj => Object.assign({}, obj) -const createParseJourney = (profile, data) => { - const parseLeg = profile.parseJourneyLeg(profile, data) +const createParseJourney = (profile, opt, data) => { + const parseLeg = profile.parseJourneyLeg(profile, opt, data) // todo: c.sDays // todo: c.conSubscr diff --git a/parse/line.js b/parse/line.js index 2a40760f..716bb69a 100644 --- a/parse/line.js +++ b/parse/line.js @@ -2,7 +2,7 @@ const slugg = require('slugg') -const createParseLine = (profile, {operators}) => { +const createParseLine = (profile, opt, {operators}) => { const byBitmask = [] for (let product of profile.products) { for (let bitmask of product.bitmasks) { diff --git a/parse/location.js b/parse/location.js index 4859be21..643f622c 100644 --- a/parse/location.js +++ b/parse/location.js @@ -7,8 +7,8 @@ const ADDRESS = 'A' // todo: what is s.rRefL? // todo: is passing in profile necessary? -// todo: [breaking] change to createParseLocation(profile, data) => (l) => loc -const parseLocation = (profile, {lines}, l) => { +// todo: [breaking] change to createParseLocation(profile, opt, data) => (l) => loc +const parseLocation = (profile, opt, {lines}, l) => { const res = {type: 'location'} if (l.crd) { res.latitude = l.crd.y / 1000000 diff --git a/parse/movement.js b/parse/movement.js index bc467838..5f942f86 100644 --- a/parse/movement.js +++ b/parse/movement.js @@ -10,7 +10,7 @@ const createParseMovement = (profile, data) => { // todo: what is m.ani.dirGeo[n]? maybe the speed? // todo: what is m.ani.proc[n]? wut? const parseMovement = (m) => { - const pStopover = profile.parseStopover(profile, data, m.date) + const pStopover = profile.parseStopover(profile, opt, data, m.date) const res = { direction: profile.parseStationName(m.dirTxt), @@ -38,13 +38,13 @@ const createParseMovement = (profile, data) => { } if (m.ani.poly) { - const parse = profile.parsePolyline(profile, data) + const parse = profile.parsePolyline(profile, opt, data) res.polyline = parse(m.ani.poly) } else if (m.ani.polyG) { let p = m.ani.polyG.polyXL p = Array.isArray(p) && polylines[p[0]] // todo: there can be >1 polyline - const parse = profile.parsePolyline(profile, data) + const parse = profile.parsePolyline(profile, opt, data) res.polyline = p && parse(p) || null } } diff --git a/parse/nearby.js b/parse/nearby.js index 0a055a54..1bc31897 100644 --- a/parse/nearby.js +++ b/parse/nearby.js @@ -7,8 +7,8 @@ // todo: what is s.dur? // todo: [breaking] change to createParseNearby(profile, data) => (n) => nearby -const parseNearby = (profile, data, n) => { - const res = profile.parseLocation(profile, data, n) +const parseNearby = (profile, opt, data, n) => { + const res = profile.parseLocation(profile, opt, data, n) res.distance = n.dist return res } diff --git a/parse/polyline.js b/parse/polyline.js index 2a939c3d..c2d5e15e 100644 --- a/parse/polyline.js +++ b/parse/polyline.js @@ -3,7 +3,7 @@ const {toGeoJSON} = require('@mapbox/polyline') const distance = require('gps-distance') -const createParsePolyline = (profile, {locations}) => { +const createParsePolyline = (profile, opt, {locations}) => { // todo: what is p.delta? // todo: what is p.type? // todo: what is p.crdEncS? diff --git a/parse/stopover.js b/parse/stopover.js index d9c78e63..f34e6aee 100644 --- a/parse/stopover.js +++ b/parse/stopover.js @@ -2,7 +2,7 @@ // todo: arrivalDelay, departureDelay or only delay ? // todo: arrivalPlatform, departurePlatform -const createParseStopover = (profile, {locations, lines, remarks}, date) => { +const createParseStopover = (profile, opt, {locations, lines, remarks}, date) => { const parseStopover = (st) => { const res = { station: locations[parseInt(st.locX)] || null,