adapt reading xml to new schema

VECTO/GUI/EngineForm.vb

@@ -177,7 +177,7 @@ Public Class EngineForm
 		End If
 
 		Dim basePath As String = Path.GetDirectoryName(file)
-		TbName.Text = engine.ModelName
+		TbName.Text = engine.Model
 		TbDispl.Text = (engine.Displacement * 1000 * 1000).ToGUIFormat()
 		TbInertia.Text = engine.Inertia.ToGUIFormat()
 		TbNleerl.Text = engine.IdleSpeed.AsRPM.ToGUIFormat()
@@ -375,14 +375,15 @@ Public Class EngineForm
 		Try
 			Dim fldFile As String =
 					If(Not String.IsNullOrWhiteSpace(_engFile), Path.Combine(Path.GetDirectoryName(_engFile), TbFLD.Text), TbFLD.Text)
-			If File.Exists(fldFile) Then fullLoadCurve = FullLoadCurveReader.Create(VectoCSVFile.Read(fldFile), engineFld:=True)
+			If File.Exists(fldFile) Then _
+				fullLoadCurve = FullLoadCurveReader.Create(VectoCSVFile.Read(fldFile), engineFld:=True)
 		Catch ex As Exception
 		End Try
 
 		Try
 			Dim fcFile As String =
 					If(Not String.IsNullOrWhiteSpace(_engFile), Path.Combine(Path.GetDirectoryName(_engFile), TbMAP.Text), TbMAP.Text)
-			if File.Exists(fcfile) then fcMap = FuelConsumptionMapReader.Create(VectoCSVFile.Read(fcFile))
+			If File.Exists(fcFile) Then fcMap = FuelConsumptionMapReader.Create(VectoCSVFile.Read(fcFile))
 		Catch ex As Exception
 		End Try
 

VECTO/GUI/GearboxForm.vb

@@ -258,7 +258,7 @@ Public Class GearboxForm
 		End If
 
 		Dim basePath As String = Path.GetDirectoryName(file)
-		TbName.Text = gearbox.ModelName
+		TbName.Text = gearbox.Model
 		TbTracInt.Text = gearbox.TractionInterruption.ToGUIFormat()
 		TBI_getr.Text = gearbox.Inertia.ToGUIFormat()
 
@@ -975,10 +975,10 @@ Public Class GearboxForm
 		End If
 		Dim data As Gearbox = FillGearboxData(_gbxFile)
 		If (Cfg.DeclMode) Then
-			Dim export As XDocument = New XMLDeclarationWriter(data.Vendor).GenerateVectoComponent(data, data)
+			Dim export As XDocument = New XMLDeclarationWriter(data.Manufacturer).GenerateVectoComponent(data, data)
 			export.Save(Path.Combine(dialog.FileName, data.ModelName + ".xml"))
 		Else
-			Dim export As XDocument = New XMLEngineeringWriter(_gbxFile, True, data.Vendor).GenerateVectoComponent(data, data)
+			Dim export As XDocument = New XMLEngineeringWriter(_gbxFile, True, data.Manufacturer).GenerateVectoComponent(data, data)
 			export.Save(Path.Combine(dialog.FileName, data.ModelName + ".xml"))
 		End If
 	End Sub
@@ -991,10 +991,10 @@ Public Class GearboxForm
 		End If
 		Dim data As Gearbox = FillGearboxData(_gbxFile)
 		If (Cfg.DeclMode) Then
-			Dim export As XDocument = New XMLDeclarationWriter(data.Vendor).GenerateVectoComponent(data)
+			Dim export As XDocument = New XMLDeclarationWriter(data.Manufacturer).GenerateVectoComponent(data)
 			export.Save(Path.Combine(dialog.FileName, data.ModelName + ".xml"))
 		Else
-			Dim export As XDocument = New XMLEngineeringWriter(_gbxFile, True, data.Vendor).GenerateVectoComponent(data)
+			Dim export As XDocument = New XMLEngineeringWriter(_gbxFile, True, data.Manufacturer).GenerateVectoComponent(data)
 			export.Save(Path.Combine(dialog.FileName, data.ModelName + ".xml"))
 		End If
 	End Sub

