From 2aa832b3d8292a9796af4861ec0aa686e71826cd Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Fri, 5 May 2023 13:37:14 +0200 Subject: [PATCH 01/22] added TripChangeRequest --- OJP/OJP_Requests.xsd | 27 ++++++++++++++++ OJP/OJP_Trips.xsd | 74 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/OJP/OJP_Requests.xsd b/OJP/OJP_Requests.xsd index e08330cdb..e30336ea6 100644 --- a/OJP/OJP_Requests.xsd +++ b/OJP/OJP_Requests.xsd @@ -299,4 +299,31 @@ + + ========================================== Trip Change Service ========================================== + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index e69cbadde..4ca2f7d0a 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1744,4 +1744,78 @@ + + ========================================== TripChangeRequest definitions ========================================== + + + + Trip change request structure. + + + + + Options to control the change + + + + + The trip result to be changed by the server. + + + + + Context to hold objects, which are referenced within the response. + + + + + + + Trip change request parameter structure. + + + + + Refers to the leg to be changed by the server. + + + + + + + + + + + + + + + Parameters for fare calculation. Only used if IncludeFare is set (TripContentFilterGroup). + + + + + + + + ========================================== TripChangeResponse definitions ========================================== + + + + Trip change response structure. + + + + + Context to hold trip response objects that occur frequently. + + + + + The trip results refined by the server. + + + + From f7bda9ba00426a5335de2ddb48e8802e0c9ff5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 11 May 2023 16:37:34 +0200 Subject: [PATCH 02/22] examples added and problem with OJP_Status fixed (again) --- .../change_trip/ChangeTripRequest.xml | 211 ++++++++++++++++++ .../change_trip/ChangeTripResponse.xml | 183 +++++++++++++++ 2 files changed, 394 insertions(+) create mode 100644 examples/functions/change_trip/ChangeTripRequest.xml create mode 100644 examples/functions/change_trip/ChangeTripResponse.xml diff --git a/examples/functions/change_trip/ChangeTripRequest.xml b/examples/functions/change_trip/ChangeTripRequest.xml new file mode 100644 index 000000000..024ad9208 --- /dev/null +++ b/examples/functions/change_trip/ChangeTripRequest.xml @@ -0,0 +1,211 @@ + + + + + 2022-12-19T12:00:00Z + IRMA + + 2022-12-19T12:00:00Z + 4711 + + 1 + 3 + SBB:ojp:prod + full + true + true + true + difficult + comfortable + + OSDM-NOVA-Prod + Senior + Disabled + + 85 + + + + + ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF + + ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF + PT2H18M + 2020-09-30T10:03:00Z + 2020-09-30T12:21:00Z + 0 + 125484 + + 1 + + + 8506302 + + St. Gallen + + + 4 + + + 2020-09-30T10:03:00Z + + 1 + + + 8505000 + + Luzern + + + 3 + + + 2020-09-30T12:21:00Z + + 15 + + + 2020-09-30 + ojp:910DG:Y:R:j20:210 + ojp:910DG:Y + R + + rail + local + + Zug + + + IR + + + + empty + + + ojp:82 + + + + Reservierung möglich + + A___R + + + + Bar + + A___B + + + + Maskenpflicht für Reisende ab 12 Jahren + + A__OM + + de:00000:-1 + + Luzern + + + + + Voralpen-Express + + + 2020 + + + + + + 2 + + walk + + 8505000 + + Luzern + + + + + 47.042666496 + 8.306332108 + + + Taxiplatz Luzern + + + PT3M + + + + 3 + + + + 47.042666496 + 8.306332108 + + + Taxiplatz Luzern + + + + + 47.06 + 8.32 + + + Destination + + + + demandResponsive + + ch:1:sboid:12391912 + + + + + onBoarding + + + + + PT13M + + + + + + + + ch:1:sboid:1230123 + New rail company + + + + + + 8530813 + + Zürich Kreuzplatz + + 23026261:27 + + + Zürich + + + 8.55408 + 47.36488 + + + + + + + + diff --git a/examples/functions/change_trip/ChangeTripResponse.xml b/examples/functions/change_trip/ChangeTripResponse.xml new file mode 100644 index 000000000..6fdc7951e --- /dev/null +++ b/examples/functions/change_trip/ChangeTripResponse.xml @@ -0,0 +1,183 @@ + + + + + 2022-12-01T17:54:38Z + OJPCH_Prod + true + + 2022-12-01T17:54:38Z + 4711 + true + 421 + 4 + + ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF + + ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF + PT2H18M + 2020-09-30T10:03:00Z + 2020-09-30T12:21:00Z + 0 + 125484 + + + 1 + + + 8506302 + + St. Gallen + + + 4 + + + 5 + + + + 2020-09-30T10:03:00Z + 2020-09-30T10:06:00Z + + + 1 + + + 8505000 + + Luzern + + + 3 + + + 2020-09-30T12:21:00Z + + 15 + + + 2020-09-30 + ojp:910DG:Y:R:j20:210 + ojp:910DG:Y + R + + rail + local + + Zug + + + IR + + + + empty + + + ojp:82 + + + + Reservierung möglich + + A___R + + + + Bar + + A___B + + + de:00000:-1 + + Luzern + + + + + Voralpen-Express + + + 2020 + + + + + + 2 + + + walk + + 8505000 + + Luzern + + + + + 47.042666496 + 8.306332108 + + + Taxiplatz Luzern + + + PT3M + + + + + 3 + + + + 47.042666496 + 8.306332108 + + + Taxiplatz Luzern + + + + + 47.06 + 8.31 + + + + New destination + + + + + demandResponsive + + ch:1:sboid:12391912 + + + + + onBoarding + + + + + PT11M + + + + + + + + + From 1c574b70d273be4b60fe1268ef3afce6f848166c Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Fri, 12 May 2023 08:17:53 +0200 Subject: [PATCH 03/22] fixed EarlierArrivalLaterDepartureType --- OJP/OJP_Trips.xsd | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index 4ca2f7d0a..71f410f3d 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1779,14 +1779,10 @@ Refers to the leg to be changed by the server. - - - - - - - - + + + Whether the requested journey leg of the passed trip should arrive earlier or depart later to give the passenger more time to make the interchange. + @@ -1797,7 +1793,15 @@ - + + + Prefer earlier arrival or later departure + + + + + + ========================================== TripChangeResponse definitions ========================================== From 8ab3a692bf5ac27a32d8c691605d4a4b6a258893 Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 08:50:02 +0200 Subject: [PATCH 04/22] added TripChangeProblemType --- OJP/OJP_Trips.xsd | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index 71f410f3d..dbaebe088 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1822,4 +1822,45 @@ + + ========================================== Problems ========================================== + + + + Types of problems that may be returned in responses to TRIPCHANGE requests. + + + + + No later option for the requested part of the TRIP could be found. + + + + + No earlier option for the requested part of the TRIP could be found. + + + + + Requested leg ref is invalid. + + + + + Requested operator is invalid. + + + + + No vehicle is available for the requested leg. + + + + + A problem has occurred that does not have a specific problem type. + + + + + From 670d3e0adf3678415d2c4c7b06a605ca4db5076e Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 08:50:36 +0200 Subject: [PATCH 05/22] added OperatorFilter --- OJP/OJP_Trips.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index dbaebe088..b00df89a9 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1791,6 +1791,11 @@ + + + Transport operators to include/exclude. + + From 806d3a16a53ed0a6818ef97cf84c44dbbebf55fa Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 08:50:58 +0200 Subject: [PATCH 06/22] added SystemId --- OJP/OJP_Trips.xsd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index b00df89a9..3b8d85532 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1777,6 +1777,9 @@ Refers to the leg to be changed by the server. + + + System reference to use for the refinement. If not specified the origin systems of each leg are used for the refinement. From bff23d47bacfc489f78ce7703ad0c8c7d44202a6 Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 08:51:35 +0200 Subject: [PATCH 07/22] changed ChangeLegRef to unbounded --- OJP/OJP_Trips.xsd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index 3b8d85532..e02fbcd76 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1774,9 +1774,11 @@ Trip change request parameter structure. - + - Refers to the leg to be changed by the server. + Refers to the legs to be changed by the server. + + System reference to use for the refinement. If not specified the origin systems of each leg are used for the refinement. From c0595418e6413e9990796a0e9fe4dc8c37723b99 Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 09:01:21 +0200 Subject: [PATCH 08/22] removed TripRefinementDataFilterGroup Was moved to TripChange-Request, so it should not be needed anymore. --- OJP/OJP_Trips.xsd | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index e02fbcd76..eeba107a1 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1526,18 +1526,6 @@ - - - Request data filters for Refinement - - - - - Transport operators to include/exclude. - - - - Trip refinement request parameter structure. @@ -1563,7 +1551,6 @@ Usage of real-time data in refinement. Default is "full". - From 27c2167aea5bc3b9585028f06c523b3137d02824 Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 09:22:59 +0200 Subject: [PATCH 09/22] fixed order of TripChangeParamStructure --- OJP/OJP_Trips.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index eeba107a1..7afb8686e 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1782,12 +1782,12 @@ Parameters for fare calculation. Only used if IncludeFare is set (TripContentFilterGroup). - Transport operators to include/exclude. + From 97958d5aae9fa4d5e0178f801014cab0154efca9 Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 12:51:35 +0200 Subject: [PATCH 10/22] added Leg.Changed --- OJP/OJP_Trips.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index 7afb8686e..f23ff3f76 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -596,6 +596,11 @@ + + + TRUE if leg got changed by TripChange-Request. + + From 365dc7f25ea74320583a931621953b4722b988c6 Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 13:13:37 +0200 Subject: [PATCH 11/22] added AdditionalWaitingTime --- OJP/OJP_Trips.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index f23ff3f76..c1a796d01 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1781,6 +1781,11 @@ Whether the requested journey leg of the passed trip should arrive earlier or depart later to give the passenger more time to make the interchange. + + + Absolute time in minutes the passenger wants additionally to make the interchange. If another TransferLeg is needed (e.g. since another quay is used for the found arrival/departure) this is taken into account. If not passed, the next best arrival/departure is requested. + + From b437f9850f86540bf32c7db75112ab55558dfb66 Mon Sep 17 00:00:00 2001 From: Malte Herlitze Date: Tue, 4 Jul 2023 13:18:50 +0200 Subject: [PATCH 12/22] added example --- .../TripChange_001_Request_laterDeparture.xml | 251 +++++++++++++++++ ...TripChange_001_Response_laterDeparture.xml | 263 ++++++++++++++++++ 2 files changed, 514 insertions(+) create mode 100644 examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml create mode 100644 examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml diff --git a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml new file mode 100644 index 000000000..f85261c09 --- /dev/null +++ b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml @@ -0,0 +1,251 @@ + + + + + 2020-06-16T10:00:00Z + IRMA + + 2020-06-16T10:00:00Z + + 3 + laterDeparture + + + ID-83BFBC80-71F5-4287-9359-55F839207004 + + ID-83BFBC80-71F5-4287-9359-55F839207004 + PT2H2M + 2023-07-04T09:02:00Z + 2023-07-04T11:04:00Z + 1 + 169328 + + 1 + + + ch:1:sloid:7000:0:349752 + + Bern + + + 2 + + + 2023-07-04T09:02:00Z + 2023-07-04T09:02:00Z + + 1 + + + ch:1:sloid:3000:501:34 + + Zürich HB + + + 34 + + + 6 + + + 2023-07-04T09:58:00Z + 2023-07-04T09:58:00Z + + 2 + + + 2023-07-04 + 91008:E:H:j23:206:815 + 91008:E + H + + rail + interRegionalRailService + + Zug + + + IC + + + + IC8 + + + 11 + + + + Gratis-Internet mit der App SBB FreeSurf + + A__FS + + + + Businesszone in 1. Klasse + + A__BZ + firstClass + businessServices + + + + Ruhezone in 1. Klasse + + A__RZ + mobilePhoneFreeZone + + + + Familienwagen mit Spielplatz + + A__FA + + + + Platzreservierung möglich + + A___R + + + + Restaurant + + A__WR + restaurantService + + + + Aussteigeseite: Links + + ojp91008EH_InfoCall206_111055_1 + + 8506121 + + Romanshorn + + + + + InterCity + + + 815 + + + Schweizerische Bundesbahnen SBB + + + ch:1:sjyid:100001:815-001 + + + + + + 2 + + walk + + ch:1:sloid:3000:501:34 + + Zürich HB + + + + 8503000 + + Zürich HB + + + 2023-07-04T09:58:00Z + 2023-07-04T10:07:00Z + PT9M + PT7M + PT2M + + + + 3 + + + 8503000 + + Zürich HB + + + 41/42 + + + 2023-07-04T10:07:00Z + 2023-07-04T10:07:00Z + + 1 + + + ch:1:sloid:3424:2:2 + + Schaffhausen + + + 2 + + + 2023-07-04T11:04:00Z + 2023-07-04T11:04:00Z + + 17 + + + 2023-07-04 + 91009:E:R:j23:164:18944 + 91009:E + R + + rail + regionalRail + + Zug + + + S + + + + S9 + + + 11 + + + + Aussteigeseite: Links + + ojp91009ER_InfoCall164_108594_1 + + 8503424 + + Schaffhausen + + + + + S-Bahn + + + 18944 + + + Schweizerische Bundesbahnen SBB + + + ch:1:sjyid:100001:18944-001 + + + + + + + + + + diff --git a/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml new file mode 100644 index 000000000..9aab37648 --- /dev/null +++ b/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml @@ -0,0 +1,263 @@ + + + + + 2023-07-04T10:37:08Z + OJP-SBB-passiv-TEST + true + + 2023-07-04T10:36:56Z + true + 497 + + ID-83BFBC80-71F5-4287-9359-55F839207005 + + ID-83BFBC80-71F5-4287-9359-55F839207005 + PT3H41M + 2023-07-04T09:02:00Z + 2023-07-04T12:43:00Z + 1 + 169328 + + 1 + + + ch:1:sloid:7000:0:349752 + + Bern + + + 2 + + + 2023-07-04T09:02:00Z + 2023-07-04T09:02:00Z + + 1 + + + ch:1:sloid:3000:501:34 + + Zürich HB + + + 34 + + + 6 + + + 2023-07-04T09:58:00Z + 2023-07-04T09:58:00Z + + 2 + + + 2023-07-04 + 91008:E:H:j23:206:815 + 91008:E + H + + rail + interRegionalRailService + + Zug + + + IC + + + + IC8 + + + 11 + + + + Gratis-Internet mit der App SBB FreeSurf + + A__FS + + + + Businesszone in 1. Klasse + + A__BZ + firstClass + businessServices + + + + Ruhezone in 1. Klasse + + A__RZ + mobilePhoneFreeZone + + + + Familienwagen mit Spielplatz + + A__FA + + + + Platzreservierung möglich + + A___R + + + + Restaurant + + A__WR + restaurantService + + + + Aussteigeseite: Links + + ojp91008EH_InfoCall206_111055_1 + + 8506121 + + Romanshorn + + + + + InterCity + + + 815 + + + Schweizerische Bundesbahnen SBB + + + ch:1:sjyid:100001:815-001 + + + + + + 2 + + walk + + ch:1:sloid:3000:501:34 + + Zürich HB + + + + 8503000 + + Zürich HB + + + 2023-07-04T09:58:00Z + 2023-07-04T10:07:00Z + PT9M + PT7M + PT2M + + + + 3 + + + ch:1:sloid:3000:3:5 + + Zürich HB + + + 5 + + + 2023-07-04T12:05:00Z + 2023-07-04T12:05:00Z + + 1 + + + ch:1:sloid:3424:2:3 + + Schaffhausen + + + 3 + + + 2023-07-04T12:43:00Z + 2023-07-04T12:43:00Z + + 4 + + + 2023-07-04 + 91037:Y:H:j23:204:4924 + 91037:Y + H + + rail + regionalRail + + Zug + + + RE + + + + RE + + 11 + + + Gratis-Internet mit der App SBB FreeSurf + + A__FS + + + + Businesszone in 1. Klasse + + A__BZ + firstClass + businessServices + + + + Aussteigeseite: Rechts + + ojp91037YH_InfoCall204_108594_1 + + 8503424 + + Schaffhausen + + + + + RegioExpress + + + 4924 + + + Schweizerische Bundesbahnen SBB + + + ch:1:sjyid:100001:4924-001 + + + + true + + + + + + + From 0b22de771726714051ef31102dd95092d5812b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 4 Jul 2023 13:47:25 +0200 Subject: [PATCH 13/22] adapted to new structure --- .../TripChange_001_Request_laterDeparture.xml | 188 +++++++++--------- ...TripChange_001_Response_laterDeparture.xml | 20 +- 2 files changed, 109 insertions(+), 99 deletions(-) diff --git a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml index f85261c09..26c88480c 100644 --- a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml +++ b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml @@ -1,6 +1,6 @@ - - + + 2020-06-16T10:00:00Z IRMA @@ -56,70 +56,72 @@ 2023-07-04 91008:E:H:j23:206:815 - 91008:E - H - - rail - interRegionalRailService - - Zug - - - IC - - - - IC8 - - - 11 - - - - Gratis-Internet mit der App SBB FreeSurf - - A__FS - - - - Businesszone in 1. Klasse - - A__BZ - firstClass - businessServices - - - - Ruhezone in 1. Klasse - - A__RZ - mobilePhoneFreeZone - - - - Familienwagen mit Spielplatz - - A__FA - - - - Platzreservierung möglich - - A___R - - - - Restaurant - - A__WR - restaurantService - - - - Aussteigeseite: Links - - ojp91008EH_InfoCall206_111055_1 - + + 91008:E + H + + rail + interRegionalRailService + + Zug + + + IC + + + + IC8 + + + 11 + + + + Gratis-Internet mit der App SBB FreeSurf + + A__FS + + + + Businesszone in 1. Klasse + + A__BZ + firstClass + businessServices + + + + Ruhezone in 1. Klasse + + A__RZ + mobilePhoneFreeZone + + + + Familienwagen mit Spielplatz + + A__FA + + + + Platzreservierung möglich + + A___R + + + + Restaurant + + A__WR + restaurantService + + + + Aussteigeseite: Links + + ojp91008EH_InfoCall206_111055_1 + + 8506121 Romanshorn @@ -198,30 +200,32 @@ 2023-07-04 91009:E:R:j23:164:18944 - 91009:E - R - - rail - regionalRail - - Zug - - - S - - - - S9 - - - 11 - - - - Aussteigeseite: Links - - ojp91009ER_InfoCall164_108594_1 - + + 91009:E + R + + rail + regionalRail + + Zug + + + S + + + + S9 + + + 11 + + + + Aussteigeseite: Links + + ojp91009ER_InfoCall164_108594_1 + + 8503424 Schaffhausen @@ -247,5 +251,5 @@ - - + + \ No newline at end of file diff --git a/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml index 9aab37648..dbecb148a 100644 --- a/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml +++ b/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml @@ -1,6 +1,6 @@ - - + + 2023-07-04T10:37:08Z OJP-SBB-passiv-TEST @@ -55,7 +55,8 @@ 2023-07-04 91008:E:H:j23:206:815 - 91008:E + + 91008:E H rail @@ -119,6 +120,8 @@ ojp91008EH_InfoCall206_111055_1 + + 8506121 Romanshorn @@ -197,7 +200,8 @@ 2023-07-04 91037:Y:H:j23:204:4924 - 91037:Y + + 91037:Y H rail @@ -232,7 +236,9 @@ Aussteigeseite: Rechts ojp91037YH_InfoCall204_108594_1 - + + + 8503424 Schaffhausen @@ -259,5 +265,5 @@ - - + + From 1c6a1512bb537dfdbe72658dac0dad62c6b40573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 4 Jul 2023 13:58:17 +0200 Subject: [PATCH 14/22] Update TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml --- ...R_01_request_Bern_Luzern_10_results_optimisation_fastest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/trip/TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml b/examples/functions/trip/TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml index d1ec25209..74542f72d 100644 --- a/examples/functions/trip/TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml +++ b/examples/functions/trip/TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml @@ -1,7 +1,7 @@ - + 2020-01-31T12:30:00Z 3CC3C04A-20A0-4B12-AC46-5A7843E328A7 From a78e2be87ca13a1d64e275d70c49d44dd8e9909b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 4 Jul 2023 14:07:52 +0200 Subject: [PATCH 15/22] test why it does not validate --- examples/functions/trip_change/test01.xml | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 examples/functions/trip_change/test01.xml diff --git a/examples/functions/trip_change/test01.xml b/examples/functions/trip_change/test01.xml new file mode 100644 index 000000000..74542f72d --- /dev/null +++ b/examples/functions/trip_change/test01.xml @@ -0,0 +1,39 @@ + + + + + 2020-01-31T12:30:00Z + 3CC3C04A-20A0-4B12-AC46-5A7843E328A7 + + 2020-01-31T12:30:00Z + + + 8503000 + + Bern + + + 2020-01-30T12:30:00Z + + + + 8505000 + + Luzern + + + + + true + 10 + PT60M + + fastest + + + + + + + + From ee3b990cf51b1a928476434a8f321ee0b8d524e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 4 Jul 2023 14:10:14 +0200 Subject: [PATCH 16/22] Update test01.xml --- examples/functions/trip_change/test01.xml | 276 +++++++++++++++++++--- 1 file changed, 246 insertions(+), 30 deletions(-) diff --git a/examples/functions/trip_change/test01.xml b/examples/functions/trip_change/test01.xml index 74542f72d..0d673206d 100644 --- a/examples/functions/trip_change/test01.xml +++ b/examples/functions/trip_change/test01.xml @@ -4,36 +4,252 @@ 2020-01-31T12:30:00Z 3CC3C04A-20A0-4B12-AC46-5A7843E328A7 - - 2020-01-31T12:30:00Z - - - 8503000 - - Bern - - - 2020-01-30T12:30:00Z - - - - 8505000 - - Luzern - - - - - true - 10 - PT60M - - fastest - - - - - + + 2020-06-16T10:00:00Z + + 3 + laterDeparture + + + ID-83BFBC80-71F5-4287-9359-55F839207004 + + ID-83BFBC80-71F5-4287-9359-55F839207004 + PT2H2M + 2023-07-04T09:02:00Z + 2023-07-04T11:04:00Z + 1 + 169328 + + 1 + + + ch:1:sloid:7000:0:349752 + + Bern + + + 2 + + + 2023-07-04T09:02:00Z + 2023-07-04T09:02:00Z + + 1 + + + ch:1:sloid:3000:501:34 + + Zürich HB + + + 34 + + + 6 + + + 2023-07-04T09:58:00Z + 2023-07-04T09:58:00Z + + 2 + + + 2023-07-04 + 91008:E:H:j23:206:815 + + 91008:E + H + + rail + interRegionalRailService + + Zug + + + IC + + + + IC8 + + + 11 + + + + Gratis-Internet mit der App SBB FreeSurf + + A__FS + + + + Businesszone in 1. Klasse + + A__BZ + firstClass + businessServices + + + + Ruhezone in 1. Klasse + + A__RZ + mobilePhoneFreeZone + + + + Familienwagen mit Spielplatz + + A__FA + + + + Platzreservierung möglich + + A___R + + + + Restaurant + + A__WR + restaurantService + + + + Aussteigeseite: Links + + ojp91008EH_InfoCall206_111055_1 + + + 8506121 + + Romanshorn + + + + + InterCity + + + 815 + + + Schweizerische Bundesbahnen SBB + + + ch:1:sjyid:100001:815-001 + + + + + + 2 + + walk + + ch:1:sloid:3000:501:34 + + Zürich HB + + + + 8503000 + + Zürich HB + + + 2023-07-04T09:58:00Z + 2023-07-04T10:07:00Z + PT9M + PT7M + PT2M + + + + 3 + + + 8503000 + + Zürich HB + + + 41/42 + + + 2023-07-04T10:07:00Z + 2023-07-04T10:07:00Z + + 1 + + + ch:1:sloid:3424:2:2 + + Schaffhausen + + + 2 + + + 2023-07-04T11:04:00Z + 2023-07-04T11:04:00Z + + 17 + + + 2023-07-04 + 91009:E:R:j23:164:18944 + + 91009:E + R + + rail + regionalRail + + Zug + + + S + + + + S9 + + + 11 + + + + Aussteigeseite: Links + + ojp91009ER_InfoCall164_108594_1 + + + 8503424 + + Schaffhausen + + + + + S-Bahn + + + 18944 + + + Schweizerische Bundesbahnen SBB + + + ch:1:sjyid:100001:18944-001 + + + + + + + From 058769f160691afeb7ff5baede51c371e42e5fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 4 Jul 2023 14:12:23 +0200 Subject: [PATCH 17/22] test3 --- .../TripChange_001_Request_laterDeparture.xml | 12 +- examples/functions/trip_change/test01.xml | 255 ------------------ 2 files changed, 6 insertions(+), 261 deletions(-) delete mode 100644 examples/functions/trip_change/test01.xml diff --git a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml index 26c88480c..0d673206d 100644 --- a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml +++ b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml @@ -1,10 +1,10 @@ - - 2020-06-16T10:00:00Z - IRMA - + + 2020-01-31T12:30:00Z + 3CC3C04A-20A0-4B12-AC46-5A7843E328A7 + 2020-06-16T10:00:00Z 3 @@ -249,7 +249,7 @@ - + - \ No newline at end of file + diff --git a/examples/functions/trip_change/test01.xml b/examples/functions/trip_change/test01.xml deleted file mode 100644 index 0d673206d..000000000 --- a/examples/functions/trip_change/test01.xml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - 2020-01-31T12:30:00Z - 3CC3C04A-20A0-4B12-AC46-5A7843E328A7 - - 2020-06-16T10:00:00Z - - 3 - laterDeparture - - - ID-83BFBC80-71F5-4287-9359-55F839207004 - - ID-83BFBC80-71F5-4287-9359-55F839207004 - PT2H2M - 2023-07-04T09:02:00Z - 2023-07-04T11:04:00Z - 1 - 169328 - - 1 - - - ch:1:sloid:7000:0:349752 - - Bern - - - 2 - - - 2023-07-04T09:02:00Z - 2023-07-04T09:02:00Z - - 1 - - - ch:1:sloid:3000:501:34 - - Zürich HB - - - 34 - - - 6 - - - 2023-07-04T09:58:00Z - 2023-07-04T09:58:00Z - - 2 - - - 2023-07-04 - 91008:E:H:j23:206:815 - - 91008:E - H - - rail - interRegionalRailService - - Zug - - - IC - - - - IC8 - - - 11 - - - - Gratis-Internet mit der App SBB FreeSurf - - A__FS - - - - Businesszone in 1. Klasse - - A__BZ - firstClass - businessServices - - - - Ruhezone in 1. Klasse - - A__RZ - mobilePhoneFreeZone - - - - Familienwagen mit Spielplatz - - A__FA - - - - Platzreservierung möglich - - A___R - - - - Restaurant - - A__WR - restaurantService - - - - Aussteigeseite: Links - - ojp91008EH_InfoCall206_111055_1 - - - 8506121 - - Romanshorn - - - - - InterCity - - - 815 - - - Schweizerische Bundesbahnen SBB - - - ch:1:sjyid:100001:815-001 - - - - - - 2 - - walk - - ch:1:sloid:3000:501:34 - - Zürich HB - - - - 8503000 - - Zürich HB - - - 2023-07-04T09:58:00Z - 2023-07-04T10:07:00Z - PT9M - PT7M - PT2M - - - - 3 - - - 8503000 - - Zürich HB - - - 41/42 - - - 2023-07-04T10:07:00Z - 2023-07-04T10:07:00Z - - 1 - - - ch:1:sloid:3424:2:2 - - Schaffhausen - - - 2 - - - 2023-07-04T11:04:00Z - 2023-07-04T11:04:00Z - - 17 - - - 2023-07-04 - 91009:E:R:j23:164:18944 - - 91009:E - R - - rail - regionalRail - - Zug - - - S - - - - S9 - - - 11 - - - - Aussteigeseite: Links - - ojp91009ER_InfoCall164_108594_1 - - - 8503424 - - Schaffhausen - - - - - S-Bahn - - - 18944 - - - Schweizerische Bundesbahnen SBB - - - ch:1:sjyid:100001:18944-001 - - - - - - - - - - From 69872ec392dafd19efc79571a9f42ec7d16760f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 4 Jul 2023 14:16:06 +0200 Subject: [PATCH 18/22] test4 --- .../TripChange_001_Request_laterDeparture.xml | 8 +- ...TripChange_001_Response_laterDeparture.xml | 320 +++++++++--------- 2 files changed, 164 insertions(+), 164 deletions(-) diff --git a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml index 0d673206d..ce221c4f2 100644 --- a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml +++ b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml @@ -1,10 +1,10 @@ - + 2020-01-31T12:30:00Z 3CC3C04A-20A0-4B12-AC46-5A7843E328A7 - + 2020-06-16T10:00:00Z 3 @@ -249,7 +249,7 @@ - + - + \ No newline at end of file diff --git a/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml index dbecb148a..428d08867 100644 --- a/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml +++ b/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml @@ -56,72 +56,71 @@ 2023-07-04 91008:E:H:j23:206:815 - 91008:E - H - - rail - interRegionalRailService - - Zug - - - IC - - - - IC8 - - - 11 - - - - Gratis-Internet mit der App SBB FreeSurf - - A__FS - - - - Businesszone in 1. Klasse - - A__BZ - firstClass - businessServices - - - - Ruhezone in 1. Klasse - - A__RZ - mobilePhoneFreeZone - - - - Familienwagen mit Spielplatz - - A__FA - - - - Platzreservierung möglich - - A___R - - - - Restaurant - - A__WR - restaurantService - - - - Aussteigeseite: Links - - ojp91008EH_InfoCall206_111055_1 - + 91008:E + H + + rail + interRegionalRailService + + Zug + + + IC + + + + IC8 + + + 11 + + + + Gratis-Internet mit der App SBB FreeSurf + + A__FS + + + + Businesszone in 1. Klasse + + A__BZ + firstClass + businessServices + + + + Ruhezone in 1. Klasse + + A__RZ + mobilePhoneFreeZone + + + + Familienwagen mit Spielplatz + + A__FA + + + + Platzreservierung möglich + + A___R + + + + Restaurant + + A__WR + restaurantService + + + + Aussteigeseite: Links + + ojp91008EH_InfoCall206_111055_1 + - 8506121 Romanshorn @@ -167,103 +166,104 @@ - 3 - - - ch:1:sloid:3000:3:5 - - Zürich HB - - - 5 - - - 2023-07-04T12:05:00Z - 2023-07-04T12:05:00Z - - 1 - - - ch:1:sloid:3424:2:3 - - Schaffhausen - - - 3 - - - 2023-07-04T12:43:00Z - 2023-07-04T12:43:00Z - - 4 - - - 2023-07-04 - 91037:Y:H:j23:204:4924 - - 91037:Y - H - - rail - regionalRail - - Zug - - - RE - - - - RE - - 11 - - - Gratis-Internet mit der App SBB FreeSurf - - A__FS - - - - Businesszone in 1. Klasse - - A__BZ - firstClass - businessServices - - - - Aussteigeseite: Rechts - - ojp91037YH_InfoCall204_108594_1 - - - - 8503424 - - Schaffhausen - - - - - RegioExpress - - - 4924 - - - Schweizerische Bundesbahnen SBB - - - ch:1:sjyid:100001:4924-001 - - - - true - + 3 + + + ch:1:sloid:3000:3:5 + + Zürich HB + + + 5 + + + 2023-07-04T12:05:00Z + 2023-07-04T12:05:00Z + + 1 + + + ch:1:sloid:3424:2:3 + + Schaffhausen + + + 3 + + + 2023-07-04T12:43:00Z + 2023-07-04T12:43:00Z + + 4 + + + 2023-07-04 + 91037:Y:H:j23:204:4924 + + 91037:Y + H + + rail + regionalRail + + Zug + + + RE + + + + RE + + + 11 + + + + Gratis-Internet mit der App SBB FreeSurf + + A__FS + + + + Businesszone in 1. Klasse + + A__BZ + firstClass + businessServices + + + + Aussteigeseite: Rechts + + ojp91037YH_InfoCall204_108594_1 + + + 8503424 + + Schaffhausen + + + + + RegioExpress + + + 4924 + + + Schweizerische Bundesbahnen SBB + + + ch:1:sjyid:100001:4924-001 + + + + true + - + \ No newline at end of file From 311edb820ba5c81591b890f5d78c874030e86e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 4 Jul 2023 14:23:29 +0200 Subject: [PATCH 19/22] fixing the validation there was another directory..... --- .../change_trip/ChangeTripRequest.xml | 211 ----------------- .../change_trip/ChangeTripResponse.xml | 183 --------------- .../trip_change/ChangeTripRequest.xml | 213 ++++++++++++++++++ .../trip_change/ChangeTripResponse.xml | 185 +++++++++++++++ 4 files changed, 398 insertions(+), 394 deletions(-) delete mode 100644 examples/functions/change_trip/ChangeTripRequest.xml delete mode 100644 examples/functions/change_trip/ChangeTripResponse.xml create mode 100644 examples/functions/trip_change/ChangeTripRequest.xml create mode 100644 examples/functions/trip_change/ChangeTripResponse.xml diff --git a/examples/functions/change_trip/ChangeTripRequest.xml b/examples/functions/change_trip/ChangeTripRequest.xml deleted file mode 100644 index 024ad9208..000000000 --- a/examples/functions/change_trip/ChangeTripRequest.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - 2022-12-19T12:00:00Z - IRMA - - 2022-12-19T12:00:00Z - 4711 - - 1 - 3 - SBB:ojp:prod - full - true - true - true - difficult - comfortable - - OSDM-NOVA-Prod - Senior - Disabled - - 85 - - - - - ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF - - ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF - PT2H18M - 2020-09-30T10:03:00Z - 2020-09-30T12:21:00Z - 0 - 125484 - - 1 - - - 8506302 - - St. Gallen - - - 4 - - - 2020-09-30T10:03:00Z - - 1 - - - 8505000 - - Luzern - - - 3 - - - 2020-09-30T12:21:00Z - - 15 - - - 2020-09-30 - ojp:910DG:Y:R:j20:210 - ojp:910DG:Y - R - - rail - local - - Zug - - - IR - - - - empty - - - ojp:82 - - - - Reservierung möglich - - A___R - - - - Bar - - A___B - - - - Maskenpflicht für Reisende ab 12 Jahren - - A__OM - - de:00000:-1 - - Luzern - - - - - Voralpen-Express - - - 2020 - - - - - - 2 - - walk - - 8505000 - - Luzern - - - - - 47.042666496 - 8.306332108 - - - Taxiplatz Luzern - - - PT3M - - - - 3 - - - - 47.042666496 - 8.306332108 - - - Taxiplatz Luzern - - - - - 47.06 - 8.32 - - - Destination - - - - demandResponsive - - ch:1:sboid:12391912 - - - - - onBoarding - - - - - PT13M - - - - - - - - ch:1:sboid:1230123 - New rail company - - - - - - 8530813 - - Zürich Kreuzplatz - - 23026261:27 - - - Zürich - - - 8.55408 - 47.36488 - - - - - - - - diff --git a/examples/functions/change_trip/ChangeTripResponse.xml b/examples/functions/change_trip/ChangeTripResponse.xml deleted file mode 100644 index 6fdc7951e..000000000 --- a/examples/functions/change_trip/ChangeTripResponse.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - - - 2022-12-01T17:54:38Z - OJPCH_Prod - true - - 2022-12-01T17:54:38Z - 4711 - true - 421 - 4 - - ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF - - ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF - PT2H18M - 2020-09-30T10:03:00Z - 2020-09-30T12:21:00Z - 0 - 125484 - - - 1 - - - 8506302 - - St. Gallen - - - 4 - - - 5 - - - - 2020-09-30T10:03:00Z - 2020-09-30T10:06:00Z - - - 1 - - - 8505000 - - Luzern - - - 3 - - - 2020-09-30T12:21:00Z - - 15 - - - 2020-09-30 - ojp:910DG:Y:R:j20:210 - ojp:910DG:Y - R - - rail - local - - Zug - - - IR - - - - empty - - - ojp:82 - - - - Reservierung möglich - - A___R - - - - Bar - - A___B - - - de:00000:-1 - - Luzern - - - - - Voralpen-Express - - - 2020 - - - - - - 2 - - - walk - - 8505000 - - Luzern - - - - - 47.042666496 - 8.306332108 - - - Taxiplatz Luzern - - - PT3M - - - - - 3 - - - - 47.042666496 - 8.306332108 - - - Taxiplatz Luzern - - - - - 47.06 - 8.31 - - - - New destination - - - - - demandResponsive - - ch:1:sboid:12391912 - - - - - onBoarding - - - - - PT11M - - - - - - - - - diff --git a/examples/functions/trip_change/ChangeTripRequest.xml b/examples/functions/trip_change/ChangeTripRequest.xml new file mode 100644 index 000000000..cd0ebe764 --- /dev/null +++ b/examples/functions/trip_change/ChangeTripRequest.xml @@ -0,0 +1,213 @@ + + + + + 2022-12-19T12:00:00Z + IRMA + + 2022-12-19T12:00:00Z + 4711 + + 1 + 3 + SBB:prod + full + true + true + true + difficult + comfortable + + OSDM-NOVA-Prod + Senior + Disabled + + 85 + + + + + ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF + + ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF + PT2H18M + 2020-09-30T10:03:00Z + 2020-09-30T12:21:00Z + 0 + 125484 + + 1 + + + 8506302 + + St. Gallen + + + 4 + + + 2020-09-30T10:03:00Z + + 1 + + + 8505000 + + Luzern + + + 3 + + + 2020-09-30T12:21:00Z + + 15 + + + 2020-09-30 + 910DG:Y:R:j20:210 + + 910DG:Y + R + + rail + local + + Zug + + + IR + + + + empty + + + 82 + + + + Reservierung möglich + + A___R + + + + Bar + + A___B + + + + Maskenpflicht für Reisende ab 12 Jahren + + A__OM + + + de:00000:-1 + + Luzern + + + + + Voralpen-Express + + + 2020 + + + + + + 2 + + walk + + 8505000 + + Luzern + + + + + 47.042666496 + 8.306332108 + + + Taxiplatz Luzern + + + PT3M + + + + 3 + + + + 47.042666496 + 8.306332108 + + + Taxiplatz Luzern + + + + + 47.06 + 8.32 + + + Destination + + + + demandResponsive + + ch:1:sboid:12391912 + + + + + onBoarding + + + + + PT13M + + + + + + + + ch:1:sboid:1230123 + New rail company + + + + + + 8530813 + + Zürich Kreuzplatz + + 23026261:27 + + + Zürich + + + 8.55408 + 47.36488 + + + + + + + + \ No newline at end of file diff --git a/examples/functions/trip_change/ChangeTripResponse.xml b/examples/functions/trip_change/ChangeTripResponse.xml new file mode 100644 index 000000000..dfd2af621 --- /dev/null +++ b/examples/functions/trip_change/ChangeTripResponse.xml @@ -0,0 +1,185 @@ + + + + + 2022-12-01T17:54:38Z + OJPCH_Prod + true + + 2022-12-01T17:54:38Z + 4711 + true + 421 + 4 + + ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF + + ID-5A9D01A0-CF49-41E7-A674-D37167E33AEF + PT2H18M + 2020-09-30T10:03:00Z + 2020-09-30T12:21:00Z + 0 + 125484 + + + 1 + + + 8506302 + + St. Gallen + + + 4 + + + 5 + + + + 2020-09-30T10:03:00Z + 2020-09-30T10:06:00Z + + + 1 + + + 8505000 + + Luzern + + + 3 + + + 2020-09-30T12:21:00Z + + 15 + + + 2020-09-30 + 910DG:Y:R:j20:210 + + 910DG:Y + R + + rail + local + + Zug + + + IR + + + + empty + + + 82 + + + + Reservierung möglich + + A___R + + + + Bar + + A___B + + + + de:00000:-1 + + Luzern + + + + + Voralpen-Express + + + 2020 + + + + + + 2 + + + walk + + 8505000 + + Luzern + + + + + 47.042666496 + 8.306332108 + + + Taxiplatz Luzern + + + PT3M + + + + + 3 + + + + 47.042666496 + 8.306332108 + + + Taxiplatz Luzern + + + + + 47.06 + 8.31 + + + + New destination + + + + + demandResponsive + + ch:1:sboid:12391912 + + + + + onBoarding + + + + + PT11M + + + + + + + + + \ No newline at end of file From 41b503c6c54c0adfe9e334c802fbde0f58c8b8f5 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 12:24:06 +0000 Subject: [PATCH 20/22] Lint and update documentation tables --- docs/generated/index.html | 106 ++++++++++++++++-- ...Luzern_10_results_optimisation_fastest.xml | 2 +- .../trip_change/ChangeTripRequest.xml | 2 +- .../trip_change/ChangeTripResponse.xml | 2 +- .../TripChange_001_Request_laterDeparture.xml | 2 +- ...TripChange_001_Response_laterDeparture.xml | 2 +- 6 files changed, 99 insertions(+), 17 deletions(-) diff --git a/docs/generated/index.html b/docs/generated/index.html index c6031f0ce..566dd5bb2 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -58,7 +58,7 @@

