From edec10a55087c1a1d9fcc1505c5996952cd7feb2 Mon Sep 17 00:00:00 2001
From: PWRxPSYCHO <pwrxpsycho@gmail.com>
Date: Thu, 6 Oct 2022 17:18:11 -0400
Subject: [PATCH] Minor tweaks

---
 .../com/geeksville/mesh/ui/MapFragment.kt     | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
index d433242f4..ae02ff5df 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
@@ -112,20 +112,24 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
                 binding.mapStyleButton.setOnClickListener {
                     chooseMapStyle()
                 }
-                model.nodeDB.nodes.value?.let { nodes ->
+                if (binding.cacheLayout.visibility == View.GONE) {
+                    model.nodeDB.nodes.value?.let { nodes ->
+                        onNodesChanged(nodes.values)
+                        drawOverlays()
+                    }
+                }
+            }
+            if (binding.cacheLayout.visibility == View.GONE) {
+                // Any times nodes change update our map
+                model.nodeDB.nodes.observe(viewLifecycleOwner) { nodes ->
                     onNodesChanged(nodes.values)
                     drawOverlays()
                 }
-            }
-            // Any times nodes change update our map
-            model.nodeDB.nodes.observe(viewLifecycleOwner) { nodes ->
-                onNodesChanged(nodes.values)
-                drawOverlays()
-            }
-            model.waypoints.observe(viewLifecycleOwner) {
-                debug("New waypoints received: ${it.size}")
-                onWaypointChanged(it.values)
-                drawOverlays()
+                model.waypoints.observe(viewLifecycleOwner) {
+                    debug("New waypoints received: ${it.size}")
+                    onWaypointChanged(it.values)
+                    drawOverlays()
+                }
             }
             zoomToNodes(mapController)
         }
@@ -309,6 +313,9 @@ class MapFragment : ScreenFragment("Map"), Logging, View.OnClickListener {
                     Toast.makeText(activity, "Download complete!", Toast.LENGTH_LONG)
                         .show()
                     writer.onDetach()
+                    binding.downloadButton.show()
+                    binding.cacheLayout.visibility = View.GONE
+                    setupMapProperties()
                     drawOverlays()
                 }