Skip to content

Commit 52ad9c4

Browse files
atibautatibaut
committed
Add correctly spelt Exchangeable* components, deprecate misspelt Exchangable* forms
1 parent 24040c1 commit 52ad9c4

4 files changed

Lines changed: 98 additions & 20 deletions

File tree

‎xsd/netex_framework/netex_responsibility/netex_entity_support.xsd‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<Date>
1818
<Modified>2010-11-05</Modified>
1919
</Date>
20+
<Date><Modified>2026-07-09</Modified>Add correctly spelt Exchangeable* / IsExchangeable values to NameOfClass alongside deprecated misspelt forms.
21+
</Date>
2022
<Description>
2123
<p>NeTEx - Network Exchange. This subschema defines data Modification base types.</p>
2224
</Description>
@@ -949,6 +951,15 @@ Rail transport, Roads and Road transport
949951
<xsd:enumeration value="ExchangableUntilDuration"/>
950952
<xsd:enumeration value="ExchangableUntilIntervalRef"/>
951953
<xsd:enumeration value="ExchangableUntilPercentUse"/>
954+
<xsd:enumeration value="ExchangeableFromAnyTime"/>
955+
<xsd:enumeration value="ExchangeableFromDuration"/>
956+
<xsd:enumeration value="ExchangeableFromIntervalRef"/>
957+
<xsd:enumeration value="ExchangeableFromPercentUse"/>
958+
<xsd:enumeration value="ExchangeableTo"/>
959+
<xsd:enumeration value="ExchangeableUntilAnyTime"/>
960+
<xsd:enumeration value="ExchangeableUntilDuration"/>
961+
<xsd:enumeration value="ExchangeableUntilIntervalRef"/>
962+
<xsd:enumeration value="ExchangeableUntilPercentUse"/>
952963
<xsd:enumeration value="Exchanging"/>
953964
<xsd:enumeration value="ExchangingRef"/>
954965
<xsd:enumeration value="Exclude"/>
@@ -1376,6 +1387,7 @@ Rail transport, Roads and Road transport
13761387
<xsd:enumeration value="IsEmergencyExit"/>
13771388
<xsd:enumeration value="IsEntry"/>
13781389
<xsd:enumeration value="IsExchangable"/>
1390+
<xsd:enumeration value="IsExchangeable"/>
13791391
<xsd:enumeration value="IsExit"/>
13801392
<xsd:enumeration value="IsExternal"/>
13811393
<xsd:enumeration value="IsFacingAisle"/>

‎xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
Add __RequiresDepost__ and __noCashPayment__ to CommercialCondition summary.
2626
Add __VehicleCOlelction_
2727
</Date>
28+
<Date><Modified>2026-07-09</Modified>Add correctly spelt IsExchangeable; deprecate misspelt IsExchangable.
29+
</Date>
2830
<Description>
2931
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
3032
<p>This sub-schema describes the CONDITION SUMMARY types.</p>
@@ -222,9 +224,14 @@ Rail transport, Roads and Road transport
222224
<xsd:documentation>Whether the ticket can be refunded.</xsd:documentation>
223225
</xsd:annotation>
224226
</xsd:element>
227+
<xsd:element name="IsExchangeable" type="xsd:boolean" default="true" minOccurs="0">
228+
<xsd:annotation>
229+
<xsd:documentation>Whether the ticket can be exchanged. +v2.1</xsd:documentation>
230+
</xsd:annotation>
231+
</xsd:element>
225232
<xsd:element name="IsExchangable" type="xsd:boolean" default="true" minOccurs="0">
226233
<xsd:annotation>
227-
<xsd:documentation>Whether the ticket can be exchanged.</xsd:documentation>
234+
<xsd:documentation>DEPRECATED - misspelt, use IsExchangeable instead. -v2.1</xsd:documentation>
228235
</xsd:annotation>
229236
</xsd:element>
230237
<xsd:element name="HasExchangeFee" type="xsd:boolean" default="false" minOccurs="0">

