Skip to content

Resolve conflicting element names in fares: StepLimitUnit, FulfilmentMethodTypes, NumberOfUnits #1043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atibaut wants to merge 1 commit into
base: v2.1-wip
Choose a base branch
from
+46 −15
Open

Resolve conflicting element names in fares: StepLimitUnit, FulfilmentMethodTypes, NumberOfUnits #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<Date>
<Modified>2010-11-05</Modified>
</Date>
<Date><Modified>2026-07-10</Modified>Add FulfilmentMethodTypes and StepLimitUnit values to NameOfClass.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines data Modification base types.</p>
</Description>
Expand Down Expand Up @@ -1145,6 +1147,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="FulfilmentMethodPriceRef"/>
<xsd:enumeration value="FulfilmentMethodRef"/>
<xsd:enumeration value="FulfilmentMethodType"/>
<xsd:enumeration value="FulfilmentMethodTypes"/>
<xsd:enumeration value="FullCharge"/>
<xsd:enumeration value="FunicularSubmode"/>
<xsd:enumeration value="FurtherDetails"/>
Expand Down Expand Up @@ -2713,6 +2716,7 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="StepLength"/>
<xsd:enumeration value="StepLimit"/>
<xsd:enumeration value="StepLimitRef"/>
<xsd:enumeration value="StepLimitUnit"/>
<xsd:enumeration value="StopArea"/>
<xsd:enumeration value="StopAreaRef"/>
<xsd:enumeration value="StopAssignment"/>
Expand Down
19 changes: 14 additions & 5 deletions xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@
</Date>
<Date><Modified>2023-12-14</Modified>FIX - Rename RoutingValidityParametersGroup to align with Transmodel. Add missing TransferRestriction, ServiceExclusion, RoutingRestrictionnZone and Border Point parametrers.
</Date>
<Date><Modified>2026-07-10</Modified>Add FulfilmentMethodTypes to DistributionParametersGroup; deprecate FulfilmentMethodType (singular name for a list of values).
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the FARE ACCESS RIGHT PARAMETER types.</p>
Expand Down Expand Up @@ -772,11 +774,18 @@ Rail transport, Roads and Road transport
<xsd:element ref="DistributionChannelRef" minOccurs="0"/>
<xsd:element ref="GroupOfDistributionChannelsRef" minOccurs="0"/>
</xsd:choice>
<xsd:element name="FulfilmentMethodType" type="FulfilmentMethodListOfEnumerations" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Fulfillment MEthod +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:element name="FulfilmentMethodTypes" type="FulfilmentMethodListOfEnumerations">
<xsd:annotation>
<xsd:documentation>Allowed FULFILMENT METHOD types. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="FulfilmentMethodType" type="FulfilmentMethodListOfEnumerations">
<xsd:annotation>
<xsd:documentation>DEPRECATED - singular name for a list of values, use FulfilmentMethodTypes instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:element ref="FulfilmentMethodRef" minOccurs="0"/>
<xsd:element name="PaymentMethod" type="PaymentMethodEnumeration" minOccurs="0">
<xsd:annotation>
Expand Down
19 changes: 14 additions & 5 deletions xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Date><Modified>2026-07-10</Modified>Add NumberOfUnits to AMOUNT OF PRICE UNIT; deprecate Amount (a number of units, not a monetary amount).
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the FARE PRODUCT types.</p>
Expand Down Expand Up @@ -854,11 +856,18 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
<xsd:element ref="PriceUnitRef" minOccurs="0"/>
<xsd:element name="Amount" type="xsd:decimal" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Number of units. If only ine. Otherwise use TARIFF with FARE QUALITY FACTOR to specify a range</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:element name="NumberOfUnits" type="xsd:decimal">
<xsd:annotation>
<xsd:documentation>Number of units, if there is only one. Otherwise use TARIFF with FARE QUALITY FACTOR to specify a range. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="Amount" type="xsd:decimal">
<xsd:annotation>
<xsd:documentation>DEPRECATED - despite its name this is a number of units, not a monetary amount; use NumberOfUnits instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
</xsd:sequence>
</xsd:group>
<!-- ==== PREASSIGNED FARE PRODUC=============================================== -->
Expand Down
19 changes: 14 additions & 5 deletions xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
</Date>
<Date><Modified>2020-12-10</Modified>FIX - Make ActivationMeans into list
</Date>
<Date><Modified>2026-07-10</Modified>Add StepLimitUnit to STEP LIMIT; deprecate AdjustmentUnits (name clash with numeric AdjustmentUnits on RULE STEP RESULT).
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
<p>This sub-schema describes the Travel USAGE PARAMETER types.</p>
Expand Down Expand Up @@ -267,11 +269,18 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether restricted to a number of stops.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AdjustmentUnits" type="StepLimitUnitEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Units in which steps atre counted.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:element name="StepLimitUnit" type="StepLimitUnitEnumeration">
<xsd:annotation>
<xsd:documentation>Units in which steps are counted. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="AdjustmentUnits" type="StepLimitUnitEnumeration">
<xsd:annotation>
<xsd:documentation>DEPRECATED - use StepLimitUnit instead; the name clashes with the numeric AdjustmentUnits on RULE STEP RESULT. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:element name="MinimumNumberOfSteps" type="xsd:nonNegativeInteger" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Minimum number of steps allowed.</xsd:documentation>
Expand Down
Loading