From 42a16f612ead7ade2690ef4740b14b3c89bf9860 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Tue, 17 Oct 2023 13:47:06 +0200
Subject: [PATCH] convert vehicles to xml version 2.0
---
.../Class_9_RigidTruck_AT_Decl.xml | 97 ++++++++++---------
...d Truck_4x2_vehicle-class-1_EURO6_2018.xml | 83 +++++++++-------
...d Truck_4x2_vehicle-class-2_EURO6_2018.xml | 83 +++++++++-------
...d Truck_4x2_vehicle-class-3_EURO6_2018.xml | 71 ++++++++------
...d Truck_4x2_vehicle-class-4_EURO6_2018.xml | 77 ++++++++-------
...d Truck_6x2_vehicle-class-9_EURO6_2018.xml | 81 +++++++++-------
... Truck_6x4_vehicle-class-11_EURO6_2018.xml | 73 ++++++++------
... Truck_8x4_vehicle-class-16_EURO6_2018.xml | 77 ++++++++-------
...Tractor_4x2_vehicle-class-5_EURO6_2018.xml | 77 ++++++++-------
...ractor_6x2_vehicle-class-10_EURO6_2018.xml | 81 +++++++++-------
...ractor_6x4_vehicle-class-12_EURO6_2018.xml | 87 +++++++++--------
11 files changed, 493 insertions(+), 394 deletions(-)
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl.xml
index fec3f265cc..419c1cc5ff 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl.xml
@@ -1,35 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-class9_AT">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class9_AT" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>TUG Generic</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N.A.</VIN>
<Date>2019-02-27T09:39:05.3188703Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Lorry</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>6x2</AxleConfiguration>
- <CurbMassChassis>7750</CurbMassChassis>
- <GrossVehicleMass>26000</GrossVehicleMass>
+ <CorrectedActualMass>7750</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>26000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-Generic220kW7.7lEngine">
+ <v2.0:Data id="ENG-Generic220kW7.7lEngine" xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>TUG Generic</Manufacturer>
<Model>Generic 220kW 7.7l Engine</Model>
<CertificationNumber>ENG-Generic 220kW 7.7l Engine</CertificationNumber>
@@ -220,8 +229,8 @@
<Entry engineSpeed="2500.00" maxTorque="711.29" dragTorque="-139.18" />
<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-145.13" />
</FullLoadAndDragCurve>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#ENG-Generic220kW7.7lEngine" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -230,10 +239,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-APT-SGenericTqMax1200">
+ <v2.0:Data id="GBX-APT-SGenericTqMax1200" xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>TUG Generic</Manufacturer>
<Model>APT-S Generic TqMax1200</Model>
<CertificationNumber>GBX-APT-S Generic TqMax1200</CertificationNumber>
@@ -1149,8 +1158,8 @@
</TorqueLossMap>
</Gear>
</Gears>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#GBX-APT-SGenericTqMax1200" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -1159,9 +1168,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
+ </Gearbox>
<TorqueConverter>
- <Data id="TC-APT-SGenericTqMax1200">
+ <v2.0:Data id="TC-APT-SGenericTqMax1200" xsi:type="TorqueConverterDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>TUG Generic</Manufacturer>
<Model>APT-S Generic TqMax1200</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -1197,8 +1207,8 @@
<Entry speedRatio="4.5000" torqueRatio="1.00" inputTorqueRef="-3182.00" />
<Entry speedRatio="5.0000" torqueRatio="1.00" inputTorqueRef="-4242.00" />
</Characteristics>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#TC-APT-SGenericTqMax1200" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -1207,11 +1217,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</TorqueConverter>
- </Gearbox>
<Axlegear>
- <Data id="AXLGEAR-6.500">
+ <v2.0:Data id="AXLGEAR-6.500" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>TUG Generic</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-6.500</CertificationNumber>
@@ -1992,8 +2001,8 @@
<Entry inputSpeed="3250.00" inputTorque="-7643.77" torqueLoss="259.16" />
<Entry inputSpeed="3250.00" inputTorque="-7960.98" torqueLoss="268.68" />
</TorqueLossMap>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-6.500" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -2002,17 +2011,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <v2.0:Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <v2.0:Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>TUG Generic</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -2021,7 +2030,7 @@
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>33350</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -2034,12 +2043,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <v2.0:Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>TUG Generic</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -2048,7 +2057,7 @@
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>33350</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -2061,12 +2070,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="3">
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <v2.0:Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>TUG Generic</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -2075,7 +2084,7 @@
<Dimension>315/70 R22.5</Dimension>
<RRCDeclared>0.0055</RRCDeclared>
<FzISO>33350</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-315_70R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -2089,15 +2098,15 @@
</Tyre>
</Axle>
</Axles>
- </Data>
+ </v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Belt driven or driven via transm. - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -2111,7 +2120,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <v2.0:Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>TUG Generic</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -2120,8 +2129,8 @@
<CdxA_0>5.80</CdxA_0>
<TransferredCdxA>5.80</TransferredCdxA>
<DeclaredCdxA>5.80</DeclaredCdxA>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -2130,8 +2139,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
index 7e40fc4d9f..a8aad8ee2c 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
@@ -1,35 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-Class1">
+<?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.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-Class1" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:05:56.7423609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Truck</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>4010</CurbMassChassis>
- <GrossVehicleMass>7501</GrossVehicleMass>
+ <CorrectedActualMass>4010</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>7501</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <v2.0:Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -209,8 +218,8 @@
<Entry engineSpeed="2500.00" maxTorque="405.00" dragTorque="-79.00" />
<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-83.00" />
</FullLoadAndDragCurve>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -219,10 +228,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <v2.0:Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -322,8 +331,8 @@
</TorqueLossMap>
</Gear>
</Gears>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -332,10 +341,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Axlegear>
- <Data id="AXLGEAR-3.800">
+ <v2.0:Data id="AXLGEAR-3.800" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-3.800</CertificationNumber>
@@ -356,8 +365,8 @@
<Entry inputSpeed="5000.00" inputTorque="50.00" torqueLoss="2.50" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2500.00" />
</TorqueLossMap>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-3.800" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -366,17 +375,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <v2.0:Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-235_75R17.5">
+ <v2.0:Data id="TYRE-235_75R17.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>235/75 R17.5</Model>
<CertificationNumber>TYRE-235/75 R17.5</CertificationNumber>
@@ -385,7 +394,7 @@
<Dimension>235/75 R17.5</Dimension>
<RRCDeclared>0.0061</RRCDeclared>
<FzISO>16677</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-235_75R17.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -398,12 +407,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-235_75R17.5">
+ <v2.0:Data id="TYRE-235_75R17.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>235/75 R17.5</Model>
<CertificationNumber>TYRE-235/75 R17.5</CertificationNumber>
@@ -412,7 +421,7 @@
<Dimension>235/75 R17.5</Dimension>
<RRCDeclared>0.0071</RRCDeclared>
<FzISO>16677</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-235_75R17.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -426,15 +435,15 @@
</Tyre>
</Axle>
</Axles>
- </Data>
+ </v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -448,7 +457,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <v2.0:Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -457,8 +466,8 @@
<CdxA_0>4.77</CdxA_0>
<TransferredCdxA>4.77</TransferredCdxA>
<DeclaredCdxA>4.77</DeclaredCdxA>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -467,8 +476,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
index 78de178f96..40cd7b2e4f 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
@@ -1,35 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-class2">
+<?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.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class2" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:05.4663609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Truck</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>4670</CurbMassChassis>
- <GrossVehicleMass>11990</GrossVehicleMass>
+ <CorrectedActualMass>4670</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>11990</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <v2.0:Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -209,8 +218,8 @@
<Entry engineSpeed="2500.00" maxTorque="566.00" dragTorque="-111.00" />
<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-116.00" />
</FullLoadAndDragCurve>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -219,10 +228,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <v2.0:Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -322,8 +331,8 @@
</TorqueLossMap>
</Gear>
</Gears>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -332,10 +341,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Axlegear>
- <Data id="AXLGEAR-4.180">
+ <v2.0:Data id="AXLGEAR-4.180" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-4.180</CertificationNumber>
@@ -356,8 +365,8 @@
<Entry inputSpeed="5000.00" inputTorque="50.00" torqueLoss="2.50" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2500.00" />
</TorqueLossMap>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-4.180" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -366,17 +375,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <v2.0:Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-265_70R19.5">
+ <v2.0:Data id="TYRE-265_70R19.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>265/70 R19.5</Model>
<CertificationNumber>TYRE-265/70 R19.5</CertificationNumber>
@@ -385,7 +394,7 @@
<Dimension>265/70 R19.5</Dimension>
<RRCDeclared>0.0061</RRCDeclared>
<FzISO>20850</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-265_70R19.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -398,12 +407,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-265_70R19.5">
+ <v2.0:Data id="TYRE-265_70R19.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>265/70 R19.5</Model>
<CertificationNumber>TYRE-265/70 R19.5</CertificationNumber>
@@ -412,7 +421,7 @@
<Dimension>265/70 R19.5</Dimension>
<RRCDeclared>0.0071</RRCDeclared>
<FzISO>20850</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-265_70R19.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -426,15 +435,15 @@
</Tyre>
</Axle>
</Axles>
- </Data>
+ </v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -448,7 +457,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <v2.0:Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -457,8 +466,8 @@
<CdxA_0>5.58</CdxA_0>
<TransferredCdxA>5.58</TransferredCdxA>
<DeclaredCdxA>5.58</DeclaredCdxA>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -467,8 +476,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
index ff4511addd..f35d16fd14 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
@@ -1,35 +1,44 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-class3">
+<?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.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class3" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:08.1943609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Truck</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>4980</CurbMassChassis>
- <GrossVehicleMass>15000</GrossVehicleMass>
+ <CorrectedActualMass>4980</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>15000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -210,7 +219,7 @@
<Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.00" />
</FullLoadAndDragCurve>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -219,10 +228,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -230,7 +239,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>SMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>6.700</Ratio>
<TorqueLossMap>
@@ -323,7 +332,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -332,10 +341,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Axlegear>
- <Data id="AXLGEAR-4.000">
+ <Data id="AXLGEAR-4.000" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-4.000</CertificationNumber>
@@ -357,7 +366,7 @@
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2500.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-4.000" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -366,17 +375,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-285_70R19.5">
+ <Data id="TYRE-285_70R19.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>285/70 R19.5</Model>
<CertificationNumber>TYRE-285/70 R19.5</CertificationNumber>
@@ -398,12 +407,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-285_70R19.5">
+ <Data id="TYRE-285_70R19.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>285/70 R19.5</Model>
<CertificationNumber>TYRE-285/70 R19.5</CertificationNumber>
@@ -429,12 +438,12 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -448,7 +457,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -458,7 +467,7 @@
<TransferredCdxA>5.15</TransferredCdxA>
<DeclaredCdxA>5.15</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -467,8 +476,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
index 221eb821d2..84e3de77b3 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
@@ -1,36 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-class4">
+<?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.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class4" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:08.2533609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Truck</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>8200</CurbMassChassis>
- <GrossVehicleMass>18000</GrossVehicleMass>
+ <CorrectedActualMass>8200</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -169,7 +178,7 @@
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
</FullLoadAndDragCurve>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -178,10 +187,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -189,7 +198,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -372,7 +381,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -381,10 +390,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Retarder>
- <Data id="RET-N.A.">
+ <Data id="RET-N.A." xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -425,7 +434,7 @@
<Entry retarderSpeed="3000.00" torqueLoss="28.00" />
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -434,10 +443,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
<Axlegear>
- <Data id="AXLGEAR-2.640">
+ <Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-2.640</CertificationNumber>
@@ -459,7 +468,7 @@
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -468,17 +477,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -500,12 +509,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -531,12 +540,12 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -550,7 +559,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -560,7 +569,7 @@
<TransferredCdxA>5.95</TransferredCdxA>
<DeclaredCdxA>5.95</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -569,8 +578,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
index 3dbf7263aa..7507f97040 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
@@ -1,36 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-class9">
+<?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.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class9" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:08.5263609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Truck</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>6x2</AxleConfiguration>
- <CurbMassChassis>9300</CurbMassChassis>
- <GrossVehicleMass>26000</GrossVehicleMass>
+ <CorrectedActualMass>9300</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>26000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -169,7 +178,7 @@
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
</FullLoadAndDragCurve>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -178,10 +187,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -189,7 +198,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -372,7 +381,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -381,10 +390,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Retarder>
- <Data id="RET-N.A.">
+ <Data id="RET-N.A." xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -425,7 +434,7 @@
<Entry retarderSpeed="3000.00" torqueLoss="28.00" />
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -434,10 +443,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
<Axlegear>
- <Data id="AXLGEAR-2.640">
+ <Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-2.640</CertificationNumber>
@@ -459,7 +468,7 @@
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -468,17 +477,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -500,12 +509,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -527,12 +536,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="3">
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -558,12 +567,12 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -577,7 +586,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -587,7 +596,7 @@
<TransferredCdxA>6.05</TransferredCdxA>
<DeclaredCdxA>6.05</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -596,8 +605,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
index 6952716a83..cf8b68d463 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
@@ -1,35 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-class11">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class11" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:08.6503609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Truck</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>6x4</AxleConfiguration>
- <CurbMassChassis>10100</CurbMassChassis>
- <GrossVehicleMass>26000</GrossVehicleMass>
+ <CorrectedActualMass>10100</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>26000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -168,7 +177,7 @@
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-338.00" />
</FullLoadAndDragCurve>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -177,10 +186,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -188,7 +197,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -371,7 +380,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -380,10 +389,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Axlegear>
- <Data id="AXLGEAR-3.500">
+ <Data id="AXLGEAR-3.500" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-3.500</CertificationNumber>
@@ -405,7 +414,7 @@
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="4500.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-3.500" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -414,17 +423,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -446,12 +455,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -473,12 +482,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="3">
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -504,12 +513,12 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -523,7 +532,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -533,7 +542,7 @@
<TransferredCdxA>8.08</TransferredCdxA>
<DeclaredCdxA>8.08</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -542,8 +551,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
index 8b08eb8a22..ac26812850 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
@@ -1,35 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-class16">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-class16" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:08.9313609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Rigid Truck</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Rigid Lorry</ChassisConfiguration>
<AxleConfiguration>8x4</AxleConfiguration>
- <CurbMassChassis>11300</CurbMassChassis>
- <GrossVehicleMass>32000</GrossVehicleMass>
+ <CorrectedActualMass>11300</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>32000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -168,7 +177,7 @@
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
</FullLoadAndDragCurve>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -177,10 +186,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -188,7 +197,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -371,7 +380,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -380,10 +389,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Axlegear>
- <Data id="AXLGEAR-3.500">
+ <Data id="AXLGEAR-3.500" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-3.500</CertificationNumber>
@@ -405,7 +414,7 @@
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="4500.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-3.500" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -414,17 +423,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -446,12 +455,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -473,12 +482,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="3">
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -500,12 +509,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="4">
+ <Axle axleNumber="4" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -531,12 +540,12 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -550,7 +559,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -560,7 +569,7 @@
<TransferredCdxA>8.91</TransferredCdxA>
<DeclaredCdxA>8.91</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -569,8 +578,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index 2ff588fa09..dfc9a9a788 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -1,36 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-Class5">
+<?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.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-Class5" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:08.3093609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Tractor</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Tractor</ChassisConfiguration>
<AxleConfiguration>4x2</AxleConfiguration>
- <CurbMassChassis>8229</CurbMassChassis>
- <GrossVehicleMass>18000</GrossVehicleMass>
+ <CorrectedActualMass>8229</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -169,7 +178,7 @@
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-314.00" />
</FullLoadAndDragCurve>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -178,10 +187,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -189,7 +198,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -372,7 +381,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -381,10 +390,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Retarder>
- <Data id="RET-N.A.">
+ <Data id="RET-N.A." xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -425,7 +434,7 @@
<Entry retarderSpeed="3000.00" torqueLoss="28.00" />
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -434,10 +443,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
<Axlegear>
- <Data id="AXLGEAR-2.640">
+ <Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-2.640</CertificationNumber>
@@ -459,7 +468,7 @@
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -468,17 +477,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <Data xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsDataDeclarationType">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -500,12 +509,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -531,12 +540,12 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -550,7 +559,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -560,7 +569,7 @@
<TransferredCdxA>5.45</TransferredCdxA>
<DeclaredCdxA>5.45</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -569,8 +578,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x2_vehicle-class-10_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
index 5011b62001..ec2e7f1dc1 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
@@ -1,36 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-Class10">
+<?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.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-Class10" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:08.5953609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Tractor</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Tractor</ChassisConfiguration>
<AxleConfiguration>6x2</AxleConfiguration>
- <CurbMassChassis>9010</CurbMassChassis>
- <GrossVehicleMass>26000</GrossVehicleMass>
+ <CorrectedActualMass>9010</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>26000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -169,7 +178,7 @@
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-338.00" />
</FullLoadAndDragCurve>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -178,10 +187,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -189,7 +198,7 @@
<AppVersion>VectoCore</AppVersion>
<TransmissionType>AMT</TransmissionType>
<MainCertificationMethod>Standard values</MainCertificationMethod>
- <Gears>
+ <Gears xsi:type="GearsDeclarationType">
<Gear number="1">
<Ratio>14.930</Ratio>
<TorqueLossMap>
@@ -372,7 +381,7 @@
</Gear>
</Gears>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -381,10 +390,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Retarder>
- <Data id="RET-N.A.">
+ <Data id="RET-N.A." xsi:type="RetarderDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N/A</CertificationNumber>
@@ -425,7 +434,7 @@
<Entry retarderSpeed="3000.00" torqueLoss="28.00" />
</RetarderLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#RET-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -434,10 +443,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Retarder>
<Axlegear>
- <Data id="AXLGEAR-2.640">
+ <Data id="AXLGEAR-2.640" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-2.640</CertificationNumber>
@@ -459,7 +468,7 @@
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="2000.00" />
</TorqueLossMap>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-2.640" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -468,17 +477,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -500,12 +509,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -527,12 +536,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="3">
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_70R22.5">
+ <Data id="TYRE-315_70R22.5" xsi:type="TyreDataDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/70 R22.5</Model>
<CertificationNumber>TYRE-315/70 R22.5</CertificationNumber>
@@ -558,12 +567,12 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -577,7 +586,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -587,7 +596,7 @@
<TransferredCdxA>5.55</TransferredCdxA>
<DeclaredCdxA>5.55</DeclaredCdxA>
</Data>
- <Signature>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -596,8 +605,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x4_vehicle-class-12_EURO6_2018.xml b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
index e2910e8a7b..92d9c9e533 100644
--- a/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
+++ b/Documentation/VehiclesReleaseComparisonDeclarationMode/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
@@ -1,35 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
-<tns:VectoInputDeclaration schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationInput:v1.0 https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD/VectoInput.xsd">
- <Vehicle id="VEH-Class12">
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+xmlns:v2.2="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.2"
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCore/Resources/XSD/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-Class12" xsi:type="Vehicle_Conventional_HeavyLorryDeclarationType">
<Manufacturer>Generic Vendor</Manufacturer>
<ManufacturerAddress>N.A.</ManufacturerAddress>
<Model>N.A.</Model>
<VIN>N/A</VIN>
<Date>2017-07-06T15:06:08.7083609Z</Date>
- <LegislativeClass>N3</LegislativeClass>
- <VehicleCategory>Tractor</VehicleCategory>
+ <LegislativeCategory>N3</LegislativeCategory>
+ <ChassisConfiguration>Tractor</ChassisConfiguration>
<AxleConfiguration>6x4</AxleConfiguration>
- <CurbMassChassis>10060</CurbMassChassis>
- <GrossVehicleMass>26000</GrossVehicleMass>
+ <CorrectedActualMass>10060</CorrectedActualMass>
+ <TechnicalPermissibleMaximumLadenMass>26000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>None</RetarderType>
<AngledriveType>None</AngledriveType>
- <PTO>
+ <PTO xsi:type="PTOType">
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
<VocationalVehicle>false</VocationalVehicle>
<SleeperCab>false</SleeperCab>
- <ADAS>
+ <ADAS xsi:type="ADAS_Conventional_Type">
<EngineStopStart>false</EngineStopStart>
<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
- <Components>
+ <Components xsi:type="Components_Conventional_LorryType">
<Engine>
- <Data id="ENG-N.A.">
+ <v2.0:Data id="ENG-N.A." xsi:type="EngineDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>ENG-N.A.</CertificationNumber>
@@ -167,8 +176,8 @@
<Entry engineSpeed="2100.00" maxTorque="1176.00" dragTorque="-342.00" />
<Entry engineSpeed="2200.00" maxTorque="0.00" dragTorque="-362.00" />
</FullLoadAndDragCurve>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#ENG-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -177,10 +186,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Engine>
<Gearbox>
- <Data id="GBX-N.A.">
+ <v2.0:Data id="GBX-N.A." xsi:type="GearboxDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>GBX-N.A.</CertificationNumber>
@@ -370,8 +379,8 @@
</TorqueLossMap>
</Gear>
</Gears>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#GBX-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -380,10 +389,10 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Gearbox>
<Axlegear>
- <Data id="AXLGEAR-3.500">
+ <v2.0:Data id="AXLGEAR-3.500" xsi:type="AxlegearDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>AXLGEAR-3.500</CertificationNumber>
@@ -404,8 +413,8 @@
<Entry inputSpeed="5000.00" inputTorque="50.00" torqueLoss="4.50" />
<Entry inputSpeed="5000.00" inputTorque="50000.00" torqueLoss="4500.00" />
</TorqueLossMap>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#AXLGEAR-3.500" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -414,17 +423,17 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</Axlegear>
<AxleWheels>
- <Data>
+ <v2.0:Data xsi:type="AxleWheelsDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<Axles>
- <Axle axleNumber="1">
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleNonDriven</AxleType>
<TwinTyres>false</TwinTyres>
<Steered>true</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <v2.0:Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -433,7 +442,7 @@
<Dimension>315/80 R22.5</Dimension>
<RRCDeclared>0.0061</RRCDeclared>
<FzISO>35440</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -446,12 +455,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="2">
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <v2.0:Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -460,7 +469,7 @@
<Dimension>315/80 R22.5</Dimension>
<RRCDeclared>0.0071</RRCDeclared>
<FzISO>35440</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -473,12 +482,12 @@
</Signature>
</Tyre>
</Axle>
- <Axle axleNumber="3">
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
<AxleType>VehicleDriven</AxleType>
<TwinTyres>true</TwinTyres>
<Steered>false</Steered>
<Tyre>
- <Data id="TYRE-315_80R22.5">
+ <v2.0:Data id="TYRE-315_80R22.5" xsi:type="TyreDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>315/80 R22.5</Model>
<CertificationNumber>TYRE-315/80 R22.5</CertificationNumber>
@@ -487,7 +496,7 @@
<Dimension>315/80 R22.5</Dimension>
<RRCDeclared>0.0071</RRCDeclared>
<FzISO>35440</FzISO>
- </Data>
+ </v2.0:Data>
<Signature>
<Reference URI="#TYRE-315_80R22.5" xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
@@ -501,15 +510,15 @@
</Tyre>
</Axle>
</Axles>
- </Data>
+ </v2.0:Data>
</AxleWheels>
<Auxiliaries>
- <Data>
+ <Data xsi:type="AUX_Conventional_LorryDataType">
<Fan>
<Technology>Crankshaft mounted - Electronically controlled visco clutch</Technology>
</Fan>
<SteeringPump>
- <Technology>Fixed displacement</Technology>
+ <Technology axleNumber="1">Fixed displacement</Technology>
</SteeringPump>
<ElectricSystem>
<Technology>Standard technology</Technology>
@@ -523,7 +532,7 @@
</Data>
</Auxiliaries>
<AirDrag>
- <Data id="Airdrag-N.A.">
+ <v2.0:Data id="Airdrag-N.A." xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0">
<Manufacturer>Generic Vendor</Manufacturer>
<Model>N.A.</Model>
<CertificationNumber>N.A.</CertificationNumber>
@@ -532,8 +541,8 @@
<CdxA_0>7.79</CdxA_0>
<TransferredCdxA>7.79</TransferredCdxA>
<DeclaredCdxA>7.79</DeclaredCdxA>
- </Data>
- <Signature>
+ </v2.0:Data>
+ <v2.0:Signature>
<Reference URI="#Airdrag-N.A." xmlns="http://www.w3.org/2000/09/xmldsig#">
<Transforms>
<Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithoutComments" />
@@ -542,8 +551,8 @@
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestValue></DigestValue>
</Reference>
- </Signature>
+ </v2.0:Signature>
</AirDrag>
</Components>
- </Vehicle>
+ </v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
--
GitLab