1 files changed, 7 insertions, 1 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
index ca59266..e64afd3 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/map/UnitMapFragment.kt
@@ -93,6 +93,10 @@ class UnitMapFragment : Fragment() {
 
             binding.mapUnitCard.visibility = if (selectedUnit == null) View.GONE else View.VISIBLE
 
+            if (selectedUnit == null) {
+                unitsViewModel.clearCamera()
+            }
+
             selectedUnit?.let { unit ->
                 if (unit.position == null || unit.position?.latitude == null || unit.position?.longitude == null) {
                     binding.mapUnitCard.visibility = View.GONE
@@ -142,7 +146,9 @@ class UnitMapFragment : Fragment() {
         }
 
         unitsViewModel.camera.observe(viewLifecycleOwner) { camera ->
-            mapFragment.focusOn(camera.point.y, camera.point.x)
+            camera?.let {
+                mapFragment.focusOn(camera.point.y, camera.point.x)
+            }
         }
     }