From 503a389e4aa20a678ed4c3783d2c9a2aee117a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 19 Aug 2025 17:16:43 +0200 Subject: [PATCH 1/2] Fixes #474 --- OJP/OJP_Common.xsd | 5 + .../ShrTRResponsebicycle_sharing.xml | 133 ++++++++++++++++++ examples/switzerland/ShrTRbicycle_sharing.xml | 43 ++++++ .../ShrTRbicycle_sharing_erste_Meile.xml | 49 +++++++ .../ShrTRbicycle_sharing_letzte_Meile.xml | 49 +++++++ examples/switzerland/ShrTRcar_sharing.xml | 43 ++++++ .../switzerland/ShrTRescooter_sharing.xml | 43 ++++++ 7 files changed, 365 insertions(+) create mode 100644 examples/switzerland/ShrTRResponsebicycle_sharing.xml create mode 100644 examples/switzerland/ShrTRbicycle_sharing.xml create mode 100644 examples/switzerland/ShrTRbicycle_sharing_erste_Meile.xml create mode 100644 examples/switzerland/ShrTRbicycle_sharing_letzte_Meile.xml create mode 100644 examples/switzerland/ShrTRcar_sharing.xml create mode 100644 examples/switzerland/ShrTRescooter_sharing.xml diff --git a/OJP/OJP_Common.xsd b/OJP/OJP_Common.xsd index 1b248e25..bbb9600e 100644 --- a/OJP/OJP_Common.xsd +++ b/OJP/OJP_Common.xsd @@ -295,6 +295,11 @@ Link to the web page providing more details on the service. + + + References to the OPERATORS. Multiple OPERATORS in case a ContinuousLeg can be operated by more than one operator, especially in the ALTERNATIVE MODE OF OPERATION where there can be dozens of taxi companies and many free-floating sharing companies. + + This flag is set if the service can only be used in a restricted way. For example, a specific ACCESS MODE is required (e.g., dragLift) or the LINE is only made available to certain passenger groups (e.g., school buses, hotel shuttles). diff --git a/examples/switzerland/ShrTRResponsebicycle_sharing.xml b/examples/switzerland/ShrTRResponsebicycle_sharing.xml new file mode 100644 index 00000000..79d92060 --- /dev/null +++ b/examples/switzerland/ShrTRResponsebicycle_sharing.xml @@ -0,0 +1,133 @@ + + + + 2025-08-07T09:12:30.2711709+02:00 + MENTZ + + 2025-08-07T09:12:30.2711715+02:00 + 00-6486073608f51c1c83bb0615903bebdd-eeec2d4e58029c70-00 + de + 196 + + ID-179B62DD-3437-4BDD-8F52-D515B16FCF66 + + ID-179B62DD-3437-4BDD-8F52-D515B16FCF66 + PT7M + 2025-08-08T07:14:00Z + 2025-08-08T07:21:00Z + 0 + 2390 + + 1 + PT4M + + + + 8.53808 + 47.37683 + + + 47.376825,8.538083 + + + + 8503000 + + Zürich HB + + + + own + foot + + PT4M + 146 + + + + + 8.53808 + 47.37683 + + + 47.376825,8.538083 + + + + 8503000 + + Zürich HB + + + PT4M + 146 + + + + + 0 + + + + 2 + PT3M + + + + 1.1 + 1.1 + + + Zürich HB + + + + + 2.2 + 2.2 + + + Zürich, Giesshübel + + + + sharing + bicycle + + bird-zurich-escooter:01651159-9daa-44a4-8bb1-ffce5dc91bff + Bird + + ch:lime + + + + + + + https://go.bird.co?birdId=01651159-9daa-44a4-8bb1-ffce5dc91bff&lat=47.37844&lng=8.5347443333 + + + + + + https://go.bird.co/navigate?link=https%3A%2F%2Fgo.bird.co%2Fmap%3FbirdId%3D01651159-9daa-44a4-8bb1-ffce5dc91bff%26lat%3D47.37844983333333%26lon%3D8.534744333333332 + + + + + PT15M + + + 0.007 + + + + + + + + diff --git a/examples/switzerland/ShrTRbicycle_sharing.xml b/examples/switzerland/ShrTRbicycle_sharing.xml new file mode 100644 index 00000000..331606e5 --- /dev/null +++ b/examples/switzerland/ShrTRbicycle_sharing.xml @@ -0,0 +1,43 @@ + + + + + 2025-08-05T14:37:51.270Z + MENTZRegTest + + 2025-08-05T14:37:51.270Z + Shr-3b + + + + 7.022870 + 47.008970 + + + 47.008970,7.022870 + + + 2025-12-12T11:00:00Z + + + + 8504221 + + Neuchâtel (Neuchâtel) + + + + + + bicycle + sharing + + true + true + true + true + + + + + diff --git a/examples/switzerland/ShrTRbicycle_sharing_erste_Meile.xml b/examples/switzerland/ShrTRbicycle_sharing_erste_Meile.xml new file mode 100644 index 00000000..9bec6601 --- /dev/null +++ b/examples/switzerland/ShrTRbicycle_sharing_erste_Meile.xml @@ -0,0 +1,49 @@ + + + + + 2025-08-05T14:37:51.270Z + MENTZRegTest + + 2025-08-05T14:37:51.270Z + Shr-3b + + + + 7.022870 + 47.008970 + + + 47.008970,7.022870 + + + 2025-12-12T11:00:00Z + + + bicycle + sharing + + 10000 + PT15M + 500 + PT3M + + + + + 8504221 + + Neuchâtel (Neuchâtel) + + + + + true + true + true + true + + + + + diff --git a/examples/switzerland/ShrTRbicycle_sharing_letzte_Meile.xml b/examples/switzerland/ShrTRbicycle_sharing_letzte_Meile.xml new file mode 100644 index 00000000..5e7c165f --- /dev/null +++ b/examples/switzerland/ShrTRbicycle_sharing_letzte_Meile.xml @@ -0,0 +1,49 @@ + + + + + 2025-08-05T14:37:51.270Z + MENTZRegTest + + 2025-08-05T14:37:51.270Z + Shr-3b + + + + 7.022870 + 47.008970 + + + 47.008970,7.022870 + + + 2025-12-12T11:00:00Z + + + + 8504221 + + Neuchâtel (Neuchâtel) + + + + + bicycle + sharing + + 10000 + PT15M + 500 + PT3M + + + + true + true + true + true + + + + + diff --git a/examples/switzerland/ShrTRcar_sharing.xml b/examples/switzerland/ShrTRcar_sharing.xml new file mode 100644 index 00000000..899db072 --- /dev/null +++ b/examples/switzerland/ShrTRcar_sharing.xml @@ -0,0 +1,43 @@ + + + + + 2025-08-05T14:37:51.270Z + MENTZRegTest + + 2025-08-05T14:37:51.270Z + Shr-3b + + + + 7.022870 + 47.008970 + + + 47.008970,7.022870 + + + 2025-12-12T11:00:00Z + + + + 8504221 + + Neuchâtel (Neuchâtel) + + + + + + car + sharing + + true + true + true + true + + + + + diff --git a/examples/switzerland/ShrTRescooter_sharing.xml b/examples/switzerland/ShrTRescooter_sharing.xml new file mode 100644 index 00000000..a980e789 --- /dev/null +++ b/examples/switzerland/ShrTRescooter_sharing.xml @@ -0,0 +1,43 @@ + + + + + 2025-08-05T14:37:51.270Z + MENTZRegTest + + 2025-08-05T14:37:51.270Z + Shr-3b + + + + 7.022870 + 47.008970 + + + 47.008970,7.022870 + + + 2025-12-12T11:00:00Z + + + + 8504221 + + Neuchâtel (Neuchâtel) + + + + + + scooter + sharing + + true + true + true + true + + + + + From b5ea8bd454262a9f48fe2dd084b65a9bc68cafc2 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 15:19:43 +0000 Subject: [PATCH 2/2] fixup! Fixed linting errors --- OJP/OJP_Common.xsd | 2 +- .../ShrTRResponsebicycle_sharing.xml | 20 ++++++++++++------- examples/switzerland/ShrTRbicycle_sharing.xml | 2 +- .../ShrTRbicycle_sharing_erste_Meile.xml | 2 +- .../ShrTRbicycle_sharing_letzte_Meile.xml | 2 +- examples/switzerland/ShrTRcar_sharing.xml | 2 +- .../switzerland/ShrTRescooter_sharing.xml | 2 +- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/OJP/OJP_Common.xsd b/OJP/OJP_Common.xsd index bbb9600e..16a3cff1 100644 --- a/OJP/OJP_Common.xsd +++ b/OJP/OJP_Common.xsd @@ -299,7 +299,7 @@ References to the OPERATORS. Multiple OPERATORS in case a ContinuousLeg can be operated by more than one operator, especially in the ALTERNATIVE MODE OF OPERATION where there can be dozens of taxi companies and many free-floating sharing companies. - + This flag is set if the service can only be used in a restricted way. For example, a specific ACCESS MODE is required (e.g., dragLift) or the LINE is only made available to certain passenger groups (e.g., school buses, hotel shuttles). diff --git a/examples/switzerland/ShrTRResponsebicycle_sharing.xml b/examples/switzerland/ShrTRResponsebicycle_sharing.xml index 79d92060..89461ec1 100644 --- a/examples/switzerland/ShrTRResponsebicycle_sharing.xml +++ b/examples/switzerland/ShrTRResponsebicycle_sharing.xml @@ -1,4 +1,5 @@ - + + 2025-08-07T09:12:30.2711709+02:00 @@ -91,14 +92,18 @@ - sharing - bicycle + sharing + + bicycle + - bird-zurich-escooter:01651159-9daa-44a4-8bb1-ffce5dc91bff - Bird + bird-zurich-escooter:01651159-9daa-44a4-8bb1-ffce5dc91bff + + Bird + ch:lime - + @@ -106,7 +111,8 @@ - https://go.bird.co?birdId=01651159-9daa-44a4-8bb1-ffce5dc91bff&lat=47.37844&lng=8.5347443333 + https://go.bird.co?birdId=01651159-9daa-44a4-8bb1-ffce5dc91bff&lat=47.37844&lng=8.5347443333 + diff --git a/examples/switzerland/ShrTRbicycle_sharing.xml b/examples/switzerland/ShrTRbicycle_sharing.xml index 331606e5..3f0657f4 100644 --- a/examples/switzerland/ShrTRbicycle_sharing.xml +++ b/examples/switzerland/ShrTRbicycle_sharing.xml @@ -1,5 +1,5 @@ - + 2025-08-05T14:37:51.270Z diff --git a/examples/switzerland/ShrTRbicycle_sharing_erste_Meile.xml b/examples/switzerland/ShrTRbicycle_sharing_erste_Meile.xml index 9bec6601..b715b84c 100644 --- a/examples/switzerland/ShrTRbicycle_sharing_erste_Meile.xml +++ b/examples/switzerland/ShrTRbicycle_sharing_erste_Meile.xml @@ -1,5 +1,5 @@ - + 2025-08-05T14:37:51.270Z diff --git a/examples/switzerland/ShrTRbicycle_sharing_letzte_Meile.xml b/examples/switzerland/ShrTRbicycle_sharing_letzte_Meile.xml index 5e7c165f..9d4fc402 100644 --- a/examples/switzerland/ShrTRbicycle_sharing_letzte_Meile.xml +++ b/examples/switzerland/ShrTRbicycle_sharing_letzte_Meile.xml @@ -1,5 +1,5 @@ - + 2025-08-05T14:37:51.270Z diff --git a/examples/switzerland/ShrTRcar_sharing.xml b/examples/switzerland/ShrTRcar_sharing.xml index 899db072..2c243f97 100644 --- a/examples/switzerland/ShrTRcar_sharing.xml +++ b/examples/switzerland/ShrTRcar_sharing.xml @@ -1,5 +1,5 @@ - + 2025-08-05T14:37:51.270Z diff --git a/examples/switzerland/ShrTRescooter_sharing.xml b/examples/switzerland/ShrTRescooter_sharing.xml index a980e789..382cbe39 100644 --- a/examples/switzerland/ShrTRescooter_sharing.xml +++ b/examples/switzerland/ShrTRescooter_sharing.xml @@ -1,5 +1,5 @@ - + 2025-08-05T14:37:51.270Z