Skip to content

Update netex_typeOfValue_version.xsd #988

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
ue71603 wants to merge 5 commits into
base: next
Choose a base branch
from
Open

Update netex_typeOfValue_version.xsd #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66442e7
Update netex_typeOfValue_version.xsd
ue71603 Feb 9, 2026
ad9722f
Lint and update documentation tables
github-actions[bot] Feb 9, 2026
5c955d4
Preparing for depreciation of WheelchairVehicle
TuThoThai Feb 17, 2026
6778f14
Moving constraints to publication.xsd
TuThoThai Feb 19, 2026
1d892ea
Apply suggestion from @Aurige
TuThoThai Feb 19, 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
36 changes: 32 additions & 4 deletions xsd/NeTEx_publication.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,23 @@
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====KeyValuePair unique============================== -->
<xsd:unique name="KeyValuePair">
<xsd:annotation>
<xsd:documentation>Every Key Value Pair must be unique.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:KeyValue"/>
<xsd:field xpath="netex:Key"/>
<xsd:field xpath="netex:Value"/>
</xsd:unique>
<!-- =====PrivateCodeType unique============================== -->
<xsd:unique name="PrivateCodeType">
<xsd:annotation>
<xsd:documentation>Every PrivateCode type must be unique.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:PrivateCode"/>
<xsd:field xpath="@type"/>
</xsd:unique>
<!-- =====ResponsibilityRole============================== -->
<!-- =====ResponsibilityRole unique========================== -->
<xsd:unique name="ResponsibilityRole_UniqueBy_Id_Version">
Expand Down Expand Up @@ -600,6 +617,16 @@
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====TypeOfValue unique========================== -->
<xsd:unique name="TypeOfValue_Unique">
Copy link
Contributor

@Aurige Aurige Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unique and key on the same attribute is redundant (key is enough)

<xsd:selector xpath=".//values/TypeOfValue"/>
<xsd:field xpath="@id"/>
</xsd:unique>
<!-- =====TypeOfValue Key========================== -->
<xsd:key name="TypeOfValue_Key">
<xsd:selector xpath="values/TypeOfValue"/>
Copy link
Contributor

@Aurige Aurige Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<xsd:selector xpath="values/TypeOfValue"/>
<xsd:selector xpath=".//values/TypeOfValue"/>

Copy link
Contributor

@skinkie skinkie Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sure this works at this point? I don't know for sure, but shouldn't this be modeled like KeyValue?

Copy link
Contributor

@Aurige Aurige Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure what you mean here, KeyValue pairs don't have Id

