@rnmapbox/maps 10.1.0-beta.9 → 10.1.0-rc.1

package/CHANGELOG.md

@@ -1,9 +1,13 @@
-## UNRELEASED
+Please check `https://github.com/rnmapbox/maps/releases` for all release logs. We no longer maintain this file.
+
+### Release notes for 10.1.0
+
+- fabric support (should cover all functionality, but some stuff might be broken)
+- v11 support, including api for new features like style config, slot and ModelLayers
+- deprecate `UserLocation#renderMode`, to use native user location, use the new component `LocationPuck`
+- deprecate `Camera#onUserTrackingModeChange`, use `Viewport#onStatusChanged` instead
+- lot of smaller bugfixes/features
 
-```
-Please add unreleased changes in the following style:
-PR Title ([#123](link to my pr))
-```
 
 ### UNRELEASED/10.0.0-beta.10
 

package/README.md

@@ -183,8 +183,10 @@ const styles = StyleSheet.create({
 - [Callout](/docs/Callout.md)
 - [Camera](docs/Camera.md)
 - [UserLocation](docs/UserLocation.md)
+- [LocaitonPuck](docs/LocationPuck.md)
 - [Images](docs/Images.md)
 - [Image](docs/Image.md)
+- [Models](docs/Models.md)
 
 ### Sources
 
@@ -204,6 +206,7 @@ const styles = StyleSheet.create({
 - [SymbolLayer](/docs/SymbolLayer.md)
 - [HeatmapLayer](/docs/HeatmapLayer.md)
 - [SkyLayer](/docs/SkyLayer.md)
+- [ModelLayer](/docs/ModelLayer.md)
 
 ### Terrain
 

package/android/build.gradle

@@ -1,5 +1,5 @@
-def defaultMapboxMapsImpl = "mabpox"
-def defaultMapboxMapsVersion = "10.16.0"
+def defaultMapboxMapsImpl = "mapbox"
+def defaultMapboxMapsVersion = "10.16.2"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -43,6 +43,7 @@ if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
 }
 
 android {
+    namespace = "com.rnmapbox.rnmbx"
     if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
         msg = '@rnmapbox/maps: Maplibre implementation has been removed, set RNMapboxMapsImpl to mapbox- see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
         logger.error(msg)
@@ -57,11 +58,15 @@ android {
         sourceSets {
             main {
                 java.srcDirs = ['src/main/java']
-                if (safeExtGet("RNMapboxMapsUseV11", false)) {
+                def majorMapboxVersion = safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion).split("\\.")[0] as Integer
+                if (majorMapboxVersion >= 11) {
                     java.srcDirs += 'src/main/mapbox-v11-compat/v11'
                 } else {
                     java.srcDirs += 'src/main/mapbox-v11-compat/v10'
                 }
+                if (safeExtGet("RNMapboxMapsUseV11", false)) {
+                    logger.warn("RNMapboxMapsUseV11 is deprecated, just set RNMapboxMapsVersion to 11.*")
+                }
             }
         }
 

package/android/install.md

@@ -2,7 +2,8 @@
 
 ## Supported mapbox libraries
 
-We're only supporting mabpox 10.0 releases. 11.0 beta has experimental support.
+We're only supporting mapbox 10.16* and 11.*. The default is 10.16*. 
+Next release will be 11.* only so we recommend updatign to 11.*
 
 ### Adding mapbox maven repo
 
@@ -35,31 +36,17 @@ allprojects {
 }
 ```
 
-### Setting Mapbox implementation
-
-Note 10.1 or later only supports mapbox 10 and 11 implementations. So you no longer need to set this variable:
-
-Set `RNMapboxMapsImpl` in `android/build.gradle > buildscript > ext` section
-
-```groovy
-buildscript {
-    ext {
-        RNMapboxMapsImpl = 'mapbox'
-    }
-}
-```
-
 ### Using non default mapbox version
 
 *Warning*: If you set a custom version, make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version than what we exepect will likely result in a build error.
 
-Set `RNMapboxMapsLibs` in `android/build.gradle > buildscript > ext` section
+Set `RNMapboxMapsVersion` in `android/build.gradle > buildscript > ext` section
 
 
 ```groovy
 buildscript {
     ext {
-        RNMapboxMapsVersion = '10.6.0'
+        RNMapboxMapsVersion = '11.0.0'
     }
 }
 ```
@@ -83,15 +70,12 @@ buildscript {
 ```groovy
 buildscript {
     ext {
-        RNMapboxMapsUseV11 = true
-        RNMapboxMapsVersion = '10.6.0'
+        RNMapboxMapsVersion = '11.0.0'
     }
 }
 ```
 
-
-
-# Trhoubleshooting
+# Troubleshooting
 
 If you see `2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs` issue see [possible workaround](#workaround-for-2-files-found-with-path-libarm64-v8alibc_sharedso-from-inputs).
 

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -8,15 +8,20 @@ import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXCalloutManager
+import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewContentManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXMarkerViewManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationManager
+import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotationModule
 import com.rnmapbox.rnmbx.components.camera.RNMBXCameraManager
+import com.rnmapbox.rnmbx.components.camera.RNMBXViewport
+import com.rnmapbox.rnmbx.components.camera.RNMBXViewportManager
+import com.rnmapbox.rnmbx.components.camera.RNMBXViewportModule
 import com.rnmapbox.rnmbx.components.images.RNMBXImageManager
+import com.rnmapbox.rnmbx.components.images.RNMBXImageModule
 import com.rnmapbox.rnmbx.components.images.RNMBXImagesManager
+import com.rnmapbox.rnmbx.components.location.RNMBXCustomLocationProviderManager
 import com.rnmapbox.rnmbx.components.location.RNMBXNativeUserLocationManager
 import com.rnmapbox.rnmbx.components.mapview.NativeMapViewModule
-import com.rnmapbox.rnmbx.components.mapview.RNMBXAndroidTextureMapViewManager
-import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapViewManager
 import com.rnmapbox.rnmbx.components.styles.RNMBXStyleImportManager
 import com.rnmapbox.rnmbx.components.styles.atmosphere.RNMBXAtmosphereManager
@@ -26,14 +31,17 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManage
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXModelLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSkyLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXSymbolLayerManager
 import com.rnmapbox.rnmbx.components.styles.light.RNMBXLightManager
+import com.rnmapbox.rnmbx.components.styles.model.RNMBXModelsManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSourceManager
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSourceModule
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXVectorSourceManager
 import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrainManager
 import com.rnmapbox.rnmbx.modules.RNMBXLocationModule
@@ -41,21 +49,38 @@ import com.rnmapbox.rnmbx.modules.RNMBXLogging
 import com.rnmapbox.rnmbx.modules.RNMBXModule
 import com.rnmapbox.rnmbx.modules.RNMBXOfflineModule
 import com.rnmapbox.rnmbx.modules.RNMBXSnapshotModule
+import com.rnmapbox.rnmbx.shape_animators.RNMBXMovePointShapeAnimatorModule
+import com.rnmapbox.rnmbx.shape_animators.ShapeAnimatorManager
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 class RNMBXPackage : TurboReactPackage() {
 
-    var mapViewTagResolver: ViewTagResolver<RNMBXMapView>? = null
-    fun getMapViewTagResolver(context: ReactApplicationContext) : ViewTagResolver<RNMBXMapView> {
-        val viewTagResolver = mapViewTagResolver
+    var viewTagResolver: ViewTagResolver? = null
+    fun getViewTagResolver(context: ReactApplicationContext, module: String) : ViewTagResolver {
+        val viewTagResolver = viewTagResolver
         if (viewTagResolver == null) {
-            val viewTagResolver = ViewTagResolver<RNMBXMapView>(context)
-            mapViewTagResolver = viewTagResolver
-            return viewTagResolver
+            val result = ViewTagResolver(context)
+            this.viewTagResolver = result
+            return result
         }
         return viewTagResolver
     }
 
+    var shapeAnimators: ShapeAnimatorManager? = null
+    fun getShapeAnimators(module: String): ShapeAnimatorManager {
+        val shapeAnimators = shapeAnimators
+        if (shapeAnimators == null) {
+            val result = ShapeAnimatorManager()
+            this.shapeAnimators = result
+            return result
+        }
+        return shapeAnimators
+    }
+
+    fun resetViewTagResolver() {
+        viewTagResolver = null
+    }
+
     override fun getModule(
         s: String,
         reactApplicationContext: ReactApplicationContext
@@ -66,7 +91,12 @@ class RNMBXPackage : TurboReactPackage() {
             RNMBXOfflineModule.REACT_CLASS -> return RNMBXOfflineModule(reactApplicationContext)
             RNMBXSnapshotModule.REACT_CLASS -> return RNMBXSnapshotModule(reactApplicationContext)
             RNMBXLogging.REACT_CLASS -> return RNMBXLogging(reactApplicationContext)
-            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getMapViewTagResolver(reactApplicationContext))
+            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXViewportModule.NAME -> return RNMBXViewportModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXShapeSourceModule.NAME -> return RNMBXShapeSourceModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXImageModule.NAME -> return RNMBXImageModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXPointAnnotationModule.NAME -> return RNMBXPointAnnotationModule(reactApplicationContext, getViewTagResolver(reactApplicationContext, s))
+            RNMBXMovePointShapeAnimatorModule.NAME -> return RNMBXMovePointShapeAnimatorModule(reactApplicationContext, getShapeAnimators(s))
         }
         return null
     }
@@ -81,26 +111,32 @@ class RNMBXPackage : TurboReactPackage() {
 
         // components
         managers.add(RNMBXCameraManager(reactApplicationContext))
-        managers.add(RNMBXAndroidTextureMapViewManager(reactApplicationContext, getMapViewTagResolver(reactApplicationContext)))
-        managers.add(RNMBXMapViewManager(reactApplicationContext, getMapViewTagResolver(reactApplicationContext)))
+        managers.add(RNMBXViewportManager(reactApplicationContext))
+        managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXMapViewManager")))
         managers.add(RNMBXStyleImportManager(reactApplicationContext))
+        managers.add(RNMBXModelsManager(reactApplicationContext))
 
         // annotations
         managers.add(RNMBXMarkerViewManager(reactApplicationContext))
-        managers.add(RNMBXPointAnnotationManager(reactApplicationContext))
+        managers.add(RNMBXMarkerViewContentManager(reactApplicationContext))
+        managers.add(RNMBXPointAnnotationManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXPointAnnotationManager")))
         managers.add(RNMBXCalloutManager())
         managers.add(RNMBXNativeUserLocationManager())
+        managers.add(RNMBXCustomLocationProviderManager())
 
         // sources
         managers.add(RNMBXVectorSourceManager(reactApplicationContext))
-        managers.add(RNMBXShapeSourceManager(reactApplicationContext))
+        managers.add(RNMBXShapeSourceManager(reactApplicationContext,
+            getViewTagResolver(reactApplicationContext, "RNMBXShapeSourceManager"),
+            getShapeAnimators("RNMBXShapeSourceManager")
+            ))
         managers.add(RNMBXRasterDemSourceManager(reactApplicationContext))
         managers.add(RNMBXRasterSourceManager(reactApplicationContext))
         managers.add(RNMBXImageSourceManager())
 
         // images
         managers.add(RNMBXImagesManager(reactApplicationContext))
-        managers.add(RNMBXImageManager(reactApplicationContext))
+        managers.add(RNMBXImageManager(reactApplicationContext, getViewTagResolver(reactApplicationContext, "RNMBXImageManager")))
 
         // layers
         managers.add(RNMBXFillLayerManager())
@@ -115,10 +151,12 @@ class RNMBXPackage : TurboReactPackage() {
         managers.add(RNMBXAtmosphereManager())
         managers.add(RNMBXBackgroundLayerManager())
         managers.add(RNMBXLightManager())
+        managers.add(RNMBXModelLayerManager())
         return managers
     }
 
     override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        resetViewTagResolver()
         return ReactModuleInfoProvider {
             val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
             val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
@@ -176,6 +214,51 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // isCxxModule
                 isTurboModule // isTurboModule
             )
+            moduleInfos[RNMBXViewportModule.NAME] = ReactModuleInfo(
+                RNMBXViewportModule.NAME,
+                RNMBXViewportModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // hasConstants
+                false,  // isCxxModule
+                isTurboModule // isTurboModule
+            )
+            moduleInfos[RNMBXShapeSourceModule.NAME] = ReactModuleInfo(
+                RNMBXShapeSourceModule.NAME,
+                RNMBXShapeSourceModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // hasConstants
+                false,  // isCxxModule
+                isTurboModule // isTurboModule
+            )
+            moduleInfos[RNMBXImageModule.NAME] = ReactModuleInfo(
+                RNMBXImageModule.NAME,
+                RNMBXImageModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // hasConstants
+                false,  // isCxxModule
+                isTurboModule // isTurboModule
+            )
+            moduleInfos[RNMBXPointAnnotationModule.NAME] = ReactModuleInfo(
+                RNMBXPointAnnotationModule.NAME,
+                RNMBXPointAnnotationModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // hasConstants
+                false,  // isCxxModule
+                isTurboModule // isTurboModule
+            )
+            moduleInfos[RNMBXMovePointShapeAnimatorModule.NAME] = ReactModuleInfo(
+                RNMBXMovePointShapeAnimatorModule.NAME,
+                RNMBXMovePointShapeAnimatorModule.NAME,
+                false,
+                false,
+                false,
+                false,
+                isTurboModule
+            )
             moduleInfos
         }
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/AbstractEvent.kt

@@ -0,0 +1,24 @@
+package com.rnmapbox.rnmbx.components
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+class AbstractEvent(
+    viewId: Int,
+    private val mEventName: String,
+    private val mCanCoalesce: Boolean,
+    private val mEvent: WritableMap?
+) : Event<AbstractEvent>(viewId) {
+    override fun getEventName(): String {
+        return mEventName
+    }
+
+    override fun dispatch(rctEventEmitter: RCTEventEmitter) {
+        rctEventEmitter.receiveEvent(viewTag, eventName, mEvent)
+    }
+
+    override fun canCoalesce(): Boolean {
+        return mCanCoalesce
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/AbstractEventEmitter.kt

@@ -7,6 +7,7 @@ import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.rnmapbox.rnmbx.events.IEvent
 
@@ -27,6 +28,10 @@ abstract class AbstractEventEmitter<T : ViewGroup?>(reactApplicationContext: Rea
     val activity : Activity?
         get() = mRCTAppContext.currentActivity
 
+    fun <T : Event<T>>dispatchEvent(event: Event<T>) {
+        mEventDispatcher!!.dispatchEvent(event)
+    }
+
     fun handleEvent(event: IEvent) {
         val eventCacheKey = getEventCacheKey(event)
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/AbstractMapFeature.kt

@@ -15,6 +15,8 @@ abstract class AbstractMapFeature(context: Context?) : ReactViewGroup(context) {
     protected var mMapView: RNMBXMapView? = null;
     private var mWithMapViewCallbacks: Array<((RNMBXMapView) -> Unit)>? = null;
 
+    open var requiresStyleLoad = true;
+
     open fun addToMap(mapView: RNMBXMapView) {
         mMapView = mapView;
         mWithMapViewCallbacks?.forEach { it(mapView) }

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXCalloutManager.kt

@@ -0,0 +1,33 @@
+package com.rnmapbox.rnmbx.components.annotation
+
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXCalloutManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXCalloutManagerInterface
+
+class RNMBXCalloutManager : ViewGroupManager<RNMBXCallout>(),
+    RNMBXCalloutManagerInterface<RNMBXCallout> {
+
+    private val mDelegate: ViewManagerDelegate<RNMBXCallout>
+
+    init {
+        mDelegate = RNMBXCalloutManagerDelegate(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXCallout> {
+        return mDelegate
+    }
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXCallout {
+        return RNMBXCallout(reactContext)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXCallout"
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt

@@ -16,6 +16,7 @@ import com.rnmapbox.rnmbx.components.RemovalReason
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.utils.Logger
 import java.util.Vector
+import com.rnmapbox.rnmbx.v11compat.annotation.*
 
 private data class Vec2(val dx: Double, val dy: Double)
 
@@ -115,11 +116,13 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
 
         val options = getOptions()
 
+
         val annotation = mMapView?.viewAnnotationManager?.addViewAnnotation(
             view,
             options
         )
         didAddToMap = true
+
     }
 
     fun update() {
@@ -169,13 +172,13 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa
         val offset = getOffset()
 
         val options = viewAnnotationOptions {
-            geometry(coordinate)
-            width(width)
-            height(height)
+            coordinate?.let { geometry(it) }
+            width(width.toDouble())
+            height(height.toDouble())
             allowOverlap(mAllowOverlap)
-            offsetX(offset.dx.toInt())
-            offsetY(offset.dy.toInt())
+            offsets(offset.dx, offset.dy)
             selected(mIsSelected)
+
         }
         return options
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContent.kt

@@ -0,0 +1,23 @@
+package com.rnmapbox.rnmbx.components.annotation
+
+import android.content.Context
+import com.facebook.react.uimanager.MeasureSpecAssertions
+import com.facebook.react.views.view.ReactViewGroup
+
+class RNMBXMarkerViewContent(context: Context): ReactViewGroup(context) {
+    // see https://github.com/rnmapbox/maps/pull/3235
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        try {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        } catch(e: IllegalStateException) {
+            val w = MeasureSpec.getSize(widthMeasureSpec)
+            val h = MeasureSpec.getSize(heightMeasureSpec)
+            setMeasuredDimension(
+                if (w == 0) measuredWidth else w,
+                if (h == 0) measuredHeight else h
+            )
+        }
+    }
+
+}
+

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewContentManager.kt

@@ -0,0 +1,23 @@
+package com.rnmapbox.rnmbx.components.annotation
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.viewmanagers.RNMBXMarkerViewContentManagerInterface
+
+
+class RNMBXMarkerViewContentManager(reactApplicationContext: ReactApplicationContext) :
+    ViewGroupManager<RNMBXMarkerViewContent>(),
+    RNMBXMarkerViewContentManagerInterface<RNMBXMarkerView> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(context: ThemedReactContext): RNMBXMarkerViewContent {
+        return RNMBXMarkerViewContent(context)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXMarkerViewContent"
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerViewManager.kt

@@ -2,42 +2,56 @@ package com.rnmapbox.rnmbx.components.annotation
 
 import android.view.View
 import android.widget.FrameLayout
+import com.facebook.react.bridge.Dynamic
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
 import com.facebook.react.bridge.ReactApplicationContext
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXMarkerViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXMarkerViewManagerInterface
 import com.mapbox.maps.ScreenCoordinate
-import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.v11compat.annotation.*
 
 class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
-    AbstractEventEmitter<RNMBXMarkerView?>(reactApplicationContext) {
+    AbstractEventEmitter<RNMBXMarkerView>(reactApplicationContext),
+    RNMBXMarkerViewManagerInterface<RNMBXMarkerView> {
+    private val mDelegate: ViewManagerDelegate<RNMBXMarkerView>
+
+    init {
+        mDelegate = RNMBXMarkerViewManagerDelegate(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXMarkerView> {
+        return mDelegate
+    }
+
     override fun getName(): String {
         return REACT_CLASS
     }
 
     @ReactProp(name = "coordinate")
-    fun setCoordinate(markerView: RNMBXMarkerView, geoJSONStr: String?) {
-        markerView.setCoordinate(toPointGeometry(geoJSONStr))
+    override fun setCoordinate(markerView: RNMBXMarkerView, geoJSONStr: Dynamic) {
+        markerView.setCoordinate(toPointGeometry(geoJSONStr.asString()))
     }
 
     @ReactProp(name = "anchor")
-    fun setAnchor(markerView: RNMBXMarkerView, map: ReadableMap) {
-        markerView.setAnchor(map.getDouble("x").toFloat(), map.getDouble("y").toFloat())
+    override fun setAnchor(markerView: RNMBXMarkerView, map: Dynamic) {
+        markerView.setAnchor(map.asMap().getDouble("x").toFloat(), map.asMap().getDouble("y").toFloat())
     }
 
     @ReactProp(name = "allowOverlap")
-    fun setAllowOverlap(markerView: RNMBXMarkerView, allowOverlap: Boolean) {
-        markerView.setAllowOverlap(allowOverlap)
+    override fun setAllowOverlap(markerView: RNMBXMarkerView, allowOverlap: Dynamic) {
+        markerView.setAllowOverlap(allowOverlap.asBoolean())
     }
 
     @ReactProp(name = "isSelected")
-    fun setIsSelected(markerView: RNMBXMarkerView, isSelected: Boolean) {
-        markerView.setIsSelected(isSelected)
+    override fun setIsSelected(markerView: RNMBXMarkerView, isSelected: Dynamic) {
+        markerView.setIsSelected(isSelected.asBoolean())
     }
 
     override fun createViewInstance(reactContext: ThemedReactContext): RNMBXMarkerView {
@@ -55,7 +69,7 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
         fun markerViewContainerSizeFixer(mapView: RNMBXMapView, viewAnnotationManager: ViewAnnotationManager) {
             // see https://github.com/rnmapbox/maps/issues/2376
             viewAnnotationManager.addOnViewAnnotationUpdatedListener(object :
-                OnViewAnnotationUpdatedListener {
+                OnViewAnnotationUpdatedListener() {
                 override fun onViewAnnotationVisibilityUpdated(view: View, visible: Boolean) {
                     val parent = view.parent
                     if (parent is FrameLayout) {
@@ -65,13 +79,7 @@ class RNMBXMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
                     }
                 }
 
-                override fun onViewAnnotationPositionUpdated(
-                    view: View,
-                    leftTopCoordinate: ScreenCoordinate,
-                    width: Int,
-                    height: Int
-                ) {
-                }
+
             })
         }
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXPointAnnotation.kt

@@ -74,6 +74,11 @@ class RNMBXPointAnnotation(private val mContext: Context, private val mManager:
         mMapView?.offscreenAnnotationViewContainer?.removeView(childView)
     }
 
+    override fun setId(id: Int) {
+        super.setId(id)
+        mManager.tagAssigned(id)
+    }
+
     override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()