VECTO/GUI/MainForm.vb

@@ -1012,7 +1012,7 @@ lbFound:
 							Case XMLNames.VectoInputEngineering
 								input = New XMLEngineeringInputDataProvider(jobFile, True)
 							Case XMLNames.VectoInputDeclaration
-								input = New XMLInputDataProvider(XmlReader.Create(jobFile), True)
+								input = New XMLDeclarationInputDataProvider(XmlReader.Create(jobFile), True)
 						End Select
 				End Select
 
@@ -2002,7 +2002,7 @@ Lb1:
 						Case XMLNames.VectoInputEngineering
 							input = New XMLEngineeringInputDataProvider(f, True)
 						Case XMLNames.VectoInputDeclaration
-							input = New XMLInputDataProvider(XmlReader.Create(f), True)
+							input = New XMLDeclarationInputDataProvider(XmlReader.Create(f), True)
 					End Select
 			End Select
 

VECTO/GUI/VectoJobForm.vb

@@ -1168,7 +1168,7 @@ lbDlog:
 
 		If gearbox Is Nothing Then Return
 
-		TbGbxTxt.Text = String.Format("{0}-Speed {1} {2}", gearbox.Gears.Count, gearbox.Type.ShortName(), gearbox.ModelName)
+		TbGbxTxt.Text = String.Format("{0}-Speed {1} {2}", gearbox.Gears.Count, gearbox.Type.ShortName(), gearbox.Model)
 
 		If Cfg.DeclMode Then
 			For i = 1 To gearbox.Gears.Count
@@ -1289,7 +1289,7 @@ lbDlog:
 
 
 		TbEngTxt.Text = String.Format("{0} l {1} kw {2}", (engine.Displacement.Value() * 1000).ToString("0.0"),
-									pmax.ToString("#"), engine.ModelName)
+									pmax.ToString("#"), engine.Model)
 
 		Dim fuelConsumptionMap As FuelConsumptionMap = FuelConsumptionMapReader.Create(engine.FuelConsumptionMap)
 

VECTO/GUI/VehicleForm.vb

@@ -325,6 +325,7 @@ Public Class VehicleForm
 		Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(file),
 																IEngineeringInputDataProvider)
 		Dim vehicle As IVehicleEngineeringInputData = inputData.VehicleInputData
+		Dim airdrag As IAirdragEngineeringInputData = inputData.AirdragInputData
 		Dim retarder As IRetarderInputData = inputData.RetarderInputData
 		Dim angledrive As IAngledriveInputData = inputData.AngledriveInputData
 		Dim pto As IPTOTransmissionInputData = inputData.PTOTransmissionInputData
@@ -346,14 +347,14 @@ Public Class VehicleForm
 		CbAxleConfig.SelectedValue = vehicle.AxleConfiguration
 		TbMassMass.Text = (vehicle.GrossVehicleMassRating.Value()/1000).ToGUIFormat()
 
-		TbMass.Text = vehicle.CurbWeightChassis.ToGUIFormat()
-		TbMassExtra.Text = vehicle.CurbWeightExtra.ToGUIFormat()
+		TbMass.Text = vehicle.CurbMassChassis.ToGUIFormat()
+		TbMassExtra.Text = vehicle.CurbMassExtra.ToGUIFormat()
 		TbLoad.Text = vehicle.Loading.ToGUIFormat()
 		TBrdyn.Text = (vehicle.DynamicTyreRadius.Value()*1000).ToGUIFormat()
 
-		CbCdMode.SelectedValue = vehicle.CrossWindCorrectionMode
+		CbCdMode.SelectedValue = airdrag.CrossWindCorrectionMode
 		TbCdFile.Text =
