From 448a58e4b831de90f660860464e14df96c8dff7a Mon Sep 17 00:00:00 2001
From: Robbendebiene <robbendebiene@mailbox.org>
Date: Thu, 31 Jul 2025 08:16:20 +0200
Subject: [PATCH 1/3] Remove ActualVehicleEquipmentGroup from
 WheelchairVehicleEquipment & AccessVehicleEquipment

---
 .../netex_equipmentVehiclePassenger_version.xsd             | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
index afd8f06ba..8a8aab084 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
@@ -158,9 +158,6 @@ Rail transport, Roads and Road transport
 								</xsd:annotation>
 							</xsd:element>
 						</xsd:sequence>
-						<xsd:sequence>
-							<xsd:group ref="ActualVehicleEquipmentGroup"/>
-						</xsd:sequence>
 						<xsd:sequence>
 							<xsd:group ref="AccessVehicleEquipmentGroup"/>
 						</xsd:sequence>
@@ -328,9 +325,6 @@ Rail transport, Roads and Road transport
 								</xsd:annotation>
 							</xsd:element>
 						</xsd:sequence>
-						<xsd:sequence>
-							<xsd:group ref="ActualVehicleEquipmentGroup"/>
-						</xsd:sequence>
 						<xsd:sequence>
 							<xsd:group ref="WheelchairVehicleEquipmentGroup"/>
 						</xsd:sequence>

From ca98fa71ada8ff23bb9321013fbb1cd9eda12f6d Mon Sep 17 00:00:00 2001
From: Robbendebiene <robbendebiene@mailbox.org>
Date: Wed, 27 Aug 2025 10:07:44 +0200
Subject: [PATCH 2/3] Fix WheelchairVehicleEquipment & AccessVehicleEquipment
 inheritance

---
 .../netex_equipmentVehiclePassenger_version.xsd               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
index 8a8aab084..370184d42 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
@@ -172,7 +172,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>
@@ -339,7 +339,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>

From 7fa283c8ec5c64d67812e32f5dbce0bde84a2618 Mon Sep 17 00:00:00 2001
From: Robbendebiene <robbendebiene@mailbox.org>
Date: Mon, 1 Sep 2025 13:03:50 +0200
Subject: [PATCH 3/3] Reintroduce removed properties from
 ActualVehicleEquipment but deprecate them

---
 ...etex_equipmentVehiclePassenger_version.xsd | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
index 370184d42..453761846 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
@@ -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>
@@ -159,6 +186,7 @@ Rail transport, Roads and Road transport
 							</xsd:element>
 						</xsd:sequence>
 						<xsd:sequence>
+							<xsd:group ref="_DeprecatedActualVehicleEquipmentGroup"/>
 							<xsd:group ref="AccessVehicleEquipmentGroup"/>
 						</xsd:sequence>
 					</xsd:sequence>
@@ -326,6 +354,7 @@ Rail transport, Roads and Road transport
 							</xsd:element>
 						</xsd:sequence>
 						<xsd:sequence>
+							<xsd:group ref="_DeprecatedActualVehicleEquipmentGroup"/>
 							<xsd:group ref="WheelchairVehicleEquipmentGroup"/>
 						</xsd:sequence>
 					</xsd:sequence>