leave axle configuration at the current position but make it optional

VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd

@@ -908,6 +908,11 @@
 							<xs:documentation>P036 - enum</xs:documentation>
 						</xs:annotation>
 					</xs:element>
+					<xs:element name="AxleConfiguration" type="tns:VehicleAxleConfigurationDeclarationType" minOccurs="0">
+						<xs:annotation>
+							<xs:documentation>P037 - enum</xs:documentation>
+						</xs:annotation>
+					</xs:element>
 					<xs:element name="CurbMassChassis" type="tns:VehicleCurbMassChassisType">
 						<xs:annotation>
 							<xs:documentation>P038 - [kg]</xs:documentation>
@@ -920,11 +925,6 @@
 					</xs:element>
 					<xs:choice>
 						<xs:sequence>
-							<xs:element name="AxleConfiguration" type="tns:VehicleAxleConfigurationDeclarationType">
-								<xs:annotation>
-									<xs:documentation>P037 - enum</xs:documentation>
-								</xs:annotation>
-							</xs:element>
 							<xs:element name="IdlingSpeed" type="tns:EngineDeclaredSpeedType">
 								<xs:annotation>
 									<xs:documentation>P198 - [1/min]</xs:documentation>
@@ -981,23 +981,6 @@
 									<xs:documentation>P276 - bool</xs:documentation>
 								</xs:annotation>
 							</xs:element>
-							<xs:sequence>
-								<xs:element name="TorqueLimits" type="tns:TorqueLimitsType" minOccurs="0"/>
-								<xs:element name="Components">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="Engine" type="tns:EngineComponentDeclarationType"/>
-											<xs:element name="Gearbox" type="tns:GearboxComponentDeclarationType"/>
-											<xs:element name="Angledrive" type="tns:AngledriveComponentDeclarationType" minOccurs="0"/>
-											<xs:element name="Retarder" type="tns:RetarderComponentDeclarationType" minOccurs="0"/>
-											<xs:element name="Axlegear" type="tns:AxlegearComponentDeclarationType"/>
-											<xs:element name="AxleWheels" type="tns:AxleWheelsComponentDeclarationType"/>
-											<xs:element name="Auxiliaries" type="tns:AuxiliariesComponentDeclarationType"/>
-											<xs:element name="AirDrag" type="tns:AirDragComponentDeclarationType" minOccurs="0"/>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
-							</xs:sequence>
 							<xs:element name="ADAS" minOccurs="0">
 								<xs:complexType>
 									<xs:sequence>
@@ -1027,6 +1010,23 @@
 									</xs:sequence>
 								</xs:complexType>
 							</xs:element>
+							<xs:sequence>
+								<xs:element name="TorqueLimits" type="tns:TorqueLimitsType" minOccurs="0"/>
+								<xs:element name="Components">
+									<xs:complexType>
+										<xs:sequence>
+											<xs:element name="Engine" type="tns:EngineComponentDeclarationType"/>
+											<xs:element name="Gearbox" type="tns:GearboxComponentDeclarationType"/>
+											<xs:element name="Angledrive" type="tns:AngledriveComponentDeclarationType" minOccurs="0"/>
+											<xs:element name="Retarder" type="tns:RetarderComponentDeclarationType" minOccurs="0"/>
+											<xs:element name="Axlegear" type="tns:AxlegearComponentDeclarationType"/>
+											<xs:element name="AxleWheels" type="tns:AxleWheelsComponentDeclarationType"/>
+											<xs:element name="Auxiliaries" type="tns:AuxiliariesComponentDeclarationType"/>
+											<xs:element name="AirDrag" type="tns:AirDragComponentDeclarationType" minOccurs="0"/>
+										</xs:sequence>
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
 						</xs:sequence>
 						<xs:sequence>
 							<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
@@ -1806,11 +1806,14 @@ ToDo: -0.00
 			<xs:enumeration value="Ethanol CI"/>
 			<xs:enumeration value="Petrol PI"/>
 			<xs:enumeration value="Ethanol PI"/>
-			<xs:enumeration value="LPG"/><!-- == LPG PI -->
-			<xs:enumeration value="NG"/><!-- == NG PI -->
+			<xs:enumeration value="LPG"/>
+			<xs:enumeration value="NG"/>
 			<xs:enumeration value="LPG PI"/>
 			<xs:enumeration value="NG PI"/>
-			<xs:enumeration value="NG CI"/><!-- dual fuel -->
+			<xs:enumeration value="NG CI"/>
+			<!-- == LPG PI -->
+			<!-- == NG PI -->
+			<!-- dual fuel -->
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="GearboxCertificationOptionType">