Merge pull request #16 from mcrossley/master

v 1.4.3

Author: mcrossley

CreateMissing.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <AssemblyVersion>$(PackageVersion)</AssemblyVersion>
     <FileVersion>$(PackageVersion)</FileVersion>
-    <Version>1.4.2</Version>
+    <Version>1.4.3</Version>
     <StartupObject>CreateMissing.Program</StartupObject>
     <TargetFramework>net48</TargetFramework>
     <Authors>Mark Crossley</Authors>

Program.cs

@@ -535,7 +535,7 @@ private static Dayfilerec GetDayRecFromMonthly(DateTime date)
 									// not logged, calculate it
 									else
 									{
-										var wchill = MeteoLib.WindChill(Utils.ConvertUserTempToC(outsidetemp), Utils.ConvertUserWindToKPH(speed));
+										var wchill = Utils.TempCToUser(MeteoLib.WindChill(Utils.UserTempToC(outsidetemp), Utils.UserWindToKPH(speed)));
 										if (wchill < rec.LowWindChill)
 										{
 											rec.LowWindChill = wchill;
@@ -552,7 +552,7 @@ private static Dayfilerec GetDayRecFromMonthly(DateTime date)
 									// not logged, calculate it
 									else
 									{
-										var heatIndex = MeteoLib.HeatIndex(Utils.ConvertUserTempToC(outsidetemp), hum);
+										var heatIndex = Utils.TempCToUser(MeteoLib.HeatIndex(Utils.UserTempToC(outsidetemp), hum));
 										if (heatIndex > rec.HighHeatIndex)
 										{
 											rec.HighHeatIndex = heatIndex;
@@ -577,7 +577,7 @@ private static Dayfilerec GetDayRecFromMonthly(DateTime date)
 									// no logged apparent, calculate it
 									else
 									{
-										var apparent = MeteoLib.ApparentTemperature(Utils.ConvertUserTempToC(outsidetemp), Utils.ConvertUserWindToMS(speed), hum);
+										var apparent = Utils.TempCToUser(MeteoLib.ApparentTemperature(Utils.UserTempToC(outsidetemp), Utils.UserWindToMS(speed), hum));
 										if (apparent > rec.HighAppTemp)
 										{
 											rec.HighAppTemp = apparent;
@@ -609,7 +609,7 @@ private static Dayfilerec GetDayRecFromMonthly(DateTime date)
 									// no logged feels like data available, calculate it
 									else
 									{
-										var feels = MeteoLib.FeelsLike(Utils.ConvertUserTempToC(outsidetemp), Utils.ConvertUserWindToKPH(speed), hum);
+										var feels = Utils.TempCToUser(MeteoLib.FeelsLike(Utils.UserTempToC(outsidetemp), Utils.UserWindToKPH(speed), hum));
 										if (feels > rec.HighFeelsLike)
 										{
 											rec.HighFeelsLike = feels;
@@ -635,7 +635,7 @@ private static Dayfilerec GetDayRecFromMonthly(DateTime date)
 									// no logged humidex available, calculate it
 									else
 									{
-										var humidex = MeteoLib.Humidex(Utils.ConvertUserTempToC(outsidetemp), hum);
+										var humidex = Utils.TempCToUser(MeteoLib.Humidex(Utils.UserTempToC(outsidetemp), hum));
 										if (humidex > rec.HighHumidex)
 										{
 											rec.HighHumidex = humidex;

Updates.txt

@@ -1,3 +1,7 @@
+1.4.3
+—————
+- Fix for derived temperatures (wind chill, feels like, apparent) when using Fahrenheit
+
 1.4.2
 —————
 - Fix crash in solar data

Utils.cs

@@ -60,7 +60,7 @@ public static DateTime GetDateTime(DateTime date, string time)
 			return new DateTime(date.Year, date.Month, date.Day, int.Parse(tim[0]), int.Parse(tim[1]), 0);
 		}
 
-		public static double ConvertUserTempToC(double value)
+		public static double UserTempToC(double value)
 		{
 			if (Program.cumulus.Units.Temp == 1)
 			{
@@ -73,7 +73,20 @@ public static double ConvertUserTempToC(double value)
 			}
 		}
 
-		public static double ConvertUserWindToKPH(double wind) // input is in Units.Wind units, convert to km/h
+		public static double TempCToUser(double value)
+		{
+			if (Program.cumulus.Units.Temp == 1)
+			{
+				return MeteoLib.CToF(value);
+			}
+			else
+			{
+				// C
+				return value;
+			}
+		}
+
+		public static double UserWindToKPH(double wind) // input is in Units.Wind units, convert to km/h
 		{
 			switch (Program.cumulus.Units.Wind)
 			{
@@ -94,7 +107,7 @@ public static double ConvertUserWindToKPH(double wind) // input is in Units.Wind
 			};
 		}
 
-		public static double ConvertUserWindToMS(double value)
+		public static double UserWindToMS(double value)
 		{
 			switch (Program.cumulus.Units.Wind)
 			{
@@ -111,6 +124,23 @@ public static double ConvertUserWindToMS(double value)
 			};
 		}
 
+		public static double WindMSToUser(double value)
+		{
+			switch (Program.cumulus.Units.Wind)
+			{
+				case 0:
+					return value;
+				case 1:
+					return value * 2.23693629;
+				case 2:
+					return value * 3.6;
+				case 3:
+					return value * 1.94384449;
+				default:
+					return 0;
+			}
+		}
+
 		public static int CalcAvgBearing(double x, double y)
 		{
 			var avg = 90 - (int)(180 / Math.PI * Math.Atan2(y, x));