kbruen/db-vendo-client
1
0
Fork 0
mirror of https://github.com/public-transport/db-vendo-client.git synced 2025-06-07 12:52:34 +03:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

move check for transfers set to -1 to index.js

Browse source
This commit is contained in:
dabund24 2025-01-08 22:07:47 +01:00
parent ef99283e02
commit 2535bb630e
4 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
index.js
View file

@ -146,6 +146,9 @@ const createClient = (profile, userAgent, opt = {}) => {
} }
journeysRef = opt.laterThan; journeysRef = opt.laterThan;
} }
if (opt?.transfers === -1) { // having `transfers` set to -1 may not be allowed, see https://github.com/public-transport/db-vendo-client/issues/5
opt.transfers = null;
}
opt = Object.assign({ opt = Object.assign({
results: null, // number of journeys – `null` means "whatever HAFAS returns" results: null, // number of journeys – `null` means "whatever HAFAS returns"

2
p/db/journeys-req.js
View file

@ -7,7 +7,7 @@ const formatJourneysReq = (ctx, from, to, when, outFrwd, journeysRef) => {
// TODO opt.accessibility // TODO opt.accessibility
// TODO routingMode // TODO routingMode
let query = { let query = {
maxUmstiege: opt.transfers === -1 ? undefined : opt.transfers, // setting `maxUmstiege` to -1 is not allowed, see https://github.com/public-transport/db-vendo-client/issues/5 maxUmstiege: opt.transfers,
minUmstiegszeit: opt.transferTime, minUmstiegszeit: opt.transferTime,
deutschlandTicketVorhanden: false, deutschlandTicketVorhanden: false,
nurDeutschlandTicketVerbindungen: false, nurDeutschlandTicketVerbindungen: false,

2
p/dbnav/journeys-req.js
View file

@ -46,7 +46,7 @@ const formatJourneysReq = (ctx, from, to, when, outFrwd, journeysRef) => {
? [{locationId: profile.formatLocation(profile, opt.via, 'opt.via').lid}] ? [{locationId: profile.formatLocation(profile, opt.via, 'opt.via').lid}]
: undefined, : undefined,
zielLocationId: to.lid, zielLocationId: to.lid,
maxUmstiege: opt.transfers === -1 ? undefined : opt.transfers, // setting `maxUmstiege` to -1 is not allowed, see https://github.com/public-transport/db-vendo-client/issues/5 maxUmstiege: opt.transfers ?? undefined,
minUmstiegsdauer: opt.transferTime || undefined, minUmstiegsdauer: opt.transferTime || undefined,
fahrradmitnahme: opt.bike, fahrradmitnahme: opt.bike,
}, },

20
test/format/db-journeys-query.js
View file

@ -114,23 +114,3 @@ tap.test('formats a journeys() request with BC correctly (DB)', (t) => {
}); });
t.end(); t.end();
}); });
tap.test('formats a journeys() request with unlimited transfers (DB)', (t) => {
const _opt = {...opt};
const ctx = {profile, opt: _opt};
ctx.opt.transfers = 0; // no transfers
const reqZeroTransfers = profile.formatJourneysReq(ctx, '8098160', '8000284', new Date('2024-12-07T23:50:12+01:00'), true, null);
t.same(reqZeroTransfers.body.maxUmstiege, 0);
ctx.opt.transfers = null; // unconstrained transfers implicit
const reqUnlimitedTransfersImplicit = profile.formatJourneysReq(ctx, '8098160', '8000284', new Date('2024-12-07T23:50:12+01:00'), true, null);
t.same(reqUnlimitedTransfersImplicit.body.maxUmstiege, undefined);
ctx.opt.transfers = -1; // unconstrained transfers explicit
const reqUnlimitedTransfersExplicit = profile.formatJourneysReq(ctx, '8098160', '8000284', new Date('2024-12-07T23:50:12+01:00'), true, null);
t.same(reqUnlimitedTransfersExplicit.body.maxUmstiege, undefined);
t.end();
});