<xsd:field xpath="@id"/>
</xsd:key>
<!-- =====ValueSet unique========================== -->
<xsd:unique name="ValueSet_UniqueBy_Id_Version">
<xsd:annotation>
Expand Down Expand Up @@ -8341,8 +8368,8 @@
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
<!-- =====TypeOfFlexibleService============================== -->
<!-- =====TypeOfFlexibleService unique========================== -->
<!-- =====TypeOfFlexibleService============================== -->
<!-- =====TypeOfFlexibleService unique========================== -->
<xsd:unique name="TypeOfFlexibleService_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [TypeOfFlexibleService Id + Version] must be unique within document.</xsd:documentation>
Expand All @@ -8361,7 +8388,7 @@
<xsd:selector xpath=".//netex:TypeOfFlexibleService"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
</xsd:key>
<!-- =====TypeOfProductCategory============================== -->
<!-- =====TypeOfProductCategory unique========================== -->
<xsd:unique name="TypeOfProductCategory_UniqueBy_Id_Version">
Expand Down Expand Up @@ -9611,7 +9638,7 @@
<xsd:selector xpath=".//netex:FareElementInSequence"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:key>
</xsd:key>
<!-- =====TypeOfFareStructureElement============================== -->
<!-- =====TypeOfFareStructureElement unique========================== -->
<xsd:unique name="TypeOfFareStructureElement_UniqueBy_Id_Version">
Expand Down Expand Up @@ -13017,6 +13044,7 @@
</xsd:key>
<!-- =====WheelchairVehicle ================================ -->
<!-- =====WheelchairVehicle unique========================== -->
<!--This section can be deleted at the next update as WheelchairVehicle is marked deprecated since v2.0-->
<xsd:unique name="WheelchairVehicle_UniqueBy_Id_Version">
<xsd:annotation>
<xsd:documentation>Every [WheelchairVehicle Id + Version] must be unique within document.</xsd:documentation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/NeTEx_publication_timetable.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5789,7 +5789,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
<xsd:selector xpath=".//netex:JourneyFrequencyGroup"/>
<xsd:field xpath="@id"/>
<xsd:field xpath="@version"/>
</xsd:unique>
</xsd:unique>
<!-- =====JourneyFrequencyGroup Key ========================== -->
<xsd:keyref name="JourneyFrequencyGroup_KeyRef" refer="netex:JourneyFrequencyGroup_AnyVersionedKey">
<xsd:selector xpath=".//netex:JourneyFrequencyGroupRef"/>
Expand Down
20 changes: 2 additions & 18 deletions xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
<Date>
<Modified>2017-11-11 Fix allow version of dereived view id</Modified>
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Add privateCodes.
<Date>
<Modified>2023-11-07</Modified>CR0544 Add privateCodes.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines RESPONSIBILITY types.</p>
Expand Down Expand Up @@ -178,16 +179,6 @@ Rail transport, Roads and Road transport
<xsd:annotation>
<xsd:documentation>A list of alternative Key values for an element.</xsd:documentation>
</xsd:annotation>
<!-- 1.02 correction ======================================= -->
<xsd:unique name="KeyValuePair">
<xsd:annotation>
<xsd:documentation>Every Key Value Pair must be unique.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:KeyValue"/>
<xsd:field xpath="netex:Key"/>
<xsd:field xpath="netex:Value"/>
</xsd:unique>
<!-- END correction ======================================= -->
</xsd:element>
<xsd:complexType name="KeyListStructure">
<xsd:annotation>
Expand Down Expand Up @@ -228,13 +219,6 @@ Rail transport, Roads and Road transport
<xsd:annotation>
<xsd:documentation>A list of private codes that uniquely identifiy the element. May be used for inter-operating with other (legacy) systems. +v2.0</xsd:documentation>
</xsd:annotation>
<xsd:unique name="PrivateCodeType">
<xsd:annotation>
<xsd:documentation>Every PrivateCode type must be unique.</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath=".//netex:PrivateCode"/>
<xsd:field xpath="@type"/>
</xsd:unique>
</xsd:element>
<xsd:complexType name="PrivateCodesStructure">
<xsd:annotation>
Expand Down
11 changes: 2 additions & 9 deletions xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
<Date>
<Modified>217-03-27 Change to use responsibility 1.1 with AlternativeText</Modified>
</Date>
<Date><Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
<Date>
<Modified>2023-11-07</Modified>CR0544 Deprecate PrivateCode.
</Date>
<Description>
<p>NeTEx - Network Exchange. This subschema defines TYPE OF VALUE types.</p>
Expand Down Expand Up @@ -175,14 +176,6 @@ Rail transport, Roads and Road transport
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<xsd:unique name="TypeOfValue_Unique">
<xsd:selector xpath="values/TypeOfValue/Id"/>
<xsd:field xpath="."/>
</xsd:unique>
<xsd:key name="TypeOfValue_Key">
<xsd:selector xpath="values/TypeOfValue/Id"/>
<xsd:field xpath="."/>
</xsd:key>
</xsd:element>
<xsd:complexType name="ValueSet_VersionStructure">
<xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Rail transport, Roads and Road transport
<xsd:annotation>
<xsd:documentation>Distance from VEHICLE needed to operate hoist.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:element>
<xsd:element name="Ramp" type="xsd:boolean" minOccurs="0">
<xsd:annotation>
<xsd:documentation>Whether a ramp may be used to access VEHICLE.</xsd:documentation>
Expand Down
2 changes: 1 addition & 1 deletion xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
Expand Down
5 changes: 0 additions & 5 deletions xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@ Rail transport, Roads and Road transport
</xsd:restriction>
</xsd:complexContent>
</xsd:complexType>
<!--
<xsd:unique name="SfUniqueLineId">
<xsd:selector xpath=".//netex:lines/Line"/>
<xsd:field xpath="Id"/>
</xsd:unique> -->
</xsd:element>
<xsd:complexType name="Service_VersionFrameStructure">
<xsd:annotation>
Expand Down
Loading