Expand information for avalanche problems.

dagstuan · dagstuan · commit d3e5264e6705 · 2025-02-26T22:12:28.000+01:00
Display trigger sensitivity, propagation, and destructive size in the
detailed warning view for each avalanche problem.
diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/Mappers/DetailedAvalancheWarningMapper.cs b/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/Mappers/DetailedAvalancheWarningMapper.cs
@@ -34,6 +34,9 @@ public static class DetailedAvalancheWarningMapper
             ],
             ValidExpositions = problem.ValidExpositions,
             DangerLevel = problem.DangerLevel,
+            DestructiveSize = problem.DestructiveSizeExtId,
+            TriggerSensitivity = problem.AvalTriggerSensitivityId,
+            Propagation = problem.AvalPropagationId,
         }).OrderByDescending(x => x.DangerLevel),
         IsTendency = varsomWarning.IsTendency,
         EmergencyWarning = varsomWarning.EmergencyWarning?.ToEmergencyWarning(langKey)
diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/Models/DetailedAvalancheWarning.cs b/SkredvarselGarminWeb/SkredvarselGarminWeb/Endpoints/Models/DetailedAvalancheWarning.cs
@@ -1,5 +1,7 @@
 using System.Text.Json.Serialization;
 
+using SkredvarselGarminWeb.VarsomApi.Models;
+
 namespace SkredvarselGarminWeb.Endpoints.Models;
 
 public class DetailedAvalancheWarning
@@ -21,4 +23,7 @@ public class AvalancheProblem
     public required int[] ExposedHeights { get; init; }
     public required string ValidExpositions { get; init; }
     public required int DangerLevel { get; init; }
+    public required DestructiveSizeExt DestructiveSize { get; init; }
+    public required AvalTriggerSensitivity TriggerSensitivity { get; init; }
+    public required AvalPropagation Propagation { get; init; }
 }
diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb/VarsomApi/IVarsomApi.cs b/SkredvarselGarminWeb/SkredvarselGarminWeb/VarsomApi/IVarsomApi.cs
@@ -6,6 +6,6 @@ namespace SkredvarselGarminWeb.VarsomApi;
 
 public interface IVarsomApi
 {
-    [Get("/avalancheWarningByRegion/Detail/{regionId}/{langKey}/{from}/{to}")]
+    [Get("/AvalancheWarningByRegion/Detail/{regionId}/{langKey}/{from}/{to}")]
     Task<IEnumerable<VarsomDetailedAvalancheWarning>> GetDetailedWarningsByRegion(int regionId, string langKey, DateOnly from, DateOnly to);
 }
diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb/VarsomApi/Models/Enums.cs b/SkredvarselGarminWeb/SkredvarselGarminWeb/VarsomApi/Models/Enums.cs
@@ -0,0 +1,29 @@
+namespace SkredvarselGarminWeb.VarsomApi.Models;
+
+public enum DestructiveSizeExt
+{
+    NotGiven = 0,
+    Small = 1,
+    Medium = 2,
+    Large = 3,
+    VeryLarge = 4,
+    Extreme = 5,
+}
+
+public enum AvalTriggerSensitivity
+{
+    NotGiven = 0,
+    VeryHardToTrigger = 10,
+    HardToTrigger = 20,
+    EasyToTrigger = 30,
+    VeryEasyToTrigger = 40,
+    NaturallyTriggered = 45,
+}
+
+public enum AvalPropagation
+{
+    NotGiven = 0,
+    FewSteepSlopes = 1,
+    SomeSteepSlopes = 2,
+    ManySteepSlopes = 3,
+}
diff --git a/SkredvarselGarminWeb/SkredvarselGarminWeb/VarsomApi/Models/VarsomDetailedAvalancheWarning.cs b/SkredvarselGarminWeb/SkredvarselGarminWeb/VarsomApi/Models/VarsomDetailedAvalancheWarning.cs
@@ -15,10 +15,12 @@ public class VarsomDetailedAvalancheWarning
 public class VarsomAvalancheProblem
 {
     public required string AvalancheProblemTypeName { get; init; }
-    public required int AvalancheProblemTypeId { get; init; }
     public required int ExposedHeight1 { get; init; }
     public required int ExposedHeight2 { get; init; }
     public required int ExposedHeightFill { get; init; }
     public required string ValidExpositions { get; init; }
     public required int DangerLevel { get; init; }
+    public required DestructiveSizeExt DestructiveSizeExtId { get; init; }
+    public required AvalTriggerSensitivity AvalTriggerSensitivityId { get; init; }
+    public required AvalPropagation AvalPropagationId { get; init; }
 }
