From 17b9a89fa48b8a3d3a1a91ee0153cc98503dd07b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 16 Jul 2026 19:30:03 +0200 Subject: [PATCH 01/22] Broader usage direction type 2 (#1021) * Broader use of DirectionType as alternative to DirectionRef * Update Netex_09.1_Bus_InterchangeRule.xml --- .gitignore | 2 ++ .../functions/timetable/Netex_09.1_Bus_InterchangeRule.xml | 2 ++ .../part1_networkDescription/netex_line_version.xsd | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 3ce15e17c..ea923de8d 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,5 @@ fabric.properties # Editor-based Rest Client .idea/httpRequests +.idea/.name +/.idea diff --git a/examples/functions/timetable/Netex_09.1_Bus_InterchangeRule.xml b/examples/functions/timetable/Netex_09.1_Bus_InterchangeRule.xml index 8af4a93ea..18889888a 100644 --- a/examples/functions/timetable/Netex_09.1_Bus_InterchangeRule.xml +++ b/examples/functions/timetable/Netex_09.1_Bus_InterchangeRule.xml @@ -362,6 +362,8 @@ The Calendar is shown coded as + outbound + diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd index 40f5462c8..85a954399 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -987,6 +987,11 @@ Rail transport, Roads and Road transport + + + A Direction of a ROUTE, that can be used instead of DirectionRef. The enumeration provides a restricted set of values. +v2.1. + + Alternative LINE Reference for AVMS system. DEPRECATED - v2.0 From 194ddc67a628349daea79fe4b8762ed8d684be01 Mon Sep 17 00:00:00 2001 From: duexw Date: Thu, 16 Jul 2026 19:33:46 +0200 Subject: [PATCH 02/22] New property to indicate an interchange within the same vehicle (#1027) * Added Element "ChangeWithinVehicle" to InterchangePropertyGroup * improve documentation by adding the tag `+v2.1` --- .../part2_journeyTimes/netex_interchange_version.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd index e3607ea9d..fa650d000 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd @@ -533,6 +533,11 @@ Default is false. Default is false. + + + In case of train splitting, the passenger may have to change to a different part of the train to continue the journey. Default is false. +v2.1 + + From 2cead31c86fb6b4db831a7cc61c3b09abdafb431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 16 Jul 2026 20:33:01 +0200 Subject: [PATCH 03/22] Add StopPointInServiceJourneyPatternRef to JourneyWaitTime for stops visited 2 times in the same ServiceJourney with different wait times (#1031) * Addint StopPointInServiceJourneyPatternRef to JourneyWaitTime * made JourneyWaitTimeGroup/StopPointInJourneyPatternRef reference the correct element type * Update netex_journeyTiming_version.xsd * add example and fix error and make it all one choice * Update netex_journeyTiming_version.xsd --- NeTEx.spp | 1 + ...eTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml | 786 ++++++++++++++++++ .../netex_journeyTiming_version.xsd | 22 +- 3 files changed, 808 insertions(+), 1 deletion(-) create mode 100644 examples/functions/timetable/NeTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml diff --git a/NeTEx.spp b/NeTEx.spp index 11d91fa2d..b5a8a143e 100644 --- a/NeTEx.spp +++ b/NeTEx.spp @@ -734,6 +734,7 @@ + diff --git a/examples/functions/timetable/NeTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml b/examples/functions/timetable/NeTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml new file mode 100644 index 000000000..918106381 --- /dev/null +++ b/examples/functions/timetable/NeTEx_CH_Bern_Spiez_Zweisimmen_ValidRef.xml @@ -0,0 +1,786 @@ + + + + 2025-06-26T14:16:54+02:00 + TUXALP + NeTEx Zweisimmen Example edited by Urs + + + + + 2025-12-15T00:00:00 + 2026-12-12T23:59:59 + + + + + + Fahrplanjahr 2025/26 + + + + + BLS + BLS AG + + + entityLegalOwnership + + + + operation + + + + + + + + ProductCategories + + + Regio Express + RE + + + Regionalzug + R + + + + + + + + + SBOID + ch:1:sboid:100015 + + + ch:1:sboid:101105 + BLS AG + BLS + + + + + + + + + DIDOK + 7000 + + + SLOID + ch:1:sloid:7000 + + + Bern + 7000 + + + 7.43913088992 + 46.94883228914 + 540.2 + + + + + Berna + + + railStation + + + + + SLOID + ch:1:sloid:7000:5:9 + + + + + 7.43913088992 + 46.94883228914 + 540.2 + + + + + + + + + DIDOK + 7100 + + + SLOID + ch:1:sloid:7100 + + + Thun + 7100 + + + 7.62960582867 + 46.75485272921 + 559.75 + + + railStation + + + + + SLOID + ch:1:sloid:7100:1:1 + + + + + 7.62960582867 + 46.75485272921 + 559.75 + + + + + + + + + DIDOK + 8507483 + + + SLOID + ch:1:sloid:7483 + + + Spiez + 8507483 + + + 7.68010305780 + 46.68639566696 + 627.82 + + + railStation + + + + + SLOID + ch:1:sloid:7483:0:3AB + + + + + 7.68010305780 + 46.68639566696 + 627.82 + + + + + + + + + DIDOK + 8507290 + + + SLOID + ch:1:sloid:7290 + + + Zweisimmen + 8507290 + + + 7.37486190719 + 46.55348254993 + 941.6 + + + railStation + + + + + SLOID + ch:1:sloid:7290:0:930269 + + + + + 7.37486190719 + 46.55348254993 + 941.6 + + + + + + + + + DIDOK + 8507478 + + + SLOID + ch:1:sloid:7478 + + + Frutigen + 8507478 + + + 7.65158908644 + 46.58857680502 + 779.8 + + + railStation + + + + + SLOID + ch:1:sloid:7478:0:852180 + + + + + 7.65158908644 + 46.58857680502 + 779.8 + + + + + + + + + DIDOK + 8501609 + + + SLOID + ch:1:sloid:1609 + + + Brig + 8507290 + + + 7.99057910188 + 46.32002223690 + 677.9 + + + railStation + + + + + SLOID + ch:1:sloid:1609:4:9 + + + + + 7.99057910188 + 46.32002223690 + 677.9 + + + + + + + + + + + + + + + + SLNID + ch:1:slnid:1024437 + + + Bern - Spiez - Kandersteg - Brig (- Domodossola) + RE1 + rail + RE1 + + + + + + + + SLNID + ch:1:slnid:1024426 + + + Spiez - Zweisimmen + R11 + rail + R11 + + + + + Brig / Zweisimmen + + + + + + + DIDOK + 8507000 + + + SLOID + ch:1:sloid:7000:5:9 + + + Bern + 9 + railStation + + + + + DIDOK + 8507100 + + + SLOID + ch:1:sloid:7100:1:1 + + + Thun + 1 + railStation + + + + + DIDOK + 8507483 + + + SLOID + ch:1:sloid:7483:0:954324 + + + Spiez + 3 + railStation + + + + + DIDOK + 8507290 + + + SLOID + ch:1:sloid:7290:0:930269 + + + Zweisimmen + 6 + railStation + + + + + DIDOK + 8507478 + + + SLOID + ch:1:sloid:7478:0:852180 + + + Frutigen + 3 + railStation + + + + + DIDOK + 8501609 + + + SLOID + ch:1:sloid:1609:4:9 + + + Brig + 9 + railStation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bern-Spiez + + + + outbound + + + + + false + true + + + + + + + + true + true + + + + true + false + + + passenger + + + Spiez-Zweisimmen + + + + outbound + + + + + false + true + + + + true + false + + + passenger + + + + + + Spiez-Brig + + + + outbound + + + + + false + true + + + + + true + true + + + + true + false + + + passenger + + + + + + + + PT21M + + + + PT10M10S + + + + + + + + PT1M + + + + + + + + PT47M + + + + + + + + PT12M + + + + PT57M + + + + + + + PT1M + + + + + + + + + + 2025-12-14T00:00:00 + 2026-12-13T23:59:59 + 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000 + + + + + + + + + + + + + SJYID + ch:1:sjyid:100015:4175-001 + + + ch:1:ServiceJourney:1 + rail + + + planned + 14:39:00 + 0 + + + + + outbound + + + + + + + + + + + SJYID + ch:1:sjyid:100015:6829-001 + + + ch:1:VehicleJourney:2 + rail + + + planned + 08:30:00 + 0 + + + + + outbound + + + + + + + + + + + SJYID + ch:1:sjyid:100015:4179-001 + + + ch:1:ServiceJourney:1 + rail + + + planned + 15:12:00 + 0 + + + + + outbound + + + + + + + + RE1 4175 Bern - Spiez + 4175 + + + R11 6829 Spiez - Zweisimmen + 6829 + + + RE1 4179 Spiez - Brig + 4179 + + + + + + + + + + + + true + false + true + true + + + + + + + + + + + false + false + + + true + true + + + + + + + + + + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd index cfcd99378..a2e6defd8 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd @@ -2,6 +2,7 @@ + @@ -157,7 +158,26 @@ Rail transport, Roads and Road transport Elements of a JOURNEY WAIT TIME. - + + + In some cases there are multiple visits to the same stop with a different WaitTime (e.g., on the second there is a change in the driver). Then, one of the PointInJourneyPatternRef is needed instead of the TimingPoint. Must be optional, because in the JourneyPatternWaitTime other element make the reference to the pattern. Otherwise a TimingPointRef is the element to be used. +v2.1 + + + + The standard way to use JourneyWaitTime is with a TimingPointRef. + + + + + +v2.1 + + + + + +v2.1 + + + Wait time as interval. From ddfbf11d897f5b3423b3552270773861c53f244e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Thu, 16 Jul 2026 23:10:51 +0200 Subject: [PATCH 04/22] allow new restriction for JourneyPart (#1026) * allow new restriction for JourneyPart * add choice in the JourneyPattern * adding example for JourneyPattern usage --- ...HB_Winterthur_StGallen_with_Facilities.xml | 632 ++++++++++++++++++ .../netex_coupledJourney_version.xsd | 36 +- 2 files changed, 658 insertions(+), 10 deletions(-) create mode 100644 examples/functions/patterns/NeTEX_CH_Bern_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml diff --git a/examples/functions/patterns/NeTEX_CH_Bern_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml b/examples/functions/patterns/NeTEX_CH_Bern_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml new file mode 100644 index 000000000..5ecbd423b --- /dev/null +++ b/examples/functions/patterns/NeTEX_CH_Bern_Olten_ZuerichHB_Winterthur_StGallen_with_Facilities.xml @@ -0,0 +1,632 @@ + + + + 2025-06-26T14:16:54+02:00 + SBB-Prod + + + + 2025-12-15T00:00:00 + 2026-12-14T23:59:59 + + + + + + SBB + SBB + + + EntityLegalOwnership + + + + Operation + + + + + + + + ProductCategories + + + Intercity + IC + + + + + Usage of JourneyPart + + + Facility change + + + + + Type Of Notice + + + Allgemeiner Hinweis + 1 + + + Angebot + 10 + + + + + + + + + GO + 11 + + + SBOID + ch:1:sboid:100001 + + + + ch:1:sboid:100001> + 11 + + Schweizer Bundesbahn + SBB + + + + + + + + + SLOID + ch:1:sloid:7000 + + + DIDOK + 8507000 + + + + x + 8507000 + + Bern + + + 7.4391308 + 46.9488322 + 540.2 + + + + + + + sloid + ch:1:sloid:7000:4:7 + + + + ch:1:sloid:7000:4:7 + + + + 7.4391308 + 46.9488322 + 540.2 + + + 1 + + + + + + + SLOID + ch:1:sloid:218 + + + DIDOK + 8500218 + + + + ch:1:sloid:218 + 8500218 + + Olten + + + 7.9084951 + 47.3526357 + 398 + + + + + + + SLOID + ch:1:sloid:218:7 + + + + ch:1:sloid:218:7 + + + + 7.9084951 + 47.3526357 + 398 + + + 1 + + + + + + + SLOID + ch:1:sloid:3000 + + + DIDOK + 8572203 + + + + ch:1:sloid:3000 + 8572203 + + Zuerich_HB + + + 8.54021234910 + 47.3781766 + 407.7 + + + + + + + SLOID + ch:1:sloid:3000:501:33 + + + + ch:1:sloid:3000:501:33 + + + + 8.54021234910 + 47.3781766 + 407.7 + + + 1 + + + + + + + SLOID + ch:1:sloid:6000 + + + DIDOK + 8506000 + + + + ch:1:sloid:6000 + 8506000 + + Winterthur + + + 7.558970 + 47.4464565 + 426 + + + + + + + SLOID + ch:1:sloid:6000:5 + + + + ch:1:sloid:6000:5 + + + + 7.558970 + 47.4464565 + 426 + + + 1 + + + + + + + SLOID + ch:1:sloid:6302 + + + DIDOK + 8506302 + + + + ch:1:sloid:630 + 8506302 + + St_Gallen + + + 9.3698966 + 47.4231789 + 669.6 + + + + + + + SLOID + ch:1:sloid:6302 + + + + ch:1:sloid:6302 + + + + 9.3698966 + 47.4231789 + 669.6 + + + 1 + + + + + + + + + + + SLNID + ch:1:slnid:1024329 + + + + ch:1:slnid:1024329 + + Bern_Olten_Zurich_HB_Winterthur_St_Gallen + rail + + highSpeedRail + + IC8 + + fixed + + + + + + Bern + + + Olten + + + Zuerich_HB + + + Winterthur + + + St_Gallen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Bahn-2000 Strecke + + + + + + + + + + + + + + + + + + + Bern_Olten_Zurich_HB_Winterthur_St_Gallen + + + + outbound + + + + false + true + + + + true + true + + + + true + true + + + + true + true + + + + true + false + + + + + + + + + + PT59M + + + + PT18M + + + + PT9M + + + + PT44M + + + + + + PT9M + + + + PT2M + + + + PT2M + + + + + + + + + 2025-12-14T00:00:00 + 2026-12-13T23:59:59 + 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000 + + + + + + + + + + + + + + SJYID + sjyid-1 + + + + sjyid-1 + + rail + + + planned + 05:29:00 + + + + + inbound + + + + + + + + + 05:29:00 + 0 + 06:28:00 + 0 + + + + + + + + + + 06:57:00 + 0 + 07:52:00 + 0 + + + + + + + + + + + + + + 703 + + + + + + firstClass + freeWifi + + + + bistro + + + + + running + + + + + + + + Bistro + + + Zone catering / Distributeur + + + Zona catering / Distributore + + + Bistro + A__WS + A__WS + + true + + + Erste Klasse + A___1 + A___1 + + true + + + WLAN Hotspot verfügbar + A__WV + A__WV + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd index bcee07323..217bf4fd5 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd @@ -230,16 +230,32 @@ Rail transport, Roads and Road transport - - - Point at which this JOURNEY PART starts. - - - - - Point at which this JOURNEY PART ends. - - + + + + + Point at which this JOURNEY PART starts. + + + + + Point at which this JOURNEY PART ends. If not set it is until the end of the JOURNEY. We will make this element mandatory in the future. + + + + + + + POINT at which applicability of JOURNEY PART starts. When using PASSING TIME this element is to be used. +v2.1 + + + + + POINT at which applicability of JOURNEY PART ends. +v2.1 + + + + From f76423f6e8fc0cd47ce57c6ec6c9e905ff63af6c Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Fri, 10 Jul 2026 00:06:10 +0200 Subject: [PATCH 05/22] Add correctly spelt Exchangeable* components, deprecate misspelt Exchangable* forms --- .../netex_entity_support.xsd | 12 +++ .../netex_fareConditionSummary_version.xsd | 9 +- ...netex_usageParameterAfterSales_support.xsd | 12 ++- ...netex_usageParameterAfterSales_version.xsd | 85 +++++++++++++++---- 4 files changed, 98 insertions(+), 20 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index a06fa9282..be9b2c238 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -17,6 +17,8 @@ 2010-11-05 + 2026-07-09Add correctly spelt Exchangeable* / IsExchangeable values to NameOfClass alongside deprecated misspelt forms. +

NeTEx - Network Exchange. This subschema defines data Modification base types.

 @@ -949,6 +951,15 @@ Rail transport, Roads and Road transport + + + + + + + + + @@ -1376,6 +1387,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd index 22f5a1416..e480aab20 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd @@ -25,6 +25,8 @@ Add __RequiresDepost__ and __noCashPayment__ to CommercialCondition summary. Add __VehicleCOlelction_ + 2026-07-09Add correctly spelt IsExchangeable; deprecate misspelt IsExchangable. +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the CONDITION SUMMARY types.

@@ -222,9 +224,14 @@ Rail transport, Roads and Road transport Whether the ticket can be refunded. + + + Whether the ticket can be exchanged. +v2.1 + + - Whether the ticket can be exchanged. + DEPRECATED - misspelt, use IsExchangeable instead. -v2.1 diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd index 85e9e859d..f197c0213 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd @@ -34,6 +34,8 @@ 2019-03-12NORWAY-103 *FARES* Add purchaseGracePeriod new enum value to Reselling \ ResellWhen + 2026-07-09Add correctly spelt ExchangeableToEnumeration; deprecate misspelt ExchangableToEnumeration. +

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

This sub-schema describes the After Sales USAGE PARAMETER types.

@@ -226,9 +228,9 @@ Rail transport, Roads and Road transport - + - Allowed values for Exchangeable to. + Allowed values for Exchangeable to. +v2.1 @@ -244,6 +246,12 @@ Rail transport, Roads and Road transport + + + DEPRECATED - misspelt, use ExchangeableToEnumeration instead. -v2.1 + + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd index c8c1ea1fc..6690b0a41 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd @@ -32,6 +32,8 @@ 2019-03-26NL-27 CD #58 Add default TypeOfProductCategory and TypeOfService to Line: Move TypeOfProductCategory amnd TypeOfService from netex_journey_version to Framework reusable components (netex_travelRights_version) so they are visible from part 1 Can therefore drop include of netex_travelRights_version from File netex_usageParameterAfterSales_version.xsd. + + 2026-07-09Add correctly spelt Exchangeable* elements; deprecate misspelt Exchangable* forms.

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

@@ -161,49 +163,93 @@ Rail transport, Roads and Road transport + + + Special value - Can be resold from any point after purchase. +v2.1 + + + + + Duration to start of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) after which ticket may be resold. +v2.1 + + + + + Can be resold once a certain percentage of duration or use has been achieved. +v2.1 + + - Special value - Can be resold from any point after purchase. + DEPRECATED - misspelt, use ExchangeableFromAnyTime instead. -v2.1 - Duration to start of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) after which ticket may be resold. + DEPRECATED - misspelt, use ExchangeableFromDuration instead. -v2.1 - Can be resold once a certain percentage of duration or use has been achieved. +v1.1 + DEPRECATED - misspelt, use ExchangeableFromPercentUse instead. -v2.1 - - - Reference to arbitrary TimeInterval determining period from which reselling can be done relative to trigger point. - - + + + Reference to arbitrary TimeInterval determining period from which reselling can be done relative to trigger point. +v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableFromIntervalRef instead. -v2.1 + + + + + + + Can be resold anyTime. +v2.1 + + + + + Duration to end of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) or that ticket. +v2.1 + + + + + Can be resold until a certain percentage of duration or use has been achieved. +v2.1 + + - Can be resold anyTime. + DEPRECATED - misspelt, use ExchangeableUntilAnyTime instead. -v2.1 - Duration to end of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) or that ticket. + DEPRECATED - misspelt, use ExchangeableUntilDuration instead. -v2.1 - Can be resold until a certain percentage of duration or use has been achieved. +v1.1 + DEPRECATED - misspelt, use ExchangeableUntilPercentUse instead. -v2.1 + + + + + + + Reference to arbitrary TimeInterval determining period up until which reselling can be done relative to trigger point. +v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableUntilIntervalRef instead. -v2.1 - - - Reference to arbitrary TimeInterval determining period up until which reselling can be done relative to trigger point. - - Constraint on when change can be made +v1.1 @@ -315,9 +361,14 @@ Rail transport, Roads and Road transport Fare class to which can exchange, if specifically limited. + + + Type of fare for which product can be exchanged. +v2.1 + + - Type of fare for which product can be exchanged. + DEPRECATED - misspelt, use ExchangeableTo instead. -v2.1 From b752133ebf4cfe61bf166326cc1791bf0fefc8d3 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Fri, 10 Jul 2026 00:28:10 +0200 Subject: [PATCH 06/22] Fix typo in ExchangeableUntilDuration documentation (or -> of) --- .../part3_fares/netex_usageParameterAfterSales_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd index 6690b0a41..1afd254b0 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd @@ -214,7 +214,7 @@ Rail transport, Roads and Road transport - Duration to end of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) or that ticket. +v2.1 + Duration to end of period before (negative) or after (positive) the trigger point (i.e. either Start of Validity or First Use ) of that ticket. +v2.1 From 371492ec699e3fbfed0a6cdf073f5222aa4d4066 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Thu, 9 Jul 2026 22:32:50 +0000 Subject: [PATCH 07/22] Wrap ExchangeableTo/ExchangableTo in xsd:choice to prevent both spellings appearing simultaneously --- ...netex_usageParameterAfterSales_version.xsd | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd index 1afd254b0..c454c718b 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd @@ -361,16 +361,18 @@ Rail transport, Roads and Road transport Fare class to which can exchange, if specifically limited. - - - Type of fare for which product can be exchanged. +v2.1 - - - - - DEPRECATED - misspelt, use ExchangeableTo instead. -v2.1 - - + + + + Type of fare for which product can be exchanged. +v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableTo instead. -v2.1 + + + From d04d2cb28488ae24030bd59257f0d1fe97092bcc Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Thu, 9 Jul 2026 22:33:28 +0000 Subject: [PATCH 08/22] fix: wrap IsExchangeable/IsExchangable in xsd:choice in fareConditionSummary --- .../netex_fareConditionSummary_version.xsd | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd index e480aab20..f8856641d 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd @@ -224,16 +224,18 @@ Rail transport, Roads and Road transport Whether the ticket can be refunded. - - - Whether the ticket can be exchanged. +v2.1 - - - - - DEPRECATED - misspelt, use IsExchangeable instead. -v2.1 - - + + + + Whether the ticket can be exchanged. +v2.1 + + + + + DEPRECATED - misspelt, use IsExchangeable instead. -v2.1 + + + Whether there is a charge for exchanges. From 4f6a16c894d394c9cf6c8ea9114ff61aeee039ef Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Fri, 10 Jul 2026 00:59:11 +0200 Subject: [PATCH 09/22] Rename misspelt enumeration type outright instead of deprecating (type names are not visible in instance documents) --- .../netex_usageParameterAfterSales_support.xsd | 8 +------- .../netex_usageParameterAfterSales_version.xsd | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd index f197c0213..acad7da8d 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd @@ -34,7 +34,7 @@ 2019-03-12NORWAY-103 *FARES* Add purchaseGracePeriod new enum value to Reselling \ ResellWhen - 2026-07-09Add correctly spelt ExchangeableToEnumeration; deprecate misspelt ExchangableToEnumeration. + 2026-07-09Rename misspelt ExchangableToEnumeration to ExchangeableToEnumeration.

NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.

@@ -246,12 +246,6 @@ Rail transport, Roads and Road transport - - - DEPRECATED - misspelt, use ExchangeableToEnumeration instead. -v2.1 - - - diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd index c454c718b..0f7e71244 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd @@ -367,7 +367,7 @@ Rail transport, Roads and Road transport Type of fare for which product can be exchanged. +v2.1 - + DEPRECATED - misspelt, use ExchangeableTo instead. -v2.1 From 797fb04c29f3720e70e37dd7e489164b9f50af90 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Fri, 10 Jul 2026 01:19:13 +0200 Subject: [PATCH 10/22] Annotate misspelt NameOfClass enumeration values as DEPRECATED --- .../netex_entity_support.xsd | 60 +++++++++++++++---- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index be9b2c238..40c6c4b51 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -942,15 +942,51 @@ Rail transport, Roads and Road transport - - - - - - - - - + + + DEPRECATED - misspelt, use ExchangeableFromAnyTime instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableFromDuration instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableFromIntervalRef instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableFromPercentUse instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableTo instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableUntilAnyTime instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableUntilDuration instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableUntilIntervalRef instead. -v2.1 + + + + + DEPRECATED - misspelt, use ExchangeableUntilPercentUse instead. -v2.1 + + @@ -1386,7 +1422,11 @@ Rail transport, Roads and Road transport - + + + DEPRECATED - misspelt, use IsExchangeable instead. -v2.1 + + From 1ec57b2525674f0e2a3c79a910937eacfa122c6b Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Sun, 19 Jul 2026 14:18:37 +0200 Subject: [PATCH 11/22] documentation improvement Improvement made on the documentation for: - values marked as deprecated - added values in replacement of the deprecated ones --- .../netex_entity_support.xsd | 70 ++++++++++++++----- 1 file changed, 53 insertions(+), 17 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 40c6c4b51..a7ff179c3 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -944,17 +944,17 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use ExchangeableFromAnyTime instead. -v2.1 + DEPRECATED due to mispelling, use ExchangeableFromAnyTime instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableFromDuration instead. -v2.1 + DEPRECATED due to mispelling, use ExchangeableFromDuration instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableFromIntervalRef instead. -v2.1 + DEPRECATED due to mispelling, use ExchangeableFromIntervalRef instead. -v2.1 @@ -964,38 +964,74 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use ExchangeableTo instead. -v2.1 + DEPRECATED due to mispelling, use ExchangeableTo instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableUntilAnyTime instead. -v2.1 + DEPRECATED due to mispelling, use ExchangeableUntilAnyTime instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableUntilDuration instead. -v2.1 + DEPRECATED due to mispelling, use ExchangeableUntilDuration instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableUntilIntervalRef instead. -v2.1 + DEPRECATED due to mispelling, use ExchangeableUntilIntervalRef instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableUntilPercentUse instead. -v2.1 + DEPRECATED due to mispelling, use ExchangeableUntilPercentUse instead. -v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 + + + + + Replaces previously missplet value. +v2.1 - - - - - - - - - From c5712e74c76fa06f93f2e824ebe161930cb2979f Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 19 Jul 2026 12:20:16 +0000 Subject: [PATCH 12/22] Lint and update documentation tables --- .../netex_entity_support.xsd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index a7ff179c3..21366d39e 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -993,42 +993,42 @@ Rail transport, Roads and Road transport - + Replaces previously missplet value. +v2.1 - + Replaces previously missplet value. +v2.1 - + Replaces previously missplet value. +v2.1 - + Replaces previously missplet value. +v2.1 - + Replaces previously missplet value. +v2.1 - + Replaces previously missplet value. +v2.1 - + Replaces previously missplet value. +v2.1 - + Replaces previously missplet value. +v2.1 From 8337ab14331d5bfbab9275d5b9e7954553f1f620 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Sun, 19 Jul 2026 14:22:22 +0200 Subject: [PATCH 13/22] improves documentation For both deprecated and replacement values --- .../netex_responsibility/netex_entity_support.xsd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 21366d39e..1b94ac13e 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -1460,10 +1460,14 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use IsExchangeable instead. -v2.1 + DEPRECATED due to misspelling, use IsExchangeable instead. -v2.1 + + Replaces previously missplet value. +v2.1 + + From 2330b9b6b78b4783aa1ada4d49096a5c49ffe641 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Sun, 19 Jul 2026 14:24:31 +0200 Subject: [PATCH 14/22] improves documentation for consistency with the documentation on netex_entity_support.xsd --- .../part3_fares/netex_fareConditionSummary_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd index f8856641d..f2c8b4f2a 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd @@ -232,7 +232,7 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use IsExchangeable instead. -v2.1 + DEPRECATED due to misspelling, use IsExchangeable instead. -v2.1 From 6fdce3b3de1b461c5ba4ff8d4fa69d852a3a3a40 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Sun, 19 Jul 2026 14:26:59 +0200 Subject: [PATCH 15/22] improves documentation For consistency with netex_entity_support.xsd --- .../netex_usageParameterAfterSales_version.xsd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd index 0f7e71244..31db1082a 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd @@ -180,17 +180,17 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use ExchangeableFromAnyTime instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableFromAnyTime instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableFromDuration instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableFromDuration instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableFromPercentUse instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableFromPercentUse instead. -v2.1 @@ -202,7 +202,7 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use ExchangeableFromIntervalRef instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableFromIntervalRef instead. -v2.1 @@ -224,17 +224,17 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use ExchangeableUntilAnyTime instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableUntilAnyTime instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableUntilDuration instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableUntilDuration instead. -v2.1 - DEPRECATED - misspelt, use ExchangeableUntilPercentUse instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableUntilPercentUse instead. -v2.1 @@ -246,7 +246,7 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use ExchangeableUntilIntervalRef instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableUntilIntervalRef instead. -v2.1 @@ -369,7 +369,7 @@ Rail transport, Roads and Road transport - DEPRECATED - misspelt, use ExchangeableTo instead. -v2.1 + DEPRECATED due to misspelling, use ExchangeableTo instead. -v2.1 From e773c5bc79b8e56fdff9648dcb13b0d603370d01 Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Sun, 19 Jul 2026 14:29:41 +0200 Subject: [PATCH 16/22] fix XSD removal of faulty "/" left in there by me --- .../netex_responsibility/netex_entity_support.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd index 1b94ac13e..fcc8391dc 100644 --- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd @@ -1463,7 +1463,7 @@ Rail transport, Roads and Road transport DEPRECATED due to misspelling, use IsExchangeable instead. -v2.1 - + Replaces previously missplet value. +v2.1 From cc8dbf9e9476be1caaf01a44cdb754de2405e88e Mon Sep 17 00:00:00 2001 From: Tu-Tho Thai Date: Mon, 20 Jul 2026 11:08:48 +0200 Subject: [PATCH 17/22] Addition of AI guidelines in the readme (#1050) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * addition of AI guidelines: attempt for write what has been discussed previously on the use of AI * clarification on roles: clarifying that only contributors can be seen as authors or co-authors of commits and pull requests Co-authored-by: Thibaut Barrère Co-authored-by: Tim Rivett <56296031+tim-rivett@users.noreply.github.com> --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index 582390b9f..3717dd239 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,23 @@ For new features, the decision between targetting v2.1-wip or v3.0-wip will be m _Upcoming: templates for Pull Request_ +### The use of AI in this repo 🤖 + +In this repository, the use of AI should follow these guidelines. The guiding principle is that any contributor is ultimately reponsible for their work on NeTEx and they should be the last reviewer of any AI-guided work before submitting it for peer-review; in other words, only contributors can be authors or co-authors of any change made to NeTEx. + +AI **can** be used for: +- Generation of code for contributors to work on the XSD by themselves, +- Analysis of any change proposed to the XSD before it is edited / commented / approved, +- Improvements to the general language in the documentation (i.e, anything in `` and ``) or to check for typos in any work. + +AI **cannot** be used for: +- Committing a change in a Pull Request, i.e. the AI agent cannot be an author or co-author of any commit, +- Authoring a change, i.e. the AI agent cannot be an author or co-author of any Pull Request, +- Automated code review as a stand alone action, i.e. the result of a review must be proof-read by a contributor, +- Produce documentation from scratch (i.e, anything in `` and `` should be proof-read by a contributor if it was suggested by AI). + +In case you have a GitHub Pro account, please disable the feature `Automated Copilot code review` before contributing here. + ---- ## Changelog 📰 From 73b337e22ceed7905a1be14e4e506f1afa359b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Mon, 20 Jul 2026 14:40:00 +0200 Subject: [PATCH 18/22] Merge pull request #1020 from TransmodelEcosystem/CheckConstraint_added_StopPointInJourneyPattern adding CheckConstraint to StopPointInJourneyPattern and Passingtime --- .../Netex_01.2_Bus_SimpleTimetable_WithTimings.xml | 6 ++++++ .../netex_servicePattern_version.xsd | 9 +++++++++ .../part2_journeyTimes/netex_passingTimes_version.xsd | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml b/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml index 5aca118bd..fd73a4314 100644 --- a/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml +++ b/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml @@ -420,6 +420,12 @@ The Calendar is shown coded as true + + + + noWaiting + + diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd index 05f21f6d0..dd455b791 100644 --- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd +++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd @@ -3,11 +3,13 @@ + + @@ -901,6 +903,13 @@ Rail transport, Roads and Road transport Nature of use of stop, e.g. access, interchange only, or pass through. Default is Access. + + + + + Implements the navigation from processes or barriers that the travellers will be facing (e.g., security check, check-in, etc.). +v2.1 + + diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd index 1faa2c962..ab2345d40 100644 --- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd +++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd @@ -3,6 +3,7 @@ + @@ -204,6 +205,11 @@ Rail transport, Roads and Road transport Number of days after the starting time of the journey if not same calendar day. Default is 0 for same day. + + + CHECK CONSTRAINTs can be used on StopPointInJourneyPattern as well. It should be used there, if it affects every SERVICE JOURNEY with that SERVICE JOURNEY PATTERN. If the CONSTRAINT only affects one single SERVICE JOURNEY and PASSING TIME, then it is better to use this CHECK CONSTRAINT directly in PASSING TIME. +v2.1 + + OCCUPANCYs associated with this journey. +v2.0 From c54937a9d70fd3514f976d64a2918c1883f820d8 Mon Sep 17 00:00:00 2001 From: Micovec <30734146+Micovec@users.noreply.github.com> Date: Wed, 29 Jul 2026 20:53:26 +0200 Subject: [PATCH 19/22] Fixed typo in nta examples in years (+ CI fix for forks) (#1052) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixed typo in nta examples in years * CI: also run on pull_request so fork PRs get checks --------- Co-authored-by: Stefan de Konink Co-authored-by: Thibaut Barrère --- .github/workflows/ci.yml | 8 +++++++- .../NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml | 2 +- .../NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml | 2 +- ...PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml | 2 +- .../NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml | 2 +- .../standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml | 2 +- .../nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml | 2 +- examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abef8b4f9..0cc1e3674 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,8 @@ name: CI -on: push +on: + push: + pull_request: permissions: contents: write @@ -26,7 +28,11 @@ jobs: - name: Validate NeTEx XML examples run: ./.github/scripts/validate-examples.sh + # Only on push: a pull_request run from a fork gets a read-only token + # and cannot commit back. Target branches are still normalized by the + # push-triggered run that follows the merge. - name: Commit changes + if: github.event_name == 'push' uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit with: default_author: github_actions diff --git a/examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml b/examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml index eb3bb3323..48174101a 100644 --- a/examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml +++ b/examples/standards/nta/NTA-PI-01_EI_IR_LINE_OFFER__Journey00122_20200801.xml @@ -410,7 +410,7 @@ RS 0 100 10 Reservations available# (C) NTA 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:47.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml b/examples/standards/nta/NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml index 8b978d180..db2d6e08f 100644 --- a/examples/standards/nta/NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml +++ b/examples/standards/nta/NTA-PI-01_EI_IR_STOP_OFFER__AllStations_20200801.xml @@ -11,7 +11,7 @@ HRDF records NeTEx format . (C) NTA , IR 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml index 9324fe52e..fb16ecbe4 100644 --- a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml +++ b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml @@ -309,7 +309,7 @@ attribution002,0,1,Transdev,12345 (C) NTA 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml index a33b8d52d..f4ad4dc8b 100644 --- a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml +++ b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml @@ -312,7 +312,7 @@ attribution002,0,1,Transdev,12345 (C) NTA 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml index 8ede5b50c..0f74db8b7 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml @@ -1,6 +1,6 @@ - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml index b06d4b8bd..2ae253a28 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml @@ -7,7 +7,7 @@ This Example shows an extract of encoding a single Operator data encoded (C) NTA 2020 --> - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml index 1ea83cc31..fa45caf31 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NTA_Luas_20200715.xml @@ -1,6 +1,6 @@ - 20209-12-17T09:30:46.0Z + 2019-12-17T09:30:46.0Z SYS001 From 482a533e953062e02c08a612cde95eba60563134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Tue, 11 Aug 2026 10:11:58 +0200 Subject: [PATCH 20/22] Typo fixed (#1058) Fix typo in the documentation of LINE Fix made by @ue71603 --- .../part1_networkDescription/netex_line_version.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd index 40f5462c8..43e37932f 100644 --- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd +++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd @@ -373,7 +373,7 @@ Rail transport, Roads and Road transport - Public identifier of a LINe. + Public identifier of a LINE. From c6bdabc891c41600501dbaa31a7a4467b1f36666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20G=C3=BCnter?= Date: Wed, 12 Aug 2026 16:02:46 +0200 Subject: [PATCH 21/22] Update netex_nm_equipmentEnergy_support.xsd --- .../netex_nm_equipmentEnergy_support.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd index d765daa13..4e41ad415 100644 --- a/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd +++ b/xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd @@ -320,6 +320,7 @@ Rail transport, Roads and Road transport + From 130225ccd2138f799c85d6726e9d95cb2e075f99 Mon Sep 17 00:00:00 2001 From: Micovec <30734146+Micovec@users.noreply.github.com> Date: Thu, 3 Sep 2026 18:29:33 +0200 Subject: [PATCH 22/22] Merge pull request #1064 from TransmodelEcosystem/bugfix_uri_in_examples Fixed uri in examples - typos only --- .../Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml | 2 +- .../Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml | 2 +- .../Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml | 2 +- .../Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml | 2 +- ...etex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml | 2 +- ...etex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml | 2 +- ...tex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml | 2 +- ...61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml | 2 +- .../Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml | 2 +- .../functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml | 2 +- examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml | 2 +- .../standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml | 2 +- .../nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml index 5ca209688..9a6a69d24 100644 --- a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml +++ b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml @@ -120,7 +120,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml b/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml index 39336b637..54410bb9a 100644 --- a/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml +++ b/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml @@ -152,7 +152,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml b/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml index 1d5f6c775..399ee1b84 100644 --- a/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml +++ b/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml @@ -147,7 +147,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml b/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml index c2dabe149..679300a50 100644 --- a/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml +++ b/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml @@ -197,7 +197,7 @@ The Calendar is shown coded as myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml b/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml index 470d60750..a1fee2dbf 100644 --- a/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml +++ b/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml @@ -157,7 +157,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml b/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml index 4dd208386..121da9bea 100644 --- a/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml +++ b/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml @@ -185,7 +185,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml b/examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml index d5d8f6df6..c6e03a29b 100644 --- a/examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml +++ b/examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml @@ -142,7 +142,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml b/examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml index 3a2e7ce01..a9c50c8cd 100644 --- a/examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml +++ b/examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml @@ -158,7 +158,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml b/examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml index 82d50fe41..950a259c4 100644 --- a/examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml +++ b/examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml @@ -111,7 +111,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml b/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml index e78ea3f99..10eda14e3 100644 --- a/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml +++ b/examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml @@ -91,7 +91,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs myfares - http://www.myfares,com/fares + http://www.myfares.com/fares Fare data diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml index 0f74db8b7..a6a2203be 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml @@ -51,7 +51,7 @@ stg - http:///www.transdevireland.ie/timetable + http://www.transdevireland.ie/timetable Stage coach TXC data diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml index 2ae253a28..060400f0f 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml @@ -58,7 +58,7 @@ This Example shows an extract of encoding a single Operator data encoded stg - http:///www.transdevireland.ie/timetable + http://www.transdevireland.ie/timetable Stage coach TXC data diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml index 926b5a4d6..4c3fe149a 100644 --- a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml +++ b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml @@ -64,7 +64,7 @@ This Example shows an extract of real Irish Operator data encoded in NeT noc - http:///www.nta.ie/noc + http://www.nta.ie/noc National operator codes