OJP - Open API for distributed Journey
  • 1. OJP.xsd - OJP messages as extension of SIRI
    • -
  • 2. OJP/OJP_Requests.xsd - OJP service requests and responses
    • +
  • 2. OJP/OJP_Requests.xsd - OJP service requests and responses
  • 3. OJP/OJP_RequestSupport.xsd - Supporting definitions for OJP service requests and their responses
  • 4. OJP/OJP_Fare.xsd - Request and response definitions for general, stop-specific and trip-specific fare information
  • 5. OJP/OJP_FareSupport.xsd - Supporting definitions for fare information on passenger trips
    • @@ -67,7 +67,7 @@

    OJP - Open API for distributed Journey 8. OJP/OJP_PlaceSupport.xsd - Supporting definitions for location information
  • 9. OJP/OJP_StopEvents.xsd - Request and response definitions for arrivals and departures of public transport services at stops
  • 10. OJP/OJP_TripInfo.xsd - Request and response definitions for information on a single trip
    • -
  • 11. OJP/OJP_Trips.xsd - Request and response definitions for trip requests and distributed journey planning
    • +
  • 11. OJP/OJP_Trips.xsd - Request and response definitions for trip requests and distributed journey planning
  • 12. OJP/OJP_JourneySupport.xsd - Supporting definitions for journeys on public transport vehicles
  • 13. OJP/OJP_Availability.xsd - Request and response definitions for availability of tickets and services on a journey leg.
  • 14. OJP/OJP_Common.xsd - Supporting definitions of common structures
    • @@ -303,6 +303,25 @@

    OJP - Open API for distributed Journey LineInformationResponse

    LineResult

    0:*

    +LineResult

    →‍siri:Extensions

    0:1

    →‍siri:Extensions

    +

    2.45. The toplevel element OJPTripChangeRequest

    OJPTripChangeRequest

    +OJPTripChangeRequest (↔ siri:AbstractFunctionalServiceRequest)

    2.46. The complex type OJPTripChangeRequestStructure

    + + + + + + + +

    OJPTripChangeRequestStructure

    +AbstractOJPServiceRequest

    The element contains a sequence of the following elements:

    TripChangeRequest

    ChangeParams

    0:1

    +TripChangeParam

    Options to control the change

    TripResult

    1:1

    +TripResult

    The trip result to be changed by the server.

    TripResponseContext

    0:1

    +ResponseContext

    Context to hold objects, which are referenced within the response.

    →‍siri:Extensions

    0:1

    →‍siri:Extensions

    2.47. The toplevel element OJPTripChangeDelivery

    OJPTripChangeDelivery

    +OJPTripChangeDelivery (↔ siri:AbstractFunctionalServiceDelivery)

    2.48. The complex type OJPTripChangeDeliveryStructure

    + + + + + + + + + +

    OJPTripChangeDeliveryStructure

    siri:AbstractServiceDeliveryStructure

    The element contains a sequence of the following elements:

    →‍OJPTripChangeRequest

    0:1

    →‍OJPTripChangeRequest

    ServiceResponseContext

    DataFrameRef

    0:1

    siri:DataFrameRefStructure

    identifier of the set of data being used by an information system, which allows a comparison to be made with the versions of data being used by overlapping systems.

    CalcTime

    0:1

    Calc

    Calculation time.

    ErrorCondition

    0:*

    +OJPError

    OJP generic problem for the whole delivery.

    TripChangeResponse

    TripResponseContext

    0:1

    +ResponseContext

    Context to hold trip response objects that occur frequently.

    TripResult

    0:1

    +TripResult

    The trip results refined by the server.

    →‍siri:Extensions

    0:1

    →‍siri:Extensions

    3. OJP/OJP_RequestSupport.xsd - Supporting definitions for OJP service requests and their responses

    3.1. Simple type definitions

    CalcTimeType

    xs:integer

    Type definition for calculation time in milliseconds.

    CertificateIdType

    xs:NMTOKEN

    Type definition for the form of identification that can be used as a Message Integrity Property (public key cryptography)

    OJPGenericProblemTypeEnumeration

    OJPGENERIC_REQUESTNOTSUPPORTED | OJPGENERIC_FEATURENOTSUPPORTED | OJPGENERIC_LANGUAGENOTSUPPORTED | OJPGENERIC_EXCEPTIONFROMREQUESTEDLANGUAGE | OJPGENERIC_DATAFRAMEREFNOTAVAILABLE | OJPGENERIC_SYSTEMID_NOT_FOUND | OJPGENERIC_OTHER

    Types of problems that may be returned in case of generic problems with the request.

    SignatureType

    xs:string

    data for transmission of message signatures (public key cryptography), used to prove Message Integrity

    3.2. The MessageIntegrityPropertiesGroup group

    @@ -641,10 +660,10 @@

    OJP - Open API for distributed Journey

    MessageIntegrityPropertiesGroup

    Properties that allow checks for message integrity.

    MessageIntegrityProperties

    Signature

    0:1

    Signature

    Authorisation signature (data for transmission of message signatures (public key cryptography), used to prove Message Integrity).

    →‍siri:ServiceFacilityGroup

    JourneyTrack

    0:1

    +LegTrack

    Geographic embedding of this journey. The entire journey is regarded as one leg.

    Extension

    0:1

    xs:anyType

    10.8. The toplevel element TripInfoProblemType

    TripInfoProblemType

    TripInfoProblemType (↔ ErrorType)

    -

    11. OJP/OJP_Trips.xsd - Request and response definitions for trip requests and distributed journey planning

    11.1. Simple type definitions

    AccessFeatureStatusEnumeration

    unknown | available | partiallyAvailable | notAvailable

    Allowed values for status of the access feature.

    AccessFeatureTypeEnumeration

    elevator | stairs | seriesOfStairs | singleStep | seriesOfSingleSteps | escalator | travelator | ramp | footpath | shuttle | other | unkown

    Allowed values for a AccessFeature.

    AccessibilityFeatureTypesEnumeration

    lowFloorAccess | stepFreeAccess | accessWithSteps | slidingStep | raisedKerb | narrowEntrance | wheelchairLift | manualRamp | automaticRamp | suitableForWheelchairs | suitableForUnassistedWheelchairs | suitableForHeaviliyDisabled | suitableForPushchairs | suitableForBicycles | tactilePlatformEdges | tactileGuidingStrips | tactileOrAuditorySigns | visualSigns | elevatorWithTactileButtons | elevatorWithAcousticAnnouncements | audioInformation | audioForHearingImpaired | visualDisplays | displaysForVisuallyImpaired | largePrintTimetables | boardingAssistance | onboardAssistance | unaccompaniedMinorAssistance | barrier | validator

    Allowed values for AccessibilityFeature (for mobility and sensory impairments, assistance and important elements to pay attention to).

    FeasibilityEnumeration

    allAccessFeaturesAvailable | accessFeatureNotAvailable | accessFeaturePartiallyAvailable | accessFeatureWithUnknownAvailability | seeSituations

    Allowed values for the feasibility of a TRIP or part of a TRIP.

    GuidanceAdviceEnumeration

    origin | destination | continue | keep | turn | leave | enter | enter_roundabout | stay_in_roundabout | leave_roundabout | enter_builtup_area | leave_builtup_area | freewayAccessRamp | unknown_lane_choice | left_lane | middle_lane | right_lane | unknown_turning_kind

    Various types of guidance advice given to traveller. Suitable values may differ by MODE (e.g. a car driver needs different advice than a person walking for a transfer.

    LegObjectIdType

    ObjectIdType

    Type for identifier of a NeTEx Object.

    MultiPointTripResultObjectIdType

    ObjectIdType

    Type for identifier of a NeTEx Object.

    MultiPointTypeEnumeration

    anyPoint | eachOrigin | eachDestination | eachOriginDestination | somePoints

    How the multiple origin/destination points should be considered. +

    11. OJP/OJP_Trips.xsd - Request and response definitions for trip requests and distributed journey planning

    11.1. Simple type definitions

    AccessFeatureStatusEnumeration

    unknown | available | partiallyAvailable | notAvailable

    Allowed values for status of the access feature.

    AccessFeatureTypeEnumeration

    elevator | stairs | seriesOfStairs | singleStep | seriesOfSingleSteps | escalator | travelator | ramp | footpath | shuttle | other | unkown

    Allowed values for a AccessFeature.

    AccessibilityFeatureTypesEnumeration

    lowFloorAccess | stepFreeAccess | accessWithSteps | slidingStep | raisedKerb | narrowEntrance | wheelchairLift | manualRamp | automaticRamp | suitableForWheelchairs | suitableForUnassistedWheelchairs | suitableForHeaviliyDisabled | suitableForPushchairs | suitableForBicycles | tactilePlatformEdges | tactileGuidingStrips | tactileOrAuditorySigns | visualSigns | elevatorWithTactileButtons | elevatorWithAcousticAnnouncements | audioInformation | audioForHearingImpaired | visualDisplays | displaysForVisuallyImpaired | largePrintTimetables | boardingAssistance | onboardAssistance | unaccompaniedMinorAssistance | barrier | validator

    Allowed values for AccessibilityFeature (for mobility and sensory impairments, assistance and important elements to pay attention to).

    EarlierArrivalLaterDepartureType

    laterDeparture | earlierArrival

    Prefer earlier arrival or later departure

    FeasibilityEnumeration

    allAccessFeaturesAvailable | accessFeatureNotAvailable | accessFeaturePartiallyAvailable | accessFeatureWithUnknownAvailability | seeSituations

    Allowed values for the feasibility of a TRIP or part of a TRIP.

    GuidanceAdviceEnumeration

    origin | destination | continue | keep | turn | leave | enter | enter_roundabout | stay_in_roundabout | leave_roundabout | enter_builtup_area | leave_builtup_area | freewayAccessRamp | unknown_lane_choice | left_lane | middle_lane | right_lane | unknown_turning_kind

    Various types of guidance advice given to traveller. Suitable values may differ by MODE (e.g. a car driver needs different advice than a person walking for a transfer.

    LegObjectIdType

    ObjectIdType

    Type for identifier of a NeTEx Object.

    MultiPointTripResultObjectIdType

    ObjectIdType

    Type for identifier of a NeTEx Object.

    MultiPointTypeEnumeration

    anyPoint | eachOrigin | eachDestination | eachOriginDestination | somePoints

    How the multiple origin/destination points should be considered. Note: Unfortunately this element was underdefined before and this resulted in different implementations. Note: MultiPointType trumps the number of results. If the algorithm thinks it necessary to provide more results, it should. -

    OptimisationMethodEnumeration

    fastest | minChanges | leastWalking | leastCost | leastDistance | earliestArrival | latestDeparture | earliestArrivalAndLatestDeparture | minNonLevelEntrances | minStairs | bestForVisualImpairment | bestForAuditoryImpairment | environmentalSafety | extraSafe | extraReliable | scenic | quietTravel

    The types of algorithm that can be used for planning a journey (fastest, least walking, etc.). Only one method can be used. Each one really is a whole set of a policy, which is defined below. E.g. fastest also includes least transfers as a second criteria, some modes are excluded usually by default. Implementations might differ (slightly). Also some strategies might not be implemented. The most important strategies are marked.

    TransitionEnumeration

    up | down | level | upAndDown | downAndUp

    Transition types for interchanges.

    TripObjectIdType

    ObjectIdType

    Type for identifier of a NeTEx Object.

    TripProblemTypeEnumeration

    TRIP_NOTRIPFOUND | TRIP_ORIGINUNKNOWN | TRIP_DESTINATIONUNKNOWN | TRIP_VIAUNKNOWN | TRIP_NOTVIAUNKNOWN | TRIP_NOCHANGEATUNKNOWN | TRIP_NOORIGIN | TRIP_NODESTINATION | TRIP_ORIGINDESTINATIONIDENTICAL | TRIP_DATETIMEERROR | TRIP_TIMEWINDOWTOOLARGE | TRIP_DEPARTUREAFTERARRIVAL | TRIP_DATEOUTOFRANGE | TRIP_ORIGINEQUIVALENT | TRIP_DESTINATIONEQUIVALENT | TRIP_VIAEQUIVALENT | TRIP_REALTIMEINCOMPLETE | TRIP_ITTIMEEXTENDED | TRIP_ITMODECHANGED | TRIP_INCONVENIENTWAITING | TRIP_MULTIPOINT_NOTALLPOINTSCOVERED | TRIP_MULTIPOINT_TOOMANYPOINTS | TRIP_MULTIPOINT_TYPE_NOT_SUPPORTED | TRIP_REFINE_LEG_UNKNOWN | REFINE_OBJECTNOTFOUND | REFINE_PROFILENOTSUPPORTED | TRIP_OTHER

    Types of problems that may be returned in responses to Trip requests.

    TripResultObjectIdType

    ObjectIdType

    Type for identifier of a NeTEx Object.

    TurnActionEnumeration

    straight_on | half_right | right | sharp_right | uturn | sharp_left | left | half_left | up | down | unknown_turn_action

    The range of possible turns that can be described.

    11.2. The TripRequestGroup group

    +

    TripRequestGroup

    Trip request structure.

    OptimisationMethodEnumeration

    fastest | minChanges | leastWalking | leastCost | leastDistance | earliestArrival | latestDeparture | earliestArrivalAndLatestDeparture | minNonLevelEntrances | minStairs | bestForVisualImpairment | bestForAuditoryImpairment | environmentalSafety | extraSafe | extraReliable | scenic | quietTravel

    The types of algorithm that can be used for planning a journey (fastest, least walking, etc.). Only one method can be used. Each one really is a whole set of a policy, which is defined below. E.g. fastest also includes least transfers as a second criteria, some modes are excluded usually by default. Implementations might differ (slightly). Also some strategies might not be implemented. The most important strategies are marked.

    TransitionEnumeration

    up | down | level | upAndDown | downAndUp

    Transition types for interchanges.

    TripChangeProblemTypeEnumeration

    TRIPCHANGE_NOLATERTRIPFOUND | TRIPCHANGE_NOEARLIERTRIPFOUND | TRIPCHANGE_INVALIDLEGREF | TRIPCHANGE_INVALIDOPERATOR | TRIPCHANGE_NOVEHICLEAVAILABLE | TRIPCHANGE_OTHER

    Types of problems that may be returned in responses to TRIPCHANGE requests.

    TripObjectIdType

    ObjectIdType

    Type for identifier of a NeTEx Object.

    TripProblemTypeEnumeration

    TRIP_NOTRIPFOUND | TRIP_ORIGINUNKNOWN | TRIP_DESTINATIONUNKNOWN | TRIP_VIAUNKNOWN | TRIP_NOTVIAUNKNOWN | TRIP_NOCHANGEATUNKNOWN | TRIP_NOORIGIN | TRIP_NODESTINATION | TRIP_ORIGINDESTINATIONIDENTICAL | TRIP_DATETIMEERROR | TRIP_TIMEWINDOWTOOLARGE | TRIP_DEPARTUREAFTERARRIVAL | TRIP_DATEOUTOFRANGE | TRIP_ORIGINEQUIVALENT | TRIP_DESTINATIONEQUIVALENT | TRIP_VIAEQUIVALENT | TRIP_REALTIMEINCOMPLETE | TRIP_ITTIMEEXTENDED | TRIP_ITMODECHANGED | TRIP_INCONVENIENTWAITING | TRIP_MULTIPOINT_NOTALLPOINTSCOVERED | TRIP_MULTIPOINT_TOOMANYPOINTS | TRIP_MULTIPOINT_TYPE_NOT_SUPPORTED | TRIP_REFINE_LEG_UNKNOWN | REFINE_OBJECTNOTFOUND | REFINE_PROFILENOTSUPPORTED | TRIP_OTHER

    Types of problems that may be returned in responses to Trip requests.

    TripResultObjectIdType

    ObjectIdType

    Type for identifier of a NeTEx Object.

    TurnActionEnumeration

    straight_on | half_right | right | sharp_right | uturn | sharp_left | left | half_left | up | down | unknown_turn_action

    The range of possible turns that can be described.

    11.2. The TripRequestGroup group

    TripRequestGroup

    Trip request structure.

    TripRequest

    Origin

    1:*

    +PlaceContext

    Specifies the origin situation from where the user wants to start.

    Destination

    1:*

    +PlaceContext

    Specifies the destination situation where the user is heading to.

    Via

    0:*

    +TripVia

    Ordered series of points where the journey must pass through. If more than one via point is given all of them must be obeyed - in the correct order. The server is allowed to replace a via stop by equivalent stops. @@ -863,7 +882,7 @@

    OJP - Open API for distributed Journey

    Infeasible

    0:1

    xs:boolean

    Whether this trip cannot be used, due to operational delays and impossible transfers. Default is false.

    Feasibility

    0:*

    Feasibility

    Information about the feasibility of the TRIP, in particular with respect to the access features used.

    SituationFullRefs

    0:1

    +SituationRefList

    A list of references to SITUATIONs.

    Extension

    0:1

    xs:anyType

    11.15. The complex type LegStructure

    -

    LegStructure

    a single stage of a TRIP that is made without change of MODE or service (ie: between each interchange)

    The element contains a sequence of the following elements:

    Id

    1:1

    LegObjectId

    Id of this leg. Unique within trip result.

    ParticipantRef

    0:1

    siri:ParticipantRefStructure

    [equivalent of PARTICIPANT in SIRI] IT system that is participating in a communication with other participant(s)

    Duration

    0:1

    xs:duration

    The duration of the leg (e.g. from Transmodel PT RIDE LEG.Duration)

    Then, the element contains one of the following elements:

    a

    ContinuousLeg

    -1:1

    +ContinuousLeg

    Leg by a continuously available service or mode of transport.

    b

    TimedLeg

    -1:1

    +TimedLeg

    Timetabled Leg.

    c

    TransferLeg

    -1:1

    +TransferLeg

    Leg to connect between different services or modes of transport (interchanges).

    Sustainability

    EmissionCO2

    0:1

    +EmissionCO2

    Estimation of CO2 emissions.

    11.16. The complex type TimedLegStructure

    +

    TimedLegStructure

    passenger LEG with timetabled schedule. Corresponds to a RIDE.

    The element contains a sequence of the following elements:

    LegBoard

    1:1

    +LegBoard

    Stop/Station where boarding is done

    LegIntermediates

    0:*

    +LegIntermediate

    information about the intermediate passed stop points.

    LegAlight

    1:1

    +LegAlight

    Stop/Station to alight

    Service

    1:1

    +DatedJourney

    Service that is used for this leg.

    LegAttribute

    0:*

    +LegAttribute

    Attributes that are not valid on the whole service, but only on parts of the journey leg.

    Changed

    0:1

    xs:boolean

    TRUE if leg got changed by TripChange-Request.

    11.16. The complex type TimedLegStructure

    @@ -1063,11 +1082,7 @@

    OJP - Open API for distributed Journey

    -

    TimedLegStructure

    passenger LEG with timetabled schedule. Corresponds to a RIDE.

    The element contains a sequence of the following elements:

    LegBoard

    1:1

    +LegBoard

    Stop/Station where boarding is done

    LegIntermediates

    0:*

    +LegIntermediate

    information about the intermediate passed stop points.

    LegAlight

    1:1

    +LegAlight

    Stop/Station to alight

    Service

    1:1

    +DatedJourney

    Service that is used for this leg.

    LegAttribute

    0:*

    +LegAttribute

    Attributes that are not valid on the whole service, but only on parts of the journey leg.

    OperatingDays

    OperatingDays

    0:1

    +OperatingDays

    Bit string definition of operating days.

    OperatingDaysDescription

    0:1

    +InternationalText

    Textual description of the operation days, e.g. "monday to friday" or "not on holidays".

    LegTrack

    0:1

    +LegTrack

    Geographic embedding of this leg.

    TripRefineRequest

    RefineParams

    0:1

    +TripRefineParam

    Options to control the refine

    TripResult

    1:1

    +TripResult

    The trip result to be refined by the server.

    TripResponseContext

    0:1

    +ResponseContext

    Context to hold objects, which are referenced within the response.

    11.36. The TripRefinementDataFilterGroup group

    - -

    TripRefinementDataFilterGroup

    Request data filters for Refinement

    TripRefinementDataFilter

    OperatorFilter

    0:1

    +OperatorFilter

    Transport operators to include/exclude.

    11.37. The complex type TripRefineParamStructure

    - - +

    TripRefineParamStructure

    Trip refinement request parameter structure.

    The element contains a sequence of the following elements:

    ForeignObjectRefs

    0:1

    xs:boolean

    If true, then the request may contain object references from another system. Default is FALSE.

    RefineLegRef

    1:*

    LegObjectId

    Refers to the legs to be refined by the server. If none is given, then all legs are open for refinement (depending if the relevant system can refine them).

    SystemId

    0:1

    xs:normalizedString

    System reference to use for the refinement. If not specified the origin systems of each leg are used for the refinement.

    UseRealtimeData

    0:1

    UseRealtimeData

    Usage of real-time data in refinement. Default is "full".

    TripRefinementDataFilter

    OperatorFilter

    0:1

    +OperatorFilter

    Transport operators to include/exclude.

    11.36. The complex type TripRefineParamStructure

    @@ -1127,11 +1142,78 @@

    OJP - Open API for distributed Journey

    -

    TripRefineParamStructure

    Trip refinement request parameter structure.

    The element contains a sequence of the following elements:

    ForeignObjectRefs

    0:1

    xs:boolean

    If true, then the request may contain object references from another system. Default is FALSE.

    RefineLegRef

    1:*

    LegObjectId

    Refers to the legs to be refined by the server. If none is given, then all legs are open for refinement (depending if the relevant system can refine them).

    SystemId

    0:1

    xs:normalizedString

    System reference to use for the refinement. If not specified the origin systems of each leg are used for the refinement.

    UseRealtimeData

    0:1

    UseRealtimeData

    Usage of real-time data in refinement. Default is "full".

    BaseTripContentFilter

    IncludeTrackSections

    0:1

    xs:boolean

    Whether the result should include TrackSection elements to describe the geographic route of each journey leg.

    IncludeLegProjection

    0:1

    xs:boolean

    Whether the result should include the geographic projection (coordinates) of each journey leg.

    TripSummaryOnly

    0:1

    xs:boolean

    If true, then the response will contain only summaries of the found trips. Default is false.

    FareParam

    0:1

    +FareParam

    Parameters for fare calculation. Only used if IncludeFare is set (TripContentFilterGroup).

    Extension

    0:1

    xs:anyType

    11.38. The TripRefineResponseGroup group

    +

    TripRefineResponseGroup

    Trip refinement response structure.

    FareParam

    0:1

    +FareParam

    Parameters for fare calculation. Only used if IncludeFare is set (TripContentFilterGroup).

    Extension

    0:1

    xs:anyType

    11.37. The TripRefineResponseGroup group

    -

    TripRefineResponseGroup

    Trip refinement response structure.

    TripRefineResponse

    TripResponseContext

    0:1

    +ResponseContext

    Context to hold trip response objects that occur frequently.

    UnknownLegRef

    0:*

    LegObjectId

    Refers to a leg that was not found in the data of the server. If the to be refined TripResult could not be found or unequivocally determined, all RefineLegRefs are returned as UnknownLegRefs.

    TripResult

    0:*

    +TripResult

    The trip results refined by the server.

    11.39. The toplevel element TripProblemType

    TripProblemType

    TripProblemType (↔ ErrorType)

    +

    11.38. The toplevel element TripProblemType

    TripProblemType

    TripProblemType (↔ ErrorType)

    11.39. The TripChangeRequestGroup group

    + + + +

    TripChangeRequestGroup

    Trip change request structure.

    TripChangeRequest

    ChangeParams

    0:1

    +TripChangeParam

    Options to control the change

    TripResult

    1:1

    +TripResult

    The trip result to be changed by the server.

    TripResponseContext

    0:1

    +ResponseContext

    Context to hold objects, which are referenced within the response.

    11.40. The complex type TripChangeParamStructure

    + + + + + + + + + + + + + + + + + | | `easy` +| + + + + + | | `medium` +| + + + + + | | `difficult` +| + + + + + + + + + | | `fast` +| + + + + + | | `green` +| + + + + + | | `comfortable` +| + + + + + + + +

    TripChangeParamStructure

    Trip change request parameter structure.

    The element contains a sequence of the following elements:

    ChangeLegRef

    1:*

    LegObjectId

    Refers to the legs to be changed by the server.

    SystemId

    0:1

    xs:normalizedString

    System reference to use for the refinement. If not specified the origin systems of each leg are used for the refinement.

    EarlierArrivalLaterDeparture

    0:1

    EarlierArrivalLaterDeparture

    Whether the requested journey leg of the passed trip should arrive earlier or depart later to give the passenger more time to make the interchange.

    AdditionalWaitingTime

    0:1

    xs:duration

    Absolute time in minutes the passenger wants additionally to make the interchange. If another TransferLeg is needed (e.g. since another quay is used for the found arrival/departure) this is taken into account. If not passed, the next best arrival/departure is requested.

    BaseTripContentFilter

    IncludeTrackSections

    0:1

    xs:boolean

    Whether the result should include TrackSection elements to describe the geographic route of each journey leg.

    IncludeLegProjection

    0:1

    xs:boolean

    Whether the result should include the geographic projection (coordinates) of each journey leg.

    IncludeTurnDescription

    0:1

    xs:boolean

    Whether the result should include turn-by-turn instructions for each journey leg.

    IncludeAccessFeatures

    0:1

    xs:boolean

    Whether the result should include the access features (stairs, elevator, etc.) on each path link.

    IncludeAccessFeaturesStatus

    0:1

    xs:boolean

    Whether the result should include real time status of access features to indicate broken equipment.

    IncludeAccessibilityDetails

    0:*

    AccessibilityDetailsProfile

    Which accessibility features and other accessibility-related information to retrieve (e.g. guidance text for the visually impaired).

    IncludePlacesContext

    0:1

    xs:boolean

    Whether the place context is needed. If a requestor has that information already, the response can be made slimmer, when set to false. Default is true.

    IncludeSituationsContext

    0:1

    xs:boolean

    Wheter the situation context is needed. If a requestor has that information by other means or can't process it, the response can be made slimmer, when set to false. Default is true

    TripContentFilter

    IncludeIntermediateStops

    0:1

    xs:boolean

    Whether the result should include intermediate stops (between the passenger's board and alight stops).

    IncludeAlternativeOptions

    0:1

    xs:boolean

    Whether alternative options should be presented as well. Mainly important for dominated journeys or in the case of ContinuousLegs the second-best route. Should be optimised for the user expectance (see. e.g https://theses.hal.science/tel-01848737). However, what the alternative options are may vary widely depending on the optimisation methods and filters.

    IncludeFare

    0:1

    xs:boolean

    Whether the result should include fare information.

    IncludeOperatingDays

    0:1

    xs:boolean

    Whether the result should include operating day information - as encoded bit string and in natural language.

    HikingProfile

    0:1

    Users hiking profile. The main element to control general walking behaviour is WalkSpeed (together with accessibility constraints). Note: possible explanations in German can be found here: https://akademie.alpinewelten.com/bergwandern/klassifizierung-von-wanderwegen

    CyclingProfile

    0:1

    Cycling profile of the user (especially for sportive activities).

    TripSummaryOnly

    0:1

    xs:boolean

    If true, then the response will contain only summaries of the found trips. Default is false.

    FareParam

    0:1

    +FareParam

    Parameters for fare calculation. Only used if IncludeFare is set (TripContentFilterGroup).

    OperatorFilter

    0:1

    +OperatorFilter

    Transport operators to include/exclude.

    Extension

    0:1

    xs:anyType

    11.41. The TripChangeResponseGroup group

    + + +

    TripChangeResponseGroup

    Trip change response structure.

    TripChangeResponse

    TripResponseContext

    0:1

    +ResponseContext

    Context to hold trip response objects that occur frequently.

    TripResult

    0:1

    +TripResult

    The trip results refined by the server.

    11.42. The toplevel element TripChangeProblemType

    TripChangeProblemType

    TripChangeProblemType (↔ ErrorType)

    12. OJP/OJP_JourneySupport.xsd - Supporting definitions for journeys on public transport vehicles

    12.1. Simple type definitions

    AccessibilityDetailsProfileEnumeration

    visualImpairment | auditoryImpairment | mobilityImpairment | bicycle | general

    Allowed values for AccessibilityDetails.

    ReservationNeededEnumeration

    none | service | stop

    Possible types of reservation needed for services.

    UseRealtimeDataEnumeration

    full | explanatory | none

    VehicleProgressEnumeration

    Not yet operated | Operation finished | At stop | Between stops

    Vehicle progress relative to timetable service pattern.

    12.2. The complex type ServiceViaPointStructure

    diff --git a/examples/functions/trip/TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml b/examples/functions/trip/TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml index 74542f72d..d1ec25209 100644 --- a/examples/functions/trip/TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml +++ b/examples/functions/trip/TR_01_request_Bern_Luzern_10_results_optimisation_fastest.xml @@ -1,7 +1,7 @@ - + 2020-01-31T12:30:00Z 3CC3C04A-20A0-4B12-AC46-5A7843E328A7 diff --git a/examples/functions/trip_change/ChangeTripRequest.xml b/examples/functions/trip_change/ChangeTripRequest.xml index cd0ebe764..f266957fe 100644 --- a/examples/functions/trip_change/ChangeTripRequest.xml +++ b/examples/functions/trip_change/ChangeTripRequest.xml @@ -210,4 +210,4 @@ - \ No newline at end of file + diff --git a/examples/functions/trip_change/ChangeTripResponse.xml b/examples/functions/trip_change/ChangeTripResponse.xml index dfd2af621..54072f05b 100644 --- a/examples/functions/trip_change/ChangeTripResponse.xml +++ b/examples/functions/trip_change/ChangeTripResponse.xml @@ -182,4 +182,4 @@ - \ No newline at end of file + diff --git a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml index ce221c4f2..1305f1f5e 100644 --- a/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml +++ b/examples/functions/trip_change/TripChange_001_Request_laterDeparture.xml @@ -252,4 +252,4 @@ - \ No newline at end of file + diff --git a/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml b/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml index 428d08867..b7e31f74a 100644 --- a/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml +++ b/examples/functions/trip_change/TripChange_001_Response_laterDeparture.xml @@ -266,4 +266,4 @@ - \ No newline at end of file + From e3a0c72e78e9295025a02d1ce61c0dbee3b8f4c2 Mon Sep 17 00:00:00 2001 From: Stefan de Konink Date: Tue, 18 Jul 2023 09:02:41 +0200 Subject: [PATCH 21/22] Apply suggestions from code review --- OJP/OJP_Trips.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OJP/OJP_Trips.xsd b/OJP/OJP_Trips.xsd index c1a796d01..0a1a8d3b9 100644 --- a/OJP/OJP_Trips.xsd +++ b/OJP/OJP_Trips.xsd @@ -1746,7 +1746,7 @@ - Options to control the change + Options to control the change. From b1d4066d7504c361682fece46915d270d65a001b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 07:03:26 +0000 Subject: [PATCH 22/22] Lint and update documentation tables --- docs/generated/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/generated/index.html b/docs/generated/index.html index 566dd5bb2..1bc492cfd 100644 --- a/docs/generated/index.html +++ b/docs/generated/index.html @@ -306,7 +306,7 @@

    OJP - Open API for distributed Journey

    ServiceViaPointStructure

    [a specialisation of VIA in TMv6] STOP PLACE or SCHEDULED STOP POINT as a VIA for a particular SERVICE PATTERN. Specialisation of a VIA.

    The element contains a sequence of the following elements:

    StopPoint

    →‍siri:StopPointRef

    1:1

    →‍siri:StopPointRef

    Reference to a stop point.

    StopPointName

    1:1

    +InternationalText

    Name or description of stop point for use in passenger information.

    2.45. The toplevel element OJPTripChangeRequest

    OJPTripChangeRequest

    +OJPTripChangeRequest (↔ siri:AbstractFunctionalServiceRequest)

    2.46. The complex type OJPTripChangeRequestStructure

    - + @@ -1147,7 +1147,7 @@

    OJP - Open API for distributed Journey

    OJPTripChangeRequestStructure

    +AbstractOJPServiceRequest

    The element contains a sequence of the following elements:

    TripChangeRequest

    ChangeParams

    0:1

    +TripChangeParam

    Options to control the change

    TripChangeRequest

    ChangeParams

    0:1

    +TripChangeParam

    Options to control the change.

    TripResult

    1:1

    +TripResult

    The trip result to be changed by the server.

    TripResponseContext

    0:1

    +ResponseContext

    Context to hold objects, which are referenced within the response.

    →‍siri:Extensions

    0:1

    →‍siri:Extensions

    UnknownLegRef

    0:*

    LegObjectId

    Refers to a leg that was not found in the data of the server. If the to be refined TripResult could not be found or unequivocally determined, all RefineLegRefs are returned as UnknownLegRefs.

    TripResult

    0:*

    +TripResult

    The trip results refined by the server.

    11.38. The toplevel element TripProblemType

    TripProblemType

    TripProblemType (↔ ErrorType)

    11.39. The TripChangeRequestGroup group

    - +

    TripChangeRequestGroup

    Trip change request structure.

    TripChangeRequest

    ChangeParams

    0:1

    +TripChangeParam

    Options to control the change

    TripChangeRequest

    ChangeParams

    0:1

    +TripChangeParam

    Options to control the change.

    TripResult

    1:1

    +TripResult

    The trip result to be changed by the server.

    TripResponseContext

    0:1

    +ResponseContext

    Context to hold objects, which are referenced within the response.

    11.40. The complex type TripChangeParamStructure

    TripChangeParamStructure

    Trip change request parameter structure.

    The element contains a sequence of the following elements:

    ChangeLegRef

    1:*

    LegObjectId

    Refers to the legs to be changed by the server.

    SystemId

    0:1

    xs:normalizedString

    System reference to use for the refinement. If not specified the origin systems of each leg are used for the refinement.

    EarlierArrivalLaterDeparture

    0:1

    EarlierArrivalLaterDeparture

    Whether the requested journey leg of the passed trip should arrive earlier or depart later to give the passenger more time to make the interchange.

    AdditionalWaitingTime

    0:1

    xs:duration

    Absolute time in minutes the passenger wants additionally to make the interchange. If another TransferLeg is needed (e.g. since another quay is used for the found arrival/departure) this is taken into account. If not passed, the next best arrival/departure is requested.