diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb index 1c14097503c61b72ac3f04be258c426571a83310..cb48367bb73132f69636d10511c61498e0646cd7 100644 --- a/VECTO/OutputData/JSONFileWriter.vb +++ b/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) diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs index a5262b4ca36c2633ce4efd170ea7f04b3d5dbe3f..07e3a0f8243f2b1f4bcb1f4db17197246916aaf8 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs +++ b/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