‎xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
</Date>
3535
<Date><Modified>2019-03-12</Modified>NORWAY-103 *FARES* Add purchaseGracePeriod new enum value to Reselling \ ResellWhen
3636
</Date>
37+
<Date><Modified>2026-07-09</Modified>Add correctly spelt ExchangeableToEnumeration; deprecate misspelt ExchangableToEnumeration.
38+
</Date>
3739
<Description>
3840
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
3941
<p>This sub-schema describes the After Sales USAGE PARAMETER types.</p>
@@ -226,9 +228,9 @@ Rail transport, Roads and Road transport
226228
</xsd:restriction>
227229
</xsd:simpleContent>
228230
</xsd:complexType>
229-
<xsd:simpleType name="ExchangableToEnumeration">
231+
<xsd:simpleType name="ExchangeableToEnumeration">
230232
<xsd:annotation>
231-
<xsd:documentation>Allowed values for Exchangeable to.</xsd:documentation>
233+
<xsd:documentation>Allowed values for Exchangeable to. +v2.1</xsd:documentation>
232234
</xsd:annotation>
233235
<xsd:restriction base="xsd:normalizedString">
234236
<xsd:enumeration value="anyProduct"/>
@@ -244,6 +246,12 @@ Rail transport, Roads and Road transport
244246
<xsd:enumeration value="other"/>
245247
</xsd:restriction>
246248
</xsd:simpleType>
249+
<xsd:simpleType name="ExchangableToEnumeration">
250+
<xsd:annotation>
251+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableToEnumeration instead. -v2.1</xsd:documentation>
252+
</xsd:annotation>
253+
<xsd:restriction base="ExchangeableToEnumeration"/>
254+
</xsd:simpleType>
247255
<!-- === REFUNDING PARAMETER====================================================== -->
248256
<xsd:simpleType name="RefundingIdType">
249257
<xsd:annotation>

‎xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd‎

