Skip to content

Fix Exchangable misspelling: add Exchangeable* components, deprecate misspelt forms #1041

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

Merged
atibaut merged 13 commits into from
Jul 22, 2026
+194 −38
Merged

Fix Exchangable misspelling: add Exchangeable* components, deprecate misspelt forms #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f76423f
Add correctly spelt Exchangeable* components, deprecate misspelt Exch…
atibaut Jul 9, 2026
b752133
Fix typo in ExchangeableUntilDuration documentation (or -> of)
atibaut Jul 9, 2026
371492e
Wrap ExchangeableTo/ExchangableTo in xsd:choice to prevent both spell…
atibaut Jul 9, 2026
d04d2cb
fix: wrap IsExchangeable/IsExchangable in xsd:choice in fareCondition…
atibaut Jul 9, 2026
4f6a16c
Rename misspelt enumeration type outright instead of deprecating (typ…
atibaut Jul 9, 2026
797fb04
Annotate misspelt NameOfClass enumeration values as DEPRECATED
atibaut Jul 9, 2026
1ec57b2
documentation improvement
TuThoThai Jul 19, 2026
c5712e7
Lint and update documentation tables
github-actions[bot] Jul 19, 2026
8337ab1
improves documentation
TuThoThai Jul 19, 2026
2330b9b
improves documentation
TuThoThai Jul 19, 2026
6fdce3b
improves documentation
TuThoThai Jul 19, 2026
e773c5b
fix XSD
TuThoThai Jul 19, 2026
7d12e8b
Merge branch 'v2.1-wip' into fix/exchangeable-spelling
atibaut Jul 22, 2026
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
112 changes: 102 additions & 10 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-09</Modified>Add correctly spelt Exchangeable* / IsExchangeable values to NameOfClass alongside deprecated misspelt forms.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines data Modification base types.</p>
</Description>
Expand Down Expand Up @@ -940,15 +942,96 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="EstimatedPassingTimeView"/>
<xsd:enumeration value="EuroClass"/>
<xsd:enumeration value="EvenNumberRange"/>
<xsd:enumeration value="ExchangableFromAnyTime"/>
<xsd:enumeration value="ExchangableFromDuration"/>
<xsd:enumeration value="ExchangableFromIntervalRef"/>
<xsd:enumeration value="ExchangableFromPercentUse"/>
<xsd:enumeration value="ExchangableTo"/>
<xsd:enumeration value="ExchangableUntilAnyTime"/>
<xsd:enumeration value="ExchangableUntilDuration"/>
<xsd:enumeration value="ExchangableUntilIntervalRef"/>
<xsd:enumeration value="ExchangableUntilPercentUse"/>
<xsd:enumeration value="ExchangableFromAnyTime">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to mispelling, use ExchangeableFromAnyTime instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangableFromDuration">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to mispelling, use ExchangeableFromDuration instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangableFromIntervalRef">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to mispelling, use ExchangeableFromIntervalRef instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangableFromPercentUse">
<xsd:annotation>
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableFromPercentUse instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangableTo">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to mispelling, use ExchangeableTo instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangableUntilAnyTime">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to mispelling, use ExchangeableUntilAnyTime instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangableUntilDuration">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to mispelling, use ExchangeableUntilDuration instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangableUntilIntervalRef">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to mispelling, use ExchangeableUntilIntervalRef instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangableUntilPercentUse">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to mispelling, use ExchangeableUntilPercentUse instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableFromAnyTime">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableFromDuration">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableFromIntervalRef">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableFromPercentUse">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableTo">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableUntilAnyTime">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableUntilDuration">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableUntilIntervalRef">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="ExchangeableUntilPercentUse">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="Exchanging"/>
<xsd:enumeration value="ExchangingRef"/>
<xsd:enumeration value="Exclude"/>
Expand Down Expand Up @@ -1375,7 +1458,16 @@ Rail transport, Roads and Road transport
<xsd:enumeration value="IsDirect"/>
<xsd:enumeration value="IsEmergencyExit"/>
<xsd:enumeration value="IsEntry"/>
<xsd:enumeration value="IsExchangable"/>
<xsd:enumeration value="IsExchangable">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to misspelling, use IsExchangeable instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="IsExchangeable">
<xsd:annotation>
<xsd:documentation>Replaces previously missplet value. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:enumeration>
<xsd:enumeration value="IsExit"/>
<xsd:enumeration value="IsExternal"/>
<xsd:enumeration value="IsFacingAisle"/>
Expand Down
19 changes: 14 additions & 5 deletions xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
Add __RequiresDepost__ and __noCashPayment__ to CommercialCondition summary.
Add __VehicleCOlelction_
</Date>
<Date><Modified>2026-07-09</Modified>Add correctly spelt IsExchangeable; deprecate misspelt IsExchangable.
</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 CONDITION SUMMARY types.</p>
Expand Down Expand Up @@ -222,11 +224,18 @@ Rail transport, Roads and Road transport
<xsd:documentation>Whether the ticket can be refunded.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="IsExchangable" type="xsd:boolean" default="true" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether the ticket can be exchanged.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:element name="IsExchangeable" type="xsd:boolean" default="true">
<xsd:annotation>
<xsd:documentation>Whether the ticket can be exchanged. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="IsExchangable" type="xsd:boolean" default="true">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to misspelling, use IsExchangeable instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:element name="HasExchangeFee" type="xsd:boolean" default="false" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether there is a charge for exchanges.</xsd:documentation>
Expand Down
6 changes: 4 additions & 2 deletions xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
</Date>
<Date><Modified>2019-03-12</Modified>NORWAY-103 *FARES* Add purchaseGracePeriod new enum value to Reselling \ ResellWhen
</Date>
<Date><Modified>2026-07-09</Modified>Rename misspelt ExchangableToEnumeration to ExchangeableToEnumeration.
</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 After Sales USAGE PARAMETER types.</p>
Expand Down Expand Up @@ -226,9 +228,9 @@ Rail transport, Roads and Road transport
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
<xsd:simpleType name="ExchangableToEnumeration">
<xsd:simpleType name="ExchangeableToEnumeration">
<xsd:annotation>
<xsd:documentation>Allowed values for Exchangeable to.</xsd:documentation>
<xsd:documentation>Allowed values for Exchangeable to. +v2.1</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:normalizedString">
<xsd:enumeration value="anyProduct"/>
Expand Down
95 changes: 74 additions & 21 deletions xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
<Date><Modified>2019-03-26</Modified>NL-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.
</Date>
<Date><Modified>2026-07-09</Modified>Add correctly spelt Exchangeable* elements; deprecate misspelt Exchangable* forms.
</Date>
<Description>
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
Expand Down Expand Up @@ -161,49 +163,93 @@ Rail transport, Roads and Road transport
</xsd:annotation>
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:element name="ExchangeableFromAnyTime" type="EmptyType">
<xsd:annotation>
<xsd:documentation>Special value - Can be resold from any point after purchase. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangeableFromDuration" type="xsd:duration">
<xsd:annotation>
<xsd:documentation>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</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangeableFromPercentUse" type="xsd:decimal">
<xsd:annotation>
<xsd:documentation>Can be resold once a certain percentage of duration or use has been achieved. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableFromAnyTime" type="EmptyType">
<xsd:annotation>
<xsd:documentation>Special value - Can be resold from any point after purchase.</xsd:documentation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableFromAnyTime instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableFromDuration" type="xsd:duration">
<xsd:annotation>
<xsd:documentation>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.</xsd:documentation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableFromDuration instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableFromPercentUse" type="xsd:decimal">
<xsd:annotation>
<xsd:documentation>Can be resold once a certain percentage of duration or use has been achieved. +v1.1</xsd:documentation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableFromPercentUse instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:element name="ExchangableFromIntervalRef" type="TimeIntervalRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Reference to arbitrary TimeInterval determining period from which reselling can be done relative to trigger point.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:element name="ExchangeableFromIntervalRef" type="TimeIntervalRefStructure">
<xsd:annotation>
<xsd:documentation>Reference to arbitrary TimeInterval determining period from which reselling can be done relative to trigger point. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableFromIntervalRef" type="TimeIntervalRefStructure">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableFromIntervalRef instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:choice minOccurs="0">
<xsd:element name="ExchangeableUntilAnyTime" type="EmptyType">
<xsd:annotation>
<xsd:documentation>Can be resold anyTime. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangeableUntilDuration" type="xsd:duration">
<xsd:annotation>
<xsd:documentation>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</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangeableUntilPercentUse" type="xsd:decimal">
<xsd:annotation>
<xsd:documentation>Can be resold until a certain percentage of duration or use has been achieved. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableUntilAnyTime" type="EmptyType">
<xsd:annotation>
<xsd:documentation>Can be resold anyTime.</xsd:documentation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableUntilAnyTime instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableUntilDuration" type="xsd:duration">
<xsd:annotation>
<xsd:documentation>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.</xsd:documentation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableUntilDuration instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableUntilPercentUse" type="xsd:decimal">
<xsd:annotation>
<xsd:documentation>Can be resold until a certain percentage of duration or use has been achieved. +v1.1</xsd:documentation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableUntilPercentUse instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:choice minOccurs="0">
<xsd:element name="ExchangeableUntilIntervalRef" type="TimeIntervalRefStructure">
<xsd:annotation>
<xsd:documentation>Reference to arbitrary TimeInterval determining period up until which reselling can be done relative to trigger point. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableUntilIntervalRef" type="TimeIntervalRefStructure">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableUntilIntervalRef instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:element name="ExchangableUntilIntervalRef" type="TimeIntervalRefStructure" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Reference to arbitrary TimeInterval determining period up until which reselling can be done relative to trigger point.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="EffectiveFrom" type="EffectiveFromEnumeration" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Constraint on when change can be made +v1.1</xsd:documentation>
Expand Down Expand Up @@ -315,11 +361,18 @@ Rail transport, Roads and Road transport
<xsd:documentation>Fare class to which can exchange, if specifically limited.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableTo" type="ExchangableToEnumeration" default="anyProduct" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Type of fare for which product can be exchanged.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice minOccurs="0">
<xsd:element name="ExchangeableTo" type="ExchangeableToEnumeration" default="anyProduct">
<xsd:annotation>
<xsd:documentation>Type of fare for which product can be exchanged. +v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="ExchangableTo" type="ExchangeableToEnumeration" default="anyProduct">
<xsd:annotation>
<xsd:documentation>DEPRECATED due to misspelling, use ExchangeableTo instead. -v2.1</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
</xsd:sequence>
</xsd:group>
<!-- ==== REFUNDING================================================= -->
Expand Down
Loading