From 96b4d55f56c9b0ff21028ead5b064df33fd45844 Mon Sep 17 00:00:00 2001 From: Jannis R Date: Sun, 18 Apr 2021 22:31:41 +0200 Subject: [PATCH] =?UTF-8?q?re-upgrade=20profiles,=20adapt=20feature=20flag?= =?UTF-8?q?s,=20adapt=20tests=20=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- p/avv/index.js | 5 ++++- p/bart/index.js | 7 +++++-- p/bvg/index.js | 1 + p/cfl/base.json | 2 +- p/cfl/index.js | 7 +++++-- p/cmta/base.json | 2 +- p/cmta/index.js | 6 ++++-- p/db-busradar-nrw/base.json | 2 +- p/db-busradar-nrw/index.js | 7 +++++-- p/db/base.json | 2 +- p/db/index.js | 8 +++++--- p/hvv/base.json | 2 +- p/hvv/index.js | 2 +- p/insa/base.json | 2 +- p/insa/index.js | 5 +++-- p/invg/base.json | 2 +- p/invg/index.js | 4 +++- p/irish-rail/base.json | 2 +- p/irish-rail/index.js | 3 +++ p/mobil-nrw/base.json | 2 +- p/mobiliteit-lu/base.json | 2 +- p/mobiliteit-lu/index.js | 3 +-- p/nahsh/base.json | 3 ++- p/nahsh/index.js | 6 ++++-- p/nvv/base.json | 2 +- p/nvv/index.js | 5 +++-- p/oebb/base.json | 10 +++++----- p/oebb/index.js | 1 + p/pkp/index.js | 3 +++ p/rejseplanen/base.json | 2 +- p/rejseplanen/index.js | 1 + p/rmv/base.json | 2 +- p/rmv/index.js | 4 +++- p/rsag/base.json | 2 +- p/rsag/index.js | 4 +--- p/saarfahrplan/base.json | 2 +- p/saarfahrplan/index.js | 1 + p/sbahn-muenchen/base.json | 2 +- p/sbahn-muenchen/index.js | 1 + p/sbb/base.json | 2 +- p/sbb/index.js | 3 +++ p/sncb/base.json | 2 +- p/sncb/index.js | 5 +++-- p/svv/base.json | 2 +- p/svv/index.js | 1 + p/vbb/base.json | 2 +- p/vbb/index.js | 4 +++- p/vbn/base.json | 2 +- p/vbn/index.js | 4 +--- p/vkg/index.js | 4 ++-- p/vmt/base.json | 2 +- p/vmt/index.js | 6 +++--- p/vos/index.js | 7 +++++-- p/vrn/base.json | 2 +- p/vrn/index.js | 1 + p/vsn/base.json | 2 +- p/vsn/index.js | 3 +-- p/vvt/index.js | 4 ++-- p/zvv/base.json | 2 +- p/zvv/index.js | 3 +-- test/e2e/cmta.js | 1 - test/e2e/db-busradar-nrw.js | 1 - test/e2e/db.js | 2 -- test/e2e/hvv.js | 1 - test/e2e/insa.js | 1 - test/e2e/nahsh.js | 1 - test/e2e/nvv.js | 1 - test/e2e/sbb.js | 1 - test/e2e/vbb.js | 2 -- 69 files changed, 116 insertions(+), 87 deletions(-) diff --git a/p/avv/index.js b/p/avv/index.js index 206a1d27..3136dfff 100644 --- a/p/avv/index.js +++ b/p/avv/index.js @@ -85,10 +85,13 @@ const avvProfile = { ...baseProfile, locale: 'de-DE', timezone: 'Europe/Berlin', - ver: '1.18', + ver: '1.26', products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, reachableFrom: true, diff --git a/p/bart/index.js b/p/bart/index.js index b7fb44fa..53ea3294 100644 --- a/p/bart/index.js +++ b/p/bart/index.js @@ -50,14 +50,17 @@ const bartProfile = { ...baseProfile, locale: 'en-US', timezone: 'America/Los_Angeles', - ver: '1.25', + ver: '1.40', products, trip: true, radar: true, - refreshJourney: false, // todo: depends on 8615b85 from #204 reachableFrom: true, + + departuresGetPasslist: false, // `departures()` method: support for `getPasslist` field? + departuresStbFltrEquiv: false, // `departures()` method: support for `stbFltrEquiv` field? + refreshJourneyUseOutReconL: true, } module.exports = bartProfile diff --git a/p/bvg/index.js b/p/bvg/index.js index 88af2f43..c508178c 100644 --- a/p/bvg/index.js +++ b/p/bvg/index.js @@ -130,6 +130,7 @@ const bvgProfile = { departuresGetPasslist: false, // `departures()` method: support for `getPasslist` field? departuresStbFltrEquiv: false, // `departures()` method: support for `stbFltrEquiv` field? + refreshJourneyUseOutReconL: true, trip: true, radar: true, refreshJourney: true, diff --git a/p/cfl/base.json b/p/cfl/base.json index 4573f32d..10a0806a 100644 --- a/p/cfl/base.json +++ b/p/cfl/base.json @@ -10,6 +10,6 @@ "name": "cflPROD-STORE" }, "endpoint": "https://horaires.cfl.lu/bin/mgate.exe", - "ver": "1.16", + "ver": "1.43", "defaultLanguage": "fr" } diff --git a/p/cfl/index.js b/p/cfl/index.js index 4c3b3aa1..73c03302 100644 --- a/p/cfl/index.js +++ b/p/cfl/index.js @@ -16,10 +16,13 @@ const cflProfile = { products: products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, - // todo: reachableFrom? - remarks: false, // seems like ver >= 1.20 is required + reachableFrom: true, + remarksGetPolyline: false, } module.exports = cflProfile; diff --git a/p/cmta/base.json b/p/cmta/base.json index 80e8033b..99e14ea9 100644 --- a/p/cmta/base.json +++ b/p/cmta/base.json @@ -10,6 +10,6 @@ "name": "CapMetro" }, "endpoint": "https://capmetro.hafas.cloud/bin/mgate.exe", - "ver": "1.13", + "ver": "1.40", "defaultLanguage": "en" } diff --git a/p/cmta/index.js b/p/cmta/index.js index 3506b918..72dfa6a9 100644 --- a/p/cmta/index.js +++ b/p/cmta/index.js @@ -10,12 +10,14 @@ const cmtaProfile = { products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, refreshJourney: true, reachableFrom: true, - remarks: false, // seems like ver >= 1.20 is required - lines: false, // seems like ver >= 1.16 is required + remarks: true, // `.svcResL[0].res.msgL[]` is missing though 🤔 } module.exports = cmtaProfile diff --git a/p/db-busradar-nrw/base.json b/p/db-busradar-nrw/base.json index aa2c4dd8..2a7c5eaa 100644 --- a/p/db-busradar-nrw/base.json +++ b/p/db-busradar-nrw/base.json @@ -11,6 +11,6 @@ }, "endpoint": "https://db-regio.hafas.de/bin/hci/mgate.exe", "ext": "DB.REGIO.1", - "ver": "1.10", + "ver": "1.24", "defaultLanguage": "de" } diff --git a/p/db-busradar-nrw/index.js b/p/db-busradar-nrw/index.js index c3eecc7b..f84eefcf 100644 --- a/p/db-busradar-nrw/index.js +++ b/p/db-busradar-nrw/index.js @@ -82,11 +82,14 @@ const dbBusradarNrwProfile = { products: products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, journeysOutFrwd: false, trip: true, radar: true, - remarks: false, // seems like ver >= 1.20 is required - lines: false, // seems like ver >= 1.16 is required + remarks: true, // `.svcResL[0].res.msgL[]` is missing though 🤔 + lines: false, // `.svcResL[0].res.lineL[]` is missing 🤔 } module.exports = dbBusradarNrwProfile diff --git a/p/db/base.json b/p/db/base.json index d2179bf8..a01d2001 100644 --- a/p/db/base.json +++ b/p/db/base.json @@ -12,6 +12,6 @@ }, "endpoint": "https://reiseauskunft.bahn.de/bin/mgate.exe", "ext": "DB.R19.12.a", - "ver": "1.18", + "ver": "1.34", "defaultLanguage": "en" } diff --git a/p/db/index.js b/p/db/index.js index dd0c4cfd..47a4857f 100644 --- a/p/db/index.js +++ b/p/db/index.js @@ -474,11 +474,13 @@ const dbProfile = { formatStation, - trip: true, // todo: #49 + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, + trip: true, radar: true, reachableFrom: true, - remarks: false, // seems like ver >= 1.20 is required - lines: false, // seems like ver >= 1.16 is required + lines: false, // `.svcResL[0].res.lineL[]` is missing 🤔 } module.exports = dbProfile diff --git a/p/hvv/base.json b/p/hvv/base.json index a72e19be..0e267a21 100644 --- a/p/hvv/base.json +++ b/p/hvv/base.json @@ -12,6 +12,6 @@ }, "endpoint": "https://hvv-app.hafas.de/bin/mgate.exe", "ext": "HVV.1", - "ver": "1.16", + "ver": "1.18", "defaultLanguage": "de" } diff --git a/p/hvv/index.js b/p/hvv/index.js index 76ce4407..f86eff0c 100644 --- a/p/hvv/index.js +++ b/p/hvv/index.js @@ -17,7 +17,7 @@ const hvvProfile = { radar: true, refreshJourney: true, reachableFrom: true, - remarks: false, // seems like ver >= 1.20 is required + remarksGetPolyline: false, lines: false, // fails with `FAIL` "HCI Service: request failed" } diff --git a/p/insa/base.json b/p/insa/base.json index 6627caaf..6a69af88 100644 --- a/p/insa/base.json +++ b/p/insa/base.json @@ -10,6 +10,6 @@ "name": "nasaPROD" }, "endpoint": "https://reiseauskunft.insa.de/bin/mgate.exe", - "ver": "1.18", + "ver": "1.44", "defaultLanguage": "de" } diff --git a/p/insa/index.js b/p/insa/index.js index 7195afe2..7d351ba6 100644 --- a/p/insa/index.js +++ b/p/insa/index.js @@ -10,11 +10,12 @@ const insaProfile = { products: products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, trip: true, radar: true, - refreshJourney: false, + refreshJourneyUseOutReconL: true, reachableFrom: true, - remarks: false, // seems like ver >= 1.20 is required } module.exports = insaProfile; diff --git a/p/invg/base.json b/p/invg/base.json index a0dfd151..5c14969f 100644 --- a/p/invg/base.json +++ b/p/invg/base.json @@ -10,6 +10,6 @@ "name": "invgPROD-APPSTORE-LIVE" }, "endpoint": "https://fpa.invg.de/bin/mgate.exe", - "ver": "1.16", + "ver": "1.39", "defaultLanguage": "de" } diff --git a/p/invg/index.js b/p/invg/index.js index a0f2adf5..1c983852 100644 --- a/p/invg/index.js +++ b/p/invg/index.js @@ -10,10 +10,12 @@ const invgProfile = { products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, refreshJourney: true, - remarks: false, // seems like ver >= 1.20 is required } module.exports = invgProfile diff --git a/p/irish-rail/base.json b/p/irish-rail/base.json index 32125a92..f437cb63 100644 --- a/p/irish-rail/base.json +++ b/p/irish-rail/base.json @@ -10,6 +10,6 @@ "name": "IrishRailPROD-APPSTORE" }, "endpoint": "https://journeyplanner.irishrail.ie/bin/mgate.exe", - "ver": "1.18", + "ver": "1.33", "defaultLanguage": "en" } diff --git a/p/irish-rail/index.js b/p/irish-rail/index.js index 37c18221..01e55d9d 100644 --- a/p/irish-rail/index.js +++ b/p/irish-rail/index.js @@ -18,6 +18,9 @@ const irishRailProfile = { products: products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourney: false, // fails with `CGI_READ_FAILED` trip: true, radar: true, } diff --git a/p/mobil-nrw/base.json b/p/mobil-nrw/base.json index 70a1ed05..71454660 100644 --- a/p/mobil-nrw/base.json +++ b/p/mobil-nrw/base.json @@ -10,6 +10,6 @@ "name": "NRW" }, "endpoint": "https://nrw.hafas.de/bin/mgate.exe", - "ver": "1.24", + "ver": "1.34", "defaultLanguage": "de" } diff --git a/p/mobiliteit-lu/base.json b/p/mobiliteit-lu/base.json index 3f2d9dbb..33b0a6eb 100644 --- a/p/mobiliteit-lu/base.json +++ b/p/mobiliteit-lu/base.json @@ -9,6 +9,6 @@ "name": "webapp" }, "endpoint": "https://cdt.hafas.de/bin/mgate.exe", - "ver": "1.25", + "ver": "1.43", "defaultLanguage": "de" } diff --git a/p/mobiliteit-lu/index.js b/p/mobiliteit-lu/index.js index 02b9518d..e2fdba2f 100644 --- a/p/mobiliteit-lu/index.js +++ b/p/mobiliteit-lu/index.js @@ -14,10 +14,9 @@ const mobiliteitLuProfile = { radar: true, reachableFrom: true, - // Version 1.25 doesn't seem to support getPasslist & stbFltrEquiv - // for departures()/arrivals(). departuresGetPasslist: false, departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, } module.exports = mobiliteitLuProfile; diff --git a/p/nahsh/base.json b/p/nahsh/base.json index 4644cbf1..95f2da25 100644 --- a/p/nahsh/base.json +++ b/p/nahsh/base.json @@ -4,11 +4,12 @@ "aid": "r0Ot9FLFNAFxijLW" }, "client": { + "type": "IPH", "id": "NAHSH", "v": "3000700", "name": "NAHSHPROD" }, "endpoint": "https://nah.sh.hafas.de/bin/mgate.exe", - "ver": "1.16", + "ver": "1.30", "defaultLanguage": "de" } diff --git a/p/nahsh/index.js b/p/nahsh/index.js index 076c942b..f77ead67 100644 --- a/p/nahsh/index.js +++ b/p/nahsh/index.js @@ -77,10 +77,12 @@ const nahshProfile = { parseJourney: parseHook(_parseJourney, parseJourneyWithTickets), parseMovement: parseHook(_parseMovement, fixMovement), + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, - radar: true, // todo: see #34 + radar: true, reachableFrom: true, - remarks: false, // seems like ver >= 1.20 is required } module.exports = nahshProfile diff --git a/p/nvv/base.json b/p/nvv/base.json index fd120f37..c4a35853 100644 --- a/p/nvv/base.json +++ b/p/nvv/base.json @@ -11,6 +11,6 @@ }, "endpoint": "https://auskunft.nvv.de/auskunft/bin/app/mgate.exe", "ext": "NVV.6.0", - "ver": "1.18", + "ver": "1.45", "defaultLanguage": "de" } diff --git a/p/nvv/index.js b/p/nvv/index.js index f99c85df..f099ab0c 100644 --- a/p/nvv/index.js +++ b/p/nvv/index.js @@ -10,11 +10,12 @@ const saarfahrplanProfile = { products: products, - departuresGetPasslist: true, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, reachableFrom: true, - remarks: false, // seems like ver >= 1.20 is required } module.exports = saarfahrplanProfile diff --git a/p/oebb/base.json b/p/oebb/base.json index fdf2707f..17ca9c25 100644 --- a/p/oebb/base.json +++ b/p/oebb/base.json @@ -4,12 +4,12 @@ "aid": "OWDL4fE4ixNiPBBm" }, "client": { - "type": "IPA", + "type": "IPH", "id": "OEBB", - "v": "6000500", - "name": "oebbIPAD_ADHOC" + "v": "6030600", + "name": "oebbPROD-ADHOC" }, - "endpoint": "http://fahrplan.oebb.at/bin/mgate.exe", - "ver": "1.16", + "endpoint": "https://fahrplan.oebb.at/bin/mgate.exe", + "ver": "1.41", "defaultLanguage": "de" } diff --git a/p/oebb/index.js b/p/oebb/index.js index ada8a531..16b4659d 100644 --- a/p/oebb/index.js +++ b/p/oebb/index.js @@ -60,6 +60,7 @@ const oebbProfile = { trip: true, radar: true, reachableFrom: true, + lines: false, // `.svcResL[0].res.lineL[]` is missing 🤔 } module.exports = oebbProfile diff --git a/p/pkp/index.js b/p/pkp/index.js index b3e279d8..8dbe67f8 100644 --- a/p/pkp/index.js +++ b/p/pkp/index.js @@ -27,6 +27,9 @@ const pkpProfile = { refreshJourney: false, reachableFrom: true, remarks: false, // seems like ver >= 1.20 is required + + departuresGetPasslist: false, + departuresStbFltrEquiv: false, } module.exports = pkpProfile diff --git a/p/rejseplanen/base.json b/p/rejseplanen/base.json index a01451f7..bf3ca2f0 100644 --- a/p/rejseplanen/base.json +++ b/p/rejseplanen/base.json @@ -9,6 +9,6 @@ }, "endpoint": "https://mobilapps.rejseplanen.dk/bin/iphone.exe", "ext": "DK.9", - "ver": "1.21", + "ver": "1.43", "defaultLanguage": "dk" } diff --git a/p/rejseplanen/index.js b/p/rejseplanen/index.js index cc871ccf..d0437775 100644 --- a/p/rejseplanen/index.js +++ b/p/rejseplanen/index.js @@ -12,6 +12,7 @@ const rejseplanenProfile = { departuresGetPasslist: false, departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, } diff --git a/p/rmv/base.json b/p/rmv/base.json index c7fcc649..198b9fdb 100644 --- a/p/rmv/base.json +++ b/p/rmv/base.json @@ -10,6 +10,6 @@ }, "endpoint": "https://www.rmv.de/auskunft/bin/jp/mgate.exe", "ext": "RMV.1", - "ver": "1.18", + "ver": "1.44", "defaultLanguage": "de" } diff --git a/p/rmv/index.js b/p/rmv/index.js index 1527043b..0f9cbd86 100644 --- a/p/rmv/index.js +++ b/p/rmv/index.js @@ -10,11 +10,13 @@ const hvvProfile = { products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, refreshJourney: true, reachableFrom: true, - remarks: false, // seems like ver >= 1.20 is required } module.exports = hvvProfile diff --git a/p/rsag/base.json b/p/rsag/base.json index 3f22799d..71a47b3a 100644 --- a/p/rsag/base.json +++ b/p/rsag/base.json @@ -10,6 +10,6 @@ }, "endpoint": "https://fahrplan.rsag-online.de/bin/mgate.exe", "ext": "VBN.2", - "ver": "1.24", + "ver": "1.42", "defaultLanguage": "de" } diff --git a/p/rsag/index.js b/p/rsag/index.js index 38793b54..557828b6 100644 --- a/p/rsag/index.js +++ b/p/rsag/index.js @@ -13,9 +13,7 @@ const rsagProfile = { trip: true, radar: true, reachableFrom: true, - - // todo: these fail ver >=1.21, see #164 - refreshJourney: false, + refreshJourneyUseOutReconL: true, departuresGetPasslist: false, departuresStbFltrEquiv: false, } diff --git a/p/saarfahrplan/base.json b/p/saarfahrplan/base.json index 30b351d6..9a3896b7 100644 --- a/p/saarfahrplan/base.json +++ b/p/saarfahrplan/base.json @@ -10,6 +10,6 @@ "name": "Saarfahrplan" }, "endpoint": "https://saarfahrplan.de/bin/mgate.exe", - "ver": "1.21", + "ver": "1.40", "defaultLanguage": "de" } diff --git a/p/saarfahrplan/index.js b/p/saarfahrplan/index.js index 54a2d84d..0354fc57 100644 --- a/p/saarfahrplan/index.js +++ b/p/saarfahrplan/index.js @@ -25,6 +25,7 @@ const saarfahrplanProfile = { departuresGetPasslist: false, departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, reachableFrom: true diff --git a/p/sbahn-muenchen/base.json b/p/sbahn-muenchen/base.json index 040ead13..bc81357e 100644 --- a/p/sbahn-muenchen/base.json +++ b/p/sbahn-muenchen/base.json @@ -12,6 +12,6 @@ }, "endpoint": "https://s-bahn-muenchen.hafas.de/bin/540/mgate.exe", "ext": "DB.R15.12.a", - "ver": "1.21", + "ver": "1.34", "defaultLanguage": "en" } diff --git a/p/sbahn-muenchen/index.js b/p/sbahn-muenchen/index.js index 2e9593e1..440b849a 100644 --- a/p/sbahn-muenchen/index.js +++ b/p/sbahn-muenchen/index.js @@ -14,6 +14,7 @@ const sBahnMunichProfile = { departuresGetPasslist: false, departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, refreshJourney: true, diff --git a/p/sbb/base.json b/p/sbb/base.json index 38d35f28..914437f7 100644 --- a/p/sbb/base.json +++ b/p/sbb/base.json @@ -9,6 +9,6 @@ "v": "" }, "endpoint": "http://fahrplan.sbb.ch/bin/mgate.exe", - "ver": "1.18", + "ver": "1.44", "defaultLanguage": "de" } diff --git a/p/sbb/index.js b/p/sbb/index.js index bf0cda13..569d24b9 100644 --- a/p/sbb/index.js +++ b/p/sbb/index.js @@ -10,6 +10,9 @@ const sbbProfile = { products: products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, radar: true, reachableFrom: true, diff --git a/p/sncb/base.json b/p/sncb/base.json index 3c397f4e..eaf07605 100644 --- a/p/sncb/base.json +++ b/p/sncb/base.json @@ -10,6 +10,6 @@ "name": "sncb" }, "endpoint": "https://www.belgianrail.be/jp/sncb-nmbs-routeplanner/mgate.exe", - "ver": "1.16", + "ver": "1.21", "defaultLanguage": "fr" } diff --git a/p/sncb/index.js b/p/sncb/index.js index 2f95675a..51e73d79 100644 --- a/p/sncb/index.js +++ b/p/sncb/index.js @@ -56,11 +56,12 @@ const sncbProfile = { parseLine: parseHook(parseLine, lineNameWithoutFahrtNr), + departuresGetPasslist: false, + departuresStbFltrEquiv: false, trip: true, refreshJourney: true, radar: true, - // todo: `reachableFrom: true` fails with `H9240` - remarks: false, // seems like ver >= 1.20 is required + reachableFrom: false, // todo: fails with `H9240` } module.exports = sncbProfile diff --git a/p/svv/base.json b/p/svv/base.json index db779ae4..c5149d5b 100644 --- a/p/svv/base.json +++ b/p/svv/base.json @@ -10,6 +10,6 @@ }, "endpoint": "https://fahrplan.salzburg-verkehr.at/bin/mgate.exe", "ext": "VAO.11", - "ver": "1.20", + "ver": "1.39", "defaultLanguage": "de" } diff --git a/p/svv/index.js b/p/svv/index.js index a2a13d9b..a89543d6 100644 --- a/p/svv/index.js +++ b/p/svv/index.js @@ -15,6 +15,7 @@ const svvProfile = { reachableFrom: true, departuresGetPasslist: false, departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, } module.exports = svvProfile diff --git a/p/vbb/base.json b/p/vbb/base.json index fd487f41..f78c57e3 100644 --- a/p/vbb/base.json +++ b/p/vbb/base.json @@ -11,6 +11,6 @@ }, "endpoint": "https://fahrinfo.vbb.de/bin/mgate.exe", "ext": "VBB.1", - "ver": "1.16", + "ver": "1.45", "defaultLanguage": "de" } diff --git a/p/vbb/index.js b/p/vbb/index.js index 2ff43c18..f13326c4 100644 --- a/p/vbb/index.js +++ b/p/vbb/index.js @@ -108,11 +108,13 @@ const vbbProfile = { formatStation, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, journeysWalkingSpeed: true, + refreshJourneyUseOutReconL: true, trip: true, radar: true, reachableFrom: true, - remarks: false, // seems like ver >= 1.20 is required } module.exports = vbbProfile diff --git a/p/vbn/base.json b/p/vbn/base.json index 293da284..2589d5a8 100644 --- a/p/vbn/base.json +++ b/p/vbn/base.json @@ -10,6 +10,6 @@ "name": "vbn" }, "endpoint": "https://fahrplaner.vbn.de/bin/mgate.exe", - "ver": "1.27", + "ver": "1.42", "defaultLanguage": "de" } diff --git a/p/vbn/index.js b/p/vbn/index.js index a0e310e1..894cd423 100644 --- a/p/vbn/index.js +++ b/p/vbn/index.js @@ -17,9 +17,7 @@ const insaProfile = { trip: true, radar: true, reachableFrom: true, - - // todo: these fail with ver >= 1.21, see #164 - refreshJourney: false, + refreshJourneyUseOutReconL: true, departuresGetPasslist: false, departuresStbFltrEquiv: false, } diff --git a/p/vkg/index.js b/p/vkg/index.js index bc67da99..f477667c 100644 --- a/p/vkg/index.js +++ b/p/vkg/index.js @@ -78,14 +78,14 @@ const vosProfile = { ...baseProfile, locale: 'at-DE', timezone: 'Europe/Vienna', - ver: '1.32', + ver: '1.39', products, departuresGetPasslist: false, departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, - refreshJourney: false, // todo: depends on 8615b85 from #204 reachableFrom: true, } diff --git a/p/vmt/base.json b/p/vmt/base.json index 7416fb7c..6169852e 100644 --- a/p/vmt/base.json +++ b/p/vmt/base.json @@ -10,6 +10,6 @@ "name": "VMT" }, "endpoint": "https://vmt.hafas.de/bin/ticketing/mgate.exe", - "ver": "1.18", + "ver": "1.34", "defaultLanguage": "de" } diff --git a/p/vmt/index.js b/p/vmt/index.js index 9ddc50f2..8889169f 100644 --- a/p/vmt/index.js +++ b/p/vmt/index.js @@ -14,11 +14,11 @@ const hvvProfile = { products, + departuresGetPasslist: false, + departuresStbFltrEquiv: false, + refreshJourneyUseOutReconL: true, trip: true, - refreshJourney: true, reachableFrom: true, - // fails with `CGI_READ_FAILED` - // radar: true, remarks: false, // seems like ver >= 1.20 is required } diff --git a/p/vos/index.js b/p/vos/index.js index f7c46ac4..6f195827 100644 --- a/p/vos/index.js +++ b/p/vos/index.js @@ -78,14 +78,17 @@ const vosProfile = { ...baseProfile, locale: 'de-DE', timezone: 'Europe/Berlin', - ver: '1.32', + ver: '1.42', products, trip: true, radar: true, - refreshJourney: false, // todo: depends on 8615b85 from #204 + refreshJourneyUseOutReconL: true, reachableFrom: true, + + departuresGetPasslist: false, + departuresStbFltrEquiv: false, } module.exports = vosProfile diff --git a/p/vrn/base.json b/p/vrn/base.json index c985d72f..49995a8a 100644 --- a/p/vrn/base.json +++ b/p/vrn/base.json @@ -11,6 +11,6 @@ }, "endpoint": "https://vrn.hafas.de/bin/mgate.exe", "ext": "DB.R19.04.a", - "ver": "1.24", + "ver": "1.34", "defaultLanguage": "de" } diff --git a/p/vrn/index.js b/p/vrn/index.js index f4d401c9..7fc1cacc 100644 --- a/p/vrn/index.js +++ b/p/vrn/index.js @@ -27,6 +27,7 @@ const hvvProfile = { refreshJourney: true, formatRefreshJourneyReq, + refreshJourneyUseOutReconL: true, departuresGetPasslist: false, // `departures()`: support for `getPasslist`? departuresStbFltrEquiv: false, // `departures()`: support for `stbFltrEquiv`? } diff --git a/p/vsn/base.json b/p/vsn/base.json index 295fdca6..285bdeef 100644 --- a/p/vsn/base.json +++ b/p/vsn/base.json @@ -10,6 +10,6 @@ "name": "vsn" }, "endpoint": "https://fahrplaner.vsninfo.de/hafas/mgate.exe", - "ver": "1.24", + "ver": "1.42", "defaultLanguage": "de" } diff --git a/p/vsn/index.js b/p/vsn/index.js index db67da59..1a26ca0d 100644 --- a/p/vsn/index.js +++ b/p/vsn/index.js @@ -14,11 +14,10 @@ const vsnProfile = { products: products, + refreshJourneyUseOutReconL: true, trip: true, radar: true, - refreshJourney: true, reachableFrom: true, - departuresGetPasslist: false, departuresStbFltrEquiv: false } diff --git a/p/vvt/index.js b/p/vvt/index.js index 41133833..86b56641 100644 --- a/p/vvt/index.js +++ b/p/vvt/index.js @@ -78,14 +78,14 @@ const vvtProfile = { ...baseProfile, locale: 'at-DE', timezone: 'Europe/Vienna', - ver: '1.32', + ver: '1.39', products, departuresGetPasslist: false, departuresStbFltrEquiv: false, trip: true, - refreshJourney: false, // todo: depends on 8615b85 from #204 + refreshJourneyUseOutReconL: true, reachableFrom: true, } diff --git a/p/zvv/base.json b/p/zvv/base.json index 97e35045..16ec75c1 100644 --- a/p/zvv/base.json +++ b/p/zvv/base.json @@ -11,6 +11,6 @@ }, "endpoint": "https://online.fahrplan.zvv.ch/bin/mgate.exe", "ext": "ZVV.2", - "ver": "1.24", + "ver": "1.42", "defaultLanguage": "de" } diff --git a/p/zvv/index.js b/p/zvv/index.js index f6ec985d..99efb835 100644 --- a/p/zvv/index.js +++ b/p/zvv/index.js @@ -15,8 +15,7 @@ const zvvProfile = { trip: true, radar: true, - // todo: fails with "Parser error: root.svcReqL.svcReqL.req(ctxRecon)" - refreshJourney: false, + refreshJourneyUseOutReconL: true, reachableFrom: true, } diff --git a/test/e2e/cmta.js b/test/e2e/cmta.js index ea46a7ed..c3e72ebd 100644 --- a/test/e2e/cmta.js +++ b/test/e2e/cmta.js @@ -162,7 +162,6 @@ test('trip details', async (t) => { test('departures at Broadie Oaks', async (t) => { const departures = await client.departures(broadieOaks, { duration: 10, when, - stopovers: true }) await testDepartures({ diff --git a/test/e2e/db-busradar-nrw.js b/test/e2e/db-busradar-nrw.js index 6ff39035..8e16ced2 100644 --- a/test/e2e/db-busradar-nrw.js +++ b/test/e2e/db-busradar-nrw.js @@ -35,7 +35,6 @@ const hagenVorhalle = '8000977' test('departures at Hagen Bauhaus', async (t) => { const departures = await client.departures(hagenBauhaus, { duration: 120, when, - stopovers: true }) await testDepartures({ diff --git a/test/e2e/db.js b/test/e2e/db.js index 18412537..83a5dd01 100644 --- a/test/e2e/db.js +++ b/test/e2e/db.js @@ -277,7 +277,6 @@ test('departures at Berlin Schwedter Str.', async (t) => { const departures = await client.departures(blnSchwedterStr, { duration: 5, when, - stopovers: true }) await testDepartures({ @@ -341,7 +340,6 @@ test('arrivals at Berlin Schwedter Str.', async (t) => { const arrivals = await client.arrivals(blnSchwedterStr, { duration: 5, when, - stopovers: true }) await testArrivals({ diff --git a/test/e2e/hvv.js b/test/e2e/hvv.js index 37c84872..7d170337 100644 --- a/test/e2e/hvv.js +++ b/test/e2e/hvv.js @@ -152,7 +152,6 @@ test('trip details', async (t) => { test('departures at Hamburg Barmbek', async (t) => { const departures = await client.departures(barmbek, { duration: 5, when, - stopovers: true }) await testDepartures({ diff --git a/test/e2e/insa.js b/test/e2e/insa.js index 4ce5a3c3..1f8687d4 100644 --- a/test/e2e/insa.js +++ b/test/e2e/insa.js @@ -189,7 +189,6 @@ test('trip details', async (t) => { test('departures at Magdeburg Leiterstr.', async (t) => { const departures = await client.departures(leiterstr, { duration: 5, when, - stopovers: true }) await testDepartures({ diff --git a/test/e2e/nahsh.js b/test/e2e/nahsh.js index cde0df2a..6c0ca040 100644 --- a/test/e2e/nahsh.js +++ b/test/e2e/nahsh.js @@ -226,7 +226,6 @@ test('trip details', async (t) => { test('departures at Kiel Räucherei', async (t) => { const departures = await client.departures(kielRaeucherei, { duration: 30, when, - stopovers: true }) await testDepartures({ diff --git a/test/e2e/nvv.js b/test/e2e/nvv.js index 22815cc6..91b235b9 100644 --- a/test/e2e/nvv.js +++ b/test/e2e/nvv.js @@ -171,7 +171,6 @@ test('trip details', async (t) => { test('departures at Kassel Auestadion.', async (t) => { const departures = await client.departures(auestadion, { duration: 11, when, - stopovers: true }) await testDepartures({ diff --git a/test/e2e/sbb.js b/test/e2e/sbb.js index fbc9969a..1747be69 100644 --- a/test/e2e/sbb.js +++ b/test/e2e/sbb.js @@ -143,7 +143,6 @@ test('trip details', async (t) => { test.skip('departures at Lausanne', async (t) => { const departures = await client.departures(lausanne, { duration: 10, when, - stopovers: true }) await testDepartures({ diff --git a/test/e2e/vbb.js b/test/e2e/vbb.js index a1b9a003..3c89808a 100644 --- a/test/e2e/vbb.js +++ b/test/e2e/vbb.js @@ -249,7 +249,6 @@ test('journeys: via works – with detour', async (t) => { test('departures', async (t) => { const departures = await client.departures(spichernstr, { duration: 5, when, - stopovers: true }) await testDepartures({ @@ -312,7 +311,6 @@ test('departures without related stations', async (t) => { test('arrivals', async (t) => { const arrivals = await client.arrivals(spichernstr, { duration: 5, when, - stopovers: true }) await testArrivals({