Fixed zooming selected unit and refactored attribution into wrap

1 files changed, 2 insertions, 7 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 b67bca8..1a39ab1 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
@@ -61,13 +61,10 @@ class UnitMapFragment : Fragment() {
     }
 
     private fun initializeMap() {
-        shouldCenter = true
+        shouldCenter = shouldCenter && unitsViewModel.selectedUnit.value == null
         mapFragment = childFragmentManager.findFragmentById(R.id.unitsMap) as MapWrapperFragment
         mapFragment.setMarkerCallback(unitsViewModel::selectUnitWith)
         mapFragment.setOverlayPaddingTop(resources.getDimensionPixelSize(R.dimen.nav_height))
-
-        val layer = MapLayer.defaultLayer
-        binding.attributionText.text = HtmlCompat.fromHtml(layer.attribution, 0)
     }
 
     private fun setupObservers() {
@@ -76,7 +73,7 @@ class UnitMapFragment : Fragment() {
         unitsViewModel.units.observe(viewLifecycleOwner) { units ->
             Log.d("UnitMapFragment", "Available units: $units")
             mapFragment.display(
-                units.mapNotNull { it.position }.toTypedArray(),
+                units.toTypedArray(),
                 isReport = false,
                 center = shouldCenter
             )
@@ -117,8 +114,6 @@ class UnitMapFragment : Fragment() {
             unitsViewModel.selectedUnit.value?.let {
                 mapFragment.focusOn(it.position!!.latitude!!, it.position!!.longitude!!)
             }
-            val layer = MapLayer.layers[type]!!
-            binding.attributionText.text = HtmlCompat.fromHtml(layer.attribution, 0)
         }
 
         unitsViewModel.geofences.observe(viewLifecycleOwner) { geofences ->