1 files changed, 26 insertions, 99 deletions

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt
index 242cccf..1c4ad3b 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt
@@ -17,107 +17,34 @@
  */
 package mx.trackermap.TrackerMap.android.shared
 
-import android.util.Log
 import mx.trackermap.TrackerMap.android.R
-import mx.trackermap.TrackerMap.android.map.MapFragment
-import mx.trackermap.TrackerMap.client.models.Position
-import mx.trackermap.TrackerMap.client.models.Stop
-import mx.trackermap.TrackerMap.client.models.UnitInformation
-import mx.trackermap.TrackerMap.utils.MarkerType
+import mx.trackermap.TrackerMap.client.models.Marker
 
 object MarkerTransformations {
-    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.device.name,
-            unit.position!!.latitude!!,
-            unit.position!!.longitude!!,
-            categoryToMarkerType(unit.device.category ?: "")
-        )
-    }
-
-    fun positionToMarker(position: Position): MapFragment.Marker? {
-        if (position.latitude == null || position.longitude == null) {
-            return null
-        }
-
-        return MapFragment.Marker(
-            position.id!!,
-            "",
-            position.latitude!!,
-            position.longitude!!
-        )
-    }
-
-    fun stopToMarker(stop: Stop): MapFragment.Marker? {
-        Log.d("MarkerTransformations", "stopToMarker($stop)")
-        if (stop.latitude == null || stop.longitude == null) {
-            return null
-        }
-
-        return MapFragment.Marker(
-            stop.deviceId!!,
-            stop.deviceName!!,
-            stop.latitude!!,
-            stop.longitude!!
-        )
-    }
-
-    private fun categoryToMarkerType(category: String?): MarkerType {
-        return when (category?.lowercase()) {
-            "animal" -> MarkerType.ANIMAL
-            "backhoe" -> MarkerType.BACKHOE
-            "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
-        }
-    }
-
-    fun markerTypeToResourceId(markerType: MarkerType): Int {
+    fun markerTypeToResourceId(markerType: Marker.Type): Int {
         return when (markerType) {
-            MarkerType.ANIMAL -> R.drawable.map_animal
-            MarkerType.BACKHOE -> R.drawable.map_backhoe
-            MarkerType.BICYCLE -> R.drawable.map_bicycle
-            MarkerType.BOAT -> R.drawable.map_boat
-            MarkerType.BUS -> R.drawable.map_bus
-            MarkerType.CAR -> R.drawable.map_car
-            MarkerType.CRANE -> R.drawable.map_crane
-            MarkerType.DEFAULT -> R.drawable.map_default
-            MarkerType.HELICOPTER -> R.drawable.map_helicopter
-            MarkerType.MOTORCYCLE -> R.drawable.map_motorcycle
-            MarkerType.OFFROAD -> R.drawable.map_offroad
-            MarkerType.PERSON -> R.drawable.map_person
-            MarkerType.PICKUP -> R.drawable.map_pickup
-            MarkerType.PLANE -> R.drawable.map_plane
-            MarkerType.SCOOTER -> R.drawable.map_scooter
-            MarkerType.SHIP -> R.drawable.map_ship
-            MarkerType.TRACTOR -> R.drawable.map_tractor
-            MarkerType.TRAIN -> R.drawable.map_train
-            MarkerType.TRAM -> R.drawable.map_tram
-            MarkerType.TROLLEYBUS -> R.drawable.map_trolleybus
-            MarkerType.TRUCK -> R.drawable.map_truck
-            MarkerType.VAN -> R.drawable.map_van
+            Marker.Type.ANIMAL -> R.drawable.map_animal
+            Marker.Type.BACKHOE -> R.drawable.map_backhoe
+            Marker.Type.BICYCLE -> R.drawable.map_bicycle
+            Marker.Type.BOAT -> R.drawable.map_boat
+            Marker.Type.BUS -> R.drawable.map_bus
+            Marker.Type.CAR -> R.drawable.map_car
+            Marker.Type.CRANE -> R.drawable.map_crane
+            Marker.Type.DEFAULT -> R.drawable.map_default
+            Marker.Type.HELICOPTER -> R.drawable.map_helicopter
+            Marker.Type.MOTORCYCLE -> R.drawable.map_motorcycle
+            Marker.Type.OFFROAD -> R.drawable.map_offroad
+            Marker.Type.PERSON -> R.drawable.map_person
+            Marker.Type.PICKUP -> R.drawable.map_pickup
+            Marker.Type.PLANE -> R.drawable.map_plane
+            Marker.Type.SCOOTER -> R.drawable.map_scooter
+            Marker.Type.SHIP -> R.drawable.map_ship
+            Marker.Type.TRACTOR -> R.drawable.map_tractor
+            Marker.Type.TRAIN -> R.drawable.map_train
+            Marker.Type.TRAM -> R.drawable.map_tram
+            Marker.Type.TROLLEYBUS -> R.drawable.map_trolleybus
+            Marker.Type.TRUCK -> R.drawable.map_truck
+            Marker.Type.VAN -> R.drawable.map_van
 
             MarkerType.REPORT_POSITION -> R.drawable.map_report_position
             MarkerType.REPORT_START -> R.drawable.map_report_start
@@ -154,10 +81,10 @@ object MarkerTransformations {
     }
 
     fun categoryToResourceId(category: String?): Int {
-        return markerTypeToResourceId(categoryToMarkerType(category))
+        return markerTypeToResourceId(Marker.categoryToMarkerType(category))
     }
 
     fun categoryToStringId(category: String?): Int {
-        return markerTypeToResourceId(categoryToMarkerType(category))
+        return markerTypeToStringId(Marker.categoryToMarkerType(category))
     }
 }
\ No newline at end of file