Map module: review comments and small fixes

base-map/src/main/java/ru/touchin/basemap/AbstractMapManager.kt

@@ -43,7 +43,7 @@ abstract class AbstractMapManager<TMapView : View, TMap : Any, TLocation : Any>(
 
     abstract fun increaseZoom(target: TLocation, zoomIncreaseValue: Int = getDefaultZoomStep())
 
-    abstract fun decreaseZoom(target: TLocation, zoomIncreaseValue: Int = getDefaultZoomStep())
+    abstract fun decreaseZoom(target: TLocation, zoomDecreaseValue: Int = getDefaultZoomStep())
 
     abstract fun setMapAllGesturesEnabled(enabled: Boolean)
 

google-map/src/main/java/ru/touchin/googlemap/GoogleIconGenerator.kt

@@ -17,28 +17,24 @@ open class GoogleIconGenerator<T : ClusterItem>(
         private val context: Context
 ) : IconGenerator(context), BaseIconGenerator<T, Cluster<T>, BitmapDescriptor> {
 
-    init {
-        setBackground(ContextCompat.getDrawable(context, R.drawable.default_cluster_background))
-        LayoutInflater
-                .from(context)
-                .inflate(R.layout.view_google_map_cluster_item, null)
-                .apply {
-                    setContentView(this)
-                }
-    }
-
     private val clusterIconsCache = SparseArray<BitmapDescriptor>()
     private val clusterItemIconsCache = mutableMapOf<T, BitmapDescriptor>()
 
+    fun setDefaultViewAndBackground() {
+        val defaultLayout = LayoutInflater.from(context).inflate(R.layout.view_google_map_cluster_item, null)
+        setBackground(ContextCompat.getDrawable(context, R.drawable.default_cluster_background))
+        setContentView(defaultLayout)
+    }
+
     override fun getClusterIcon(cluster: Cluster<T>): BitmapDescriptor? {
         val clusterSize = cluster.size
         return BitmapDescriptorFactory.fromBitmap(makeIcon(clusterSize.toString()))
     }
 
-    override fun getClusterItemIcon(clusterItem: T): BitmapDescriptor? =
+    override fun getClusterItemIcon(clusterItem: T): BitmapDescriptor? {
-            context.getDrawable(ru.touchin.basemap.R.drawable.marker_default_icon)?.let {
+        val defaultIcon = context.getDrawable(ru.touchin.basemap.R.drawable.marker_default_icon)
-                BitmapDescriptorFactory.fromBitmap(it.toBitmap())
+        return BitmapDescriptorFactory.fromBitmap(defaultIcon?.toBitmap())
-            }
+    }
 
     override fun getClusterItemView(clusterItem: T): BitmapDescriptor? =
             clusterItemIconsCache.getOrPutIfNotNull(clusterItem) { getClusterItemIcon(clusterItem) }

google-map/src/main/java/ru/touchin/googlemap/GoogleMapItemRenderer.kt

@@ -1,7 +1,6 @@
 package ru.touchin.googlemap
 
 import android.content.Context
-import android.view.LayoutInflater
 import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.MarkerOptions
@@ -19,10 +18,7 @@ open class GoogleMapItemRenderer<TClusterItem : ClusterItem>(
 ) : DefaultClusterRenderer<TClusterItem>(context, googleMap, clusterManager) {
 
     var iconGenerator: BaseIconGenerator<TClusterItem, Cluster<TClusterItem>, BitmapDescriptor> =
-            GoogleIconGenerator<TClusterItem>(context).apply {
+            GoogleIconGenerator<TClusterItem>(context).apply { setDefaultViewAndBackground() }
-                setBackground(context.getDrawable(R.drawable.default_cluster_background))
-                setContentView(LayoutInflater.from(context).inflate(R.layout.view_google_map_cluster_item, null))
-            }
 
     override fun shouldRenderAsCluster(cluster: Cluster<TClusterItem>): Boolean =
             cluster.size > minClusterItemSize

google-map/src/main/java/ru/touchin/googlemap/GoogleMapManager.kt

@@ -20,7 +20,7 @@ class GoogleMapManager(mapView: MapView) : AbstractMapManager<MapView, GoogleMap
 
     override fun initialize(mapListener: AbstractMapListener<MapView, GoogleMap, LatLng>?) {
         super.initialize(mapListener)
-        mapView.getMapAsync(::initMap)
+        mapView.getMapAsync(this::initMap)
     }
 
     override fun initMap(map: GoogleMap) {

google-map/src/main/java/ru/touchin/googlemap/GooglePlacemarkManager.kt

@@ -12,18 +12,20 @@ import com.google.maps.android.clustering.algo.Algorithm
 import com.google.maps.android.clustering.algo.NonHierarchicalDistanceBasedAlgorithm
 import com.google.maps.android.clustering.algo.PreCachingAlgorithmDecorator
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.sample
 
+@OptIn(FlowPreview::class)
+
 class GooglePlacemarkManager<TClusterItem : ClusterItem>(
         context: Context,
         private val lifecycleOwner: LifecycleOwner,
@@ -47,7 +49,8 @@ class GooglePlacemarkManager<TClusterItem : ClusterItem>(
 
     private val markers = mutableListOf<TClusterItem>()
     private var lastVisibleItems = emptyList<TClusterItem>()
-    private var onCameraIdleListener: (() -> Unit)? = null
+
+    var onCameraIdleListener: (() -> Unit)? = null
 
     var clusterRenderer: GoogleMapItemRenderer<TClusterItem>? = null
         set(value) {
@@ -55,8 +58,6 @@ class GooglePlacemarkManager<TClusterItem : ClusterItem>(
             setRenderer(value)
         }
 
-    private val lock = Any()
-
     init {
         googleMap.setOnCameraIdleListener(this)
         googleMap.setOnMarkerClickListener(this)
@@ -65,40 +66,28 @@ class GooglePlacemarkManager<TClusterItem : ClusterItem>(
         setOnClusterItemClickListener(clusterItemTapAction)
     }
 
-    fun setItems(items: Collection<TClusterItem>) {
+    @Synchronized
-        synchronized(lock) {
-            markers.clear()
-            markers.addAll(items)
-            onDataChanged()
-        }
-    }
-
     override fun addItems(items: Collection<TClusterItem>) {
-        synchronized(lock) {
+        markers.addAll(items)
-            markers.addAll(items)
+        onDataChanged()
-            onDataChanged()
-        }
     }
 
+    @Synchronized
     override fun addItem(clusterItem: TClusterItem) {
-        synchronized(lock) {
+        markers.add(clusterItem)
-            markers.add(clusterItem)
+        onDataChanged()
-            onDataChanged()
-        }
     }
 
+    @Synchronized
     override fun removeItem(atmClusterItem: TClusterItem) {
-        synchronized(lock) {
+        markers.remove(atmClusterItem)
-            markers.remove(atmClusterItem)
+        onDataChanged()
-            onDataChanged()
-        }
     }
 
+    @Synchronized
     override fun clearItems() {
-        synchronized(lock) {
+        markers.clear()
-            markers.clear()
+        onDataChanged()
-            onDataChanged()
-        }
     }
 
     override fun onCameraIdle() {
@@ -106,22 +95,11 @@ class GooglePlacemarkManager<TClusterItem : ClusterItem>(
         onCameraIdleEvent.tryEmit(true)
     }
 
-    private fun onDataChanged() {
+    @Synchronized
-        onVisibilityChangedEvent.tryEmit(getData())
+    fun setItems(items: Collection<TClusterItem>) {
-    }
+        markers.clear()
-
+        markers.addAll(items)
-    private fun getData(): Pair<VisibleRegion?, List<TClusterItem>> =
+        onDataChanged()
-            googleMap.projection.visibleRegion to markers
-
-    private fun listenToCameraIdleEvents() {
-        cameraIdleJob = lifecycleOwner.lifecycleScope.launchWhenStarted {
-            onCameraIdleEvent
-                    .debounce(CAMERA_DEBOUNCE_MILLI)
-                    .flowOn(Dispatchers.Main)
-                    .collect {
-                        onCameraIdleListener?.invoke()
-                    }
-        }
     }
 
     fun startClustering() {
@@ -131,10 +109,7 @@ class GooglePlacemarkManager<TClusterItem : ClusterItem>(
                     .debounce(CLUSTERING_START_DEBOUNCE_MILLI)
                     .flowOn(Dispatchers.Default)
                     .onStart { emit(getData()) }
-                    .filter { (visibleRegion, _) -> visibleRegion != null }
+                    .mapNotNull { (region, items) -> findItemsInRegion(region, items) }
-                    .map { (visibleRegion, clusteringItems) ->
-                        clusteringItems.filter { visibleRegion?.latLngBounds?.contains(it.position) == true }
-                    }
                     .sample(CLUSTERING_NEW_LIST_CONSUMING_THROTTLE_MILLIS)
                     .catch { emit(lastVisibleItems) }
                     .flowOn(Dispatchers.Main)
@@ -148,16 +123,32 @@ class GooglePlacemarkManager<TClusterItem : ClusterItem>(
         listenToCameraIdleEvents()
     }
 
+    private fun listenToCameraIdleEvents() {
+        cameraIdleJob = lifecycleOwner.lifecycleScope.launchWhenStarted {
+            onCameraIdleEvent
+                    .debounce(CAMERA_DEBOUNCE_MILLI)
+                    .flowOn(Dispatchers.Main)
+                    .collect {
+                        onCameraIdleListener?.invoke()
+                    }
+        }
+    }
+
     fun stopClustering() {
         clusteringJob?.cancel()
         cameraIdleJob?.cancel()
     }
 
-    fun setOnCameraIdleListener(listener: () -> Unit) {
+    private fun onDataChanged() {
-        if (onCameraIdleListener != null) return
+        onVisibilityChangedEvent.tryEmit(getData())
-        onCameraIdleListener = listener
     }
 
+    private fun getData(): Pair<VisibleRegion?, List<TClusterItem>> =
+            googleMap.projection.visibleRegion to markers
+
+    private fun findItemsInRegion(region: VisibleRegion?, items: List<TClusterItem>): List<TClusterItem>? =
+            region?.let { items.filter { item -> item.position in region.latLngBounds } }
+
     private companion object {
         const val CAMERA_DEBOUNCE_MILLI = 50L
 

yandex-map/src/main/java/ru/touchin/yandexmap/DefaultIconGenerator.kt

@@ -8,11 +8,11 @@ import com.yandex.runtime.ui_view.ViewProvider
 class DefaultIconGenerator<T : PointModel>(private val context: Context) : YandexIconGenerator<T>() {
 
     override fun getClusterIcon(cluster: List<T>): ViewProvider {
-        val view: TextView = LayoutInflater.from(context).inflate(R.layout.default_cluster_view, null) as TextView
+        val textView = LayoutInflater.from(context).inflate(R.layout.default_cluster_view, null).apply {
-        view.setText(cluster.size.toString())
+            (this as? TextView)?.text = cluster.size.toString()
-        view.setBackgroundResource(ru.touchin.basemap.R.drawable.marker_default_icon)
+            setBackgroundResource(ru.touchin.basemap.R.drawable.marker_default_icon)
-
+        }
-        return ViewProvider(view)
+        return ViewProvider(textView)
     }
 
     override fun getClusterItemIcon(clusterItem: T) = ViewProvider(

yandex-map/src/main/java/ru/touchin/yandexmap/YandexMapManager.kt

@@ -135,10 +135,12 @@ class YandexMapManager(
     }
 
     override fun setMapAllGesturesEnabled(enabled: Boolean) {
-        map.isRotateGesturesEnabled = enabled
+        with(map) {
-        map.isScrollGesturesEnabled = enabled
+            isRotateGesturesEnabled = enabled
-        map.isTiltGesturesEnabled = enabled
+            isScrollGesturesEnabled = enabled
-        map.isZoomGesturesEnabled = enabled
+            isTiltGesturesEnabled = enabled
+            isZoomGesturesEnabled = enabled
+        }
     }
 
     override fun setMyLocationEnabled(enabled: Boolean) {

yandex-map/src/main/java/ru/touchin/yandexmap/YandexPlacemarkManager.kt

@@ -15,6 +15,11 @@ class YandexPlacemarkManager<TPoint : PointModel>(
         private val markerTapAction: (MapObject, Point) -> Boolean,
 ) : ClusterListener, ClusterTapListener, MapObjectTapListener {
 
+    private companion object {
+        const val DEFAULT_CLUSTER_RADIUS = 42.0
+        const val DEFAULT_MIN_ZOOM = 35
+    }
+
     private val markers = mutableListOf<TPoint>()
     private var placemarkCollection: ClusterizedPlacemarkCollection? = null
 
@@ -25,8 +30,8 @@ class YandexPlacemarkManager<TPoint : PointModel>(
 
     fun addMarkersOnMap(
             mapView: MapView,
-            clusterRadius: Double = 42.0,
+            clusterRadius: Double = DEFAULT_CLUSTER_RADIUS,
-            minZoom: Int = 35
+            minZoom: Int = DEFAULT_MIN_ZOOM
     ) {
         removeMarkers()
 
@@ -52,9 +57,8 @@ class YandexPlacemarkManager<TPoint : PointModel>(
     }
 
     override fun onClusterAdded(cluster: Cluster) {
-        mapItemRenderer.getClusterIcon(cluster.toPlacemarkList())?.let {
+        val clusterIcon = mapItemRenderer.getClusterIcon(cluster.toPlacemarkList())
-            cluster.appearance.setView(it)
+        clusterIcon?.let(cluster.appearance::setView)
-        }
         cluster.addClusterTapListener(this)
     }