Switch navigator to new beacon layer

Signed-off-by: Kyle Corry <kylecorry31@gmail.com>

Author: kylecorry31

app/src/main/java/com/kylecorry/trail_sense/tools/beacons/map_layers/BeaconGeoJsonSource.kt

@@ -16,11 +16,16 @@ class BeaconGeoJsonSource : GeoJsonSource {
 
     private var highlighted: Beacon? = null
     private var featureToBeaconMap = mapOf<GeoJsonFeature, Beacon>()
+    private var outlineColor = Color.WHITE
 
     fun highlight(beacon: Beacon?) {
         highlighted = beacon
     }
 
+    fun setOutlineColor(color: Int) {
+        outlineColor = color
+    }
+
     private val beaconService = AppServiceRegistry.get<BeaconService>()
 
     fun getBeacon(feature: GeoJsonFeature): Beacon? {
@@ -43,7 +48,7 @@ class BeaconGeoJsonSource : GeoJsonSource {
                     it.id,
                     it.name.trim(),
                     color = it.color,
-                    strokeColor = Color.WHITE,
+                    strokeColor = outlineColor,
                     opacity = if (highlighted == null || highlighted?.id == it.id) {
                         255
                     } else {

app/src/main/java/com/kylecorry/trail_sense/tools/beacons/map_layers/BeaconLayer.kt

@@ -20,6 +20,11 @@ class BeaconLayer(private val onBeaconClick: (beacon: Beacon) -> Boolean = { fal
         percentOpacity = prefs.opacity.get() / 100f
     }
 
+    fun setOutlineColor(color: Int){
+        source.setOutlineColor(color)
+        invalidate()
+    }
+
     fun highlight(beacon: Beacon?) {
         source.highlight(beacon)
         invalidate()

app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/NavigatorFragment.kt

@@ -622,7 +622,6 @@ class NavigatorFragment : BoundFragment<ActivityNavigatorBinding>() {
             }
 
             // Update beacon layers
-            layers.setBeacons(nearbyBeacons)
             beaconCompassLayer.setBeacons(nearbyBeacons)
             beaconCompassLayer.highlight(destinationBeacon)
             layers.setDestination(destinationBeacon)

app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/layers/NavigationCompassLayerManager.kt

@@ -21,7 +21,7 @@ import com.kylecorry.trail_sense.shared.map_layers.ui.layers.MyLocationLayerMana
 import com.kylecorry.trail_sense.shared.map_layers.ui.layers.TiledMapLayer
 import com.kylecorry.trail_sense.shared.sensors.SensorService
 import com.kylecorry.trail_sense.tools.beacons.domain.Beacon
-import com.kylecorry.trail_sense.tools.beacons.map_layers.LegacyBeaconLayer
+import com.kylecorry.trail_sense.tools.beacons.map_layers.BeaconLayer
 import com.kylecorry.trail_sense.tools.paths.map_layers.PathLayer
 import com.kylecorry.trail_sense.tools.paths.map_layers.PathLayerManager
 import com.kylecorry.trail_sense.tools.photo_maps.infrastructure.tiles.PhotoMapRegionLoader
@@ -33,7 +33,7 @@ import com.kylecorry.trail_sense.tools.tides.map_layers.TideMapLayerManager
 class NavigationCompassLayerManager {
     private val taskRunner = MapLayerBackgroundTask()
     private val pathLayer = PathLayer()
-    private val beaconLayer = LegacyBeaconLayer()
+    private val beaconLayer = BeaconLayer()
     private val myLocationLayer = MyLocationLayer()
     private val tideLayer = TideMapLayer()
     private val photoMapLayer = TiledMapLayer()
@@ -138,10 +138,6 @@ class NavigationCompassLayerManager {
         layerManager?.onBoundsChanged(bounds)
     }
 
-    fun setBeacons(beacons: List<Beacon>) {
-        beaconLayer.setBeacons(beacons)
-    }
-
     fun setDestination(beacon: Beacon?) {
         beaconLayer.highlight(beacon)
     }