Merge pull request #109 from dagstuan/newVarsomApi

Change Varsom API version. Add API support for IsTendency and EmergencyWarning.

Author: dagstuan

SkredvarselGarminWeb/SkredvarselGarminWeb/Configuration/RefitConfiguration.cs

@@ -44,7 +44,7 @@ public static void AddRefitClients(this IServiceCollection serviceCollection, Vi
         serviceCollection.AddRefitClient<IVarsomApi>(varsomApiSettings)
             .ConfigureHttpClient(c =>
             {
-                c.BaseAddress = new Uri("https://api01.nve.no/hydrology/forecast/avalanche/v6.2.1/api");
+                c.BaseAddress = new Uri("https://api01.nve.no/hydrology/forecast/avalanche/v6.3.0/api");
             })
             .AddPolicyHandler(retryPolicy)
             .AddPolicyHandler(timeoutPolicy);

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/Mappers/DetailedAvalancheWarningMapper.cs

@@ -14,18 +14,23 @@ public static class DetailedAvalancheWarningMapper
             varsomWarning.ValidTo,
         ],
         MainText = varsomWarning.MainText,
-        AvalancheProblems = varsomWarning.AvalancheProblems?.Select(problem => new AvalancheProblem()
+        AvalancheProblems = (varsomWarning.AvalancheProblems ?? [])?.Select(problem => new AvalancheProblem()
         {
             TypeName = problem.AvalancheProblemTypeName,
             ExposedHeights = [
-                problem.ExposedHeight1,
-                problem.ExposedHeight2,
-                problem.ExposedHeightFill,
-            ],
+                    problem.ExposedHeight1,
+                    problem.ExposedHeight2,
+                    problem.ExposedHeightFill,
+                ],
             ValidExpositions = problem.ValidExpositions,
             DangerLevel = problem.DangerLevel,
-        })
-        .OrderByDescending(x => x.DangerLevel)
-        .ToList() ?? new List<AvalancheProblem>()
+        }).OrderByDescending(x => x.DangerLevel),
+        IsTendency = varsomWarning.IsTendency,
+        EmergencyWarning = varsomWarning.EmergencyWarning.ToEmergencyWarning()
     };
+
+    private static string? ToEmergencyWarning(this string emergencyWarning) =>
+        !emergencyWarning.Equals("ikke gitt", StringComparison.CurrentCultureIgnoreCase)
+            ? emergencyWarning
+            : null;
 }

SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/Models/DetailedAvalancheWarning.cs

@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 namespace SkredvarselGarminWeb.Endpoints.Models;
 
 public class DetailedAvalancheWarning
@@ -7,6 +9,10 @@ public class DetailedAvalancheWarning
     public required DateTime[] Validity { get; init; }
     public required string MainText { get; init; }
     public required IEnumerable<AvalancheProblem>? AvalancheProblems { get; init; }
+    public required bool IsTendency { get; init; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public required string? EmergencyWarning { get; init; }
 }
 
 public class AvalancheProblem

SkredvarselGarminWeb/SkredvarselGarminWeb/VarsomApi/Models/VarsomDetailedAvalancheWarning.cs

@@ -8,6 +8,8 @@ public class VarsomDetailedAvalancheWarning
     public required string DangerLevel { get; init; }
     public required string MainText { get; init; }
     public required IEnumerable<VarsomAvalancheProblem> AvalancheProblems { get; init; }
+    public required string EmergencyWarning { get; init; }
+    public required bool IsTendency { get; init; }
 }
 
 public class VarsomAvalancheProblem