Merge pull request #51 from zxbmmmmmmmmm/feat/historical-weather

历史天气支持

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "messagepack.generator": {
+      "version": "2.5.140",
+      "commands": [
+        "mpc"
+      ],
+      "rollForward": false
+    }
+  }
+}

FluentWeather.Abstraction/Interfaces/WeatherProvider/IHistoricalWeatherProvider.cs

@@ -0,0 +1,11 @@
+using FluentWeather.Abstraction.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace FluentWeather.Abstraction.Interfaces.WeatherProvider;
+
+public interface IHistoricalWeatherProvider
+{
+    public Task<List<WeatherDailyBase>> GetHistoricalDailyWeather(double lon, double lat, DateTime startTime, DateTime endTime);
+}

FluentWeather.Abstraction/Models/HistoricalDailyWeatherBase.cs

@@ -0,0 +1,29 @@
+using System;
+
+namespace FluentWeather.Abstraction.Models;
+
+public class HistoricalDailyWeatherBase
+{
+    public DateTime Date { get; set; }
+
+    public WeatherCode Weather { get; set; }
+
+    public int HistoricalMaxTemperature { get; set; }
+
+    public DateTime HistoricalMaxTemperatureDate { get; set; }
+
+    public int HistoricalMinTemperature { get; set; }
+
+    public DateTime HistoricalMinTemperatureDate { get; set; }
+
+    public int AverageMaxTemperature { get; set; }
+
+    public int AverageMinTemperature { get; set; }
+
+    public double? AveragePrecipitation { get; set; }
+
+    public double? MaxPrecipitation { get; set; }
+
+    public DateTime? MaxPrecipitationDate { get; set; }
+    public double? AveragePrecipitationHours { get; set; }
+}

FluentWeather.Abstraction/Models/Location.cs

@@ -116,6 +116,12 @@ public override bool Equals(object obj)
 
     public override int GetHashCode()
     {
-        return base.GetHashCode();
+        unchecked
+        {
+            int hash = 17;
+            hash = hash * 23 + Latitude.GetHashCode();
+            hash = hash * 23 + Longitude.GetHashCode();
+            return hash;
+        }
     }
 }

FluentWeather.Abstraction/Models/WeatherDailyBase.cs

@@ -7,8 +7,8 @@ namespace FluentWeather.Abstraction.Models;
 
 public class WeatherDailyBase : WeatherBase, IWeatherNight, ITemperatureRange, IWind, ITime, IAstronomic,ICloudAmount,IVisibility,IPressure,IHumidity
 {
-    public  int MaxTemperature { get; set; }
-    public  int MinTemperature { get; set; }
+    public int MaxTemperature { get; set; }
+    public int MinTemperature { get; set; }
     public  DateTime Time { get; set; }
     public WeatherBase? WeatherNight { get; set; }
 
@@ -30,4 +30,6 @@ public string WindDirectionDescription
     public int? Visibility { get; set; }
     public int? Pressure { get; set; }
     public int? Humidity { get; set ; }
+    public double? Precipitation { get; set; }
+    public double? PrecipitationHours { get; set; }
 }

FluentWeather.OpenMeteoProvider/FluentWeather.OpenMeteoProvider.csproj

@@ -8,7 +8,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="OpenMeteoApi" Version="1.1.0" />
+    <PackageReference Include="OpenMeteoApi" Version="1.2.0" />
     <PackageReference Include="PolySharp" Version="1.14.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

FluentWeather.OpenMeteoProvider/Mappers/CurrentWeatherMapper.cs

