Finishes the reports UI

1 files changed, 5 insertions, 38 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 20dd59b..427f020 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
@@ -16,7 +16,6 @@ import mx.trackermap.TrackerMap.android.devices.Action
 import mx.trackermap.TrackerMap.android.units.UnitsViewModel
 import mx.trackermap.TrackerMap.client.models.UnitInformation
 import mx.trackermap.TrackerMap.utils.Formatter
-import mx.trackermap.TrackerMap.utils.MarkerType
 import mx.trackermap.TrackerMap.utils.SpeedUnit
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -56,7 +55,9 @@ class UnitMapFragment : Fragment() {
         unitsViewModel.units.observe(viewLifecycleOwner) { units ->
             Log.d("UnitMapFragment", "Available units: $units")
 
-            unitsMapFragment.display(units.mapNotNull(this::unitToMarker).toTypedArray())
+            unitsMapFragment.display(
+                units.mapNotNull(MarkerTransformations::unitToMarker).toTypedArray()
+            )
         }
 
         unitsViewModel.selectedUnit.observe(viewLifecycleOwner) { selectedUnit ->
@@ -107,7 +108,8 @@ class UnitMapFragment : Fragment() {
 
                         unitName.text = unit.device.name
                         driverName.text = unit.device.contact
-                        unitSpeed.text = Formatter.formatSpeed(unit.position?.speed ?: 0.0, SpeedUnit.KMH)
+                        unitSpeed.text =
+                            Formatter.formatSpeed(unit.position?.speed ?: 0.0, SpeedUnit.KMH)
                         lastAddress.text = unit.position?.address
                         unit.position?.fixTime?.let {
                             lastDate.text = Formatter.formatDate(it)
@@ -123,41 +125,6 @@ class UnitMapFragment : Fragment() {
         }
     }
 
-    private fun unitToMarker(unit: UnitInformation): MapFragment.Marker? {
-        if (unit.position == null || unit.position!!.latitude == null || unit.position!!.longitude == null) {
-            return null
-        }
-
-        return MapFragment.Marker(
-            unit.position!!.id!!,
-            unit.position!!.latitude!!,
-            unit.position!!.longitude!!,
-            when (unit.device.category?.lowercase()) {
-                "animal" -> MarkerType.ANIMAL
-                "bicycle" -> MarkerType.BICYCLE
-                "boat" -> MarkerType.BOAT
-                "bus" -> MarkerType.BUS
-                "car" -> MarkerType.CAR
-                "crane" -> MarkerType.CRANE
-                "helicopter" -> MarkerType.HELICOPTER
-                "motorcycle" -> MarkerType.MOTORCYCLE
-                "offroad" -> MarkerType.OFFROAD
-                "person" -> MarkerType.PERSON
-                "pickup" -> MarkerType.PICKUP
-                "plane" -> MarkerType.PLANE
-                "scooter" -> MarkerType.SCOOTER
-                "ship" -> MarkerType.SHIP
-                "tractor" -> MarkerType.TRACTOR
-                "train" -> MarkerType.TRAIN
-                "tram" -> MarkerType.TRAM
-                "trolleybus" -> MarkerType.TROLLEYBUS
-                "truck" -> MarkerType.TRUCK
-                "van" -> MarkerType.VAN
-                else -> MarkerType.DEFAULT
-            }
-        )
-    }
-
     private fun itemAction(unit: UnitInformation, action: Action) {
         when (action) {
             Action.DETAILS, Action.REPORTS, Action.COMMANDS -> {