Merge branch 'master' into bugfix/VECTO-368-validation-error-on-gears-ratio

VECTO/OutputData/JSONFileWriter.vb

@@ -51,6 +51,7 @@ Public Class JSONFileWriter
 		body.Add("WHTC-Urban", eng.WHTCUrban)
 		body.Add("WHTC-Rural", eng.WHTCRural)
 		body.Add("WHTC-Motorway", eng.WHTCMotorway)
+		body.Add("WHTC-Engineering", eng.WHTCEngineering)
 		body.Add("ColdHotBalancingFactor", eng.ColdHotBalancingFactor)
 
 		WriteFile(header, body, filename)

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

@@ -99,7 +99,13 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		public virtual double WHTCEngineering
 		{
-			get { return 1; }
+			get
+			{
+				if (Body["WHTC-Engineering"] == null) {
+					return 1;
+				}
+				return Body.GetEx<double>("WHTC-Engineering");
+			}
 		}
 
 		public virtual double WHTCMotorway