-			If(vehicle.CrosswindCorrectionMap Is Nothing, "", GetRelativePath(vehicle.CrosswindCorrectionMap.Source, basePath))
+			If(airdrag.CrosswindCorrectionMap Is Nothing, "", GetRelativePath(airdrag.CrosswindCorrectionMap.Source, basePath))
 
 		CbRtType.SelectedValue = retarder.Type
 		TbRtRatio.Text = retarder.Ratio.ToGUIFormat()
@@ -381,7 +382,7 @@ Public Class VehicleForm
 
 		'TbMassExtra.Text = veh.MassExtra.ToGUIFormat()
 
-		TBcdA.Text = vehicle.AirDragArea.ToGUIFormat()
+		TBcdA.Text = airdrag.AirDragArea.ToGUIFormat()
 
 		cbPTOType.SelectedValue = pto.PTOTransmissionType
 		tbPTOLossMap.Text = If(pto.PTOLossMap Is Nothing, "", GetRelativePath(pto.PTOLossMap.Source, basePath))

VECTO/Input Files/Engine.vb

@@ -280,7 +280,7 @@ Public Class Engine
 		End Get
 	End Property
 
-	Public ReadOnly Property Vendor As String Implements IComponentInputData.Vendor
+	Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
 		Get
 			Return "N.A." ' TODO: MQ 20160919
 		End Get
@@ -298,12 +298,18 @@ Public Class Engine
 		End Get
 	End Property
 
-	Public ReadOnly Property TypeId As String Implements IComponentInputData.TypeId
+	Public ReadOnly Property TechnicalReportId As String Implements IComponentInputData.TechnicalReportId
 		Get
 			Return "N.A." ' Todo: MQ 20160919
 		End Get
 	End Property
 
+	Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+		Get
+			Return "N.A."
+		End Get
+	End Property
+
 	Public ReadOnly Property DigestValue As String Implements IComponentInputData.DigestValue
 		Get
 			Return ""
@@ -316,7 +322,7 @@ Public Class Engine
 		End Get
 	End Property
 
-	Public ReadOnly Property IComponentInputData_ModelName As String Implements IComponentInputData.ModelName
+	Public ReadOnly Property Model As String Implements IComponentInputData.Model
 		Get
 			Return ModelName
 		End Get

VECTO/Input Files/Gearbox.vb

@@ -283,7 +283,7 @@ Public Class Gearbox
 		End Get
 	End Property
 
-	Public ReadOnly Property Vendor As String Implements IComponentInputData.Vendor
+	Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
 		Get
 			Return "N.A."  ' Todo MQ 20160915
 		End Get
@@ -301,12 +301,18 @@ Public Class Gearbox
 		End Get
 	End Property
 
-	Public ReadOnly Property TypeId As String Implements IComponentInputData.TypeId
+	Public ReadOnly Property TechnicalReportId As String Implements IComponentInputData.TechnicalReportId
 		Get
 			Return "N.A." ' todo MQ 20160915
 		End Get
 	End Property
 
+	Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+		Get
+			Return "N.A."
+		End Get
+	End Property
+
 	Public ReadOnly Property DigestValue As String Implements IComponentInputData.DigestValue
 		Get
 			Return ""
@@ -319,7 +325,7 @@ Public Class Gearbox
 		End Get
 	End Property
 
-	Public ReadOnly Property IComponentInputData_ModelName As String Implements IComponentInputData.ModelName
+	Public ReadOnly Property Model As String Implements IComponentInputData.Model
 		Get
 			Return ModelName
 		End Get
@@ -458,7 +464,6 @@ Public Class Gearbox
 	End Property
 
 
-
 	Public ReadOnly Property IGearboxEngineeringInputData_UpshiftMinAcceleration As MeterPerSquareSecond _
 		Implements IGearboxEngineeringInputData.UpshiftMinAcceleration
 		Get

VECTO/Input Files/VectoJob.vb

@@ -444,6 +444,21 @@ Public Class VectoJob
 		End Get
 	End Property
 
