diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd index 80987e87a24abdf6d57e3a0c964aa0d322edffd7..8e51374adee6f78d30a5eb382956588928f22f7b 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd @@ -1115,7 +1115,6 @@ </xs:complexType> </xs:element> <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/> - <xs:element name="HybridElectricHDV" type="xs:boolean"/> <xs:element name="ClassBus" type="xs:string"/> <xs:element name="TotalNumberOfPassengers" type="xs:int"/> <xs:element name="VehicleTypeApprovalNumber" type="xs:string" minOccurs="0"/> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd index 9c2449fc2bcb29fabaf9d80690709ad64e1410e7..ca3f0abd27668edb9dabb898810c63106b7956a7 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd @@ -822,7 +822,15 @@ </xs:complexType> </xs:element> <xs:group ref="mrf:GeneralVehicleOutputGroup"/> - <xs:group ref="mrf:CompletedBusSequenceGroup"/> + <xs:sequence> + <xs:element name="CorrectedActualMass" type="v1.0:VehicleCurbMassChassisType"/> + <xs:element name="ZeroEmissionVehicle" type="xs:boolean"/> + <xs:element name="ClassBus" type="v2.4:RegisteredClassType"/> + <xs:element name="NumberPassengersUpperDeck" type="xs:int"/> + <xs:element name="NumberPassengersLowerDeck" type="xs:int"/> + <xs:element name="BodyworkCode" type="v2.4:VehicleCodeType"/> + <xs:element name="LowEntry" type="xs:boolean"/> + </xs:sequence> </xs:sequence> </xs:group> <xs:group name="LorryGeneralVehicleOutputGroup"> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml index c488cdbd6c6b1f7629eaea7589e2ebd6325f3b7a..c18e44733f66a77b990e61c5ca951f16d8a252d3 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/IEPC_heavyLorry.xml @@ -17,7 +17,7 @@ <PTOShaftsGearWheels>none</PTOShaftsGearWheels> <PTOOtherElements>none</PTOOtherElements> </PTO> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml index f0c39eb8910edb7559a5acf14471f00274bbdd31..c86303680b6168bd40152f18bda3d9bceb97df0d 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_AMT_E2.xml @@ -17,7 +17,7 @@ <PTOShaftsGearWheels>none</PTOShaftsGearWheels> <PTOOtherElements>none</PTOOtherElements> </PTO> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> <!-- optional --> <SleeperCab>false</SleeperCab> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml index 0646086cb4fb980e07e204b47a64ee31c2a92df7..3acd757b9c21b7566063348061b679f2f4df6004 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_APT-N_E2.xml @@ -17,7 +17,7 @@ <PTOShaftsGearWheels>none</PTOShaftsGearWheels> <PTOOtherElements>none</PTOOtherElements> </PTO> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml index 9929f9a229bdb9ae050e96f558d1367e04a9cbe2..29eb0bd857399758da6471aeef94c5fcb867ed7c 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E3.xml @@ -17,7 +17,7 @@ <PTOShaftsGearWheels>none</PTOShaftsGearWheels> <PTOOtherElements>none</PTOOtherElements> </PTO> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml index 7900c34fa0476e6a032d3577ceb0cdc2c2587d10..9b8cd6206d63f3df07664171200aa21fbce7b5c2 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/PEV_heavyLorry_E4.xml @@ -17,7 +17,7 @@ <PTOShaftsGearWheels>none</PTOShaftsGearWheels> <PTOOtherElements>none</PTOOtherElements> </PTO> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VocationalVehicle>false</VocationalVehicle> <SleeperCab>false</SleeperCab> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml index 317379a196e960b7eda1da9931d0eb3c20b22ec4..3327527b034c90477e8cf58e38dad9b25bab26af 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/IEPC_mediumLorry.xml @@ -15,7 +15,7 @@ <!-- optional --> <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E-IEPC</ArchitectureID> <OvcHev>true</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml index f54a01de667af7b602b326f2f97d38cc61cc923b..2aab5c96bbca0ee65a9c77091004f0fc731d4db5 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2.xml @@ -14,7 +14,7 @@ <CargoVolume>20.300</CargoVolume><!-- optional --> <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml index 34337610219f1a4b0a4a9cddb024a373a21d4c95..3d97772fd6049b70420cecfb4631b8cf84a07ae7 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_AMT_E2_EM_Std.xml @@ -15,7 +15,7 @@ <!-- optional --> <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml index 720126847837289e47d801313777767158486095..13964488070161145a0df55388353c57efa10c4a 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_APT-N_E2.xml @@ -15,7 +15,7 @@ <!-- optional --> <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml index b79c86a89dc07f1934887699f6f532a4b3245e64..892fa63e7d4b79c8f139efe20fbca90250e72d91 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E3.xml @@ -15,7 +15,7 @@ <!-- optional --> <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E3</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml index d1454baea1299e3b8f09cc624ac368991333190e..691f9bd29a0732130113aea67e60b8611e67d732 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/PEV_mediumLorry_E4.xml @@ -15,7 +15,7 @@ <!-- optional --> <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E4</ArchitectureID> <OvcHev>false</OvcHev> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/PEV_mediumLorry_AMT_E2_BatteryStd.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/PEV_mediumLorry_AMT_E2_BatteryStd.xml index 15167fb7ac66761263e796b6e2cd9e4d4248cab2..eea8ef7c5d5a6fc61d3be46efb2aaed3d1d4d1d4 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/PEV_mediumLorry_AMT_E2_BatteryStd.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/MockupBusTest/MediumLorry/PEV_mediumLorry_AMT_E2_BatteryStd.xml @@ -14,7 +14,7 @@ <CargoVolume>20.300</CargoVolume><!-- optional --> <RetarderType>None</RetarderType> <AngledriveType>None</AngledriveType> - <ZeroEmissionVehicle>false</ZeroEmissionVehicle> + <ZeroEmissionVehicle>true</ZeroEmissionVehicle> <VehicleTypeApprovalNumber>ASDF</VehicleTypeApprovalNumber> <ArchitectureID>E2</ArchitectureID> <OvcHev>false</OvcHev>