From f231007892ed54c9beae509175d1a566e6f2b37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20G=C3=BCnter?= <matthias.guenter@sbb.ch>
Date: Fri, 19 Apr 2024 09:54:12 +0200
Subject: [PATCH] fixing ambiguity and double VehicleCodeGroup

---
 .../netex_vehicleType_version.xsd              |  2 +-
 .../netex_vehicle_version.xsd                  | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
index 3c1205187..25924e206 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
@@ -1117,7 +1117,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element ref="PrivateCode" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Energy required for a full charge. +v2.0</xsd:documentation>
+					<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:sequence>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
index f7852d59a..a0f9d6afb 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
@@ -179,7 +179,6 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="ContactRef" minOccurs="0"/>
 			<xsd:element ref="TransportTypeRef" minOccurs="0"/>
 			<xsd:element ref="VehicleModelRef" minOccurs="0"/>
-			<xsd:element ref="VehicleModelProfileRef" minOccurs="0"/>
 			<xsd:element name="actualVehicleEquipments" type="equipments_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>ACTUAL EQUIPMENT found in VEHICLE.</xsd:documentation>
@@ -229,23 +228,6 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
-	<xsd:group name="VehicleCodeGroup">
-		<xsd:annotation>
-			<xsd:documentation>Alternative Code Elements for VEHICLE.</xsd:documentation>
-		</xsd:annotation>
-		<xsd:sequence>
-			<xsd:element name="OperationalNumber" type="xsd:normalizedString" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>Operational Number of VEHICLE.</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-			<xsd:element ref="PrivateCode" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>DEPRECATED - use privateCodes</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
-		</xsd:sequence>
-	</xsd:group>
 	<!-- ==== ROLLING STOCK INVENTORY ================================================= -->
 	<xsd:element name="RollingStockItem_DummyType" type="DataManagedObjectStructure" abstract="true" substitutionGroup="DataManagedObject">
 		<xsd:annotation>