diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
index 04f22b045ad86cfe474900e7b4caaff2d080e02e..c8f44fc1b3bb0d1c4f800d92383c39cb6692142e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_full-sample.xml
@@ -1 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<Model>Sample Bus Model 2</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<ClassBus>A</ClassBus>
<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
<BodyworkCode>CE</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Infinite Loop</ManufacturerAddress>
+ <VIN>VEH-1234567891</VIN>
+ <Date>2021-01-09T11:00:00Z</Date>
+ <Model>Sample Bus Model 2</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>7000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
+ <ClassBus>A</ClassBus>
+ <NumberPassengerSeatsLowerDeck>10</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>42</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>20</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>13</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CE</BodyworkCode>
+ <LowEntry>true</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index a580db7446d77a5ac44a28e6284b220ebfc0e9f9..7c9454e563e8bbe3283a2361f19032c6ef2ebf79 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -1 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
+ <Manufacturer>Some Manufacturer 2</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
+ <VIN>VEH-1234567891</VIN>
+ <Date>2021-01-09T11:00:00Z</Date>
+ <NumberPassengerSeatsLowerDeck>10</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>42</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>20</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>13</NumberPassengersStandingUpperDeck>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
index f2258e15572f77990aca8a993e3c0015119f505a..24f2810fdf692cbe4e1f1f7af756eddf86f2e8fd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.8/vecto_vehicle-stage_input_full-sample.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<tns:VectoInputDeclaration xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8" schemaVersion="2.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
- <v2.0:Vehicle id="TODO_ADDIDENTIFIER" xsi:type="InterimStageInputType">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="InterimStageInputType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
<VIN>VEH-1234567890</VIN>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
index 9e20d2cd2d4e3791611918ac7b389c79169f1984..57659cef43c4d0b34fa9e642d9fb832a5070197e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_full-sample.xml
@@ -1 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer</Manufacturer>
<ManufacturerAddress>Infinite Loop</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<Model>Sample Bus Model 2</Model>
<LegislativeCategory>M3</LegislativeCategory>
<CorrectedActualMass>7000</CorrectedActualMass>
<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
<ClassBus>A</ClassBus>
<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
<BodyworkCode>CC</BodyworkCode>
<LowEntry>true</LowEntry>
<HeightIntegratedBody>2500</HeightIntegratedBody>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Infinite Loop</ManufacturerAddress>
+ <VIN>VEH-1234567891</VIN>
+ <Date>2021-01-09T11:00:00Z</Date>
+ <Model>Sample Bus Model 2</Model>
+ <LegislativeCategory>M3</LegislativeCategory>
+ <CorrectedActualMass>7000</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
+ <ClassBus>A</ClassBus>
+ <NumberPassengerSeatsLowerDeck>10</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>42</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>20</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>13</NumberPassengersStandingUpperDeck>
+ <BodyworkCode>CC</BodyworkCode>
+ <LowEntry>true</LowEntry>
+ <HeightIntegratedBody>2500</HeightIntegratedBody>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
index 6404f3d41e9b2c384697e1762cc46bf9a919d79a..9a6adaf176806f20f62ebdccdf56a5ee7ebbe527 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-exempted_input_only_certain_entries02-sample.xml
@@ -1 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
<Manufacturer>Some Manufacturer 2</Manufacturer>
<ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
<VIN>VEH-1234567891</VIN>
<Date>2021-01-09T11:00:00Z</Date>
<NumberPassengersLowerDeck>10</NumberPassengersLowerDeck>
<NumberPassengersUpperDeck>20</NumberPassengersUpperDeck>
</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.8"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob E:\VECTO_DEV\fk_vecto-dev\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="ExemptedInterimStageInputType">
+ <Manufacturer>Some Manufacturer 2</Manufacturer>
+ <ManufacturerAddress>Some Manufacturer Address 2</ManufacturerAddress>
+ <VIN>VEH-1234567891</VIN>
+ <Date>2021-01-09T11:00:00Z</Date>
+ <NumberPassengerSeatsLowerDeck>10</NumberPassengerSeatsLowerDeck>
+ <NumberPassengersStandingLowerDeck>42</NumberPassengersStandingLowerDeck>
+ <NumberPassengerSeatsUpperDeck>20</NumberPassengerSeatsUpperDeck>
+ <NumberPassengersStandingUpperDeck>13</NumberPassengersStandingUpperDeck>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
index c3be89ee5b145013a5f6503292e93dbe380e104a..04127d5f4f065075535a015d32563b68c11ae934 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
@@ -54,12 +54,12 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual("Some Manufacturer", vehicle.Manufacturer);
Assert.AreEqual("Some Manufacturer Address", vehicle.ManufacturerAddress);
Assert.AreEqual("VEH-1234567890", vehicle.VIN);
- Assert.AreEqual(DateTime.Parse("2020-01-09T11:00:00Z").ToUniversalTime(), vehicle.Date);
+ Assert.AreEqual(DateTime.Parse("2021-06-30T22:00:00Z").ToUniversalTime(), vehicle.Date);
Assert.AreEqual("Sample Bus Model", vehicle.Model);
Assert.AreEqual(LegislativeClass.M3, vehicle.LegislativeClass);
Assert.AreEqual(500, vehicle.CurbMassChassis.Value());//CorrectedActualMass
Assert.AreEqual(3500, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass
- Assert.AreEqual(null, vehicle.AirdragModifiedMultistage);
+ Assert.AreEqual(true, vehicle.AirdragModifiedMultistage);
Assert.AreEqual(TankSystem.Compressed, vehicle.TankSystem);//NgTankSystem
Assert.AreEqual(RegistrationClass.II_III, vehicle.RegisteredClass);//ClassBus
Assert.AreEqual(1, vehicle.NumberPassengerSeatsLowerDeck);
@@ -158,8 +158,10 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(10000, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass
Assert.AreEqual(RegistrationClass.A, vehicle.RegisteredClass);//ClassBus
Assert.AreEqual(10, vehicle.NumberPassengerSeatsLowerDeck);
+ Assert.AreEqual(42, vehicle.NumberPassengersStandingLowerDeck);
Assert.AreEqual(20, vehicle.NumberPassengerSeatsUpperDeck);
- Assert.AreEqual(VehicleCode.CC, vehicle.VehicleCode);
+ Assert.AreEqual(13, vehicle.NumberPassengersStandingUpperDeck);
+ Assert.AreEqual(VehicleCode.CE, vehicle.VehicleCode);
Assert.AreEqual(true, vehicle.LowEntry);
Assert.AreEqual(2.5, vehicle.Height.Value());
}