@@ -12,14 +12,14 @@ public static OpenMeteoWeatherNow MapToOpenMeteoWeatherNow(this CurrentWeather i
         return new OpenMeteoWeatherNow
         {
             //Description = WeatherCodeHelper.GetWeatherDescription(item.WeatherCode!.Value),
-            WeatherType = WeatherCodeHelper.GetWeatherType(item.WeatherCode.Value),
+            WeatherType = WeatherCodeHelper.GetWeatherType(item.WeatherCode!.Value),
             WindDirection = UnitConverter.GetWindDirectionFromAngle(item.WindDirection10m!.Value),
-            WindScale = UnitConverter.GetWindScaleFromKM((int)item.WindSpeed10m!).ToString(),
+            WindScale = UnitConverter.GetWindScaleFromKM((int)item.WindSpeed10m!.Value).ToString(),
             WindSpeed = (int)item.WindSpeed10m,
             ApparentTemperature = (int)item.ApparentTemperature!.Value,
             Humidity = item.RelativeHumidity2m!.Value,
-            Temperature = (int)item.Temperature2m!,
-            Pressure = (int)item.SurfacePressure!,
+            Temperature = (int)Math.Round(item.Temperature2m!.Value),
+            Pressure = item.SurfacePressure is null ? null : (int)Math.Round(item.SurfacePressure.Value),
             //Visibility = int.Parse(item.),
             CloudAmount = item.CloudCover
 

FluentWeather.OpenMeteoProvider/Mappers/DailyForecastMapper.cs

@@ -15,11 +15,11 @@ public static OpenMeteoDailyForecast MapToOpenMeteoDailyForecast(this DailyForec
             //Description = WeatherCodeHelper.GetWeatherDescription(item.WeatherCode!.Value),
             WeatherType = WeatherCodeHelper.GetWeatherType(item.WeatherCode!.Value),
             WindDirection = UnitConverter.GetWindDirectionFromAngle(item.WindDirection10mDominant!.Value),
-            WindSpeed = (int)item.WindSpeed10mMax!,
-            WindScale = UnitConverter.GetWindScaleFromKM((int)item.WindSpeed10mMax!.Value).ToString(),
+            WindSpeed = (int)Math.Round(item.WindSpeed10mMax!.Value),
+            WindScale = UnitConverter.GetWindScaleFromKM((int)Math.Round(item.WindSpeed10mMax!.Value)).ToString(),
             //Humidity = int.Parse(item.),
-            MaxTemperature = (int)item.Temperature2mMax!,
-            MinTemperature = (int)item.Temperature2mMin!,
+            MaxTemperature = (int)Math.Round(item.Temperature2mMax!.Value),
+            MinTemperature = (int)Math.Round(item.Temperature2mMin!.Value),
             //Pressure = int.Parse(item),
             Time = item.Time!.Value,
             //Visibility = int.Parse(item.),

FluentWeather.OpenMeteoProvider/Mappers/HourlyForecastMapper.cs

@@ -16,14 +16,14 @@ public static WeatherHourlyBase MapToHourlyForecast(this HourlyForecastItem item
             WindDirection = UnitConverter.GetWindDirectionFromAngle(item.WindDirection10m!.Value),
             //Description = WeatherCodeHelper.GetWeatherDescription(item.WeatherCode!.Value),
             WindScale = UnitConverter.GetWindScaleFromKM((int)item.WindSpeed10m!.Value).ToString(),
-            WindSpeed = (int)item.WindSpeed10m!.Value,
+            WindSpeed = (int)Math.Round(item.WindSpeed10m!.Value),
             Humidity = item.RelativeHumidity2m,
-            Pressure = (int?)item.SurfacePressure,
-            Temperature = (int)item.Temperature2m!,
+            Pressure = item.SurfacePressure is null ? null : (int)Math.Round(item.SurfacePressure.Value),
+            Temperature = (int)Math.Round(item.Temperature2m!.Value),
             Time = item.Time!.Value,
             PrecipitationProbability = item.PrecipitationProbability,
             CloudAmount = item.CloudCover,
-            Visibility = (int?)item.Visibility/1000,
+            Visibility = item.Visibility is null ? null : (int)Math.Round(item.Visibility.Value/1000),
         };
     }
 }

FluentWeather.OpenMeteoProvider/OpenMeteoProvider.cs

@@ -11,10 +11,11 @@
 using FluentWeather.OpenMeteoProvider.Models;
 using OpenMeteoApi.Variables;
 using System;
+using System.Linq;
 
 namespace FluentWeather.OpenMeteoProvider;
 
-public sealed class OpenMeteoProvider : ProviderBase, ICurrentWeatherProvider, IAirConditionProvider, IDailyForecastProvider, IHourlyForecastProvider , IPrecipitationProvider
+public sealed class OpenMeteoProvider : ProviderBase, ICurrentWeatherProvider, IAirConditionProvider, IDailyForecastProvider, IHourlyForecastProvider, IPrecipitationProvider, IHistoricalWeatherProvider
 {
     public override string Name => "OpenMeteo";
     public override string Id => "open-meteo";
@@ -48,7 +49,7 @@ public async Task<List<WeatherDailyBase>> GetDailyForecasts(double lon, double l
     public async Task<List<WeatherHourlyBase>> GetHourlyForecasts(double lon, double lat)
     {
         var result = await Client.GetHourlyForecasts(lat, lon);
-        return result.ConvertAll<WeatherHourlyBase>(p => p.MapToHourlyForecast());
+        return result.ConvertAll(p => p.MapToHourlyForecast());
     }
 
     public async Task<PrecipitationBase> GetPrecipitations(double lon, double lat)
@@ -60,4 +61,25 @@ public async Task<PrecipitationBase> GetPrecipitations(double lon, double lat)
         };
         return precip;
     }
+
+    public async Task<List<WeatherDailyBase>> GetHistoricalDailyWeather(double lon, double lat, DateTime startTime, DateTime endTime)
+    {
+        var list = new List<WeatherDailyBase>();
+        var data = await Client.GetHistoricalWeatherData(lat, lon, startTime, endTime, 
+            dailyVariables: [DailyVariables.WeatherCode,DailyVariables.Temperature2mMax,DailyVariables.Temperature2mMin,DailyVariables.PrecipitationSum,DailyVariables.PrecipitationHours]
+            );
+        for (var i = 0; i < data.DailyForecast!.Time!.Count(); i++)
+        {
+            var item = new WeatherDailyBase
+            {
+                Time = data.DailyForecast.Time![i]!.Value,
+                Precipitation = data.DailyForecast.PrecipitationSum![i],
+                PrecipitationHours = data.DailyForecast.PrecipitationHours![i],
+                MaxTemperature = (int)Math.Round(data.DailyForecast.Temperature2mMax![i]!.Value),
+                MinTemperature = (int)Math.Round(data.DailyForecast.Temperature2mMin![i]!.Value),
+            };
+            list.Add(item);
+        }
+        return list;
+    }
 }