Lines changed: 68 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<Date><Modified>2019-03-26</Modified>NL-27 CD #58 Add default TypeOfProductCategory and TypeOfService to Line:
3333
Move TypeOfProductCategory amnd TypeOfService from netex_journey_version to Framework reusable components (netex_travelRights_version) so they are visible from part 1
3434
Can therefore drop include of netex_travelRights_version from File netex_usageParameterAfterSales_version.xsd.
35+
</Date>
36+
<Date><Modified>2026-07-09</Modified>Add correctly spelt Exchangeable* elements; deprecate misspelt Exchangable* forms.
3537
</Date>
3638
<Description>
3739
<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
@@ -161,49 +163,93 @@ Rail transport, Roads and Road transport
161163
</xsd:annotation>
162164
</xsd:element>
163165
<xsd:choice minOccurs="0">
166+
<xsd:element name="ExchangeableFromAnyTime" type="EmptyType">
167+
<xsd:annotation>
168+
<xsd:documentation>Special value - Can be resold from any point after purchase. +v2.1</xsd:documentation>
169+
</xsd:annotation>
170+
</xsd:element>
171+
<xsd:element name="ExchangeableFromDuration" type="xsd:duration">
172+
<xsd:annotation>
173+
<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>
174+
</xsd:annotation>
175+
</xsd:element>
176+
<xsd:element name="ExchangeableFromPercentUse" type="xsd:decimal">
177+
<xsd:annotation>
178+
<xsd:documentation>Can be resold once a certain percentage of duration or use has been achieved. +v2.1</xsd:documentation>
179+
</xsd:annotation>
180+
</xsd:element>
164181
<xsd:element name="ExchangableFromAnyTime" type="EmptyType">
165182
<xsd:annotation>
166-
<xsd:documentation>Special value - Can be resold from any point after purchase.</xsd:documentation>
183+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableFromAnyTime instead. -v2.1</xsd:documentation>
167184
</xsd:annotation>
168185
</xsd:element>
169186
<xsd:element name="ExchangableFromDuration" type="xsd:duration">
170187
<xsd:annotation>
171-
<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>
188+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableFromDuration instead. -v2.1</xsd:documentation>
172189
</xsd:annotation>
173190
</xsd:element>
174191
<xsd:element name="ExchangableFromPercentUse" type="xsd:decimal">
175192
<xsd:annotation>
176-
<xsd:documentation>Can be resold once a certain percentage of duration or use has been achieved. +v1.1</xsd:documentation>
193+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableFromPercentUse instead. -v2.1</xsd:documentation>
177194
</xsd:annotation>
178195
</xsd:element>
179196
</xsd:choice>
180-
<xsd:element name="ExchangableFromIntervalRef" type="TimeIntervalRefStructure" minOccurs="0">
181-
<xsd:annotation>
182-
<xsd:documentation>Reference to arbitrary TimeInterval determining period from which reselling can be done relative to trigger point.</xsd:documentation>
183-
</xsd:annotation>
184-
</xsd:element>
185197
<xsd:choice minOccurs="0">
198+
<xsd:element name="ExchangeableFromIntervalRef" type="TimeIntervalRefStructure">
199+
<xsd:annotation>
200+
<xsd:documentation>Reference to arbitrary TimeInterval determining period from which reselling can be done relative to trigger point. +v2.1</xsd:documentation>
201+
</xsd:annotation>
202+
</xsd:element>
203+
<xsd:element name="ExchangableFromIntervalRef" type="TimeIntervalRefStructure">
204+
<xsd:annotation>
205+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableFromIntervalRef instead. -v2.1</xsd:documentation>
206+
</xsd:annotation>
207+
</xsd:element>
208+
</xsd:choice>
209+
<xsd:choice minOccurs="0">
210+
<xsd:element name="ExchangeableUntilAnyTime" type="EmptyType">
211+
<xsd:annotation>
212+
<xsd:documentation>Can be resold anyTime. +v2.1</xsd:documentation>
213+
</xsd:annotation>
214+
</xsd:element>
215+
<xsd:element name="ExchangeableUntilDuration" type="xsd:duration">
216+
<xsd:annotation>
217+
<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. +v2.1</xsd:documentation>
218+
</xsd:annotation>
219+
</xsd:element>
220+
<xsd:element name="ExchangeableUntilPercentUse" type="xsd:decimal">
221+
<xsd:annotation>
222+
<xsd:documentation>Can be resold until a certain percentage of duration or use has been achieved. +v2.1</xsd:documentation>
223+
</xsd:annotation>
224+
</xsd:element>
186225
<xsd:element name="ExchangableUntilAnyTime" type="EmptyType">
187226
<xsd:annotation>
188-
<xsd:documentation>Can be resold anyTime.</xsd:documentation>
227+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableUntilAnyTime instead. -v2.1</xsd:documentation>
189228
</xsd:annotation>
190229
</xsd:element>
191230
<xsd:element name="ExchangableUntilDuration" type="xsd:duration">
192231
<xsd:annotation>
193-
<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>
232+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableUntilDuration instead. -v2.1</xsd:documentation>
194233
</xsd:annotation>
195234
</xsd:element>
196235
<xsd:element name="ExchangableUntilPercentUse" type="xsd:decimal">
197236
<xsd:annotation>
198-
<xsd:documentation>Can be resold until a certain percentage of duration or use has been achieved. +v1.1</xsd:documentation>
237+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableUntilPercentUse instead. -v2.1</xsd:documentation>
238+
</xsd:annotation>
239+
</xsd:element>
240+
</xsd:choice>
241+
<xsd:choice minOccurs="0">
242+
<xsd:element name="ExchangeableUntilIntervalRef" type="TimeIntervalRefStructure">
243+
<xsd:annotation>
244+
<xsd:documentation>Reference to arbitrary TimeInterval determining period up until which reselling can be done relative to trigger point. +v2.1</xsd:documentation>
245+
</xsd:annotation>
246+
</xsd:element>
247+
<xsd:element name="ExchangableUntilIntervalRef" type="TimeIntervalRefStructure">
248+
<xsd:annotation>
249+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableUntilIntervalRef instead. -v2.1</xsd:documentation>
199250
</xsd:annotation>
200251
</xsd:element>
201252
</xsd:choice>
202-
<xsd:element name="ExchangableUntilIntervalRef" type="TimeIntervalRefStructure" minOccurs="0">
203-
<xsd:annotation>
204-
<xsd:documentation>Reference to arbitrary TimeInterval determining period up until which reselling can be done relative to trigger point.</xsd:documentation>
205-
</xsd:annotation>
206-
</xsd:element>
207253
<xsd:element name="EffectiveFrom" type="EffectiveFromEnumeration" minOccurs="0">
208254
<xsd:annotation>
209255
<xsd:documentation>Constraint on when change can be made +v1.1</xsd:documentation>
@@ -315,9 +361,14 @@ Rail transport, Roads and Road transport
315361
<xsd:documentation>Fare class to which can exchange, if specifically limited.</xsd:documentation>
316362
</xsd:annotation>
317363
</xsd:element>
364+
<xsd:element name="ExchangeableTo" type="ExchangeableToEnumeration" default="anyProduct" minOccurs="0">
365+
<xsd:annotation>
366+
<xsd:documentation>Type of fare for which product can be exchanged. +v2.1</xsd:documentation>
367+
</xsd:annotation>
368+
</xsd:element>
318369
<xsd:element name="ExchangableTo" type="ExchangableToEnumeration" default="anyProduct" minOccurs="0">
319370
<xsd:annotation>
320-
<xsd:documentation>Type of fare for which product can be exchanged.</xsd:documentation>
371+
<xsd:documentation>DEPRECATED - misspelt, use ExchangeableTo instead. -v2.1</xsd:documentation>
321372
</xsd:annotation>
322373
</xsd:element>
323374
</xsd:sequence>

0 commit comments

Comments
 (0)