1 files changed, 11 insertions, 2 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 0658f56..3ab25e4 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
@@ -6,6 +6,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.core.text.HtmlCompat
 import kotlinx.coroutines.DelicateCoroutinesApi
 import mx.trackermap.TrackerMap.android.R
@@ -17,14 +18,18 @@ import mx.trackermap.TrackerMap.android.units.UnitFragment
 import mx.trackermap.TrackerMap.android.units.UnitsViewModel
 import mx.trackermap.TrackerMap.client.models.MapLayer
 import mx.trackermap.TrackerMap.client.models.UnitInformation
+import kotlin.time.ExperimentalTime
 
 @DelicateCoroutinesApi
+@ExperimentalTime
 class UnitMapFragment(private val unitsViewModel: UnitsViewModel) : UnitFragment(unitsViewModel) {
 
     private var _binding: UnitMapFragmentBinding? = null
     private val binding get() = _binding!!
     private lateinit var unitsMapFragment: MapFragment
 
+    private var shouldCenter = true
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -53,6 +58,7 @@ class UnitMapFragment(private val unitsViewModel: UnitsViewModel) : UnitFragment
     }
 
     private fun initializeMap() {
+        shouldCenter = true
         unitsMapFragment = childFragmentManager.findFragmentById(R.id.unitsMap) as MapFragment
         unitsMapFragment.markerCallback = unitsViewModel::selectUnitWith
 
@@ -65,11 +71,14 @@ class UnitMapFragment(private val unitsViewModel: UnitsViewModel) : UnitFragment
 
         unitsViewModel.units.observe(viewLifecycleOwner) { units ->
             Log.d("UnitMapFragment", "Available units: $units")
-
             unitsMapFragment.display(
                 units.mapNotNull(MarkerTransformations::unitToMarker).toTypedArray(),
-                isReport = false
+                isReport = false,
+                center = shouldCenter
             )
+            if (units.isNotEmpty()) {
+                shouldCenter = false
+            }
         }
 
         unitsViewModel.selectedUnit.observe(viewLifecycleOwner) { selectedUnit ->