set whtc correction factors to 1 by default, override only in declaration mode

VectoCore/InputData/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs

@@ -116,9 +116,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 				Displacement = data.Displacement,
 				IdleSpeed = data.IdleSpeed,
 				ConsumptionMap = FuelConsumptionMap.Create(data.FuelConsumptionMap),
-				WHTCUrban = data.WHTCUrban,
-				WHTCMotorway = data.WHTCMotorway,
-				WHTCRural = data.WHTCRural,
 			};
 			return retVal;
 		}

VectoCore/InputData/Reader/DataObjectAdaper/DeclarationDataAdapter.cs

@@ -142,6 +142,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdaper
 			}
 
 			var retVal = SetCommonCombustionEngineData(engine);
+			retVal.WHTCUrban = engine.WHTCUrban;
+			retVal.WHTCMotorway = engine.WHTCMotorway;
+			retVal.WHTCRural = engine.WHTCRural;
 			retVal.Inertia = DeclarationData.Engine.EngineInertia(retVal.Displacement);
 			retVal.FullLoadCurve = EngineFullLoadCurve.Create(engine.FullLoadCurve, true);
 			retVal.FullLoadCurve.EngineData = retVal;

VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs

@@ -64,6 +64,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data
 
 		internal double WHTCCorrectionFactor = 1;
 
+		public CombustionEngineData()
+		{
+			WHTCUrban = 1;
+			WHTCMotorway = 1;
+			WHTCRural = 1;
+		}
+
 		#region Equality Member
 
 		protected bool Equals(CombustionEngineData other)