@rnmapbox/maps 10.1.0-beta.10 → 10.1.0-beta.13

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/camera/RNMBXCamera.kt

@@ -40,6 +40,8 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
     AbstractMapFeature(
         mContext
     ) {
+    override var requiresStyleLoad = false
+
     private var hasSentFirstRegion = false
     private var mDefaultStop: CameraStop? = null
     private var mCameraStop: CameraStop? = null
@@ -317,21 +319,77 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
         when (status) {
             ViewportStatus.Idle -> return null
             is ViewportStatus.State ->
-                return toFollowUserMode(status)
+                return toFollowUserMode(status.state)
             is ViewportStatus.Transition ->
                 return toFollowUserMode(status.toState)
         }
     }
 
+    fun toUserTrackingMode(state: ViewportState): Int {
+        when (state) {
+            is FollowPuckViewportState -> {
+                return when (state.options.bearing) {
+                    is FollowPuckViewportStateBearing.SyncWithLocationPuck -> {
+                        val location = mMapView?.mapView?.location2
+                        if (location?.puckBearingEnabled == true) {
+                            when (location.puckBearingSource) {
+
+                                PuckBearingSource.HEADING -> {
+                                    UserTrackingMode.FollowWithHeading
+                                }
+                                PuckBearingSource.COURSE -> {
+                                    UserTrackingMode.FollowWithCourse
+                                }
+                                else -> {
+                                    UserTrackingMode.FOLLOW
+                                }
+                            }
+                        } else {
+                            UserTrackingMode.FOLLOW
+                        }
+                    }
+
+                    is FollowPuckViewportStateBearing.Constant ->
+                        UserTrackingMode.FOLLOW
+
+                    else -> {
+                        Logger.w(LOG_TAG, "Unexpected bearing: ${state.options.bearing}")
+                        UserTrackingMode.FOLLOW
+                    }
+                }
+            }
+
+            is OverviewViewportState -> {
+                return UserTrackingMode.NONE
+            }
+
+            else -> {
+                return UserTrackingMode.NONE // TODO
+            }
+        }
+    }
+
+    fun toUserTrackingMode(status: ViewportStatus): Int {
+        return when (status) {
+            ViewportStatus.Idle -> UserTrackingMode.NONE
+            is ViewportStatus.State ->
+                toUserTrackingMode(status.state)
+
+            is ViewportStatus.Transition ->
+                toUserTrackingMode(status.toState)
+        }
+    }
+
     fun toReadableMap(status: ViewportStatus): ReadableMap {
-        when (status) {
-            ViewportStatus.Idle -> return writableMapOf("state" to "idle")
+        return when (status) {
+            ViewportStatus.Idle -> writableMapOf("state" to "idle")
             is ViewportStatus.State ->
-                return writableMapOf(
+                writableMapOf(
                     "state" to status.toString()
                 )
+
             is ViewportStatus.Transition ->
-                return writableMapOf(
+                writableMapOf(
                     "transition" to status.toString()
                 )
         }
@@ -344,12 +402,11 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
                 toStatus: ViewportStatus,
                 reason: ViewportStatusChangeReason
             ) {
-                if (reason == ViewportStatusChangeReason.USER_INTERACTION) {
+                if (reason == ViewportStatusChangeReason.USER_INTERACTION || reason == ViewportStatusChangeReason.TRANSITION_SUCCEEDED) {
                     val followUserLocation = toFollowUserLocation(toStatus)
 
-
-
-                    mManager.handleEvent(MapUserTrackingModeEvent(this@RNMBXCamera, UserTrackingMode.NONE,
+                    val mode = toUserTrackingMode(toStatus)
+                    mManager.handleEvent(MapUserTrackingModeEvent(this@RNMBXCamera, mode,
                     writableMapOf(
                         "followUserMode" to toFollowUserMode(toStatus),
                         "followUserLocation" to followUserLocation,

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

@@ -228,8 +228,8 @@ class RNMBXImages(context: Context, private val mManager: RNMBXImagesManager) :
             var maxY = info.stretchY.maxOfOrNull { max(it.first, it.second) } ?: 0.0f
             var maxX = info.stretchX.maxOfOrNull { max(it.first, it.second) } ?: 0.0f
             if (info.content != null) {
-                maxX = max(max(info.content.left,info.content.right), maxX)
-                maxY = max(max(info.content.top,info.content.bottom), maxY)
+                maxX = max(max(info.content.left, info.content.right), maxX)
+                maxY = max(max(info.content.top, info.content.bottom), maxY)
             }
             return emptyImage(ceil(maxX).toInt()+1, ceil(maxY).toInt()+1)
         } else {

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

@@ -67,7 +67,7 @@ class LocationComponentManager(mapView: RNMBXMapView, context: Context) {
 
     private fun applyStateChanges(map: RNMBXMapView, oldState: State, newState: State, fullUpdate: Boolean) {
         val mapView = map.mapView
-        if (map.getLifecycleState() != Lifecycle.State.STARTED) {
+        if (map.getLifecycleState() != Lifecycle.State.STARTED && map.getLifecycleState() != Lifecycle.State.INITIALIZED) {
             // In case lifecycle was already stopped, so we're part of shutdown, do not call updateSettings as it'll just restart
             // the loationComponent that will not be stopped. See https://github.com/mapbox/mapbox-maps-android/issues/2017
             if (!newState.enabled) {

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

@@ -25,6 +25,7 @@ object UserTrackingMode {
             FOLLOW -> return "normal"
             FollowWithCourse -> return "course"
             FollowWithHeading -> return "compass"
+            NONE -> return null
         }
         return null
     }

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

@@ -478,7 +478,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             }
         }
 
-        val addToMap = styleLoaded
+        val addToMap = styleLoaded || (feature?.requiresStyleLoad == false)
 
         var entry = FeatureEntry(feature, childView, false)
         if (addToMap) {
@@ -541,11 +541,13 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         }
     }
 
-    private fun addFeaturesToMap() {
+    private fun addFeaturesToMap(styleLoaded: Boolean = false) {
         mFeatures.forEach {
             if (!it.addedToMap) {
-                it.feature?.addToMap(this)
-                it.addedToMap = true
+                if (styleLoaded || it.feature?.requiresStyleLoad == false) {
+                    it.feature?.addToMap(this)
+                    it.addedToMap = true
+                }
             }
         }
     }
@@ -654,6 +656,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
                             }
                         }
                 )
+                addFeaturesToMap(false)
             }
         }
     }

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

@@ -23,6 +23,8 @@ import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.ExpressionParser
 import com.rnmapbox.rnmbx.utils.Logger
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
+import com.rnmapbox.rnmbx.utils.extensions.getAndLogIfNotBoolean
+import com.rnmapbox.rnmbx.utils.extensions.getAndLogIfNotDouble
 import com.rnmapbox.rnmbx.utils.extensions.toCoordinate
 import com.rnmapbox.rnmbx.utils.extensions.toRectF
 import com.rnmapbox.rnmbx.utils.extensions.toScreenCoordinate
@@ -139,6 +141,55 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
         mapView.setReactLocalizeLabels(locale, layerIds)
     }
 
+    @ReactProp(name = "gestureSettings")
+    override fun setGestureSettings(mapView: RNMBXMapView, settings: Dynamic) {
+        mapView.getMapboxMap().gesturesPlugin {
+            val map = settings.asMap()
+            this.updateSettings {
+                map.getAndLogIfNotBoolean("doubleTapToZoomInEnabled", LOG_TAG)?.let {
+                    this.doubleTapToZoomInEnabled = it
+                }
+                map.getAndLogIfNotBoolean("doubleTouchToZoomOutEnabled", LOG_TAG)?.let {
+                    this.doubleTouchToZoomOutEnabled = it
+                }
+                map.getAndLogIfNotBoolean("pinchPanEnabled", LOG_TAG)?.let {
+                    this.pinchScrollEnabled = it
+                }
+                map.getAndLogIfNotBoolean("pinchZoomEnabled", LOG_TAG)?.let {
+                    this.pinchToZoomEnabled = it
+                }
+                map.getAndLogIfNotBoolean("pinchZoomDecelerationEnabled", LOG_TAG)?.let {
+                    this.pinchToZoomDecelerationEnabled = it
+                }
+                map.getAndLogIfNotBoolean("pitchEnabled", LOG_TAG)?.let {
+                    this.pitchEnabled = it
+                }
+                map.getAndLogIfNotBoolean("quickZoomEnabled", LOG_TAG)?.let {
+                    this.quickZoomEnabled = it
+                }
+                map.getAndLogIfNotBoolean("rotateEnabled", LOG_TAG)?.let {
+                    this.rotateEnabled = it
+                }
+                map.getAndLogIfNotBoolean("rotateDecelerationEnabled", LOG_TAG)?.let {
+                    this.rotateDecelerationEnabled = it
+                }
+                map.getAndLogIfNotBoolean("panEnabled", LOG_TAG)?.let {
+                    this.scrollEnabled = it
+                }
+                map.getAndLogIfNotDouble("panDecelerationFactor", LOG_TAG)?.let {
+                    this.scrollDecelerationEnabled = it > 0.0
+                }
+                map.getAndLogIfNotBoolean("simultaneousRotateAndPinchToZoomEnabled", LOG_TAG)?.let {
+                    this.simultaneousRotateAndPinchToZoomEnabled = it
+                }
+                map.getAndLogIfNotDouble("zoomAnimationAmount", LOG_TAG)?.let {
+                    this.zoomAnimationAmount = it.toFloat()
+                }
+            }
+        }
+
+    }
+
     @ReactProp(name = "styleURL")
     override fun setStyleURL(mapView: RNMBXMapView, styleURL:Dynamic) {
         mapView.setReactStyleURL(styleURL.asString())

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXSkyLayerManager.kt

@@ -61,12 +61,6 @@ class RNMBXSkyLayerManager : ViewGroupManager<RNMBXSkyLayer>(),
         layer.setReactStyle(style.asMap())
     }
 
-//    not available
-//    @ReactProp(name = "sourceLayerID")
-//    override fun setSourceLayerId(layer: RNMBXSkyLayer, sourceLayerID: Dynamic) {
-//        layer.setSourceLayerID(sourceLayerID.asString())
-//    }
-
     @ReactProp(name = "filter")
     override fun setFilter(layer: RNMBXSkyLayer, filterList: Dynamic) {
         layer.setFilter(filterList.asArray())

package/android/src/main/java/com/rnmapbox/rnmbx/utils/BitmapUtils.kt

@@ -33,10 +33,6 @@ object BitmapUtils {
             }
         }
 
-    fun getBitmapFromURL(url: String?): Bitmap? {
-        return getBitmapFromURL(url, null)
-    }
-
     fun toImage(bitmap: Bitmap): Image {
         if (bitmap.config != Bitmap.Config.ARGB_8888) {
             throw RuntimeException("Only ARGB_8888 bitmap config is supported!")
@@ -71,33 +67,6 @@ object BitmapUtils {
         }
     }
 
-    fun getBitmapFromURL(url: String?, options: BitmapFactory.Options?): Bitmap? {
-        var bitmap = getImage(url)
-        if (bitmap != null) {
-            return bitmap
-        }
-        try {
-            val bitmapStream = URL(url).openStream()
-            bitmap = BitmapFactory.decodeStream(bitmapStream, null, options)
-            bitmapStream.close()
-            addImage(url, bitmap)
-        } catch (e: Exception) {
-            Log.w(LOG_TAG, e.localizedMessage)
-            bitmap =
-                Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8) // Returns a transparent bitmap
-        }
-        return bitmap
-    }
-
-    fun getBitmapFromResource(
-        context: Context,
-        resourceName: String?,
-        options: BitmapFactory.Options?
-    ): Bitmap {
-        val resources = context.resources
-        val resID = resources.getIdentifier(resourceName, "drawable", context.packageName)
-        return BitmapFactory.decodeResource(resources, resID, options)
-    }
 
     @Throws(IOException::class)
     fun createImgTempFile(context: Context, image: Image): String? {

package/android/src/main/java/com/rnmapbox/rnmbx/utils/DownloadMapImageTask.kt

@@ -4,11 +4,9 @@ import android.content.Context
 import android.graphics.Bitmap
 import com.mapbox.maps.Style
 import com.mapbox.maps.MapboxMap
-import com.rnmapbox.rnmbx.utils.DownloadMapImageTask.OnAllImagesLoaded
 import android.os.AsyncTask
 import com.rnmapbox.rnmbx.utils.ImageEntry
 import android.util.DisplayMetrics
-import com.rnmapbox.rnmbx.utils.DownloadMapImageTask
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.util.Log
@@ -22,11 +20,8 @@ import com.facebook.imagepipeline.image.CloseableStaticBitmap
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.facebook.react.views.imagehelper.ImageSource
 import com.rnmapbox.rnmbx.components.images.ImageInfo
-import com.rnmapbox.rnmbx.components.images.addBitmapImage
 import java.io.File
 import java.lang.ref.WeakReference
-import java.util.AbstractMap
-import java.util.ArrayList
 import java.util.HashMap
 import com.rnmapbox.rnmbx.v11compat.image.*
 
@@ -54,64 +49,40 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
             if (uri.startsWith("/")) {
                 uri = Uri.fromFile(File(uri)).toString()
             }
-            if (uri.startsWith("http://") || uri.startsWith("https://") ||
-                uri.startsWith("file://") || uri.startsWith("asset://") || uri.startsWith("data:")
-            ) {
-                val source = ImageSource(context, uri)
-                val request = ImageRequestBuilder.newBuilderWithSource(source.uri)
-                    .setRotationOptions(RotationOptions.autoRotate())
-                    .build()
-                val dataSource =
-                    Fresco.getImagePipeline().fetchDecodedImage(request, mCallerContext)
-                var result: CloseableReference<CloseableImage>? = null
-                try {
-                    result = DataSources.waitForFinalResult(dataSource)
-                    if (result != null) {
-                        val image = result.get()
-                        if (image is CloseableStaticBitmap) {
-                            val bitmap =
-                                image.underlyingBitmap // Copy the bitmap to make sure it doesn't get recycled when we release
-                                    // the fresco reference.
-                                    .copy(Bitmap.Config.ARGB_8888, true)
-                            bitmap.density =
-                                (DisplayMetrics.DENSITY_DEFAULT.toDouble() * imageEntry.getScaleOr(
-                                    1.0
-                                )).toInt()
-                            images.add(
-                                DownloadedImage(name=key, bitmap=bitmap, info=imageEntry.info)
-                            )
-                        } else {
-                            FLog.e(LOG_TAG, "Failed to load bitmap from: $uri")
-                        }
+            val source = ImageSource(context, uri)
+            val request = ImageRequestBuilder.newBuilderWithSource(source.uri)
+                .setRotationOptions(RotationOptions.autoRotate())
+                .build()
+            val dataSource =
+                Fresco.getImagePipeline().fetchDecodedImage(request, mCallerContext)
+            var result: CloseableReference<CloseableImage>? = null
+            try {
+                result = DataSources.waitForFinalResult(dataSource)
+                if (result != null) {
+                    val image = result.get()
+                    if (image is CloseableStaticBitmap) {
+                        val bitmap =
+                            image.underlyingBitmap // Copy the bitmap to make sure it doesn't get recycled when we release
+                                // the fresco reference.
+                                .copy(Bitmap.Config.ARGB_8888, true)
+                        Log.e("RNMBXImageManager", "downloadImage: $key $uri $image ${image.width}x${image.height}")
+                        bitmap.density = DisplayMetrics.DENSITY_DEFAULT
+                        images.add(
+                            DownloadedImage(name=key, bitmap=bitmap, info=imageEntry.info)
+                        )
                     } else {
                         FLog.e(LOG_TAG, "Failed to load bitmap from: $uri")
                     }
-                } catch (e: Throwable) {
-                    Log.w(LOG_TAG, e.localizedMessage)
-                } finally {
-                    dataSource.close()
-                    if (result != null) {
-                        CloseableReference.closeSafely(result)
-                    }
-                }
-            } else {
-                // local asset required from JS require('image.png') or import icon from 'image.png' while in release mode
-                val bitmap = BitmapUtils.getBitmapFromResource(
-                    context,
-                    uri,
-                    getBitmapOptions(metrics, imageEntry.info.scale)
-                )
-                if (bitmap != null) {
-                    images.add(
-                        DownloadedImage(
-                            name=key,
-                            bitmap=bitmap,
-                            info=imageEntry.info
-                        )
-                    )
                 } else {
                     FLog.e(LOG_TAG, "Failed to load bitmap from: $uri")
                 }
+            } catch (e: Throwable) {
+                Log.w(LOG_TAG, e.localizedMessage)
+            } finally {
+                dataSource.close()
+                if (result != null) {
+                    CloseableReference.closeSafely(result)
+                }
             }
         }
         return images
@@ -134,16 +105,6 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImag
         mCallback?.onAllImagesLoaded()
     }
 
-    private fun getBitmapOptions(metrics: DisplayMetrics, scale: Double?): BitmapFactory.Options {
-        val options = BitmapFactory.Options()
-        options.inScreenDensity = metrics.densityDpi
-        options.inTargetDensity = metrics.densityDpi
-        if (scale != null) {
-            options.inDensity = (DisplayMetrics.DENSITY_DEFAULT.toDouble() * scale).toInt()
-        }
-        return options
-    }
-
     companion object {
         const val LOG_TAG = "DownloadMapImageTask"
     }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableMap.kt

@@ -2,6 +2,7 @@ package com.rnmapbox.rnmbx.utils.extensions
 
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
+import com.rnmapbox.rnmbx.utils.Logger
 
 fun ReadableMap.forEach(action: (String, Any) -> Unit) {
     val iterator = this.entryIterator
@@ -17,3 +18,37 @@ fun ReadableMap.getIfDouble(key: String): Double? {
         null
     }
 }
+
+fun ReadableMap.getIfBoolean(key: String): Boolean? {
+    return if (hasKey(key) && (getType(key) == ReadableType.Boolean)) {
+        getBoolean(key)
+    } else {
+        null
+    }
+}
+
+fun ReadableMap.getAndLogIfNotBoolean(key: String, tag:String = "RNMBXReadableMap"): Boolean? {
+    return if (hasKey(key)) {
+      if (getType(key) == ReadableType.Boolean) {
+          getBoolean(key)
+      } else {
+          Logger.e("RNMBXReadableMap", "$key is expected to be a boolean but was: ${getType(key)}")
+          null
+      }
+    } else {
+        null
+    }
+}
+
+fun ReadableMap.getAndLogIfNotDouble(key: String, tag: String = "RNMBXReadableMap"): Double? {
+    return if (hasKey(key)) {
+        if (getType(key) == ReadableType.Number) {
+            getDouble(key)
+        } else {
+            Logger.e("RNMBXReadableMap", "$key is expected to be a double but was: ${getType(key)}")
+            null
+        }
+    } else {
+        null
+    }
+}

package/android/src/main/mapbox-v11-compat/v11/com/mapbox/rnmbx/v11compat/Image.kt

@@ -65,4 +65,4 @@ fun emptyImage(width: Int, height: Int): Image {
     return Image(
         width, height, DataRef.allocateNative(width * height * 4)
     )
-}
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java

@@ -79,6 +79,9 @@ public class RNMBXMapViewManagerDelegate<T extends View, U extends BaseViewManag
       case "styleURL":
         mViewManager.setStyleURL(view, new DynamicFromObject(value));
         break;
+      case "gestureSettings":
+        mViewManager.setGestureSettings(view, new DynamicFromObject(value));
+        break;
       case "scaleBarViewMargins":
         mViewManager.setScaleBarViewMargins(view, new DynamicFromObject(value));
         break;

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerInterface.java

@@ -32,6 +32,7 @@ public interface RNMBXMapViewManagerInterface<T extends View> {
   void setProjection(T view, Dynamic value);
   void setLocalizeLabels(T view, Dynamic value);
   void setStyleURL(T view, Dynamic value);
+  void setGestureSettings(T view, Dynamic value);
   void setScaleBarViewMargins(T view, Dynamic value);
   void setAttributionViewMargins(T view, Dynamic value);
   void setAttributionViewPosition(T view, Dynamic value);

package/ios/RNMBX/CustomHttpHeaders.swift

@@ -1,6 +1,17 @@
 import MapboxMaps
 
 class CustomHttpHeaders : HttpServiceInterceptorInterface {
+  #if RNMBX_11
+  func onRequest(for request: HttpRequest, continuation: @escaping HttpServiceInterceptorRequestContinuation) {
+    let request = onRequest(for: request)
+    continuation(HttpRequestOrResponse.fromHttpRequest(request))
+  }
+
+  func onResponse(for response: HttpResponse, continuation: @escaping HttpServiceInterceptorResponseContinuation) {
+    continuation(response)
+  }
+  #endif
+
   static var shared : CustomHttpHeaders = {
     let headers = CustomHttpHeaders()
     headers.install()

package/ios/RNMBX/RNMBXMapView.swift

@@ -255,7 +255,9 @@ open class RNMBXMapView : MapView {
   @objc public func setReactProjection(_ value: String?) {
     if let value = value {
       let projection = StyleProjection(name: value == "globe" ? .globe : .mercator)
-      try! self.mapboxMap.style.setProjection(projection)
+      logged("RNMBXMapView.setReactProjection") {
+        try self.mapboxMap.style.setProjection(projection)
+      }
     }
   }
 
@@ -272,6 +274,59 @@ open class RNMBXMapView : MapView {
     }
   }
   
+  @objc public func setReactGestureSettings(_ value: NSDictionary?) {
+    if let value = value, let gestures = self.mapView.gestures {
+      var options = gestures.options
+      if let doubleTapToZoomInEnabled = value["doubleTapToZoomInEnabled"] as? NSNumber {
+        options.doubleTapToZoomInEnabled = doubleTapToZoomInEnabled.boolValue
+      }
+      if let doubleTouchToZoomOutEnabled = value["doubleTouchToZoomOutEnabled"] as? NSNumber {
+        options.doubleTouchToZoomOutEnabled = doubleTouchToZoomOutEnabled.boolValue
+      }
+      if let pinchScrollEnabled = value["pinchPanEnabled"] as? NSNumber {
+        options.pinchPanEnabled = pinchScrollEnabled.boolValue
+      }
+      if let pinchZoomEnabled = value["pinchZoomEnabled"] as? NSNumber {
+        options.pinchZoomEnabled = pinchZoomEnabled.boolValue
+      }
+      /* android only
+      if let pinchZoomDecelerationEnabled = value["pinchZoomDecelerationEnabled"] as? NSNumber {
+        options.pinchZoomDecelerationEnabled = pinchZoomDecelerationEnabled.boolValue
+      }
+      */
+      if let pitchEnabled = value["pitchEnabled"] as? NSNumber {
+        options.pitchEnabled = pitchEnabled.boolValue
+      }
+      if let quickZoomEnabled = value["quickZoomEnabled"] as? NSNumber {
+        options.quickZoomEnabled = quickZoomEnabled.boolValue
+      }
+      if let rotateEnabled = value["rotateEnabled"] as? NSNumber {
+        options.rotateEnabled = rotateEnabled.boolValue
+      }
+      /* android only
+      if let rotateDecelerationEnabled = value["rotateDecelerationEnabled"] as? NSNumber {
+        options.rotateDecelerationEnabled = rotateDecelerationEnabled.boolValue
+      }*/
+      if let panEnabled = value["panEnabled"] as? NSNumber {
+        options.panEnabled = panEnabled.boolValue
+      }
+      if let panDecelerationFactor = value["panDecelerationFactor"] as? NSNumber {
+        options.panDecelerationFactor = panDecelerationFactor.CGFloat
+      }
+      #if RNMBX_11
+      if let simultaneousRotateAndPinchZoomEnabled = value["simultaneousRotateAndPinchZoomEnabled"] as? NSNumber {
+        options.simultaneousRotateAndPinchZoomEnabled = simultaneousRotateAndPinchZoomEnabled.boolValue
+      }
+      #endif
+      /* android only
+      if let zoomAnimationAmount = value["zoomAnimationAmount"] as? NSNumber {
+        options.zoomAnimationAmount = zoomAnimationAmount.CGFloat
+      }*/
+      if options != gestures.options {
+        gestures.options = options
+      }
+    }
+  }
   
   @objc public func setReactAttributionEnabled(_ value: Bool) {
     mapView.ornaments.options.attributionButton.visibility = value ? .visible : .hidden

package/ios/RNMBX/RNMBXMapViewManager.m

@@ -29,6 +29,8 @@ RCT_REMAP_VIEW_PROPERTY(pitchEnabled, reactPitchEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(projection, reactProjection, NSString)
 RCT_REMAP_VIEW_PROPERTY(localizeLabels, reactLocalizeLabels, NSDictionary)
 
+RCT_REMAP_VIEW_PROPERTY(gestureSettings, reactGestureSettings, NSDictionary)
+
 RCT_REMAP_VIEW_PROPERTY(styleURL, reactStyleURL, NSString)
 RCT_REMAP_VIEW_PROPERTY(onPress, reactOnPress, RCTBubblingEventBlock)
 RCT_REMAP_VIEW_PROPERTY(onLongPress, reactOnLongPress, RCTBubblingEventBlock)

package/ios/install.md

@@ -90,7 +90,7 @@ Add the following to your Podfile:
 
 ```ruby
 $RNMapboxMapsUseV11 = true # use 11 version
-$RNMapboxMapsVersion = '= 11.0.0-beta.3'
+$RNMapboxMapsVersion = '= 11.0.0-beta.5'
 ```
 
 

package/lib/commonjs/Mapbox.js

@@ -361,8 +361,8 @@ var _Logger = _interopRequireDefault(require("./utils/Logger"));
 var _requestAndroidLocationPermissions = require("./requestAndroidLocationPermissions");
 var _getAnnotationsLayerID = require("./utils/getAnnotationsLayerID");
 var _deprecation = require("./utils/deprecation");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /** @deprecated This will be removed in a future release. Use `AnimatedPoint` instead. */
 const AnimatedMapPoint = exports.AnimatedMapPoint = (0, _deprecation.deprecatedClass)(_classes.AnimatedPoint, 'AnimatedMapPoint is deprecated please use AnimatedPoint');