diff --git a/Generic Vehicles/Declaration Mode/Completed 31b/CompletedBus_31b.vecto b/Generic Vehicles/Declaration Mode/CompletedBus 31b/CompletedBus_31b.vecto
similarity index 100%
rename from Generic Vehicles/Declaration Mode/Completed 31b/CompletedBus_31b.vecto
rename to Generic Vehicles/Declaration Mode/CompletedBus 31b/CompletedBus_31b.vecto
diff --git a/Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
similarity index 86%
rename from Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
rename to Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
index ca639ef812380b3c9e3ae469c591ca67be9009d3..033d7250d54768e4f76e348d034617a1f3882b8a 100644
--- a/Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-031eec78fb1746d280d9">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-35d2c92f368748528f58">
<Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+ <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
@@ -10,7 +10,7 @@
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>700</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
@@ -212,17 +212,17 @@
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>qbkrFYROE5tA+8PnYHcW9bd65Z8HWn1fCwMHHrtSqKY=</di:DigestValue>
+ <di:DigestValue>svVL/7eKMZ9ULNstW+bZeIpS8UXpNXpkxyWDtFD5QzU=</di:DigestValue>
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-6c34e6e3c0654ca2b66d">
+ <di:Reference URI="#RESULT-1bf4f0ed871443f4a122">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>5tgyq+cWmJLc6jGrNL+vrTKwUvPfffC9L2KQNsN5me0=</di:DigestValue>
+ <di:DigestValue>wBzAtyXjA+9GqsqTOzhR7u5J46ICG5qxMtHt2EslnBo=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -237,9 +237,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.39581</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.26127</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1421.75</CO2>
+ <CO2 unit="g/km">1411.89</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -251,9 +251,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">23.48056</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">23.36173</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1721.17</CO2>
+ <CO2 unit="g/km">1712.46</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -265,9 +265,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.90915</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.79525</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1166.17</CO2>
+ <CO2 unit="g/km">1157.82</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -279,9 +279,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.25350</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.17590</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1411.32</CO2>
+ <CO2 unit="g/km">1405.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -293,9 +293,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.61881</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.24764</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1071.59</CO2>
+ <CO2 unit="g/km">1044.38</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -307,9 +307,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.74669</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.32635</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1300.87</CO2>
+ <CO2 unit="g/km">1270.06</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -321,9 +321,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.82851</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.31731</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1453.47</CO2>
+ <CO2 unit="g/km">1489.30</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -335,9 +335,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">24.12659</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">24.95584</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1768.53</CO2>
+ <CO2 unit="g/km">1829.32</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -349,9 +349,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.37265</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.66413</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1200.15</CO2>
+ <CO2 unit="g/km">1221.52</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -363,9 +363,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.89387</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.46277</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1458.26</CO2>
+ <CO2 unit="g/km">1499.96</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -377,9 +377,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.18680</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.85984</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1113.22</CO2>
+ <CO2 unit="g/km">1089.26</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -391,37 +391,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.46135</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.25391</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1353.26</CO2>
+ <CO2 unit="g/km">1338.05</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
- <Payload unit="kg">1075.44</Payload>
- <PassengerCount>15.15</PassengerCount>
+ <TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
+ <Payload unit="kg">879.90</Payload>
+ <PassengerCount>12.39</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.39119</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.74380</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">981.60</CO2>
+ <CO2 unit="g/km">934.15</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
- <Payload unit="kg">4301.75</Payload>
- <PassengerCount>60.59</PassengerCount>
+ <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>49.57</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.14041</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.17565</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1109.82</CO2>
+ <CO2 unit="g/km">1039.10</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -433,9 +433,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.91114</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.06324</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">873.11</CO2>
+ <CO2 unit="g/km">810.96</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -447,37 +447,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.33438</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.51205</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">904.14</CO2>
+ <CO2 unit="g/km">843.86</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
- <Payload unit="kg">1262.82</Payload>
- <PassengerCount>17.79</PassengerCount>
+ <TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
+ <Payload unit="kg">1052.35</Payload>
+ <PassengerCount>14.82</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.79159</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.14244</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1010.95</CO2>
+ <CO2 unit="g/km">963.37</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
- <Payload unit="kg">5051.30</Payload>
- <PassengerCount>71.15</PassengerCount>
+ <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+ <Payload unit="kg">4209.41</Payload>
+ <PassengerCount>59.29</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.77755</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.86026</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1156.53</CO2>
+ <CO2 unit="g/km">1089.29</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -489,9 +489,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.42999</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.54039</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">911.14</CO2>
+ <CO2 unit="g/km">845.93</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -503,24 +503,24 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.91402</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.07723</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">946.63</CO2>
+ <CO2 unit="g/km">885.29</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-05-11T12:53:35.5309828Z</Date>
+ <Date>2020-05-28T09:52:05.8747231Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-031eec78fb1746d280d9">
+ <di:Reference URI="#PIF-35d2c92f368748528f58">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>abc/t5+cWFTVDs6Mg9DmP5sj7khuShNbWtU6Zxi9MGw=</di:DigestValue>
+ <di:DigestValue>7oGL3IjWrdZyNguz1VYabaxABpSO8GkKn5rAQ+SyUhA=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd8e91637c540cb94f2acb0dc99a3e3edfd6302f
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-031eec78fb1746d280d9">
+ <Vehicle xsi:type="VehiclePIFType">
+ <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+ <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890_nonSmart</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <VehicleCategory>Bus</VehicleCategory>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>700</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+ <adas:EngineStopStart>false</adas:EngineStopStart>
+ <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+ <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+ <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
+ <tcl:Entry gear="6" maxTorque="1800" />
+ <tcl:Entry gear="1" maxTorque="2500" />
+ </TorqueLimits>
+ <Components xsi:type="VehicleComponentsPIFType">
+ <Engine>
+ <Data xsi:type="EngineDataPIFType">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic primary bus 41 Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>7700</Displacement>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>220000</RatedPower>
+ <MaxEngineTorque>1100</MaxEngineTorque>
+ <WHRType>
+ <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+ <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+ </WHRType>
+ <Mode>
+ <IdlingSpeed>700</IdlingSpeed>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
+ <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
+ <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
+ <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
+ <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
+ <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
+ <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
+ <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
+ <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
+ <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
+ <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
+ <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
+ </FullLoadAndDragCurve>
+ <Fuels>
+ <FuelType>Diesel CI</FuelType>
+ </Fuels>
+ </Mode>
+ </Data>
+ </Engine>
+ <Transmission>
+ <Data xsi:type="TransmissionDataPIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>AT 6 Gear</Model>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>APT-S</TransmissionType>
+ <Gears xsi:type="TransmissionGearsPIFType">
+ <Gear number="1">
+ <Ratio>3.364</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.909</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="3">
+ <Ratio>1.421</Ratio>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="4">
+ <Ratio>1.000</Ratio>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="5">
+ <Ratio>0.720</Ratio>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="6">
+ <Ratio>0.615</Ratio>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ </Gears>
+ </Data>
+ </Transmission>
+ <TorqueConverter>
+ <Data xsi:type="TorqueConverterDataPIFType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <Characteristics>
+ <Entry speedRatio='0.0000' torqueRatio='1.80' inputTorqueRef='368.37'/>
+ <Entry speedRatio='0.6000' torqueRatio='1.23' inputTorqueRef='294.70'/>
+ <Entry speedRatio='0.9000' torqueRatio='0.95' inputTorqueRef='184.18'/>
+ <Entry speedRatio='1.0000' torqueRatio='0.94' inputTorqueRef='0.00'/>
+ <Entry speedRatio='5.0000' torqueRatio='0.90' inputTorqueRef='-1473.48'/>
+ </Characteristics>
+ </Data>
+ </TorqueConverter>
+ <Axlegear>
+ <Data xsi:type="AxlegearDataPIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic primary bus 41 AxleGear</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>6.500</Ratio>
+ </Data>
+ </Axlegear>
+ <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
+ <Data xsi:type="AxleWheelsDataDeclarationType">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </pbus:AxleWheels>
+ <Auxiliaries>
+ <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
+ <aux:Fan>
+ <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
+ </aux:Fan>
+ <aux:SteeringPump>
+ <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
+ </aux:SteeringPump>
+ <aux:ElectricSystem>
+ <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
+ <aux:SmartElectrics>true</aux:SmartElectrics>
+ <aux:MaxAlternatorPower>15000</aux:MaxAlternatorPower>
+ <aux:ElectricStorageCapacity>50</aux:ElectricStorageCapacity>
+ </aux:ElectricSystem>
+ <aux:PneumaticSystem>
+ <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
+ <aux:Clutch>none</aux:Clutch>
+ <aux:CompressorRatio>1.000</aux:CompressorRatio>
+ <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
+ <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
+ <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
+ <aux:AdBlueDosing>true</aux:AdBlueDosing>
+ </aux:PneumaticSystem>
+ <aux:HVAC>
+ <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
+ <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
+ </aux:HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </Vehicle>
+ <InputDataSignature>
+ <di:Reference URI="#VEH-PrimaryBus_nonSmart">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>qbkrFYROE5tA+8PnYHcW9bd65Z8HWn1fCwMHHrtSqKY=</di:DigestValue>
+ </di:Reference>
+ </InputDataSignature>
+ <ManufacturerRecordSignature>
+ <di:Reference URI="#RESULT-6c34e6e3c0654ca2b66d">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>5tgyq+cWmJLc6jGrNL+vrTKwUvPfffC9L2KQNsN5me0=</di:DigestValue>
+ </di:Reference>
+ </ManufacturerRecordSignature>
+ <Results>
+ <Status>success</Status>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">19.39581</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1421.75</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">23.48056</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1721.17</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.90915</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1166.17</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">19.25350</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1411.32</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">14.61881</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1071.59</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">17.74669</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1300.87</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">19.82851</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1453.47</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">24.12659</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1768.53</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">16.37265</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1200.15</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">19.89387</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1458.26</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.18680</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1113.22</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">18.46135</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1353.26</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32SD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>15.15</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.39119</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">981.60</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32SD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
+ <Payload unit="kg">4301.75</Payload>
+ <PassengerCount>60.59</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.14041</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1109.82</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32SD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
+ <Payload unit="kg">1094.99</Payload>
+ <PassengerCount>15.42</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">11.91114</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">873.11</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32SD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
+ <Payload unit="kg">2737.48</Payload>
+ <PassengerCount>38.56</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">12.33438</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">904.14</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32DD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+ <Payload unit="kg">1262.82</Payload>
+ <PassengerCount>17.79</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.79159</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1010.95</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32DD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
+ <Payload unit="kg">5051.30</Payload>
+ <PassengerCount>71.15</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.77755</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1156.53</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32DD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
+ <Payload unit="kg">1347.01</Payload>
+ <PassengerCount>18.97</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">12.42999</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">911.14</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32DD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
+ <Payload unit="kg">3367.53</Payload>
+ <PassengerCount>47.43</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">12.91402</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">946.63</CO2>
+ </Result>
+ </Results>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-11T12:53:35.5309828Z</Date>
+ </ApplicationInformation>
+ </pif:Data>
+ <pif:Signature>
+ <di:Reference URI="#PIF-031eec78fb1746d280d9">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>abc/t5+cWFTVDs6Mg9DmP5sj7khuShNbWtU6Zxi9MGw=</di:DigestValue>
+ </di:Reference>
+ </pif:Signature>
+</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Completed 31b/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b/vecto_vehicle-completed_heavyBus_31b.xml
similarity index 100%
rename from Generic Vehicles/Declaration Mode/Completed 31b/vecto_vehicle-completed_heavyBus_31b.xml
rename to Generic Vehicles/Declaration Mode/CompletedBus 31b/vecto_vehicle-completed_heavyBus_31b.xml
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml
index e3297b102fa69f17d84177abea8af770d2093aff..36f07e888c0d4ee87db0041aa278fc5bddd965e2 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-a05132b257084f40aaea">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-c8b453c485434c64944f">
<Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+ <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
@@ -261,17 +261,17 @@
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>0BZN5PRA+yNbRtyLAPI/77M0iruHuhaFcTOZnPxKfHU=</di:DigestValue>
+ <di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-3a8e8386f57c42c1a157">
+ <di:Reference URI="#RESULT-82b4f146b0aa4bbd999e">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>sLB3B7Y2jzBFA1PR6n/xV+rsz77UGsbY23o0IGGX2Ng=</di:DigestValue>
+ <di:DigestValue>Gl4zU+e+6MHw1VEoATFgmxfzrPRIBZ0ENDYcsgKLYtQ=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -286,9 +286,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.09062</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1619.29</CO2>
+ <CO2 unit="g/km">1555.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -300,9 +300,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">26.42283</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1936.85</CO2>
+ <CO2 unit="g/km">1862.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -314,9 +314,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.40227</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1275.62</CO2>
+ <CO2 unit="g/km">1227.15</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -328,9 +328,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.00254</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1539.53</CO2>
+ <CO2 unit="g/km">1483.80</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -342,9 +342,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.97840</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1097.95</CO2>
+ <CO2 unit="g/km">1051.58</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -356,9 +356,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.29954</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1341.39</CO2>
+ <CO2 unit="g/km">1290.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -370,9 +370,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.84600</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1674.66</CO2>
+ <CO2 unit="g/km">1665.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -384,9 +384,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">27.81260</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2038.72</CO2>
+ <CO2 unit="g/km">2049.48</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -398,9 +398,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.08030</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1325.32</CO2>
+ <CO2 unit="g/km">1312.66</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -412,9 +412,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.18081</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1625.90</CO2>
+ <CO2 unit="g/km">1630.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -426,9 +426,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.62208</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1145.13</CO2>
+ <CO2 unit="g/km">1120.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -440,37 +440,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.48708</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1428.44</CO2>
+ <CO2 unit="g/km">1411.95</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
- <Payload unit="kg">1254.68</Payload>
- <PassengerCount>17.67</PassengerCount>
+ <TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
+ <Payload unit="kg">1026.55</Payload>
+ <PassengerCount>14.46</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.55465</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">920.28</CO2>
+ <CO2 unit="g/km">866.77</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">20231.71</TotalVehicleMass>
- <Payload unit="kg">5018.71</Payload>
- <PassengerCount>70.69</PassengerCount>
+ <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
+ <Payload unit="kg">4106.21</Payload>
+ <PassengerCount>57.83</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.40400</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1055.84</CO2>
+ <CO2 unit="g/km">976.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
@@ -482,9 +482,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.47946</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">694.86</CO2>
+ <CO2 unit="g/km">639.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
@@ -496,37 +496,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.96360</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">730.35</CO2>
+ <CO2 unit="g/km">674.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
- <Payload unit="kg">1738.08</Payload>
- <PassengerCount>24.48</PassengerCount>
+ <TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
+ <Payload unit="kg">1448.40</Payload>
+ <PassengerCount>20.40</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.19300</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1040.38</CO2>
+ <CO2 unit="g/km">985.77</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">24802.32</TotalVehicleMass>
- <Payload unit="kg">6952.32</Payload>
- <PassengerCount>97.92</PassengerCount>
+ <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
+ <Payload unit="kg">5793.60</Payload>
+ <PassengerCount>81.60</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.70781</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1224.72</CO2>
+ <CO2 unit="g/km">1141.12</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
@@ -538,9 +538,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">10.63725</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">779.73</CO2>
+ <CO2 unit="g/km">720.51</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
@@ -552,24 +552,24 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.34633</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">831.71</CO2>
+ <CO2 unit="g/km">774.60</CO2>
</Result>
</Results>
<ApplicationInformation>
- <SimulationToolVersion>0.6.1.1954-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-05-11T09:15:28.1347345Z</Date>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-28T09:51:39.6478812Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-a05132b257084f40aaea">
+ <di:Reference URI="#PIF-c8b453c485434c64944f">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>6Mg8/kouOaJSejUIYlsWCjr183cZAHK9iaFbNbG9q9U=</di:DigestValue>
+ <di:DigestValue>5KVo8ALppPSbjnRc9INOVP7076vOZW9YCt91Oov8/+U=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml b/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
index 250df1d708987ef7194f42f83bb571fd78fb78b9..93e698f0872181ff13d90b148b889ae001ebe33e 100644
--- a/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
+++ b/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
diff --git a/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml b/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
index 48caa0c3f0b498cfe7ca0fdd285bdedfae5890db..4d065f7c2d49d37856d8e87f14f1faa9c9a5f81b 100644
--- a/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
+++ b/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
diff --git a/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml b/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
index 1f2160e1ceb5da198a6ab7e74a614ca3c23e3d16..f9ae42448f9612b7efa234ff72e0543182ecbcc8 100644
--- a/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
+++ b/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
diff --git a/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml b/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
index b48df7b2d7d812ac35290537a7d0376c8a111281..30df4a340641a8a3e2b1455d862a59145a92f515 100644
--- a/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
+++ b/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartES-PS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartES-PS</VIN>
diff --git a/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml b/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
index 2d12f98a4d38eddccc1efdeae3af731d13568ca0..97ee6362d9c069498d7c209dab2d8928c3192bf8 100644
--- a/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
+++ b/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>