From 60b151c69097501cdb1f881f65622238fef2dd77 Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sat, 2 Jul 2022 23:55:16 +0200 Subject: [PATCH] fix markers sometimes not being highlighted even though they should be --- .../main/java/net/vonforst/evmap/fragment/MapFragment.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt index 626ae033..2372c422 100644 --- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt +++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt @@ -1041,7 +1041,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac // update icons of existing markers (connector filter may have changed) for ((marker, charger) in markers) { - val highlight = charger == vm.chargerSparse.value + val highlight = charger.id == vm.chargerSparse.value?.id marker.setIcon( chargerIconGenerator.getBitmapDescriptor( getMarkerTint(charger, vm.filteredConnectors.value), @@ -1065,7 +1065,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac // animate marker if it is visible, otherwise remove immediately if (bounds.contains(marker.position)) { val tint = getMarkerTint(charger, vm.filteredConnectors.value) - val highlight = charger == vm.chargerSparse.value + val highlight = charger.id == vm.chargerSparse.value?.id val fault = charger.faultReport != null val multi = charger.isMulti(vm.filteredConnectors.value) val fav = @@ -1085,7 +1085,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac for (charger in chargers) { if (!map1.contains(charger.id)) { val tint = getMarkerTint(charger, vm.filteredConnectors.value) - val highlight = charger == vm.chargerSparse.value + val highlight = charger.id == vm.chargerSparse.value?.id val fault = charger.faultReport != null val multi = charger.isMulti(vm.filteredConnectors.value) val fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()