From 43c319acd0a6d26fd31f8f7b09584027647766da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 22 Sep 2025 22:58:47 +0200 Subject: [PATCH 1/7] First draft of the extension of the booking --- .../newModes/NewModes-CarPoolingExample.xml | 6 +- .../NewModes-ChauffeuredServiceExample.xml | 74 ++++++++++---- .../netex_serviceRestrictions_version.xsd | 96 ++++++++++++++++++- ...etex_usageParameterEligibility_version.xsd | 2 +- .../netex_nm_mobilityService_version.xsd | 4 +- 5 files changed, 157 insertions(+), 25 deletions(-) diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml index 59579f46a..bfc66f147 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -447,7 +447,8 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held Ryde car scharing scheme. 2018-01-01 - + + https://www.ryde.eu/booking @@ -460,7 +461,8 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held Booklings made using app. Bookings can be made up to two hour before travel. false none - + + true true diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index 8221791ac..5ea40f625 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -454,6 +454,13 @@ + + + + A classical public transport line + + + @@ -485,23 +492,54 @@ Home James Cars. - - - =31666777 - https://www.homeJames.eu/booking - - mobileApp online - authorisedPublic - advanceOnly - onCheckOut - 20:00:00 - P1D - https://www.homeJames.eu/booking - Booklings made online or by pyone Bookings can be made up to two hour before travel. - PT2H - true - none - + + + + =31666777 + https://www.homeJames.eu/booking + + mobileApp online + authorisedPublic + advanceOnly + onCheckOut + 20:00:00 + P1D + https://www.homeJames.eu/booking + Booklings made online or by pyone Bookings can be made up to two hour before travel. + PT2H + true + none + + + true + true + + + + PT15M + 500 + + + + 65 + + + + + 20 + + + + + true + + + + + 2 + + + true true @@ -1238,4 +1276,4 @@ This Shows sample Purchases - + \ No newline at end of file diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index 761b836c2..9a4d9fed3 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -2,7 +2,9 @@ - + + + @@ -232,6 +234,96 @@ Rail transport, Roads and Road transport + + + Type for SERVICE COMPETITIVE CONDITION. + + + + + + + + + + Elements for SERVICE COMPETITIVE CONDITION. + + + + + + + Line that is not to be competed with. + + + + + Temporal distance to the line. + + + + + Distance in meters to the line. + + + + + + + Interchange between different flexible services is allowed. + + + + + Interchange between the flexible service and conventional services is allowed + + + + + + + + + Type for SERVICE ELIGIBILITY ARRANGEMENTs. + + + + + + + + + + Elements for SERVICE ELIGIBILITY ARRANGEMENTs. + + + + + + + + + + + + + + + + + Type for containment in frame of BOOKING ARRANGEMENTs + + + + + + + + + + @@ -402,4 +494,4 @@ Rail transport, Roads and Road transport - + \ No newline at end of file diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd index 8498fbbba..613a99efc 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd @@ -687,7 +687,7 @@ Rail transport, Roads and Road transport - The policy to apply if ta user's eligibility as a USER PROFILE changes. + The policy to apply if a user's eligibility as a USER PROFILE changes. diff --git a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd index 112f64bf3..2f13bee13 100644 --- a/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd +++ b/xsd/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd @@ -127,9 +127,9 @@ Rail transport, Roads and Road transport - + - Booking Arrangements for service. + BOOKING ARRANGEMENTs for SERVICE. From d43171162bbc6407b9f8687b312f3ec705de8563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 22 Sep 2025 23:04:39 +0200 Subject: [PATCH 2/7] Update IXSI Service 1 - Static Data.xml --- .../newModes/IXSI Service 1 - Static Data.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/functions/newModes/IXSI Service 1 - Static Data.xml b/examples/functions/newModes/IXSI Service 1 - Static Data.xml index 320c1f8f8..3c961353d 100644 --- a/examples/functions/newModes/IXSI Service 1 - Static Data.xml +++ b/examples/functions/newModes/IXSI Service 1 - Static Data.xml @@ -114,9 +114,11 @@ Stadtmobil - - https://www.stadtmobil.de/ - + + + https://www.stadtmobil.de/ + + true @@ -132,4 +134,4 @@ - + \ No newline at end of file From dd765a1245ffd8ef1b187212c9996b2954ab5187 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 21:08:51 +0000 Subject: [PATCH 3/7] Lint and update documentation tables --- .../newModes/IXSI Service 1 - Static Data.xml | 2 +- .../newModes/NewModes-CarPoolingExample.xml | 24 +++++++++---------- .../NewModes-ChauffeuredServiceExample.xml | 2 +- .../netex_serviceRestrictions_version.xsd | 10 ++++---- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/examples/functions/newModes/IXSI Service 1 - Static Data.xml b/examples/functions/newModes/IXSI Service 1 - Static Data.xml index 3c961353d..88f685f5f 100644 --- a/examples/functions/newModes/IXSI Service 1 - Static Data.xml +++ b/examples/functions/newModes/IXSI Service 1 - Static Data.xml @@ -134,4 +134,4 @@ - \ No newline at end of file + diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml index bfc66f147..4b68d1911 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -449,18 +449,18 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held - - https://www.ryde.eu/booking - - mobileApp online - authorisedPublic - advanceAndDayOfTravel - onCheckOut - PT2H - https://www.ryde.eu/booking - Booklings made using app. Bookings can be made up to two hour before travel. - false - none + + https://www.ryde.eu/booking + + mobileApp online + authorisedPublic + advanceAndDayOfTravel + onCheckOut + PT2H + https://www.ryde.eu/booking + Booklings made using app. Bookings can be made up to two hour before travel. + false + none true diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index 5ea40f625..91df23afb 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -1276,4 +1276,4 @@ This Shows sample Purchases - \ No newline at end of file + diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index 9a4d9fed3..9532b7a59 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -3,8 +3,10 @@ - - + + + + @@ -268,7 +270,7 @@ Rail transport, Roads and Road transport - + Interchange between different flexible services is allowed. @@ -494,4 +496,4 @@ Rail transport, Roads and Road transport - \ No newline at end of file + From 8256741c7897df68b6c382118d3a044a9b22f44e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 23 Sep 2025 17:47:57 +0200 Subject: [PATCH 4/7] Update examples/functions/newModes/NewModes-CarPoolingExample.xml Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- examples/functions/newModes/NewModes-CarPoolingExample.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/newModes/NewModes-CarPoolingExample.xml b/examples/functions/newModes/NewModes-CarPoolingExample.xml index 4b68d1911..9d105be78 100644 --- a/examples/functions/newModes/NewModes-CarPoolingExample.xml +++ b/examples/functions/newModes/NewModes-CarPoolingExample.xml @@ -458,7 +458,7 @@ In addition CUSTOMER PURCHASE PACKAGES showing the parameters that might be held onCheckOut PT2H https://www.ryde.eu/booking - Booklings made using app. Bookings can be made up to two hour before travel. + Bookings made using app. Bookings can be made up to two hour before travel. false none From d9b3c0659cb4d944d187eb4f1d3061567b339835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 23 Sep 2025 17:48:19 +0200 Subject: [PATCH 5/7] Update xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../netex_serviceRestrictions_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index 9532b7a59..cfda5dc5b 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -265,7 +265,7 @@ Rail transport, Roads and Road transport - Distance in meters to the line. + Distance in metres to the line. From c966814afbbef3b227905659e57d08aad7058ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 23 Sep 2025 17:51:10 +0200 Subject: [PATCH 6/7] Update examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --- .../functions/newModes/NewModes-ChauffeuredServiceExample.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml index 91df23afb..0dfbf41d2 100644 --- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml +++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml @@ -505,7 +505,7 @@ 20:00:00 P1D https://www.homeJames.eu/booking - Booklings made online or by pyone Bookings can be made up to two hour before travel. + Bookings made online or by phone. Bookings must be made before 20:00 of the previous day. PT2H true none From 5c5866c1cd7a4767d5b7903d70c3038b61a78043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 24 Sep 2025 10:02:09 +0200 Subject: [PATCH 7/7] Update xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd Co-authored-by: Stefan de Konink --- .../netex_serviceRestrictions_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd index cfda5dc5b..799d6bf98 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceRestrictions_version.xsd @@ -258,7 +258,7 @@ Rail transport, Roads and Road transport Line that is not to be competed with. - + Temporal distance to the line.