diff --git a/skredvarselGarmin/manifest.xml b/skredvarselGarmin/manifest.xml
@@ -17,6 +17,7 @@
       <iq:product id="approachs50"/>
       <iq:product id="approachs7042mm"/>
       <iq:product id="approachs7047mm"/>
+      <iq:product id="descentg2"/>
       <iq:product id="descentmk2"/>
       <iq:product id="descentmk2s"/>
       <iq:product id="descentmk343mm"/>
diff --git a/skredvarselGarmin/monkey.jungle b/skredvarselGarmin/monkey.jungle
@@ -38,6 +38,7 @@ vivoactive4s.resourcePath = $(base.resourcePath);resources-h30
 vivoactive4.resourcePath = $(base.resourcePath);resources-h35
 instinct3amoled45mm.resourcePath = $(base.resourcePath);resources-h60
 instinct3amoled50mm.resourcePath = $(base.resourcePath);resources-h60
+descentg2.resourcePath = $(base.resourcePath);resources-h60
 
 descentmk2.excludeAnnotations=hasComplication;useBufferedBitmapOnGlance
 descentmk2s.excludeAnnotations=hasComplication;useBufferedBitmapOnGlance
diff --git a/skredvarselGarmin/resources-nob/strings.xml b/skredvarselGarmin/resources-nob/strings.xml
@@ -30,4 +30,15 @@
 	<string id="ComplicationShortLabel">Ava</string>
 	<string id="Updated">Oppdatert</string>
 	<string id="UseLocation">Bruk klokkeposisjon for å hente nærmeste skredvarsel.</string>
+	<string id="NotGiven">Ikke gitt</string>
+	<string id="TriggerSensitivityVeryHardToTrigger">Svært vanskelig å løse ut</string>
+	<string id="TriggerSensitivityHardToTrigger">Vanskelig å løse ut</string>
+	<string id="TriggerSensitivityEasyToTrigger">Lett å løse ut</string>
+	<string id="TriggerSensitivityVeryEasyToTrigger">Svært lett å løse ut</string>
+	<string id="TriggerSensitivityNaturallyTriggered">Naturlig utløst</string>
+	<string id="PropagationFewSteepSlopes">Få bratte heng</string>
+	<string id="PropagationSomeSteepSlopes">Noen bratte heng</string>
+	<string id="PropagationManySteepSlopes">Mange bratte heng</string>
+	<string id="Size">Str</string>
+	<string id="In">i</string>
 </strings>
diff --git a/skredvarselGarmin/resources/strings.xml b/skredvarselGarmin/resources/strings.xml
@@ -30,4 +30,15 @@
 	<string id="ComplicationShortLabel">Ava</string>
 	<string id="Updated">Updated</string>
 	<string id="UseLocation">Use watch location to show closest forecast.</string>
+	<string id="NotGiven">Ikke gitt</string>
+	<string id="TriggerSensitivityVeryHardToTrigger">Very hard to trigger</string>
+	<string id="TriggerSensitivityHardToTrigger">Hard to trigger</string>
+	<string id="TriggerSensitivityEasyToTrigger">Easy to trigger</string>
+	<string id="TriggerSensitivityVeryEasyToTrigger">Very easy to trigger</string>
+	<string id="TriggerSensitivityNaturallyTriggered">Naturally triggered</string>
+	<string id="PropagationFewSteepSlopes">Few steep slopes</string>
+	<string id="PropagationSomeSteepSlopes">Some steep slopes</string>
+	<string id="PropagationManySteepSlopes">Many steep slopes</string>
+	<string id="Size">Size</string>
+	<string id="In">in</string>
 </strings>
diff --git a/skredvarselGarmin/source/AvalancheUi/AvalancheProblemUi.mc b/skredvarselGarmin/source/AvalancheUi/AvalancheProblemUi.mc
@@ -2,6 +2,81 @@ import Toybox.Lang;
 
 using Toybox.Graphics as Gfx;
 
