From 901b8125481d285895bebdd9a4ce9be137bc9b21 Mon Sep 17 00:00:00 2001 From: Andrej Tibaut Date: Fri, 10 Jul 2026 22:51:25 +0200 Subject: [PATCH] Resolve conflicting element names: add StepLimitUnit, FulfilmentMethodTypes and NumberOfUnits; deprecate misleadingly named forms --- .../netex_entity_support.xsd | 4 ++++ .../netex_accessRightParameter_version.xsd | 19 ++++++++++++++----- .../part3_fares/netex_fareProduct_version.xsd | 19 ++++++++++++++----- .../netex_usageParameterTravel_version.xsd | 19 ++++++++++++++----- 4 files changed, 46 insertions(+), 15 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..454855a83 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-10Add FulfilmentMethodTypes and StepLimitUnit values to NameOfClass. +

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

 @@ -1145,6 +1147,7 @@ Rail transport, Roads and Road transport + @@ -2713,6 +2716,7 @@ Rail transport, Roads and Road transport + diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index e2c44b3c9..7c367b206 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -128,6 +128,8 @@ 2023-12-14FIX - Rename RoutingValidityParametersGroup to align with Transmodel. Add missing TransferRestriction, ServiceExclusion, RoutingRestrictionnZone and Border Point parametrers. + 2026-07-10Add FulfilmentMethodTypes to DistributionParametersGroup; deprecate FulfilmentMethodType (singular name for a list of values). +

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

This sub-schema describes the FARE ACCESS RIGHT PARAMETER types.

@@ -772,11 +774,18 @@ Rail transport, Roads and Road transport - - - Fulfillment MEthod +v2.0 - - + + + + Allowed FULFILMENT METHOD types. +v2.1 + + + + + DEPRECATED - singular name for a list of values, use FulfilmentMethodTypes instead. -v2.1 + + + diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd index 4ae2e778c..eb82c4a98 100644 --- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd @@ -41,6 +41,8 @@ 2023-11-07CR0544 Deprecate PrivateCode. + 2026-07-10Add NumberOfUnits to AMOUNT OF PRICE UNIT; deprecate Amount (a number of units, not a monetary amount). +

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

This sub-schema describes the FARE PRODUCT types.

@@ -854,11 +856,18 @@ Rail transport, Roads and Road transport - - - Number of units. If only ine. Otherwise use TARIFF with FARE QUALITY FACTOR to specify a range - - + + + + Number of units, if there is only one. Otherwise use TARIFF with FARE QUALITY FACTOR to specify a range. +v2.1 + + + + + DEPRECATED - despite its name this is a number of units, not a monetary amount; use NumberOfUnits instead. -v2.1 + + + diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd index 3aa183196..2be5d7a43 100644 --- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd @@ -36,6 +36,8 @@ 2020-12-10FIX - Make ActivationMeans into list + 2026-07-10Add StepLimitUnit to STEP LIMIT; deprecate AdjustmentUnits (name clash with numeric AdjustmentUnits on RULE STEP RESULT). +

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

This sub-schema describes the Travel USAGE PARAMETER types.

@@ -267,11 +269,18 @@ Rail transport, Roads and Road transport Whether restricted to a number of stops. - - - Units in which steps atre counted. - - + + + + Units in which steps are counted. +v2.1 + + + + + DEPRECATED - use StepLimitUnit instead; the name clashes with the numeric AdjustmentUnits on RULE STEP RESULT. -v2.1 + + + Minimum number of steps allowed.