From 6f3643a2b47847120d15fc8a82aa1ffcac6cbe60 Mon Sep 17 00:00:00 2001
From: Piotr Dec <piotr_dec@msn.com>
Date: Tue, 30 Jul 2024 19:50:24 +0200
Subject: [PATCH] fix: DataCache & State domain fixes

---
 .../java/eu/ztsh/garmin/data/DataCache.kt     | 19 +----------------
 .../main/java/eu/ztsh/garmin/data/Model.kt    | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/ztsh/garmin/data/DataCache.kt b/app/src/main/java/eu/ztsh/garmin/data/DataCache.kt
index 734f6e3..a7f8b8b 100644
--- a/app/src/main/java/eu/ztsh/garmin/data/DataCache.kt
+++ b/app/src/main/java/eu/ztsh/garmin/data/DataCache.kt
@@ -38,24 +38,7 @@ class DataCache {
 
     // Merge states
     fun update(state: State) {
-        if (state.lineArrows != null) {
-            stateCache.lineArrows = state.lineArrows
-        }
-        if (state.lineOutlines != null) {
-            state.lineOutlines = state.lineOutlines
-        }
-        if (state.direction != null) {
-            stateCache.direction = state.direction
-        }
-        if (state.distance != null) {
-            stateCache.distance = state.distance
-        }
-        if (state.speed != null) {
-            stateCache.speed = state.speed
-        }
-        if (state.arrival != null) {
-            stateCache.arrival = state.arrival
-        }
+        stateCache.merge(state)
     }
 
     // maneuver
diff --git a/app/src/main/java/eu/ztsh/garmin/data/Model.kt b/app/src/main/java/eu/ztsh/garmin/data/Model.kt
index 146d4ed..a11b2a3 100644
--- a/app/src/main/java/eu/ztsh/garmin/data/Model.kt
+++ b/app/src/main/java/eu/ztsh/garmin/data/Model.kt
@@ -111,6 +111,27 @@ class State {
     var traffic: Boolean? = null
     var flag: Boolean? = null
     var control: Boolean? = null
+    
+    fun merge(other: State) {
+        if (other.lineArrows != null) {
+            this.lineArrows = other.lineArrows
+        }
+        if (other.lineOutlines != null) {
+            this.lineOutlines = other.lineOutlines
+        }
+        if (other.direction != null) {
+            this.direction = other.direction
+        }
+        if (other.distance != null) {
+            this.distance = other.distance
+        }
+        if (other.speed != null) {
+            this.speed = other.speed
+        }
+        if (other.arrival != null) {
+            this.arrival = other.arrival
+        }
+    }
 
 }