+function getTriggerSensitivityText(triggerSensitivity as Number) as String {
+  if (triggerSensitivity == 0) {
+    return $.getOrLoadResourceString("Ikke gitt", :TriggerSensitivityNotGiven);
+  } else if (triggerSensitivity == 10) {
+    return $.getOrLoadResourceString(
+      "Svært vanskelig å løse ut",
+      :TriggerSensitivityVeryHardToTrigger
+    );
+  } else if (triggerSensitivity == 20) {
+    return $.getOrLoadResourceString(
+      "Vanskelig å løse ut",
+      :TriggerSensitivityHardToTrigger
+    );
+  } else if (triggerSensitivity == 30) {
+    return $.getOrLoadResourceString(
+      "Lett å løse ut",
+      :TriggerSensitivityEasyToTrigger
+    );
+  } else if (triggerSensitivity == 40) {
+    return $.getOrLoadResourceString(
+      "Svært lett å løse ut",
+      :TriggerSensitivityVeryEasyToTrigger
+    );
+  } else if (triggerSensitivity == 45) {
+    return $.getOrLoadResourceString(
+      "Naturlig utløst",
+      :TriggerSensitivityNaturallyTriggered
+    );
+  }
+
+  throw new SkredvarselGarminException(
+    "Unknown trigger sensitivity: " + triggerSensitivity
+  );
+}
+
+function getPropagationText(propagation as Number) as String {
+  if (propagation == 0) {
+    return $.getOrLoadResourceString("Ikke gitt", :PropagationNotGiven);
+  } else if (propagation == 1) {
+    return $.getOrLoadResourceString(
+      "Få bratte heng",
+      :PropagationFewSteepSlopes
+    );
+  } else if (propagation == 2) {
+    return $.getOrLoadResourceString(
+      "Noen bratte heng",
+      :PropagationSomeSteepSlopes
+    );
+  } else if (propagation == 3) {
+    return $.getOrLoadResourceString(
+      "Mange bratte heng",
+      :PropagationManySteepSlopes
+    );
+  }
+
+  throw new SkredvarselGarminException("Unknown propagation: " + propagation);
+}
+
+function getTriggerText(
+  triggerSensitivity as Number,
+  propagation as Number
+) as String {
+  return Lang.format("$1$ $2$ $3$", [
+    getTriggerSensitivityText(triggerSensitivity),
+    $.getOrLoadResourceString("i", :In),
+    $.lowercaseFirstChar(getPropagationText(propagation)),
+  ]);
+}
+
+function getDestructiveSizeText(size as Number) as String {
+  var sizeText = $.getOrLoadResourceString("Str", :Size);
+
+  return Lang.format("$1$ $2$", [sizeText, size]);
+}
+
 module AvalancheUi {
   typedef AvalancheProblemSettings as {
     :problem as AvalancheProblem,
@@ -44,7 +119,11 @@ module AvalancheUi {
     public function initialize(settings as AvalancheProblemSettings) {
       var problem = settings[:problem];
 
-      _typeName = problem["typeName"];
+      _typeName = Lang.format("$1$ - $2$ - $3$", [
+        problem["typeName"],
+        getTriggerText(problem["triggerSensitivity"], problem["propagation"]),
+        getDestructiveSizeText(problem["destructiveSize"]),
+      ]);
       _exposedHeights = problem["exposedHeights"];
       _validExpositions = problem["validExpositions"];
       _dangerLevel = problem["dangerLevel"];
@@ -103,6 +182,7 @@ module AvalancheUi {
         :text => _typeName,
         :containerWidth => _width,
         :containerHeight => _height * 0.25,
+        :scrollSpeed => 2,
         :font => Gfx.FONT_XTINY,
       });
 
diff --git a/skredvarselGarmin/source/AvalancheUi/ScrollingText.mc b/skredvarselGarmin/source/AvalancheUi/ScrollingText.mc
@@ -14,6 +14,7 @@ module AvalancheUi {
     :containerWidth as Numeric,
     :containerHeight as Numeric,
     :scrollDirection as ScrollingTextDirection?,
+    :scrollSpeed as Numeric?,
     :xAlignment as TextElementsXAlignment?,
     :yAlignment as TextElementsYAlignment?,
     :font as Gfx.FontType,
@@ -46,6 +47,8 @@ module AvalancheUi {
     private var _ticksAtStart = 0;
     private var _ticksAtEnd = 0;
 
+    private var _speed;
+
     private var _bufferedBitmapText as Gfx.BufferedBitmap?;
 
     private var _isVisible as Boolean;
@@ -59,6 +62,8 @@ module AvalancheUi {
 
       _color = settings[:color] != null ? settings[:color] : Gfx.COLOR_WHITE;
 
+      _speed = settings[:scrollSpeed] != null ? settings[:scrollSpeed] : 2;
+
       _backgroundColor =
         settings[:backgroundColor] != null
           ? settings[:backgroundColor]
@@ -236,7 +241,7 @@ module AvalancheUi {
         _ticksAtStart += 1;
       } else {
         _ticksAtStart = 0;
-        _textOffset -= 1;
+        _textOffset -= _speed;
       }
 
       if (atEnd && _ticksAtEnd > TICKS_AT_START_END) {
diff --git a/skredvarselGarmin/source/DetailedForecastsView/DetailedForecastElements.mc b/skredvarselGarmin/source/DetailedForecastsView/DetailedForecastElements.mc
@@ -49,7 +49,7 @@ public class DetailedForecastElements {
     _warning = settings[:warning];
     _fullWidth = settings[:fullWidth];
 
-    _areaWidth = Math.ceil(_fullWidth * 0.82);
+    _areaWidth = Math.ceil(_fullWidth * 0.84);
     _areaHeight = settings[:height];
     _x0 = _fullWidth / 2 - _areaWidth / 2;
 
diff --git a/skredvarselGarmin/source/backend/SkredvarselStorage.mc b/skredvarselGarmin/source/backend/SkredvarselStorage.mc
@@ -38,7 +38,7 @@ function getFavoriteRegionId() as String? {
 
 (:background)
 function resetStorageCacheIfRequired() {
-  var STORAGE_VERSION = 2;
+  var STORAGE_VERSION = 3;
   var storageVersion = Storage.getValue("storageVersion") as Number?;
   var cachedForecastsLanguage =
     Storage.getValue("cachedStorageLanguage") as Number?;
diff --git a/skredvarselGarmin/source/types.mc b/skredvarselGarmin/source/types.mc
@@ -31,6 +31,7 @@ typedef DetailedAvalancheWarning as {
   "avalancheProblems" as Array<AvalancheProblem>,
   "isTendency" as Boolean,
   "emergencyWarning" as String?,
+  "destructiveSize" as Number,
 };
 
 typedef SetupSubscriptionResponse as {
diff --git a/skredvarselGarmin/source/utils/utils.mc b/skredvarselGarmin/source/utils/utils.mc
@@ -183,6 +183,17 @@ public function minValue(arr as Array<Number>) {
   return min;
 }
 
+function lowercaseFirstChar(str as String) as String {
+  if (str.length() == 0) {
+    return str;
+  }
+
+  var firstChar = str.substring(0, 1).toLower();
+  var rest = str.substring(1, str.length());
+
+  return firstChar + rest;
+}
+
 (:release)
 public function log(message as String) {}
 

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ namespace SkredvarselGarminWeb.VarsomApi;`
`6`	`6`
`7`	`7`	`public interface IVarsomApi`
`8`	`8`	`{`
`9`		`- [Get("/avalancheWarningByRegion/Detail/{regionId}/{langKey}/{from}/{to}")]`
	`9`	`+ [Get("/AvalancheWarningByRegion/Detail/{regionId}/{langKey}/{from}/{to}")]`
`10`	`10`	`Task<IEnumerable<VarsomDetailedAvalancheWarning>> GetDetailedWarningsByRegion(int regionId, string langKey, DateOnly from, DateOnly to);`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,12 @@ public class VarsomDetailedAvalancheWarning`
`15`	`15`	`public class VarsomAvalancheProblem`
`16`	`16`	`{`
`17`	`17`	`public required string AvalancheProblemTypeName { get; init; }`
`18`		`- public required int AvalancheProblemTypeId { get; init; }`
`19`	`18`	`public required int ExposedHeight1 { get; init; }`
`20`	`19`	`public required int ExposedHeight2 { get; init; }`
`21`	`20`	`public required int ExposedHeightFill { get; init; }`
`22`	`21`	`public required string ValidExpositions { get; init; }`
`23`	`22`	`public required int DangerLevel { get; init; }`
	`23`	`+ public required DestructiveSizeExt DestructiveSizeExtId { get; init; }`
	`24`	`+ public required AvalTriggerSensitivity AvalTriggerSensitivityId { get; init; }`
	`25`	`+ public required AvalPropagation AvalPropagationId { get; init; }`
`24`	`26`	`}`