+	Public ReadOnly Property IDeclarationInputDataProvider_AirdragInputData As IAirdragDeclarationInputData _
+		Implements IDeclarationInputDataProvider.AirdragInputData
+		Get
+			Return AirdragInputData
+		End Get
+	End Property
+
+	Public ReadOnly Property AirdragInputData As IAirdragEngineeringInputData _
+		Implements IEngineeringInputDataProvider.AirdragInputData
+		Get
+			If Not File.Exists(_vehicleFile.FullPath) Then Return Nothing
+			Return New JSONComponentInputData(_vehicleFile.FullPath).AirdragInputData
+		End Get
+	End Property
+
 
 	Public Function IDeclarationInputDataProvider_JobInputData() As IDeclarationJobInputData _
 		Implements IDeclarationInputDataProvider.JobInputData

VECTO/Input Files/Vehicle.vb

@@ -27,7 +27,7 @@ Imports TUGraz.VectoCore.Utils
 <CustomValidation(GetType(Vehicle), "ValidateVehicle")>
 Public Class Vehicle
 	Implements IVehicleEngineeringInputData, IVehicleDeclarationInputData, IRetarderInputData, IPTOTransmissionInputData,
-				IAngledriveInputData
+				IAngledriveInputData, IAirdragEngineeringInputData
 
 	Private _filePath As String
 	Private _path As String
@@ -106,14 +106,14 @@ Public Class Vehicle
 			If mode = ExecutionMode.Declaration Then
 				Dim doa As DeclarationDataAdapter = New DeclarationDataAdapter()
 				Dim segment As Segment = DeclarationData.Segments.Lookup(vehicle.VehicleCategory, vehicle.AxleConfiguration,
-																		vehicle.GrossVehicleMassRating, vehicle.CurbWeightChassis)
-				vehicleData = doa.CreateVehicleData(vehicle, segment.Missions.First(),
+																		vehicle.GrossVehicleMassRating, vehicle.CurbMassChassis)
+				vehicleData = doa.CreateVehicleData(vehicle, vehicle, segment.Missions.First(),
 													segment.Missions.First().Loadings.First().Value, segment.VehicleHeight)
 				retarderData = doa.CreateRetarderData(vehicle)
 				angledriveData = doa.CreateAngledriveData(vehicle, False)
 			Else
 				Dim doa As EngineeringDataAdapter = New EngineeringDataAdapter()
-				vehicleData = doa.CreateVehicleData(vehicle)
+				vehicleData = doa.CreateVehicleData(vehicle, vehicle)
 				retarderData = doa.CreateRetarderData(vehicle)
 				angledriveData = doa.CreateAngledriveData(vehicle, True)
 				ptoData = doa.CreatePTOTransmissionData(vehicle)
@@ -209,7 +209,7 @@ Public Class Vehicle
 
 		Try
 			Dim writer As JSONFileWriter = JSONFileWriter.Instance
-			writer.SaveVehicle(Me, Me, Me, Me, _filePath)
+			writer.SaveVehicle(Me, Me, Me, Me, Me, _filePath)
 		Catch ex As Exception
 			MsgBox("Failed to save Vehicle file: " + ex.Message)
 			Return False
@@ -257,13 +257,13 @@ Public Class Vehicle
 		End Get
 	End Property
 
-	Public ReadOnly Property Vendor As String Implements IComponentInputData.Vendor
+	Public ReadOnly Property Manufacturer As String Implements IComponentInputData.Manufacturer
 		Get
 			Return "N.A."  ' TODO: MQ  20160908
 		End Get
 	End Property
 
-	Public ReadOnly Property ModelName As String Implements IComponentInputData.ModelName
+	Public ReadOnly Property Model As String Implements IComponentInputData.Model
 		Get
 			Return "N.A."  ' Todo: MQ 20160908
 		End Get
@@ -281,12 +281,18 @@ Public Class Vehicle
 		End Get
 	End Property
 
-	Public ReadOnly Property TypeId As String Implements IComponentInputData.TypeId
+	Public ReadOnly Property TechnicalReportId As String Implements IComponentInputData.TechnicalReportId
 		Get
 			Return "N.A."	' ToDo: MQ 20160908
 		End Get
 	End Property
 