FluentWeather.Uwp.Shared/Helpers/ValueConverters/ConverterMethods.cs

@@ -144,5 +144,10 @@ public static string GetImageNameNight(this WeatherCode weatherType)
             _ => "",
         };
     }
+
+    public static int Subtract(this int num1,int num2)
+    {
+        return num1 - num2;
+    }
 }
 

FluentWeather.Uwp/App.xaml

@@ -3,10 +3,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.UI.Xaml.Controls"
-    xmlns:local="using:FluentWeather.Uwp"   
+    xmlns:local="using:FluentWeather.Uwp"
     xmlns:themes="using:FluentWeather.Uwp.Themes"
-    xmlns:valueConverters2="using:ValueConverters"
-    xmlns:valueConverters="using:FluentWeather.Uwp.Shared.Helpers.ValueConverters">
+    xmlns:valueConverters="using:FluentWeather.Uwp.Shared.Helpers.ValueConverters"
+    xmlns:valueConverters2="using:ValueConverters">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

FluentWeather.Uwp/Controls/Dialogs/DailyForecastDialog.xaml.cs

@@ -98,12 +98,12 @@ private List<ITemperature> GetHourly(ObservableCollection<WeatherHourlyBase> wea
     private string GetTextFirst(List<WeatherHourlyBase> weatherList)
     {
         if (weatherList is null) return null;
-        return weatherList.Count is 0 ? null : weatherList?.ConvertAll(p => (ITime)p).ToList().First().Time.ToShortTimeString();
+        return weatherList.Count is 0 ? null : weatherList?.First().Time.ToShortTimeString();
     }
     private string GetTextLast(List<WeatherHourlyBase> weatherList)
     {
         if (weatherList is null) return null;
-        return weatherList.Count is 0 ? null : weatherList?.ConvertAll(p => (ITime)p).ToList().Last().Time.ToShortTimeString();
+        return weatherList.Count is 0 ? null : weatherList?.Last().Time.ToShortTimeString();
     }
     private void ForecastGridView_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
     {