diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-02-17 11:23:12 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2022-02-17 11:23:12 -0600 |
commit | 91681e8dd5875ac1cfa2844f7a25df081a4b255d (patch) | |
tree | c8735af6b956c5e725fd4e258f1837685d54a7cc /androidApp/src/main/java/mx/trackermap/TrackerMap | |
parent | c7e934a5b215961dcd8f63b6a5586a45a91b9186 (diff) | |
parent | 1a37308c876d09b045a0202804762bf32e9f431c (diff) | |
download | etbsa-trackermap-mobile-91681e8dd5875ac1cfa2844f7a25df081a4b255d.tar.gz etbsa-trackermap-mobile-91681e8dd5875ac1cfa2844f7a25df081a4b255d.tar.bz2 etbsa-trackermap-mobile-91681e8dd5875ac1cfa2844f7a25df081a4b255d.zip |
Merged 'main' branch and solved conflicts.
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap')
-rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/MarkerTransformations.kt | 52 | ||||
-rw-r--r-- | androidApp/src/main/java/mx/trackermap/TrackerMap/android/shared/Utils.kt | 3 |
2 files changed, 29 insertions, 26 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 1e5c4de..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 @@ -24,6 +24,7 @@ object MarkerTransformations { fun markerTypeToResourceId(markerType: Marker.Type): Int { return when (markerType) { 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 @@ -45,35 +46,36 @@ object MarkerTransformations { Marker.Type.TRUCK -> R.drawable.map_truck Marker.Type.VAN -> R.drawable.map_van - Marker.Type.REPORT_POSITION -> R.drawable.map_report_position - Marker.Type.REPORT_START -> R.drawable.map_report_start - Marker.Type.REPORT_END -> R.drawable.map_report_end + MarkerType.REPORT_POSITION -> R.drawable.map_report_position + MarkerType.REPORT_START -> R.drawable.map_report_start + MarkerType.REPORT_END -> R.drawable.map_report_end } } - fun markerTypeToStringId(markerType: Marker.Type): Int { + fun markerTypeToStringId(markerType: MarkerType): Int { return when (markerType) { - Marker.Type.ANIMAL -> R.string.unit_category_animal - Marker.Type.BICYCLE -> R.string.unit_category_bicycle - Marker.Type.BOAT -> R.string.unit_category_boat - Marker.Type.BUS -> R.string.unit_category_bus - Marker.Type.CAR -> R.string.unit_category_car - Marker.Type.CRANE -> R.string.unit_category_crane - Marker.Type.DEFAULT -> R.string.unit_category_default - Marker.Type.HELICOPTER -> R.string.unit_category_helicopter - Marker.Type.MOTORCYCLE -> R.string.unit_category_motorcycle - Marker.Type.OFFROAD -> R.string.unit_category_offroad - Marker.Type.PERSON -> R.string.unit_category_person - Marker.Type.PICKUP -> R.string.unit_category_pickup - Marker.Type.PLANE -> R.string.unit_category_plane - Marker.Type.SCOOTER -> R.string.unit_category_scooter - Marker.Type.SHIP -> R.string.unit_category_ship - Marker.Type.TRACTOR -> R.string.unit_category_tractor - Marker.Type.TRAIN -> R.string.unit_category_train - Marker.Type.TRAM -> R.string.unit_category_tram - Marker.Type.TROLLEYBUS -> R.string.unit_category_trolleybus - Marker.Type.TRUCK -> R.string.unit_category_truck - Marker.Type.VAN -> R.string.unit_category_van + 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 + MarkerType.CAR -> R.string.unit_category_car + MarkerType.CRANE -> R.string.unit_category_crane + MarkerType.DEFAULT -> R.string.unit_category_default + MarkerType.HELICOPTER -> R.string.unit_category_helicopter + MarkerType.MOTORCYCLE -> R.string.unit_category_motorcycle + MarkerType.OFFROAD -> R.string.unit_category_offroad + MarkerType.PERSON -> R.string.unit_category_person + MarkerType.PICKUP -> R.string.unit_category_pickup + MarkerType.PLANE -> R.string.unit_category_plane + MarkerType.SCOOTER -> R.string.unit_category_scooter + MarkerType.SHIP -> R.string.unit_category_ship + MarkerType.TRACTOR -> R.string.unit_category_tractor + MarkerType.TRAIN -> R.string.unit_category_train + MarkerType.TRAM -> R.string.unit_category_tram + MarkerType.TROLLEYBUS -> R.string.unit_category_trolleybus + MarkerType.TRUCK -> R.string.unit_category_truck + MarkerType.VAN -> R.string.unit_category_van else -> R.string.unit_category_default } } 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) |