@rnmapbox/maps 10.1.0-beta.14 → 10.1.0-beta.15

package/android/build.gradle

@@ -1,4 +1,4 @@
-def defaultMapboxMapsImpl = "mabpox"
+def defaultMapboxMapsImpl = "mapbox"
 def defaultMapboxMapsVersion = "10.16.1"
 
 def safeExtGet(prop, fallback) {

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

@@ -10,13 +10,13 @@ import com.facebook.react.uimanager.ViewManager
 import com.rnmapbox.rnmbx.components.annotation.RNMBXCalloutManager
 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.images.RNMBXImageManager
+import com.rnmapbox.rnmbx.components.images.RNMBXImageModule
 import com.rnmapbox.rnmbx.components.images.RNMBXImagesManager
 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
@@ -69,6 +69,8 @@ class RNMBXPackage : TurboReactPackage() {
             RNMBXLogging.REACT_CLASS -> return RNMBXLogging(reactApplicationContext)
             NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
             RNMBXShapeSourceModule.NAME -> return RNMBXShapeSourceModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
+            RNMBXImageModule.NAME -> return RNMBXImageModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
+            RNMBXPointAnnotationModule.NAME -> return RNMBXPointAnnotationModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
         }
         return null
     }
@@ -83,7 +85,6 @@ class RNMBXPackage : TurboReactPackage() {
 
         // components
         managers.add(RNMBXCameraManager(reactApplicationContext))
-        managers.add(RNMBXAndroidTextureMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
         managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
         managers.add(RNMBXStyleImportManager(reactApplicationContext))
 
@@ -187,6 +188,24 @@ class RNMBXPackage : TurboReactPackage() {
                 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
         }
     }

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/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
 
 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 {

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

@@ -0,0 +1,70 @@
+package com.rnmapbox.rnmbx.components.annotation
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXPointAnnotationManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXPointAnnotationManagerInterface
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toPointGeometry
+
+class RNMBXPointAnnotationManager(reactApplicationContext: ReactApplicationContext) : AbstractEventEmitter<RNMBXPointAnnotation>(reactApplicationContext),
+  RNMBXPointAnnotationManagerInterface<RNMBXPointAnnotation> {
+
+    private val mDelegate: ViewManagerDelegate<RNMBXPointAnnotation>
+
+    init {
+        mDelegate = RNMBXPointAnnotationManagerDelegate(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXPointAnnotation> {
+        return mDelegate
+    }
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun customEvents(): Map<String, String> {
+        return MapBuilder.builder<String, String>()
+            .put(EventKeys.POINT_ANNOTATION_SELECTED, "onMapboxPointAnnotationSelected")
+            .put(EventKeys.POINT_ANNOTATION_DESELECTED, "onMapboxPointAnnotationDeselected")
+            .put(EventKeys.POINT_ANNOTATION_DRAG_START, "onMapboxPointAnnotationDragStart")
+            .put(EventKeys.POINT_ANNOTATION_DRAG, "onMapboxPointAnnotationDrag")
+            .put(EventKeys.POINT_ANNOTATION_DRAG_END, "onMapboxPointAnnotationDragEnd")
+            .build()
+    }
+
+    // TODO: check why it does not work correctly
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXPointAnnotation {
+        return RNMBXPointAnnotation(reactContext!!, this)
+    }
+
+    @ReactProp(name = "id")
+    override fun setId(annotation: RNMBXPointAnnotation, id: Dynamic) {
+        annotation.iD = id.asString()
+    }
+
+    @ReactProp(name = "coordinate")
+    override fun setCoordinate(annotation: RNMBXPointAnnotation, geoJSONStr: Dynamic) {
+        annotation.setCoordinate(toPointGeometry(geoJSONStr.asString())!!)
+    }
+
+    @ReactProp(name = "anchor")
+    override fun setAnchor(annotation: RNMBXPointAnnotation, map: Dynamic) {
+        annotation.setAnchor(map.asMap().getDouble("x").toFloat(), map.asMap().getDouble("y").toFloat())
+    }
+
+    @ReactProp(name = "draggable")
+    override fun setDraggable(annotation: RNMBXPointAnnotation, draggable: Dynamic) {
+        annotation.setDraggable(draggable.asBoolean())
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXPointAnnotation"
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.rnmapbox.rnmbx.components.annotation
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
+import com.rnmapbox.rnmbx.NativeRNMBXPointAnnotationModuleSpec
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
+
+@ReactModule(name = RNMBXPointAnnotationModule.NAME)
+class RNMBXPointAnnotationModule(reactContext: ReactApplicationContext?, private val viewTagResolver: ViewTagResolver) :
+    NativeRNMBXPointAnnotationModuleSpec(reactContext) {
+
+    companion object {
+        const val NAME = "RNMBXPointAnnotationModule"
+    }
+
+    private fun withPointAnnotationOnUIThread(viewRef: Double?, reject: Promise, fn: (RNMBXPointAnnotation) -> Unit) {
+        if (viewRef == null) {
+            reject.reject(Exception("viewRef is null for RNMBXPointAnnotation"))
+        } else {
+            viewTagResolver.withViewResolved(viewRef.toInt(), reject, fn)
+        }
+    }
+
+    @ReactMethod
+    override fun refresh(viewRef: Double?, promise: Promise) {
+        withPointAnnotationOnUIThread(viewRef, promise) {
+            it.refresh()
+            promise.resolve(null)
+        }
+    }
+}

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

@@ -1,18 +1,16 @@
 package com.rnmapbox.rnmbx.components.images
 
 import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.DynamicFromArray
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXImageManagerInterface
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
-import com.rnmapbox.rnmbx.events.constants.EventKeys
 
 class RNMBXImageManager(private val mContext: ReactApplicationContext) : AbstractEventEmitter<RNMBXImage>(
 mContext
-) {
+), RNMBXImageManagerInterface<RNMBXImage> {
     override fun getName(): String {
         return "RNMBXImage"
     }
@@ -27,41 +25,33 @@ mContext
 
     // region React properties
     @ReactProp(name="name")
-    fun setName(image: RNMBXImage, value: String) {
-        image.name = value
+    override fun setName(image: RNMBXImage, value: Dynamic) {
+        image.name = value.asString()
     }
 
     @ReactProp(name="sdf")
-    fun setSdf(image: RNMBXImage, value: Boolean) {
-        image.sdf = value
+    override fun setSdf(image: RNMBXImage, value: Dynamic) {
+        image.sdf = value.asBoolean()
     }
 
     @ReactProp(name="stretchX")
-    fun setStretchX(image: RNMBXImage, value: Dynamic) {
+    override fun setStretchX(image: RNMBXImage, value: Dynamic) {
         image.stretchX = RNMBXImagesManager.convertStretch(value) ?: listOf()
     }
 
     @ReactProp(name="stretchY")
-    fun setStretchY(image: RNMBXImage, value: Dynamic) {
+    override fun setStretchY(image: RNMBXImage, value: Dynamic) {
         image.stretchY = RNMBXImagesManager.convertStretch(value) ?: listOf()
     }
 
     @ReactProp(name="content")
-    fun setContent(image: RNMBXImage, value: Dynamic) {
+    override fun setContent(image: RNMBXImage, value: Dynamic) {
         image.content = RNMBXImagesManager.convertContent(value)
     }
 
     @ReactProp(name="scale")
-    fun setScale(image: RNMBXImage, value: Double) {
-        image.scale = value
-    }
-    // endregion
-
-    // region React methods
-    override fun receiveCommand(root: RNMBXImage, commandId: String?, args: ReadableArray?) {
-        if (commandId == "refresh") {
-            root.refresh()
-        }
+    override fun setScale(image: RNMBXImage, value: Dynamic) {
+        image.scale = value.asDouble()
     }
     // endregion
 }

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

@@ -0,0 +1,33 @@
+package com.rnmapbox.rnmbx.components.images
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
+import com.rnmapbox.rnmbx.NativeRNMBXImageModuleSpec
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
+
+@ReactModule(name = RNMBXImageModule.NAME)
+class RNMBXImageModule(reactContext: ReactApplicationContext?, private val viewTagResolver: ViewTagResolver) :
+    NativeRNMBXImageModuleSpec(reactContext) {
+
+    companion object {
+        const val NAME = "RNMBXImageModule"
+    }
+
+    private fun withImageOnUIThread(viewRef: Double?, reject: Promise, fn: (RNMBXImage) -> Unit) {
+        if (viewRef == null) {
+            reject.reject(Exception("viewRef is null for RNMBXImage"))
+        } else {
+            viewTagResolver.withViewResolved(viewRef.toInt(), reject, fn)
+        }
+    }
+
+    @ReactMethod
+    override fun refresh(viewRef: Double?, promise: Promise) {
+        withImageOnUIThread(viewRef, promise) {
+            it.refresh()
+            promise.resolve(null)
+        }
+    }
+}

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

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.*
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXImagesManagerInterface
 import com.mapbox.maps.ImageContent
 import com.mapbox.maps.ImageStretches
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
@@ -20,7 +21,7 @@ import java.util.*
 class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXImages?>(
         mContext
-    ) {
+    ), RNMBXImagesManagerInterface<RNMBXImages> {
     override fun getName(): String {
         return "RNMBXImages"
     }
@@ -67,9 +68,9 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "images")
-    fun setImages(images: RNMBXImages, map: ReadableMap) {
+    override fun setImages(images: RNMBXImages, map: Dynamic) {
         val imagesList = mutableListOf<Map.Entry<String, ImageEntry>>()
-        map.forEach { imageName, imageInfo ->
+        map.asMap().forEach { imageName, imageInfo ->
             when (imageInfo) {
                 is ReadableMap -> {
                     val uri = imageInfo.getString("uri")
@@ -128,8 +129,8 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "hasOnImageMissing")
-    fun setHasOnImageMissing(images: RNMBXImages, value: Boolean?) {
-        images.setHasOnImageMissing(value!!)
+    override fun setHasOnImageMissing(images: RNMBXImages, value: Dynamic) {
+        images.setHasOnImageMissing(value.asBoolean())
     }
 
     fun toNativeImage(dynamic: Dynamic): NativeImage? {
@@ -165,10 +166,10 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "nativeImages")
-    fun setNativeImages(images: RNMBXImages, arr: ReadableArray) {
+    override fun setNativeImages(images: RNMBXImages, arr: Dynamic) {
         val nativeImages = mutableListOf<NativeImage>();
-        for (i in 0 until arr.size()) {
-            val nativeImage = toNativeImage(arr.getDynamic(i))
+        for (i in 0 until arr.asArray().size()) {
+            val nativeImage = toNativeImage(arr.asArray().getDynamic(i))
             if (nativeImage != null) {
                 nativeImages.add(nativeImage)
             }

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

@@ -1,26 +1,33 @@
 package com.rnmapbox.rnmbx.components.location
 
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.rnmapbox.rnmbx.utils.Logger
+import com.facebook.react.viewmanagers.RNMBXNativeUserLocationManagerInterface
 import javax.annotation.Nonnull
 
-class RNMBXNativeUserLocationManager : ViewGroupManager<RNMBXNativeUserLocation>() {
+class RNMBXNativeUserLocationManager : ViewGroupManager<RNMBXNativeUserLocation>(),
+    RNMBXNativeUserLocationManagerInterface<RNMBXNativeUserLocation> {
     @Nonnull
     override fun getName(): String {
         return REACT_CLASS
     }
 
     @ReactProp(name = "androidRenderMode")
-    fun setAndroidRenderMode(userLocation: RNMBXNativeUserLocation, mode: String) {
-        when (mode) {
+    override fun setAndroidRenderMode(userLocation: RNMBXNativeUserLocation, mode: Dynamic) {
+        when (mode.asString()) {
             "compass" -> userLocation.setAndroidRenderMode(RenderMode.COMPASS);
             "gps" -> userLocation.setAndroidRenderMode(RenderMode.GPS);
             "normal" -> userLocation.setAndroidRenderMode(RenderMode.NORMAL);
         }
     }
 
+    @ReactProp(name = "iosShowsUserHeadingIndicator")
+    override fun setIosShowsUserHeadingIndicator(view: RNMBXNativeUserLocation, value: Dynamic) {
+        // iOS only
+    }
+
     @Nonnull
     override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXNativeUserLocation {
         return RNMBXNativeUserLocation(reactContext)