+	Public ReadOnly Property CertificationNumber As String Implements IComponentInputData.CertificationNumber
+		Get
+			Return "N.A."	'ToDo
+		End Get
+	End Property
+
 	Public ReadOnly Property DigestValue As String Implements IComponentInputData.DigestValue
 		Get
 			Return ""
@@ -313,7 +319,7 @@ Public Class Vehicle
 		End Get
 	End Property
 
-	Public ReadOnly Property CurbWeightChassis As Kilogram Implements IVehicleDeclarationInputData.CurbWeightChassis
+	Public ReadOnly Property CurbMassChassis As Kilogram Implements IVehicleDeclarationInputData.CurbMassChassis
 		Get
 			Return Mass.SI(Of Kilogram)()
 		End Get
@@ -326,7 +332,7 @@ Public Class Vehicle
 		End Get
 	End Property
 
-	Public ReadOnly Property AirDragArea As SquareMeter Implements IVehicleDeclarationInputData.AirDragArea
+	Public ReadOnly Property AirDragArea As SquareMeter Implements IAirdragEngineeringInputData.AirDragArea
 		Get
 			Return CdA0.SI(Of SquareMeter)()
 		End Get
@@ -359,21 +365,21 @@ Public Class Vehicle
 								})
 	End Function
 
-	Public ReadOnly Property CurbWeightExtra As Kilogram Implements IVehicleEngineeringInputData.CurbWeightExtra
+	Public ReadOnly Property CurbMassExtra As Kilogram Implements IVehicleEngineeringInputData.CurbMassExtra
 		Get
 			Return MassExtra.SI(Of Kilogram)()
 		End Get
 	End Property
 
 	Public ReadOnly Property CrosswindCorrectionMap As TableData _
-		Implements IVehicleEngineeringInputData.CrosswindCorrectionMap
+		Implements IAirdragEngineeringInputData.CrosswindCorrectionMap
 		Get
 			Return VectoCSVFile.Read(CrossWindCorrectionFile.FullPath)
 		End Get
 	End Property
 
 	Public ReadOnly Property IVehicleEngineeringInputData_CrossWindCorrectionMode As CrossWindCorrectionMode _
-		Implements IVehicleEngineeringInputData.CrossWindCorrectionMode
+		Implements IAirdragEngineeringInputData.CrossWindCorrectionMode
 		Get
 			Return CrossWindCorrectionMode
 		End Get

VECTO/OutputData/JSONFileWriter.vb

@@ -39,7 +39,7 @@ Public Class JSONFileWriter
 
 		body.Add("SavedInDeclMode", Cfg.DeclMode)
 
-		body.Add("ModelName", eng.ModelName)
+		body.Add("ModelName", eng.Model)
 
 		body.Add("Displacement", eng.Displacement.ConvertTo().Cubic.Centi.Meter.Value().ToString())
 		body.Add("IdlingSpeed", eng.IdleSpeed.AsRPM)
@@ -79,7 +79,7 @@ Public Class JSONFileWriter
 		Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object)
 
 		body.Add(JsonKeys.SavedInDeclMode, Cfg.DeclMode)
-		body.Add(JsonKeys.Gearbox_ModelName, gbx.ModelName)
+		body.Add(JsonKeys.Gearbox_ModelName, gbx.Model)
 		body.Add(JsonKeys.Gearbox_Inertia, gbx.Inertia.Value())
 		body.Add(JsonKeys.Gearbox_TractionInterruption, gbx.TractionInterruption.Value())
 
@@ -142,7 +142,8 @@ Public Class JSONFileWriter
 		WriteFile(header, body, filename)
 	End Sub
 
