@maplibre/maplibre-react-native 11.0.0-beta.2 → 11.0.0-beta.20

package/android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNMapView.kt

@@ -37,6 +37,8 @@ import org.maplibre.android.maps.Style.OnStyleLoaded
 import org.maplibre.android.plugins.annotation.OnSymbolDragListener
 import org.maplibre.android.plugins.annotation.Symbol
 import org.maplibre.android.plugins.annotation.SymbolManager
+import org.maplibre.android.plugins.scalebar.ScaleBarOptions
+import org.maplibre.android.plugins.scalebar.ScaleBarPlugin
 import org.maplibre.android.style.expressions.Expression
 import org.maplibre.android.style.layers.Layer
 import org.maplibre.android.style.layers.Property
@@ -91,7 +93,6 @@ open class MLRNMapView(
     OnMapReadyCallback,
     MapLibreMap.OnMapClickListener,
     MapLibreMap.OnMapLongClickListener,
-    MapView.OnCameraIsChangingListener,
     MapView.OnCameraDidChangeListener,
     MapView.OnWillStartLoadingMapListener,
     MapView.OnDidFailLoadingMapListener,
@@ -154,10 +155,12 @@ open class MLRNMapView(
     private var compassMargins: IntArray? = null
     private var compassHiddenFacingNorth: Boolean? = null
 
-    private var symbolManager: SymbolManager? = null
+    private var scaleBarEnabled: Boolean? = null
+    private var scaleBarMarginTop: Float? = null
+    private var scaleBarMarginLeft: Float? = null
+    private var scaleBarPlugin: ScaleBarPlugin? = null
 
-    private var activePointAnnotationAnnotationId: Long? = null
-    private var pointAnnotationClicked = false
+    private var symbolManager: SymbolManager? = null
 
     private var markerViewManager: MarkerViewManager? = null
     private var offscreenAnnotationViewContainer: ViewGroup? = null
@@ -264,10 +267,6 @@ open class MLRNMapView(
                     }
 
                     is MLRNPointAnnotation -> {
-                        if (child.feature.annotationId == activePointAnnotationAnnotationId) {
-                            activePointAnnotationAnnotationId = null
-                        }
-
                         child.feature.mapLibreId?.let { pointAnnotations.remove(it) }
                     }
 
@@ -324,18 +323,11 @@ open class MLRNMapView(
         mapLibreMap!!.moveCamera(cameraUpdate, callback)
     }
 
-    fun getPointAnnotationByMarkerID(markerID: Long): MLRNPointAnnotation? {
-        for (key in pointAnnotations.keys) {
-            val annotation = pointAnnotations[key]
-
-            if (annotation != null && markerID == annotation.annotationId) {
-                return annotation
-            }
+    fun getPointAnnotationByAnnotationId(annotationId: Long): MLRNPointAnnotation? =
+        pointAnnotations.values.find {
+            it.annotationId == annotationId
         }
 
-        return null
-    }
-
     fun getSymbolManager(): SymbolManager = symbolManager!!
 
     interface FoundLayerCallback {
@@ -361,7 +353,6 @@ open class MLRNMapView(
 
         setLifecycleListeners()
 
-        addOnCameraIsChangingListener(this)
         addOnCameraDidChangeListener(this)
         addOnDidFailLoadingMapListener(this)
         addOnDidFinishLoadingMapListener(this)
@@ -425,12 +416,17 @@ open class MLRNMapView(
         updatePreferredFramesPerSecond()
         updateInsets()
         updateUISettings()
+        updateScaleBar()
 
         mapLibreMap.addOnCameraMoveStartedListener { reason ->
             cameraChangeTracker.setReason(reason)
             handleMapChangedEvent("onRegionWillChange", true)
         }
 
+        mapLibreMap.addOnCameraMoveListener {
+            handleMapChangedEvent("onRegionIsChanging", true)
+        }
+
         mapLibreMap.addOnMoveListener(
             object : MapLibreMap.OnMoveListener {
                 override fun onMoveBegin(detector: MoveGestureDetector) {
@@ -439,8 +435,7 @@ open class MLRNMapView(
                 }
 
                 override fun onMove(detector: MoveGestureDetector) {
-                    cameraChangeTracker.setReason(CameraChangeTracker.USER_GESTURE)
-                    handleMapChangedEvent("onRegionIsChanging", true)
+                    // Handled by mapLibreMap.addOnCameraMoveListener
                 }
 
                 override fun onMoveEnd(detector: MoveGestureDetector) {
@@ -465,28 +460,24 @@ open class MLRNMapView(
         symbolManager = SymbolManager(this, this.mapLibreMap!!, style)
         symbolManager!!.setIconAllowOverlap(true)
         symbolManager!!.addClickListener { symbol ->
-            onMarkerClick(symbol)
+            onPointAnnotationClick(symbol)
             true
         }
         symbolManager!!.addDragListener(
             object : OnSymbolDragListener {
                 override fun onAnnotationDragStarted(symbol: Symbol) {
-                    pointAnnotationClicked = true
-                    val selectedMarkerID = symbol.id
-                    val annotation = getPointAnnotationByMarkerID(selectedMarkerID)
+                    val selectedPointAnnotationID = symbol.id
+                    val annotation = getPointAnnotationByAnnotationId(selectedPointAnnotationID)
                     annotation?.onDragStart()
                 }
 
                 override fun onAnnotationDrag(symbol: Symbol) {
-                    val selectedMarkerID = symbol.id
-                    val annotation = getPointAnnotationByMarkerID(selectedMarkerID)
+                    val annotation = getPointAnnotationByAnnotationId(symbol.id)
                     annotation?.onDrag()
                 }
 
                 override fun onAnnotationDragFinished(symbol: Symbol) {
-                    pointAnnotationClicked = false
-                    val selectedMarkerID = symbol.id
-                    val annotation = getPointAnnotationByMarkerID(selectedMarkerID)
+                    val annotation = getPointAnnotationByAnnotationId(symbol.id)
                     annotation?.onDragEnd()
                 }
             },
@@ -547,19 +538,19 @@ open class MLRNMapView(
     }
 
     override fun onMapClick(latLng: LatLng): Boolean {
-        if (pointAnnotationClicked) {
-            pointAnnotationClicked = false
-        }
+        pointAnnotations.values.find { it.selected }?.let { deselectAnnotation(it) }
 
-        if (activePointAnnotationAnnotationId != null) {
-            val active = pointAnnotations.values.find { it.annotationId == activePointAnnotationAnnotationId }
-            if (active != null) {
-                deselectAnnotation(active)
+        val screenPoint = mapLibreMap!!.projection.toScreenLocation(latLng)
+
+        if (markerViewManager != null) {
+            val hitMarker = markerViewManager!!.findMarkerAtPoint(screenPoint)
+            if (hitMarker != null) {
+                val pressPoint = PointF(screenPoint.x / displayDensity, screenPoint.y / displayDensity)
+                hitMarker.markerView.onPress(latLng, pressPoint)
+                return true
             }
         }
 
-        val screenPoint = mapLibreMap!!.projection.toScreenLocation(latLng)
-
         val hits: MutableMap<String, MutableList<Feature>?> = HashMap()
         val hitPressableSources: MutableList<MLRNPressableSource<*>> = ArrayList()
         for (pressableSource in this.pressableSources) {
@@ -567,10 +558,10 @@ open class MLRNMapView(
 
             val pointWithHitbox =
                 RectF(
-                    screenPoint.x - hitbox.left,
-                    screenPoint.y - hitbox.top,
-                    screenPoint.x + hitbox.right,
-                    screenPoint.y + hitbox.bottom,
+                    screenPoint.x - (hitbox.left * displayDensity),
+                    screenPoint.y - (hitbox.top * displayDensity),
+                    screenPoint.x + (hitbox.right * displayDensity),
+                    screenPoint.y + (hitbox.bottom * displayDensity),
                 )
 
             val features =
@@ -581,6 +572,9 @@ open class MLRNMapView(
             }
         }
 
+        screenPoint.x /= this.displayDensity
+        screenPoint.y /= this.displayDensity
+
         if (hits.isNotEmpty()) {
             val source = getPressableSourceWithHighestZIndex(hitPressableSources)
             if (source != null && source.hasOnPress) {
@@ -599,11 +593,14 @@ open class MLRNMapView(
     }
 
     override fun onMapLongClick(latLng: LatLng): Boolean {
-        if (pointAnnotationClicked) {
-            pointAnnotationClicked = false
+        val screenPoint = mapLibreMap!!.projection.toScreenLocation(latLng)
+
+        if (markerViewManager?.isPointInsideMarker(screenPoint) == true) {
+            return true
         }
 
-        val screenPoint = mapLibreMap!!.projection.toScreenLocation(latLng)
+        screenPoint.x /= this.displayDensity
+        screenPoint.y /= this.displayDensity
 
         val event = MapPressEvent(surfaceId, id, "onLongPress", latLng, screenPoint)
         eventDispatcher?.dispatchEvent(event)
@@ -611,42 +608,26 @@ open class MLRNMapView(
         return false
     }
 
-    fun onMarkerClick(symbol: Symbol) {
-        pointAnnotationClicked = true
-        val selectedMarkerID = symbol.id
-
-        var activeAnnotation: MLRNPointAnnotation? = null
-        var nextActiveAnnotation: MLRNPointAnnotation? = null
-
-        for (key in pointAnnotations.keys) {
-            val pointAnnotation = pointAnnotations[key]
-            val currentAnnotationId = pointAnnotation!!.annotationId
+    fun onPointAnnotationClick(nextSymbol: Symbol) {
+        val nextSelectedPointAnnotation =
+            getPointAnnotationByAnnotationId(nextSymbol.id) ?: return
 
-            if (activePointAnnotationAnnotationId == currentAnnotationId) {
-                activeAnnotation = pointAnnotation
-            }
-
-            if (selectedMarkerID == currentAnnotationId && activePointAnnotationAnnotationId != currentAnnotationId) {
-                nextActiveAnnotation = pointAnnotation
-            }
-        }
-
-        if (activeAnnotation != null) {
-            deselectAnnotation(activeAnnotation)
-        }
+        nextSelectedPointAnnotation.onPress()
 
-        if (nextActiveAnnotation != null) {
-            selectAnnotation(nextActiveAnnotation)
+        if (!nextSelectedPointAnnotation.selected) {
+            selectAnnotation(nextSelectedPointAnnotation)
         }
     }
 
-    fun selectAnnotation(annotation: MLRNPointAnnotation) {
-        activePointAnnotationAnnotationId = annotation.annotationId
-        annotation.onSelect(true)
+    fun selectAnnotation(nextSelectedPointAnnotation: MLRNPointAnnotation) {
+        pointAnnotations.values
+            .filter { it.selected && it !== nextSelectedPointAnnotation }
+            .forEach { it.onDeselect() }
+
+        nextSelectedPointAnnotation.onSelect()
     }
 
     fun deselectAnnotation(annotation: MLRNPointAnnotation) {
-        activePointAnnotationAnnotationId = null
         annotation.onDeselect()
     }
 
@@ -654,10 +635,6 @@ open class MLRNMapView(
         cameraChangeTracker.isAnimating = animated
     }
 
-    override fun onCameraIsChanging() {
-        handleMapChangedEvent("onRegionIsChanging", true)
-    }
-
     override fun onWillStartLoadingMap() {
         handleMapChangedEvent("onWillStartLoadingMap")
     }
@@ -825,13 +802,12 @@ open class MLRNMapView(
             if (position.hasKey("right")) gravity = gravity or Gravity.END
             if (position.hasKey("top")) gravity = gravity or Gravity.TOP
             if (position.hasKey("bottom")) gravity = gravity or Gravity.BOTTOM
-            val density = this.displayDensity
             val margins =
                 intArrayOf(
-                    if (position.hasKey("left")) (density * position.getInt("left")).roundToInt() else 0,
-                    if (position.hasKey("top")) (density * position.getInt("top")).roundToInt() else 0,
-                    if (position.hasKey("right")) (density * position.getInt("right")).roundToInt() else 0,
-                    if (position.hasKey("bottom")) (density * position.getInt("bottom")).roundToInt() else 0,
+                    if (position.hasKey("left")) (displayDensity * position.getInt("left")).roundToInt() else 0,
+                    if (position.hasKey("top")) (displayDensity * position.getInt("top")).roundToInt() else 0,
+                    if (position.hasKey("right")) (displayDensity * position.getInt("right")).roundToInt() else 0,
+                    if (position.hasKey("bottom")) (displayDensity * position.getInt("bottom")).roundToInt() else 0,
                 )
             setGravity(gravity)
             setMargins(margins)
@@ -890,6 +866,38 @@ open class MLRNMapView(
         updateUISettings()
     }
 
+    fun setReactScaleBar(value: Boolean) {
+        scaleBarEnabled = value
+        updateScaleBar()
+    }
+
+    fun setReactScaleBarPosition(position: ReadableMap?) {
+        if (position == null) {
+            scaleBarMarginTop = null
+            scaleBarMarginLeft = null
+        } else {
+            scaleBarMarginTop = if (position.hasKey("top")) (displayDensity * position.getInt("top")) else 0f
+            scaleBarMarginLeft = if (position.hasKey("left")) (displayDensity * position.getInt("left")) else 0f
+        }
+        updateScaleBar()
+    }
+
+    private fun updateScaleBar() {
+        val map = mapLibreMap ?: return
+
+        if (scaleBarPlugin == null) {
+            scaleBarPlugin = ScaleBarPlugin(this, map)
+        }
+
+        val options = ScaleBarOptions(context)
+        scaleBarMarginTop?.let { options.setMarginTop(it) }
+        scaleBarMarginLeft?.let { options.setMarginLeft(it) }
+        scaleBarPlugin!!.create(options)
+        scaleBarPlugin!!.isEnabled = scaleBarEnabled ?: false
+
+        reflow()
+    }
+
     fun getCenter(): WritableArray {
         val cameraPosition = mapLibreMap!!.cameraPosition
         val center = cameraPosition.target!!
@@ -937,8 +945,7 @@ open class MLRNMapView(
         layers: ReadableArray?,
         filter: Expression?,
     ): WritableArray {
-        val density = this.displayDensity
-        val screenPoint = PointF(point.x * density, point.y * density)
+        val screenPoint = PointF(point.x * displayDensity, point.y * displayDensity)
 
         val features =
             mapLibreMap!!.queryRenderedFeatures(
@@ -981,9 +988,8 @@ open class MLRNMapView(
 
     fun project(mapCoordinate: LatLng): WritableArray {
         val pointInView = mapLibreMap!!.projection.toScreenLocation(mapCoordinate)
-        val density = this.displayDensity
-        pointInView.x /= density
-        pointInView.y /= density
+        pointInView.x /= displayDensity
+        pointInView.y /= displayDensity
         val payload: WritableArray = Arguments.createArray()
 
         payload.pushDouble(pointInView.x.toDouble())
@@ -993,9 +999,8 @@ open class MLRNMapView(
     }
 
     fun unproject(pointInView: PointF): WritableArray {
-        val density = this.displayDensity
-        pointInView.x *= density
-        pointInView.y *= density
+        pointInView.x *= displayDensity
+        pointInView.y *= displayDensity
 
         val latLng = mapLibreMap!!.projection.fromScreenLocation(pointInView)
 
@@ -1348,7 +1353,7 @@ open class MLRNMapView(
         }
 
     private fun getPressableSourceWithHighestZIndex(sources: MutableList<MLRNPressableSource<*>>?): MLRNPressableSource<*>? {
-        if (sources == null || sources.isEmpty()) {
+        if (sources.isNullOrEmpty()) {
             return null
         }
 
@@ -1401,10 +1406,10 @@ open class MLRNMapView(
      */
     private fun setUpImage(loadedStyle: Style) {
         loadedStyle.addImage(
-            "MARKER_IMAGE_ID",
+            MLRNPointAnnotation.DEFAULT_MARKER,
             BitmapFactory.decodeResource(
                 this.resources,
-                R.drawable.red_marker,
+                R.drawable.default_marker,
             ),
         )
     }

package/android/src/main/java/org/maplibre/reactnative/components/mapview/MLRNMapViewManager.kt

@@ -78,6 +78,8 @@ open class MLRNMapViewManager(
             mViews.remove(reactTag)
         }
 
+        mapView.dispose()
+
         super.onDropViewInstance(mapView)
     }
 
@@ -213,6 +215,22 @@ open class MLRNMapViewManager(
         mapView.setReactCompassHiddenFacingNorth(value)
     }
 
+    @ReactProp(name = "scaleBar")
+    override fun setScaleBar(
+        mapView: MLRNMapView,
+        value: Boolean,
+    ) {
+        mapView.setReactScaleBar(value)
+    }
+
+    @ReactProp(name = "scaleBarPosition")
+    override fun setScaleBarPosition(
+        mapView: MLRNMapView,
+        value: ReadableMap?,
+    ) {
+        mapView.setReactScaleBarPosition(value)
+    }
+
     //endregion
 
     private class MapShadowNode(

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNLogModule.kt

@@ -3,10 +3,12 @@ package org.maplibre.reactnative.modules
 import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
 import org.maplibre.android.log.Logger
 import org.maplibre.android.log.LoggerDefinition
 import org.maplibre.reactnative.NativeLogModuleSpec
 
+@ReactModule(name = MLRNLogModule.NAME)
 class MLRNLogModule(
     reactContext: ReactApplicationContext,
 ) : NativeLogModuleSpec(

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNNetworkModule.kt

@@ -1,14 +1,9 @@
 package org.maplibre.reactnative.modules
 
-import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
-import okhttp3.Dispatcher
-import okhttp3.OkHttpClient
 import org.maplibre.android.MapLibre
-import org.maplibre.android.module.http.HttpRequestUtil
 import org.maplibre.reactnative.NativeNetworkModuleSpec
-import org.maplibre.reactnative.http.RequestHeadersInterceptor
 
 @ReactModule(name = MLRNNetworkModule.NAME)
 class MLRNNetworkModule(
@@ -16,52 +11,15 @@ class MLRNNetworkModule(
 ) : NativeNetworkModuleSpec(reactContext) {
     companion object {
         const val NAME = "MLRNNetworkModule"
-        private var requestHeadersInterceptorAdded = false
     }
 
     override fun getName() = NAME
 
     private val context: ReactApplicationContext = reactContext
 
-    override fun addRequestHeader(
-        name: String,
-        value: String,
-        match: String?,
-    ) {
-        context.runOnUiQueueThread {
-            if (!requestHeadersInterceptorAdded) {
-                Log.i("MLRNNetworkModule", "Add interceptor")
-                val httpClient =
-                    OkHttpClient
-                        .Builder()
-                        .addInterceptor(RequestHeadersInterceptor.INSTANCE)
-                        .dispatcher(getDispatcher())
-                        .build()
-                HttpRequestUtil.setOkHttpClient(httpClient)
-                requestHeadersInterceptorAdded = true
-            }
-
-            RequestHeadersInterceptor.INSTANCE.addHeader(name, value, match)
-        }
-    }
-
-    override fun removeRequestHeader(name: String) {
-        context.runOnUiQueueThread {
-            RequestHeadersInterceptor.INSTANCE.removeHeader(name)
-        }
-    }
-
     override fun setConnected(connected: Boolean) {
         context.runOnUiQueueThread {
             MapLibre.setConnected(connected)
         }
     }
-
-    private fun getDispatcher(): Dispatcher {
-        val dispatcher = Dispatcher()
-        // Matches core limit set on
-        // https://github.com/mapbox/mapbox-gl-native/blob/master/platform/android/src/http_file_source.cpp#L192
-        dispatcher.maxRequestsPerHost = 20
-        return dispatcher
-    }
 }

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNOfflineModule.kt

@@ -36,6 +36,8 @@ class MLRNOfflineModule(
     private val context: Context = reactContext.applicationContext
     private var progressEventThrottle = 300.0
 
+    private val regions = HashMap<String, OfflineRegion>()
+
     override fun initialize() {
         Handler(Looper.getMainLooper()).post {
             runMigrations()
@@ -72,12 +74,14 @@ class MLRNOfflineModule(
             metadataBytes,
             object : OfflineManager.CreateOfflineRegionCallback {
                 override fun onCreate(offlineRegion: OfflineRegion) {
+                    regions[packId] = offlineRegion
                     val pack = fromOfflineRegion(offlineRegion)
                     promise.resolve(pack)
                     setOfflineRegionObserver(packId, offlineRegion)
                 }
 
                 override fun onError(error: String) {
+                    promise.reject("createPack", error)
                     emitOnError(makeErrorPayload(packId, error))
                     Log.e(NAME, "createPack error: $error")
                 }
@@ -165,6 +169,7 @@ class MLRNOfflineModule(
         offlineManager.resetDatabase(
             object : OfflineManager.FileSourceCallback {
                 override fun onSuccess() {
+                    clearRegions()
                     promise.resolve(null)
                 }
 
@@ -231,6 +236,7 @@ class MLRNOfflineModule(
                     val hasRegion = region != null
 
                     if (hasRegion) {
+                        regions[id] = region
                         setOfflineRegionObserver(id, region)
                     }
 
@@ -254,7 +260,7 @@ class MLRNOfflineModule(
         offlineManager.listOfflineRegions(
             object : OfflineManager.ListOfflineRegionsCallback {
                 override fun onList(offlineRegions: Array<OfflineRegion>?) {
-                    val region = getRegionById(id, offlineRegions)
+                    val region = regions[id] ?: getRegionById(id, offlineRegions)
 
                     if (region == null) {
                         promise.resolve(null)
@@ -292,7 +298,7 @@ class MLRNOfflineModule(
         offlineManager.listOfflineRegions(
             object : OfflineManager.ListOfflineRegionsCallback {
                 override fun onList(offlineRegions: Array<OfflineRegion>?) {
-                    val region = getRegionById(id, offlineRegions)
+                    val region = regions[id] ?: getRegionById(id, offlineRegions)
 
                     if (region == null) {
                         promise.resolve(null)
@@ -304,6 +310,7 @@ class MLRNOfflineModule(
                     region.delete(
                         object : OfflineRegion.OfflineRegionDeleteCallback {
                             override fun onDelete() {
+                                regions.remove(id)
                                 promise.resolve(null)
                             }
 
@@ -331,7 +338,7 @@ class MLRNOfflineModule(
         offlineManager.listOfflineRegions(
             object : OfflineManager.ListOfflineRegionsCallback {
                 override fun onList(offlineRegions: Array<OfflineRegion>?) {
-                    val offlineRegion = getRegionById(id, offlineRegions)
+                    val offlineRegion = regions[id] ?: getRegionById(id, offlineRegions)
 
                     if (offlineRegion == null) {
                         promise.reject("pauseRegionDownload", "Unknown offline region")
@@ -361,7 +368,8 @@ class MLRNOfflineModule(
         offlineManager.listOfflineRegions(
             object : OfflineManager.ListOfflineRegionsCallback {
                 override fun onList(offlineRegions: Array<OfflineRegion>?) {
-                    val offlineRegion = getRegionById(id, offlineRegions)
+                    val offlineRegion =
+                        regions[id] ?: getRegionById(id, offlineRegions)?.also { regions[id] = it }
 
                     if (offlineRegion == null) {
                         promise.reject("resumeRegionDownload", "Unknown offline region")
@@ -631,8 +639,23 @@ class MLRNOfflineModule(
         return null
     }
 
+    override fun invalidate() {
+        Handler(Looper.getMainLooper()).post {
+            clearRegions()
+        }
+        super.invalidate()
+    }
+
     private fun activateFileSource() {
         val fileSource = FileSource.getInstance(context)
         fileSource.activate()
     }
+
+    private fun clearRegions() {
+        for (region in regions.values) {
+            region.setDownloadState(OfflineRegion.STATE_INACTIVE)
+            region.setObserver(null)
+        }
+        regions.clear()
+    }
 }