refactor marker click handler

Author: bubelov

app/src/main/kotlin/org/btcmap/map/MapFragment.kt

@@ -81,6 +81,9 @@ import org.btcmap.db
 import org.btcmap.sync
 import org.btcmap.db.table.place.Marker
 import org.btcmap.db.table.event.Event
+import org.btcmap.map.layer.EVENT_MARKER_LAYER_ID
+import org.btcmap.map.layer.EXCHANGE_MARKER_LAYER_ID
+import org.btcmap.map.layer.MERCHANT_MARKER_LAYER_ID
 import org.btcmap.map.layer.createEventLayers
 import org.btcmap.map.layer.createExchangeLayers
 import org.btcmap.map.layer.createMerchantLayers
@@ -530,12 +533,9 @@ class MapFragment : Fragment() {
 
     private fun MapLibreMap.addMarkerClickListener() {
         val layerIds = listOf(
-            LAYER_UNCLUSTERED_MERCHANTS,
-            LAYER_MERCHANTS_CATEGORY_ICONS,
-            LAYER_EXCHANGES,
-            LAYER_EXCHANGES_CATEGORY_ICONS,
-            LAYER_EVENTS,
-            LAYER_EVENTS_CATEGORY_ICONS
+            MERCHANT_MARKER_LAYER_ID,
+            EXCHANGE_MARKER_LAYER_ID,
+            EVENT_MARKER_LAYER_ID,
         )
 
         addOnMapClickListener { point ->
@@ -975,13 +975,7 @@ class MapFragment : Fragment() {
             maximumFractionDigits = 1
         }
 
-        const val LAYER_UNCLUSTERED_MERCHANTS = "unclusteredMerchants"
-        const val LAYER_MERCHANTS_CATEGORY_ICONS = "unclusteredMerchantsCategoryIcons"
-        const val LAYER_EXCHANGES = "exchanges"
-        const val LAYER_EXCHANGES_CATEGORY_ICONS = "exchangesCategoryIcons"
-        const val LAYER_EVENTS = "events"
-        const val LAYER_EVENTS_CATEGORY_ICONS = "eventsCategoryIcons"
-        val EMPTY_GEOJSON = """{"type":"FeatureCollection","features":[]}"""
+        const val EMPTY_GEOJSON = """{"type":"FeatureCollection","features":[]}"""
         const val ICON_OFFSET_Y = -29f
     }
 

app/src/main/kotlin/org/btcmap/map/layer/EventLayers.kt

@@ -11,6 +11,8 @@ import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.sources.GeoJsonOptions
 import org.maplibre.android.style.sources.GeoJsonSource
 
+const val EVENT_MARKER_LAYER_ID = "event_marker"
+
 fun createEventLayers(
     markerBackgroundColor: Int,
     usingOpenFreeMap: Boolean,
@@ -53,7 +55,7 @@ fun createEventLayers(
         }
 
     val eventMarker =
-        SymbolLayer("event_marker", source.id).apply {
+        SymbolLayer(EVENT_MARKER_LAYER_ID, source.id).apply {
             setProperties(
                 PropertyFactory.iconImage("btcmap-marker"),
                 PropertyFactory.iconAnchor(Expression.literal("bottom")),

app/src/main/kotlin/org/btcmap/map/layer/ExchangeLayers.kt

@@ -12,6 +12,8 @@ import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.sources.GeoJsonOptions
 import org.maplibre.android.style.sources.GeoJsonSource
 
+const val EXCHANGE_MARKER_LAYER_ID = "exchange_marker"
+
 fun createExchangeLayers(
     markerBackgroundColor: Int,
     markerBadgeBackgroundColor: Int,
@@ -52,7 +54,7 @@ fun createExchangeLayers(
         }
 
     val marker =
-        SymbolLayer("exchange_marker", source.id).apply {
+        SymbolLayer(EXCHANGE_MARKER_LAYER_ID, source.id).apply {
             setProperties(
                 PropertyFactory.iconImage("btcmap-marker"),
                 PropertyFactory.iconAnchor(Expression.literal("bottom")),

app/src/main/kotlin/org/btcmap/map/layer/MerchantLayers.kt

@@ -12,6 +12,8 @@ import org.maplibre.android.style.layers.SymbolLayer
 import org.maplibre.android.style.sources.GeoJsonOptions
 import org.maplibre.android.style.sources.GeoJsonSource
 
+const val MERCHANT_MARKER_LAYER_ID = "merchant_marker"
+
 fun createMerchantLayers(
     markerBackgroundColor: Int,
     markerBadgeBackgroundColor: Int,
@@ -59,7 +61,7 @@ fun createMerchantLayers(
         }
 
     val markerLayer =
-        SymbolLayer("merchant_marker", merchantsSource.id).apply {
+        SymbolLayer(MERCHANT_MARKER_LAYER_ID, merchantsSource.id).apply {
             setProperties(
                 PropertyFactory.iconImage(
                     Expression.switchCase(