-	Public Sub SaveVehicle(vehicle As IVehicleEngineeringInputData, retarder As IRetarderInputData,
+	Public Sub SaveVehicle(vehicle As IVehicleEngineeringInputData, airdrag As IAirdragEngineeringInputData,
+							retarder As IRetarderInputData,
 							pto As IPTOTransmissionInputData, angledrive As IAngledriveInputData, filename As String) _
 		Implements IOutputFileWriter.SaveVehicle
 		Dim basePath As String = Path.GetDirectoryName(filename)
@@ -189,17 +190,17 @@ Public Class JSONFileWriter
 		Dim body As Dictionary(Of String, Object) = New Dictionary(Of String, Object) From {
 				{"SavedInDeclMode", Cfg.DeclMode},
 				{"VehCat", vehicle.VehicleCategory.ToString()},
-				{"CurbWeight", vehicle.CurbWeightChassis.Value()},
-				{"CurbWeightExtra", vehicle.CurbWeightExtra.Value()},
+				{"CurbWeight", vehicle.CurbMassChassis.Value()},
+				{"CurbWeightExtra", vehicle.CurbMassExtra.Value()},
 				{"Loading", vehicle.Loading.Value()},
 				{"MassMax", vehicle.GrossVehicleMassRating.ConvertTo().Ton.Value()},
-				{"CdA", vehicle.AirDragArea.Value()},
+				{"CdA", airdrag.AirDragArea.Value()},
 				{"rdyn", vehicle.DynamicTyreRadius.ConvertTo().Milli.Meter.Value()},
-				{"CdCorrMode", vehicle.CrossWindCorrectionMode.GetName()},
+				{"CdCorrMode", airdrag.CrossWindCorrectionMode.GetName()},
 				{"CdCorrFile",
-				If((vehicle.CrossWindCorrectionMode = CrossWindCorrectionMode.SpeedDependentCorrectionFactor OrElse
-					vehicle.CrossWindCorrectionMode = CrossWindCorrectionMode.VAirBetaLookupTable) AndAlso
-					Not vehicle.CrosswindCorrectionMap Is Nothing, GetRelativePath(vehicle.CrosswindCorrectionMap.Source, basePath),
+				If((airdrag.CrossWindCorrectionMode = CrossWindCorrectionMode.SpeedDependentCorrectionFactor OrElse
+					airdrag.CrossWindCorrectionMode = CrossWindCorrectionMode.VAirBetaLookupTable) AndAlso
+					Not airdrag.CrosswindCorrectionMap Is Nothing, GetRelativePath(airdrag.CrosswindCorrectionMap.Source, basePath),
 					"")
 				},
 				{"Retarder", retarderOut},

VectoCommon/VectoCommon/InputData/DeclarationInputData.cs

@@ -52,15 +52,17 @@ namespace TUGraz.VectoCommon.InputData
 
 		bool SavedInDeclarationMode { get; }
 
-		string Vendor { get; }
+		string Manufacturer { get; }
 
-		string ModelName { get; }
+		string Model { get; }
 
 		string Creator { get; }
 
 		string Date { get; }
 
-		string TypeId { get; }
+		string TechnicalReportId { get; }
+
+		string CertificationNumber { get; }
 
 		string DigestValue { get; }
 
@@ -85,7 +87,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P038  Curb Weight Vehicle
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		Kilogram CurbWeightChassis { get; }
+		Kilogram CurbMassChassis { get; }
 
 		/// <summary>
 		/// P041  Max. vehicle weight
@@ -93,12 +95,6 @@ namespace TUGraz.VectoCommon.InputData
 		/// </summary>
 		Kilogram GrossVehicleMassRating { get; }
 
-		/// <summary>
-		/// P146, P147  DragCoefficient * Cross Section Area - Rigid
-		/// cf. VECTO Input Parameters.xlsx
-		/// </summary>
-		SquareMeter AirDragArea { get; } // without trailer
-
 		///// <summary>
 		///// P117  Powered axle tyres/rims
 		///// cf. VECTO Input Parameters.xlsx
@@ -113,6 +109,15 @@ namespace TUGraz.VectoCommon.InputData
 		IList<IAxleDeclarationInputData> Axles { get; }
 	}
 
+	public interface IAirdragDeclarationInputData : IComponentInputData
+	{
+		/// <summary>
+		/// P146, P147  DragCoefficient * Cross Section Area - Rigid
+		/// cf. VECTO Input Parameters.xlsx
+		/// </summary>
+		SquareMeter AirDragArea { get; } // without trailer
+	}
+
 	public interface IRetarderInputData : IComponentInputData
 	{
 		/// <summary>

VectoCommon/VectoCommon/InputData/EngineeringInputData.cs

@@ -58,7 +58,7 @@ namespace TUGraz.VectoCommon.InputData
 		/// P039  Curb Weight Extra Trailer/Body
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
-		Kilogram CurbWeightExtra { get; }
+		Kilogram CurbMassExtra { get; }
 
 		/// <summary>
 		/// P040  Loading
@@ -78,7 +78,10 @@ namespace TUGraz.VectoCommon.InputData
 		/// cf. VECTO Input Parameters.xlsx
 		/// </summary>
 		Meter DynamicTyreRadius { get; }
+	}
 
+	public interface IAirdragEngineeringInputData : IAirdragDeclarationInputData
+	{
 		/// <summary>
 		/// P050 - Cross Wind Correction Mode
 		/// cf. VECTO Input Parameters.xlsx

VectoCommon/VectoCommon/InputData/IInputDataProvider.cs

@@ -39,6 +39,8 @@ namespace TUGraz.VectoCommon.InputData
 
 		IVehicleDeclarationInputData VehicleInputData { get; }
 
+		IAirdragDeclarationInputData AirdragInputData { get; }
+
 		IGearboxDeclarationInputData GearboxInputData { get; }
 
 		ITorqueConverterDeclarationInputData TorqueConverterInputData { get; }
@@ -62,6 +64,8 @@ namespace TUGraz.VectoCommon.InputData
 
 		IVehicleEngineeringInputData VehicleInputData { get; }
 
+		IAirdragEngineeringInputData AirdragInputData { get; }
+
 		IGearboxEngineeringInputData GearboxInputData { get; }
 
 		ITorqueConverterEngineeringInputData TorqueConverterInputData { get; }

VectoCommon/VectoCommon/OutputData/IOutputFileWriter.cs

@@ -40,7 +40,8 @@ namespace TUGraz.VectoCommon.OutputData
 
 		void SaveGearbox(IGearboxEngineeringInputData gbx, IAxleGearInputData axl, string filename);
 
-		void SaveVehicle(IVehicleEngineeringInputData vehicle, IRetarderInputData retarder,
+		void SaveVehicle(IVehicleEngineeringInputData vehicle, IAirdragEngineeringInputData airdrag,
+			IRetarderInputData retarder,
 			IPTOTransmissionInputData pto, IAngledriveInputData angledrive, string filename);
 
 		void SaveJob(IEngineeringInputDataProvider input, string filename);

VectoConsole/Program.cs

@@ -208,7 +208,7 @@ Examples:
 									dataProvider = new XMLEngineeringInputDataProvider(file, true);
 									break;
 								case "VectoInputDeclaration":
-									dataProvider = new XMLInputDataProvider(XmlReader.Create(file), true);
+									dataProvider = new XMLDeclarationInputDataProvider(XmlReader.Create(file), true);
 									break;
 							}
 							break;

VectoCore/VectoCore/Configuration/Constants.cs

@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.Configuration
 
 		public static class XML
 		{
-			public const string XSDDeclarationVersion = "0.6";
+			public const string XSDDeclarationVersion = "0.8";
 			public const string XSDEngineeringVersion = "0.7";
 
 			public const string DeclarationNSPrefix = "vdd";

VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs

@@ -47,6 +47,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		protected IVehicleEngineeringInputData VehicleData;
 		protected IRetarderInputData Retarder;
 		protected IPTOTransmissionInputData PTOTransmission;
+		private IAirdragEngineeringInputData AirdragData;
 
 
 		public JSONComponentInputData(string filename, bool tolerateMissing = false)
@@ -66,6 +67,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 			tmp.Switch()
 				.If<IVehicleEngineeringInputData>(c => VehicleData = c)
+				.If<IAirdragEngineeringInputData>(c => AirdragData = c)
 				.If<IEngineEngineeringInputData>(c => Engine = c)
 				.If<IGearboxEngineeringInputData>(c => Gearbox = c)
 				.If<IAxleGearInputData>(c => AxleGear = c)
@@ -87,6 +89,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return VehicleData; }
 		}
 
+		IAirdragDeclarationInputData IDeclarationInputDataProvider.AirdragInputData
+		{
+			get { return AirdragInputData; }
+		}
+
+		public IAirdragEngineeringInputData AirdragInputData
+		{
+			get { return AirdragData; }
+		}
+
 		IGearboxDeclarationInputData IDeclarationInputDataProvider.GearboxInputData
 		{
 			get { return GearboxInputData; }

VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs

@@ -86,8 +86,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		public virtual TableData FuelConsumptionMap
 		{
-			get
-			{
+			get {
 				try {
 					return ReadTableData(Body.GetEx<string>(JsonKeys.Engine_FuelConsumptionMap), "FuelConsumptionMap");
 				} catch (Exception) {
@@ -103,8 +102,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		public virtual TableData FullLoadCurve
 		{
-			get
-			{
+			get {
 				try {
 					return ReadTableData(Body.GetEx<string>(JsonKeys.Engine_FullLoadCurveFile), "FullLoadCurve");
 				} catch (Exception) {
@@ -125,8 +123,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		public virtual double WHTCEngineering
 		{
-			get
-			{
+			get {
 				if (Body["WHTC-Engineering"] == null) {
 					return 1;
 				}
@@ -151,8 +148,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		public double ColdHotBalancingFactor
 		{
-			get
-			{
+			get {
 				if (Body["ColdHotBalancingFactor"] == null) {
 					return 1.0;
 				}
@@ -160,12 +156,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			}
 		}
 
-		public string Vendor
+		public string Manufacturer
 		{
 			get { return "N/A"; }
 		}
 
-		public string ModelName
+		public string Model
 		{
 			get { return Body.GetEx<string>(JsonKeys.Engine_ModelName); }
 		}
@@ -180,7 +176,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return "N/A"; }
 		}
 
-		public string TypeId
+		public string TechnicalReportId
+		{
+			get { return "N/A"; }
+		}
+
+		public string CertificationNumber
 		{
 			get { return "N/A"; }
 		}

VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs

@@ -461,12 +461,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		#endregion
 
-		public string Vendor
+		public string Manufacturer
 		{
 			get { return "N/A"; }
 		}
 
-		public string ModelName
+		public string Model
 		{
 			get { return Body.GetEx<string>(JsonKeys.Gearbox_ModelName); }
 		}
@@ -481,7 +481,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return "N/A"; }
 		}
 
-		public string TypeId
+		public string TechnicalReportId
+		{
+			get { return "N/A"; }
+		}
+
+		public string CertificationNumber
 		{
 			get { return "N/A"; }
 		}

VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs

@@ -135,6 +135,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		protected IPTOTransmissionInputData PTOTransmission;
 
 		private readonly string _jobname;
+		private IAirdragEngineeringInputData AirdragData;
 
 		public JSONInputDataV2(JObject data, string filename, bool tolerateMissing = false)
 			: base(data, filename, tolerateMissing)
@@ -155,6 +156,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			Angledrive = VehicleData as IAngledriveInputData;
 			Retarder = VehicleData as IRetarderInputData;
 			PTOTransmission = VehicleData as IPTOTransmissionInputData;
+			AirdragData = VehicleData as IAirdragEngineeringInputData;
 		}
 
 		private IVehicleEngineeringInputData ReadVehicle()
@@ -218,6 +220,16 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 			get { return VehicleInputData; }
 		}
 
+		IAirdragDeclarationInputData IDeclarationInputDataProvider.AirdragInputData
+		{
+			get { return AirdragInputData; }
+		}
+
+		public IAirdragEngineeringInputData AirdragInputData
+		{
+			get { return AirdragData; }
+		}
+
 		IGearboxDeclarationInputData IDeclarationInputDataProvider.GearboxInputData
 		{
 			get { return GearboxInputData; }