diff options
Diffstat (limited to 'androidApp/src/main/java/mx')
| -rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt | 3 | ||||
| -rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt | 3 |
2 files changed, 5 insertions, 1 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 58ee108..242cccf 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 @@ -70,6 +70,7 @@ object MarkerTransformations { 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 @@ -96,6 +97,7 @@ object MarkerTransformations { fun markerTypeToResourceId(markerType: MarkerType): 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 @@ -126,6 +128,7 @@ object MarkerTransformations { fun markerTypeToStringId(markerType: MarkerType): Int { return when (markerType) { MarkerType.ANIMAL -> R.string.unit_category_animal + MarkerType.BACKHOE -> R.string.unit_category_backhoe MarkerType.BICYCLE -> R.string.unit_category_bicycle MarkerType.BOAT -> R.string.unit_category_boat MarkerType.BUS -> R.string.unit_category_bus diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt index aee7e51..ac9673f 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt @@ -43,7 +43,8 @@ class Utils { popOver.setOnMenuItemClickListener { item -> val layer = when (item.itemId) { R.id.layerStreets -> MapLayer.Type.STREETS - R.id.layerSatellite -> MapLayer.Type.SATELLITE + R.id.layerGmapsStreets -> MapLayer.Type.GMAPS_STREETS + R.id.layerGmapsSatellite -> MapLayer.Type.GMAPS_SATELLITE else -> MapLayer.Type.STREETS } callback(layer) |