From ff1b3b8c522999ce91a3f94aab83e9bec3114d18 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Fri, 13 Aug 2021 10:46:57 +0200 Subject: [PATCH] do not allow NgTankSystem parameter for IEPC/PEV vehicles --- ...arationDefinitions.2.10.2_JobInputData.xsd | 69 ++++++++++++++++--- .../Conventional_completedBus_1.xml | 2 +- .../CompletedBus/HEV_completedBus_1.xml | 2 +- .../CompletedBus/IEPC_completedBus_1.xml | 1 - .../CompletedBus/PEV_completedBus_1.xml | 1 - .../HeavyLorry/IEPC_heavyLorry.xml | 1 - .../HeavyLorry/PEV_heavyLorry_AMT_E2.xml | 2 +- .../HeavyLorry/PEV_heavyLorry_APT-N_E2.xml | 1 - .../HeavyLorry/PEV_heavyLorry_E3.xml | 1 - .../HeavyLorry/PEV_heavyLorry_E4.xml | 1 - .../MediumLorry/IEPC_mediumLorry.xml | 1 - .../MediumLorry/PEV_mediumLorry_AMT_E2.xml | 1 - .../MediumLorry/PEV_mediumLorry_APT-N_E2.xml | 1 - .../MediumLorry/PEV_mediumLorry_E3.xml | 1 - .../MediumLorry/PEV_mediumLorry_E4.xml | 1 - 15 files changed, 63 insertions(+), 23 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 5e2fb1a95a..493b4d2250 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd @@ -1319,6 +1319,11 @@ <xs:sequence> <xs:group ref="v2.10.2:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/> <xs:group ref="v2.10.2:Vehicle_CompletedBusParametersSequenceGroup"/> + <xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0"> + <xs:annotation> + <xs:documentation>P275 - enum</xs:documentation> + </xs:annotation> + </xs:element> <xs:group ref="v2.10.2:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/> <xs:element name="BodyworkCode" type="v2.10.2:VehicleCodeType" minOccurs="0"> <xs:annotation> @@ -1616,6 +1621,11 @@ <xs:sequence> <xs:group ref="v2.10.2:Vehicle_CompletedBus_GeneralParametersSequenceGroup"/> <xs:group ref="v2.10.2:Vehicle_CompletedBusParametersSequenceGroup"/> + <xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0"> + <xs:annotation> + <xs:documentation>P275 - enum</xs:documentation> + </xs:annotation> + </xs:element> <xs:group ref="v2.10.2:Vehicle_CompletedBus_PassengerCountSequenceGroup" minOccurs="0"/> <xs:element name="BodyworkCode" type="v2.10.2:VehicleCodeType" minOccurs="0"> <xs:annotation> @@ -1899,7 +1909,7 @@ <xs:extension base="v2.0:AbstractVehicleDeclarationType"> <xs:sequence> <xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_1"/> - <xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_2"/> + <xs:group ref="v2.10.2:Vehicle_HeavyLorryPEVParametersSequenceGroup_2"/> <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_IEPC_Type"/> <xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType"/> @@ -1913,7 +1923,7 @@ <xs:extension base="v2.0:AbstractVehicleDeclarationType"> <xs:sequence> <xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_1"/> - <xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_2"/> + <xs:group ref="v2.10.2:Vehicle_MediumLorryPEVParametersSequenceGroup_2"/> <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_IEPC_Type"/> <xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_IEPCType"/> @@ -1984,7 +1994,7 @@ <xs:extension base="v2.0:AbstractVehicleDeclarationType"> <xs:sequence> <xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_1"/> - <xs:group ref="v2.10.2:Vehicle_HeavyLorryParametersSequenceGroup_2"/> + <xs:group ref="v2.10.2:Vehicle_HeavyLorryPEVParametersSequenceGroup_2"/> <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_PEV_Type"/> <xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType"/> @@ -2000,7 +2010,7 @@ <xs:extension base="v2.0:AbstractVehicleDeclarationType"> <xs:sequence> <xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_1"/> - <xs:group ref="v2.10.2:Vehicle_MediumLorryParametersSequenceGroup_2"/> + <xs:group ref="v2.10.2:Vehicle_MediumLorryPEVParametersSequenceGroup_2"/> <xs:element name="ArchitectureID" type="v2.10.2:ArchitectureID_PEV_Type"/> <xs:group ref="v2.10.2:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.10.2:Abstract_ADAS_PEVType"/> @@ -2971,11 +2981,6 @@ <xs:documentation>P334 - bool</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="NgTankSystem" type="v1.0:NgTankSystemType" minOccurs="0"> - <xs:annotation> - <xs:documentation>P275 - enum</xs:documentation> - </xs:annotation> - </xs:element> <xs:element name="ClassBus" type="v2.10.2:RegisteredClassType" minOccurs="0"> <xs:annotation> <xs:documentation>P282 - enum</xs:documentation> @@ -3055,6 +3060,27 @@ </xs:element> </xs:sequence> </xs:group> + <xs:group name="Vehicle_HeavyLorryPEVParametersSequenceGroup_2"> + <xs:sequence> + <xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/> + <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType"> + <xs:annotation> + <xs:documentation>P180 - enum</xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="PTO" type="v2.0:AbstractPTODataType"/> + <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:sequence> + </xs:group> <xs:group name="Vehicle_MediumLorryParametersSequenceGroup_1"> <xs:sequence> <xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/> @@ -3102,6 +3128,31 @@ </xs:element> </xs:sequence> </xs:group> + <xs:group name="Vehicle_MediumLorryPEVParametersSequenceGroup_2"> + <xs:sequence> + <xs:element name="CargoVolume" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="v1.0:Double3"> + <xs:minExclusive value="0.000"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:group ref="v2.10.2:Vehicle_RetarderSequenceGroup"/> + <xs:element name="AngledriveType" type="v1.0:AngledriveTypeType"> + <xs:annotation> + <xs:documentation>P180 - enum</xs:documentation> + </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:sequence> + </xs:group> <xs:group name="Vehicle_PrimaryBusParametersSequenceGroup"> <xs:sequence> <xs:group ref="v2.10.2:Vehicle_GeneralParametersSequenceGroup"/> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml index 97fc641ddd..1be600645f 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml @@ -10,8 +10,8 @@ <CorrectedActualMass>500</CorrectedActualMass> <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass> <AirdragModifiedMultistage>true</AirdragModifiedMultistage> - <NgTankSystem>Compressed</NgTankSystem> <ClassBus>II+III</ClassBus> + <NgTankSystem>Compressed</NgTankSystem><!-- optional --> <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck> <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck> <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml index c015594059..505683bbe5 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml @@ -10,8 +10,8 @@ <CorrectedActualMass>500</CorrectedActualMass> <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass> <AirdragModifiedMultistage>true</AirdragModifiedMultistage> - <NgTankSystem>Compressed</NgTankSystem> <ClassBus>II+III</ClassBus> + <NgTankSystem>Compressed</NgTankSystem><!-- optional --> <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck> <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck> <NumberPassengerSeatsUpperDeck>11</NumberPassengerSeatsUpperDeck> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml index 85d6df1719..547e2944e4 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml @@ -10,7 +10,6 @@ <CorrectedActualMass>500</CorrectedActualMass> <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass> <AirdragModifiedMultistage>true</AirdragModifiedMultistage> - <NgTankSystem>Compressed</NgTankSystem> <ClassBus>II+III</ClassBus> <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck> <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml index 7f123699fc..cb50b2e0a3 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml @@ -10,7 +10,6 @@ <CorrectedActualMass>500</CorrectedActualMass> <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass> <AirdragModifiedMultistage>true</AirdragModifiedMultistage> - <NgTankSystem>Compressed</NgTankSystem> <ClassBus>II+III</ClassBus> <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck> <NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml index 138cd5158a..263d06aa9b 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/IEPC_heavyLorry.xml @@ -19,7 +19,6 @@ </PTO> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E-IEPC</ArchitectureID> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml index 0f020e3664..fb9ae486e7 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml @@ -19,7 +19,7 @@ </PTO> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> + <!-- optional --> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml index fcc54d12af..1fddfb644c 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml @@ -19,7 +19,6 @@ </PTO> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml index c60448a87f..cba0d7e062 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml @@ -19,7 +19,6 @@ </PTO> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E3</ArchitectureID> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml index 5246bea0f4..452af9e2dd 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml @@ -19,7 +19,6 @@ </PTO> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E4</ArchitectureID> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml index 984918b5d9..077d0350f1 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/IEPC_mediumLorry.xml @@ -15,7 +15,6 @@ <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E-IEPC</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml index 266ad42da2..8ac475c485 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml @@ -15,7 +15,6 @@ <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml index 8c49c240d5..aafc9089ed 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml @@ -15,7 +15,6 @@ <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml index 0592816693..b1bbe17db1 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E3.xml @@ -15,7 +15,6 @@ <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E3</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml index 5569c0336c..71cd6bcb3c 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/MediumLorry/PEV_mediumLorry_E4.xml @@ -15,7 +15,6 @@ <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> <ZeroEmissionVehicle>false</ZeroEmissionVehicle> - <NgTankSystem>Liquefied</NgTankSystem><!-- optional --> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E4</ArchitectureID> <OvcHev>false</OvcHev> -- GitLab