diff --git a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
index 2b18d352282c7a928c9ee52f1d50a64d1dad6534..33f0d0cae085653a142c029aeaf403c461f7f7ce 100644
--- a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
+++ b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
@@ -229,9 +229,9 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_VIN, _inputData.VIN));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Component_Date, DateTime.Today.ToXmlFormat()));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Component_Model, _inputData.Model));
- _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_LegislativeCategory, _inputData.LegislativeClass.ToXMLFormat()));
+ _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_LegislativeCategory, _inputData.LegislativeClass.ToXMLFormat()));
- _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_CorrectedActualMass, _inputData.CurbMassChassis?.ToXMLFormat(0)));
+ _Xelement.Add(new XElement(_defaultNamespace + XMLNames.CorrectedActualMass, _inputData.CurbMassChassis?.ToXMLFormat(0)));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_TPMLM,
_inputData.GrossVehicleMassRating?.ToXMLFormat(0)));
@@ -318,9 +318,9 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_VIN, _inputData.VIN));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Component_Date, DateTime.Today.ToXmlFormat()));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Component_Model, _inputData.Model));
- _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_LegislativeCategory, _inputData.LegislativeClass.ToXMLFormat()));
+ _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_LegislativeCategory, _inputData.LegislativeClass.ToXMLFormat()));
- _Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_CorrectedActualMass, _inputData.CurbMassChassis?.ToXMLFormat(0)));
+ _Xelement.Add(new XElement(_defaultNamespace + XMLNames.CorrectedActualMass, _inputData.CurbMassChassis?.ToXMLFormat(0)));
_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_TPMLM,
_inputData.GrossVehicleMassRating?.ToXMLFormat(0)));
diff --git a/VectoCommon/VectoCommon/Models/VehicleCategory.cs b/VectoCommon/VectoCommon/Models/VehicleCategory.cs
index dcd11cbfa3f42f1560613a607ba7c51087e4a660..083aca805f5b7e96b1bfff493511262707d6da76 100644
--- a/VectoCommon/VectoCommon/Models/VehicleCategory.cs
+++ b/VectoCommon/VectoCommon/Models/VehicleCategory.cs
@@ -154,6 +154,8 @@ namespace TUGraz.VectoCommon.Models
return VehicleCategory.Tractor;
case "Rigid Lorry":
return VehicleCategory.RigidTruck;
+ case "Van":
+ return VehicleCategory.Van;
default:
return VehicleCategory.Unknown;
}
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 1d8d95daa2887ef22fd9d6626cadd7c6b25e96d6..d3b95fc3c3513ed88153be733542700fbe46a92a 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -600,15 +600,6 @@ namespace TUGraz.VectoCommon.Resources {
}
}
- /// <summary>
- /// Looks up a localized string similar to CorrectedActualMass.
- /// </summary>
- public static string Bus_CorrectedActualMass {
- get {
- return ResourceManager.GetString("Bus_CorrectedActualMass", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to Dayrunninglights.
/// </summary>
@@ -726,15 +717,6 @@ namespace TUGraz.VectoCommon.Resources {
}
}
- /// <summary>
- /// Looks up a localized string similar to LegislativeCategory.
- /// </summary>
- public static string Bus_LegislativeCategory {
- get {
- return ResourceManager.GetString("Bus_LegislativeCategory", resourceCulture);
- }
- }
-
/// <summary>
/// Looks up a localized string similar to LowEntry.
/// </summary>
@@ -1563,6 +1545,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to CorrectedActualMass.
+ /// </summary>
+ public static string CorrectedActualMass {
+ get {
+ return ResourceManager.GetString("CorrectedActualMass", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Signature.
/// </summary>
@@ -4101,6 +4092,15 @@ namespace TUGraz.VectoCommon.Resources {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to LegislativeCategory.
+ /// </summary>
+ public static string Vehicle_LegislativeCategory {
+ get {
+ return ResourceManager.GetString("Vehicle_LegislativeCategory", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to LegislativeClass.
/// </summary>
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 027569f6d942eccf57c8f279bda72dcfe6972332..0cccf81ca6d4b1317c341877487ecb5dfbd8acaf 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1377,7 +1377,7 @@
<data name="Report_Result_PassengerCount" xml:space="preserve">
<value>PassengerCount</value>
</data>
- <data name="Bus_LegislativeCategory" xml:space="preserve">
+ <data name="Vehicle_LegislativeCategory" xml:space="preserve">
<value>LegislativeCategory</value>
</data>
<data name="Bus_ADAS_APTEcoRollReleaseLockupClutch" xml:space="preserve">
@@ -1386,7 +1386,7 @@
<data name="Bus_AirdragModifiedMultistage" xml:space="preserve">
<value>AirdragModifiedMultistage</value>
</data>
- <data name="Bus_CorrectedActualMass" xml:space="preserve">
+ <data name="CorrectedActualMass" xml:space="preserve">
<value>CorrectedActualMass</value>
</data>
<data name="Bus_NumberPassengersLowerDeck" xml:space="preserve">
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
index c1f56eba06a93c8d8fff85d1246d42a0c1c6d800..ad1cb32d152932d0041269cf777b7bbf5e221f98 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLAuxiliaryDeclarationDataProvider.cs
@@ -107,4 +107,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
auxNode, vehicle)
{ }
}
+
+ // =============================
+
+ public class XMLAuxiliaryDeclarationDataProviderV210_Lorry : XMLAuxiliaryDeclarationDataProviderV20
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+
+ public new const string XSD_TYPE = "AUX_Component_Conventional_Lorry_Type";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLAuxiliaryDeclarationDataProviderV210_Lorry(XmlNode auxNode, IXMLDeclarationVehicleData vehicle) : base(
+ auxNode, vehicle)
+ { }
+ }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
index 3613e72919411f6fae4a69ab8a386f45bf79eb63..25c114847cbaade4c5e2f357bcc589d57d822baa 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationAuxiliariesDataProvider.cs
@@ -123,4 +123,19 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
// ---------------------------------------------------------------------------------------
+
+
+ public class XMLDeclarationAuxiliariesDataProviderV210_Lorry: XMLDeclarationAuxiliariesDataProviderV20
+ {
+ public new static XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+
+ public new const string XSD_TYPE = "AUX_Conventional_LorryDataType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationAuxiliariesDataProviderV210_Lorry(
+ IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
+ vehicle, componentNode, sourceFile)
+ { }
+ }
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
index cc39642a2b4d674aec39fea0c32c1f688cde1271..426c742ae506dd8809947c37666eb37e1cf16397 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
@@ -134,6 +134,24 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
// ---------------------------------------------------------------------------------------
+ public class XMLDeclarationComponentsDataProviderV210_Lorry : XMLDeclarationComponentsDataProviderV10
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+
+ public new const string XSD_TYPE = "Components_Conventional_LorryType";
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+
+ public XMLDeclarationComponentsDataProviderV210_Lorry(
+ IXMLDeclarationVehicleData vehicle, XmlNode componentNode, string sourceFile) : base(
+ vehicle, componentNode, sourceFile)
+ { }
+
+ protected override XNamespace SchemaNamespace => NAMESPACE_URI;
+ }
+
+ // ---------------------------------------------------------------------------------------
+
public class XMLDeclarationPrimaryBusComponentsDataProviderV210 : XMLDeclarationComponentsDataProviderV10, IXMLVehicleComponentsDeclaration
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 0e945ef85aa3deaf8a82e4219f07a4b37fe23c08..425658276ddbe4f0b1ba64803a31fde2eff1101e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -510,7 +510,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>();
- public override LegislativeClass? LegislativeClass => GetString(XMLNames.Bus_LegislativeCategory)?.ParseEnum<LegislativeClass>();
+ public override LegislativeClass? LegislativeClass => GetString(XMLNames.Vehicle_LegislativeCategory)?.ParseEnum<LegislativeClass>();
public override IList<ITorqueLimitInputData> TorqueLimits => new List<ITorqueLimitInputData>();
@@ -568,6 +568,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#region Overrides of XMLDeclarationVehicleDataProviderV10
+ public override VehicleCategory VehicleCategory => VehicleCategoryHelper.Parse(GetString("ChassisConfiguration"));
+
+ public override LegislativeClass? LegislativeClass => GetString(XMLNames.Vehicle_LegislativeCategory)?.ParseEnum<LegislativeClass>();
+
public override bool SleeperCab => false;
public override bool VocationalVehicle => false;
@@ -576,6 +580,8 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public override XmlElement PTONode => null;
+ public override Kilogram CurbMassChassis => GetDouble(XMLNames.CorrectedActualMass).SI<Kilogram>();
+
public override Kilogram GrossVehicleMassRating => GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>();
public override CubicMeter CargoVolume
@@ -599,17 +605,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
protected override DataSourceType SourceType { get; }
#endregion
-
- public override XmlElement ComponentNode => null;
-
-
- public override XmlElement ADASNode => null;
-
- public override AngledriveType AngledriveType => AngledriveType.None;
-
- public override RetarderType RetarderType => RetarderType.None;
-
- public override double RetarderRatio => 0;
}
@@ -648,7 +643,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public string VIN => GetString(XMLNames.Vehicle_VIN);
- public virtual LegislativeClass? LegislativeClass => GetString(XMLNames.Bus_LegislativeCategory)?.ParseEnum<LegislativeClass>();
+ public virtual LegislativeClass? LegislativeClass => GetString(XMLNames.Vehicle_LegislativeCategory)?.ParseEnum<LegislativeClass>();
public virtual VehicleCategory VehicleCategory => VehicleCategoryHelper.Parse(GetString("ChassisConfiguration"));
@@ -830,13 +825,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
}
public override LegislativeClass? LegislativeClass =>
- ElementExists(XMLNames.Bus_LegislativeCategory)
- ? GetString(XMLNames.Bus_LegislativeCategory).ParseEnum<LegislativeClass>()
+ ElementExists(XMLNames.Vehicle_LegislativeCategory)
+ ? GetString(XMLNames.Vehicle_LegislativeCategory).ParseEnum<LegislativeClass>()
: (LegislativeClass?)null;
public override Kilogram CurbMassChassis =>
- ElementExists(XMLNames.Bus_CorrectedActualMass)
- ? GetDouble(XMLNames.Bus_CorrectedActualMass).SI<Kilogram>()
+ ElementExists(XMLNames.CorrectedActualMass)
+ ? GetDouble(XMLNames.CorrectedActualMass).SI<Kilogram>()
: null;
public override Kilogram GrossVehicleMassRating =>
@@ -1020,13 +1015,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
? GetString(XMLNames.Component_Model) : null;
public override LegislativeClass? LegislativeClass =>
- ElementExists(XMLNames.Bus_LegislativeCategory)
- ? GetString(XMLNames.Bus_LegislativeCategory).ParseEnum<LegislativeClass>()
+ ElementExists(XMLNames.Vehicle_LegislativeCategory)
+ ? GetString(XMLNames.Vehicle_LegislativeCategory).ParseEnum<LegislativeClass>()
: (LegislativeClass?)null;
public override Kilogram CurbMassChassis =>
- ElementExists(XMLNames.Bus_CorrectedActualMass)
- ? GetDouble(XMLNames.Bus_CorrectedActualMass).SI<Kilogram>()
+ ElementExists(XMLNames.CorrectedActualMass)
+ ? GetDouble(XMLNames.CorrectedActualMass).SI<Kilogram>()
: null;
public override Kilogram GrossVehicleMassRating =>
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
index da78646c74b139e0d6453484f820b30781c6dd8e..3213efea10b2076292d1e859e5da37cc6c94a75f 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataV210InjectModule.cs
@@ -12,6 +12,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
public override void Load()
{
+
+ Bind<IXMLVehicleComponentsDeclaration>().To<XMLDeclarationComponentsDataProviderV210_Lorry>().Named(
+ XMLDeclarationComponentsDataProviderV210_Lorry.QUALIFIED_XSD_TYPE);
+
Bind<IXMLDeclarationVehicleData>().To<XMLDeclarationCompletedBusDataProviderV210>()
.Named(XMLDeclarationCompletedBusDataProviderV210.QUALIFIED_XSD_TYPE);
@@ -29,6 +33,11 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
Bind<IXMLAirdragDeclarationInputData>().To<XMLDeclarationAirdragDataProviderV210>().Named(
XMLDeclarationAirdragDataProviderV210.QUALIFIED_XSD_TYPE);
+ Bind<IXMLAuxiliariesDeclarationInputData>().To<XMLDeclarationAuxiliariesDataProviderV210_Lorry>().Named(
+ XMLDeclarationAuxiliariesDataProviderV210_Lorry.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLAuxiliaryDeclarationInputData>().To<XMLAuxiliaryDeclarationDataProviderV210_Lorry>()
+ .Named(XMLAuxiliaryDeclarationDataProviderV210_Lorry.QUALIFIED_XSD_TYPE);
Bind<IXMLAdvancedDriverAssistantSystemDeclarationInputData>()
.To<XMLDeclarationADASDataProviderV210>().Named(XMLDeclarationADASDataProviderV210.QUALIFIED_XSD_TYPE);
@@ -50,6 +59,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules
.Named(XMLDeclarationMediumLorryVehicleDataProviderV210.QUALIFIED_XSD_TYPE);
+ Bind<IXMLComponentReader>().To<XMLComponentReaderV210_Lorry>()
+ .Named(XMLComponentReaderV210_Lorry.QUALIFIED_XSD_TYPE);
+
+ Bind<IXMLAuxiliaryReader>().To<XMLComponentReaderV210_Lorry>()
+ .Named(XMLComponentReaderV210_Lorry.AUXILIARIES_READER_QUALIFIED_XSD_TYPE);
+
Bind<IXMLComponentReader>().To<XMLComponentReaderV210_PrimaryBus>().Named(XMLComponentReaderV210_PrimaryBus.QUALIFIED_XSD_TYPE);
Bind<IXMLADASReader>()
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
index 1938c9dd58e38303a65c573fb52b870878d53228..92528d13ff26cc06774d7ef45f701afe7d8e85fc 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLComponentReader.cs
@@ -301,6 +301,28 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
// ---------------------------------------------------------------------------------------
+ public class XMLComponentReaderV210_Lorry : XMLComponentReaderV10
+ {
+ public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V210_JOBS;
+
+ public new const string XSD_TYPE = "Components_Conventional_LorryType";
+ //public new const string AXLE_READER_TYPE = "AxleDataDeclarationType";
+ public new const string AUX_READER_TYPE = "AUX_Conventional_LorryDataType";
+
+
+ public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
+ //public new static readonly string AXLES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLES_READER_TYPE);
+ //public new static readonly string AXLE_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AXLE_READER_TYPE);
+ //public new static readonly string GEARBOX_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, GEARBOX_READER_TYPE);
+ public new static readonly string AUXILIARIES_READER_QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI, AUX_READER_TYPE);
+
+
+ public XMLComponentReaderV210_Lorry(IXMLDeclarationVehicleData vehicle, XmlNode componentsNode) : base(
+ vehicle, componentsNode)
+ { }
+ }
+ // ---------------------------------------------------------------------------------------
+
public class XMLAuxiliaryReaderV23 : XMLComponentReaderV20
{
public new static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_DEFINITIONS_NAMESPACE_URI_V23;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedCompletedBus.cs
index 095ab3214d5d9d00d21a5e36d9266e3cb40b9a05..f63d1a463e399456a099c8d5ac2abe7c1c861c14 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/XMLManufacturerReportExemptedCompletedBus.cs
@@ -23,14 +23,14 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.ManufacturerReport
new XElement(tns + XMLNames.Component_ManufacturerAddress,
modelData.VehicleData.ManufacturerAddress),
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
- new XElement(tns + XMLNames.Bus_LegislativeCategory,
+ new XElement(tns + XMLNames.Vehicle_LegislativeCategory,
modelData.VehicleData.LegislativeClass.ToXMLFormat()),
new XElement(tns + XMLNames.Report_Vehicle_VehicleGroup,
modelData.VehicleData.VehicleClass.GetClassNumber()),
new XElement(tns + XMLNames.Vehicle_RegisteredClass,
modelData.VehicleData.RegisteredClass.ToXMLFormat()),
new XElement(tns + XMLNames.Vehicle_BodyworkCode, modelData.VehicleData.VehicleCode.ToXMLFormat()),
- new XElement(tns + XMLNames.Bus_CorrectedActualMass,
+ new XElement(tns + XMLNames.CorrectedActualMass,
XMLHelper.ValueAsUnit(modelData.VehicleData.CurbMass, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.TPMLM,
XMLHelper.ValueAsUnit(modelData.VehicleData.GrossVehicleMass, XMLNames.Unit_t, 2)),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index 2e34be9085607f7d5f16dafa888c2631e73460a8..b46ed86f96ff46b184ab1a0447fd78edbc0ff845 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -37,9 +37,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
_vehicleInputData.Model != null
? new XElement(v210 + XMLNames.Component_Model, _vehicleInputData.Model) : null,
_vehicleInputData.LegislativeClass != null
- ? new XElement(v210 + XMLNames.Bus_LegislativeCategory, _vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
+ ? new XElement(v210 + XMLNames.Vehicle_LegislativeCategory, _vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
_vehicleInputData.CurbMassChassis != null
- ? new XElement(v210 + XMLNames.Bus_CorrectedActualMass, _vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
+ ? new XElement(v210 + XMLNames.CorrectedActualMass, _vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
_vehicleInputData.GrossVehicleMassRating != null
? new XElement(v210 + XMLNames.TPMLM, _vehicleInputData.GrossVehicleMassRating.ToXMLFormat(0)) : null,
_vehicleInputData.RegisteredClass != null
@@ -267,9 +267,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
_vehicleInputData.Model != null
? new XElement(v210 + XMLNames.Component_Model, _vehicleInputData.Model) : null,
_vehicleInputData.LegislativeClass != null
- ? new XElement(v210 + XMLNames.Bus_LegislativeCategory, _vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
+ ? new XElement(v210 + XMLNames.Vehicle_LegislativeCategory, _vehicleInputData.LegislativeClass.ToXMLFormat()) : null,
_vehicleInputData.CurbMassChassis != null
- ? new XElement(v210 + XMLNames.Bus_CorrectedActualMass, _vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
+ ? new XElement(v210 + XMLNames.CorrectedActualMass, _vehicleInputData.CurbMassChassis.ToXMLFormat(0)) : null,
_vehicleInputData.GrossVehicleMassRating != null
? new XElement(v210 + XMLNames.TPMLM, _vehicleInputData.GrossVehicleMassRating.ToXMLFormat(0)) : null,
GetAirdragModifiedMultistageEntry(),
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
index 34152106880c4904a61e75337449ad33c8ce8360..4e2cb25640523c7bd05ad118fb4b7ffbf3c6586f 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLPrimaryBusVehicleReport.cs
@@ -134,7 +134,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
new XElement(tns + XMLNames.Component_Model, modelData.VehicleData.ModelName),
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
new XElement(tns + XMLNames.Component_Date, XmlConvert.ToString(modelData.VehicleData.Date, XmlDateTimeSerializationMode.Utc)),
- new XElement(tns + XMLNames.Bus_LegislativeCategory, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
+ new XElement(tns + XMLNames.Vehicle_LegislativeCategory, modelData.VehicleData.LegislativeClass.ToXMLFormat()),
new XElement(tns + XMLNames.ChassisConfiguration, modelData.VehicleData.VehicleCategory.ToXMLFormat()),
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
new XElement(tns + XMLNames.Vehicle_Articulated, modelData.VehicleData.InputData.Articulated),
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
index a3126db5a349be831a17e59583082dc0d5b734de..5e2fb1a95a2d2cdeff13388609034246b4344058 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
@@ -136,6 +136,56 @@
<xs:extension base="v1.0:AbstractAirdragDataDeclarationType"/>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="AUX_Component_Conventional_CompletedBus_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_Conventional_CompletedBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_Conventional_Lorry_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.0:AbstractAuxiliaryDataDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_Conventional_PrimaryBus_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_Conventional_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_HEV_Lorry_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV_LorryDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_HEV-P_PrimaryBus_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_HEV-S_PrimaryBus_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_IEPC_Lorry_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_IEPC_LorryDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_IEPC_PrimaryBus_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_IEPC_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_PEV_Lorry_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_LorryDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="AUX_Component_PEV_PrimaryBus_Type">
+ <xs:sequence>
+ <xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="AUX_Conventional_CompletedBusType">
<xs:complexContent>
<xs:extension base="v2.10.2:Abstract_AUX_Conventional_CompletedBusDeclarationType">
@@ -816,13 +866,7 @@
<xs:extension base="v2.10.2:Abstract_Components_Conventional_CompletedBusDeclarationType">
<xs:sequence>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
- <xs:element name="Auxiliaries" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_Conventional_CompletedBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_Conventional_CompletedBus_Type" minOccurs="0"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -838,13 +882,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.0:AbstractAuxiliaryDataDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_Conventional_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -861,13 +899,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_Conventional_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_Conventional_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -880,13 +912,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType" minOccurs="0"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -900,13 +926,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType" minOccurs="0"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV-S_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -924,13 +944,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -949,13 +963,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-P_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV-P_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -971,13 +979,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -994,13 +996,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV-S_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1013,13 +1009,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -1033,13 +1023,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV-S_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1051,13 +1035,7 @@
<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -1070,13 +1048,7 @@
<xs:group ref="v2.10.2:Components_HEV-Sx_GenSetSequenceGroup"/>
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_HEV-S_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_HEV-S_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1090,13 +1062,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType" minOccurs="0"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_IEPC_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_IEPC_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -1111,13 +1077,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType" minOccurs="0"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_IEPC_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_IEPC_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1134,13 +1094,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_PEV_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -1158,13 +1112,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_PEV_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1178,13 +1126,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_PEV_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -1199,13 +1141,7 @@
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="Axlegear" type="v2.0:AxlegearComponentDeclarationType"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_PEV_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1218,13 +1154,7 @@
<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_LorryDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_PEV_Lorry_Type"/>
<xs:element name="AirDrag" type="v2.0:AirDragComponentDeclarationType" minOccurs="0"/>
</xs:sequence>
</xs:extension>
@@ -1238,13 +1168,7 @@
<xs:element name="ElectricEnergyStorage" type="v2.10.2:ElectricEnergyStorageType"/>
<xs:element name="Retarder" type="v2.0:RetarderComponentDeclarationType" minOccurs="0"/>
<xs:element name="AxleWheels" type="v2.0:AxleWheelsComponentDeclarationType"/>
- <xs:element name="Auxiliaries">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Data" type="v2.10.2:Abstract_AUX_PEV_PrimaryBusDeclarationType"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Auxiliaries" type="v2.10.2:AUX_Component_PEV_PrimaryBus_Type"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -2141,9 +2065,6 @@
<xs:simpleType name="AlternatorTechnologyType">
<xs:union memberTypes="v2.10.2:AlternatorTechnology_Conventional_Type v2.10.2:AlternatorTechnology_HEV_Type v2.10.2:AlternatorTechnology_PEV_Type v2.10.2:AlternatorTechnology_IEPC_Type v2.10.2:AlternatorTechnology_HEV-S_Type"/>
</xs:simpleType>
- <xs:simpleType name="ArchitectureIDType">
- <xs:union memberTypes="v2.10.2:ArchitectureID_HEV_Type v2.10.2:ArchitectureID_IEPC_Type v2.10.2:ArchitectureID_PEV_Type"/>
- </xs:simpleType>
<xs:simpleType name="ArchitectureID_HEV_Type">
<xs:union memberTypes="v2.10.2:ArchitectureID_HEV-Px_Type v2.10.2:ArchitectureID_HEV-Sx_Type v2.10.2:ArchitectureID_HEV-IEPC-S_Type"/>
</xs:simpleType>
@@ -2180,6 +2101,9 @@
<xs:enumeration value="E4"/>
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="ArchitectureIDType">
+ <xs:union memberTypes="v2.10.2:ArchitectureID_HEV_Type v2.10.2:ArchitectureID_IEPC_Type v2.10.2:ArchitectureID_PEV_Type"/>
+ </xs:simpleType>
<xs:simpleType name="AuxESTechnologyLorryType">
<xs:restriction base="xs:string">
<xs:enumeration value="Standard technology"/>
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
index 6cc8de322d41564eb718f9a4a9650a637eee6c3d..5c9451cab2c9d0d079a328d377224f0429559af8 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationReaderVersionsTest.cs
@@ -121,7 +121,7 @@ namespace TUGraz.VectoCore.Tests.XML
[TestCase(@"TestData\Integration\MediumLorries\vecto_vehicle-medium_lorry-Van.xml", TestName = "Medium Lorry Van"),
TestCase(@"TestData\Integration\MediumLorries\vecto_vehicle-medium_lorry.xml", TestName = "Medium Lorry"),
- TestCase(@"TestData\Integration\MediumLorries\vecto_vehicle-medium_lorryFWD.xml", TestName = "Medium Lorry FWD"),
+ //TestCase(@"TestData\Integration\MediumLorries\vecto_vehicle-medium_lorryFWD.xml", TestName = "Medium Lorry FWD"), // FWD no longer supported / required
]
public void CreateRunDataMediumLorry(string jobFile)
{