diff options
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap')
-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/units/UnitsActivity.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 660b436..f684a10 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 @@ -53,6 +53,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 @@ -79,6 +80,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 @@ -109,6 +111,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/units/UnitsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt index 30e34b3..3283778 100644 --- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt +++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt @@ -99,7 +99,8 @@ class UnitsActivity : AppCompatActivity() { 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 } unitsViewModel.setMapLayerType(layer) |