From ca3c1e340136abdc73bc04bba83c4d313017be18 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 25 Aug 2021 08:09:24 +0200
Subject: [PATCH] adding vehicle type approval number for completed bus,
 introduce dedicated type

---
 ...arationDefinitions.2.10.2_JobInputData.xsd | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
index bd3d7a982c..348c959236 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
@@ -1414,6 +1414,7 @@
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0"/>
 					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_ConventionalType" minOccurs="0"/>
 					<xs:element name="Components" type="v2.10.2:Abstract_Components_Conventional_CompletedBusDeclarationType" minOccurs="0"/>
 				</xs:sequence>
@@ -1716,6 +1717,7 @@
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0"/>
 					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_HEVType" minOccurs="0"/>
 					<xs:element name="Components" type="v2.10.2:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
 				</xs:sequence>
@@ -1966,6 +1968,7 @@
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0"/>
 					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType" minOccurs="0"/>
 					<xs:element name="Components" type="v2.10.2:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
 				</xs:sequence>
@@ -2051,6 +2054,7 @@
 							<xs:documentation>P293 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType" minOccurs="0"/>
 					<xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType" minOccurs="0"/>
 					<xs:element name="Components" type="v2.10.2:Abstract_Components_xEV_CompletedBusType" minOccurs="0"/>
 				</xs:sequence>
@@ -3238,13 +3242,7 @@
 			<xs:element name="VocationalVehicle" type="xs:boolean"/>
 			<xs:element name="NgTankSystem" type="v2.1:NgTankSystemType" minOccurs="0"/>
 			<xs:element name="SleeperCab" type="xs:boolean"/>
-			<xs:element name="VehicleTypeApprovalNumber">
-				<xs:simpleType>
-					<xs:restriction base="xs:token">
-						<xs:minLength value="1"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
+			<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Vehicle_HeavyLorryPEVParametersSequenceGroup_2">
@@ -3259,13 +3257,7 @@
 			<xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
 			<xs:element name="VocationalVehicle" type="xs:boolean"/>
 			<xs:element name="SleeperCab" type="xs:boolean"/>
-			<xs:element name="VehicleTypeApprovalNumber">
-				<xs:simpleType>
-					<xs:restriction base="xs:token">
-						<xs:minLength value="1"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
+			<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Vehicle_MediumLorryParametersSequenceGroup_1">
@@ -3306,13 +3298,7 @@
 			</xs:element>
 			<xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
 			<xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0"/>
-			<xs:element name="VehicleTypeApprovalNumber">
-				<xs:simpleType>
-					<xs:restriction base="xs:token">
-						<xs:minLength value="1"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
+			<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Vehicle_MediumLorryPEVParametersSequenceGroup_2">
@@ -3331,13 +3317,7 @@
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="ZeroEmissionVehicle" type="xs:boolean"/>
-			<xs:element name="VehicleTypeApprovalNumber">
-				<xs:simpleType>
-					<xs:restriction base="xs:token">
-						<xs:minLength value="1"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
+			<xs:element name="VehicleTypeApprovalNumber" type="v2.10.2:VehicleTypeApprovalNumberType"/>
 		</xs:sequence>
 	</xs:group>
 	<xs:group name="Vehicle_PrimaryBusParametersSequenceGroup">
@@ -3372,4 +3352,9 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:group>
+	<xs:simpleType name="VehicleTypeApprovalNumberType">
+		<xs:restriction base="xs:token">
+			<xs:minLength value="1"/>
+		</xs:restriction>
+	</xs:simpleType>
 </xs:schema>
-- 
GitLab