Skip to content

Wrong assignment of ActualVehicleEquipmentGroup #947

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
Robbendebiene wants to merge 3 commits into
base: v2.0
Choose a base branch
from
Open

Wrong assignment of ActualVehicleEquipmentGroup #947

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
448a58e
Remove ActualVehicleEquipmentGroup from WheelchairVehicleEquipment & …
Robbendebiene Jul 31, 2025
ca98fa7
Fix WheelchairVehicleEquipment & AccessVehicleEquipment inheritance
Robbendebiene Aug 27, 2025
7fa283c
Reintroduce removed properties from ActualVehicleEquipment but deprec…
Robbendebiene Sep 1, 2025
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
39 changes: 31 additions & 8 deletions 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 @@ -133,6 +133,33 @@ Rail transport, Roads and Road transport
<xsd:element ref="AccessibilityAssessment" minOccurs="0"/>
</xsd:sequence>
</xsd:group>
<xsd:group name="_DeprecatedActualVehicleEquipmentGroup">
<xsd:annotation>
<xsd:documentation>Helper group to retain backwards compatibility with deprecation notice. Will be removed in 3.0.</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="Units" type="xsd:integer" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED: Use Units from ACTUAL VEHICLE EQUIPMENT. Will be removed in 3.0.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="VehicleTypeRef" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED: Use VehicleTypeRef from ACTUAL VEHICLE EQUIPMENT. Will be removed in 3.0.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="EquipmentRef" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED: This should NOT be used. Will be removed in 3.0.</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element ref="AccessibilityAssessment" minOccurs="0">
<xsd:annotation>
<xsd:documentation>DEPRECATED: Use AccessibilityAssessment from ACTUAL VEHICLE EQUIPMENT or on the actual element like DECK ENTRANCE. Will be removed in 3.0.</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
</xsd:group>
<!-- ======================================================================= -->
<xsd:element name="AccessVehicleEquipment" substitutionGroup="PassengerEquipment">
<xsd:annotation>
Expand All @@ -159,9 +186,7 @@ Rail transport, Roads and Road transport
</xsd:element>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="ActualVehicleEquipmentGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="_DeprecatedActualVehicleEquipmentGroup"/>
<xsd:group ref="AccessVehicleEquipmentGroup"/>
</xsd:sequence>
</xsd:sequence>
Expand All @@ -175,7 +200,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for an ACCESS VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ActualVehicleEquipment_VersionStructure">
<xsd:extension base="PassengerEquipment_VersionStructure">
<xsd:sequence>
<xsd:group ref="AccessVehicleEquipmentGroup"/>
</xsd:sequence>
Expand Down Expand Up @@ -329,9 +354,7 @@ Rail transport, Roads and Road transport
</xsd:element>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="ActualVehicleEquipmentGroup"/>
</xsd:sequence>
<xsd:sequence>
<xsd:group ref="_DeprecatedActualVehicleEquipmentGroup"/>
<xsd:group ref="WheelchairVehicleEquipmentGroup"/>
</xsd:sequence>
</xsd:sequence>
Expand All @@ -345,7 +368,7 @@ Rail transport, Roads and Road transport
<xsd:documentation>Type for a WHEELCHAIR VEHICLE EQUIPMENT.</xsd:documentation>
</xsd:annotation>
<xsd:complexContent>
<xsd:extension base="ActualVehicleEquipment_VersionStructure">
<xsd:extension base="PassengerEquipment_VersionStructure">
<xsd:sequence>
<xsd:group ref="WheelchairVehicleEquipmentGroup"/>
</xsd:sequence>
Expand Down