@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.4

package/README.md

@@ -57,16 +57,10 @@ _A community-supported, open-source React Native library for building maps with
 ---
 
 ### Supported Implementations 
-At the moment, the following implementations are supported: 
+At the moment we support Mapbox (v10) and Mapbox (v11) beta.
+We default to Mapbox (v10).
 
-
-|*RNMapboxMapsImpl*|*Notes*|
-|----------------|-----|
-|mapbox|New [Mapbox v10](https://www.mapbox.com/mobile-maps-sdk) implementation - recommended|
-|maplibre|[MapLibre](https://github.com/maplibre/maplibre-gl-native) opensource fork of Mapbox SDKs - will be dropped in next version|
-|mapbox-gl|Legacy mapbox implementation [iOS](https://docs.mapbox.com/android/legacy/maps/guides/) [Android](https://docs.mapbox.com/ios/legacy/maps/guides/) - legacy, will be dropped in next version|
-
-_See [iOS](ios/install.md) & [Android](android/install.md) setup guide for more details on setting `RNMapboxMapsImpl`_
+_See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using v11 beta_
 
 
 

package/android/build.gradle

@@ -1,4 +1,4 @@
-def defaultMapboxMapsImpl = "maplibre"
+def defaultMapboxMapsImpl = "mabpox"
 def defaultMapboxMapsVersion = "10.16.0"
 
 def safeExtGet(prop, fallback) {
@@ -44,25 +44,24 @@ if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
 
 android {
     if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
-        logger.warn('@rnmapbox/maps: Maplibre implementation is DEPRECATED and will be removed, set RNMapboxMapsImpl to mapbox- see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android')
-        sourceSets {
-            main {
-                java.srcDirs = ['src/main/java-mapboxgl/common','src/main/java-mapboxgl/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)
+        throw new GradleException(msg)
     }
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox-gl") {
-        logger.warn('@rnmapbox/maps: Maplibre implementation is DEPRECATED and will be removed, set RNMapboxMapsImpl to mapbox  - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android')
-        sourceSets {
-            main {
-                java.srcDirs = ['src/main/java-mapboxgl/common','src/main/java-mapboxgl/mapbox']
-            }
-        }
+        msg = '@rnmapbox/maps: MapboxGL implementation is DEPRECATED has been removed, set RNMapboxMapsImpl to mapbox  - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
+        logger.error(msg)
+        throw new GradleException(msg)
     }
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
         sourceSets {
             main {
                 java.srcDirs = ['src/main/java-v10']
+                if (safeExtGet("RNMapboxMapsUseV11", false)) {
+                    java.srcDirs += 'src/main/mapbox-v11-compat/v11'
+                } else {
+                    java.srcDirs += 'src/main/mapbox-v11-compat/v10'
+                }
             }
         }
 
@@ -74,7 +73,7 @@ android {
         }
     }
     else {
-        msg = "RNMapboxMapsImpl should be one of: mapbox, mapbox-gl, maplibre got: ${safeExtGet("mapboxV10", defaultMapboxMapsImpl)}"
+        msg = "RNMapboxMapsImpl should be one of: mapbox, mapbox-gl, maplibre got: ${safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl)}"
         logger.error(msg)
         throw new GradleException(msg)
     }
@@ -136,30 +135,14 @@ dependencies {
 
     // Mapbox SDK
     customizableDependencies('RNMapboxMapsLibs') {
-        if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
-            implementation ("org.maplibre.gl:android-sdk:9.5.2")
-            implementation ("org.maplibre.gl:android-sdk-turf:5.9.0")
-
-            implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
-        }
-        else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox-gl") {
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:6.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.8.0'
-
-                // plugins
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.6.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v9:0.4.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
-        }
-        else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
+        if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
             implementation "com.mapbox.maps:android:${safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)}"
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.11.0'
             implementation 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
+        } else {
+            msg = '@rnmapbox/maps: RNMapboxMapsImpl has invalid value - only mapbox supported - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
+            logger.error(msg)
+            throw new GradleException(msg) 
         }
     }
 

package/android/install.md

@@ -1,30 +1,8 @@
 # Android Installation
 
-## We're supporting 3 implementations at the moment:
+## Supported mapbox libraries
 
-  - mapbox: v10 latest mapbox implementation - *recommended*, not opensource requires access for download
-  - maplibre: *DEFAULT* open source fork of older open source mapbox libraries with many improvements, will be removed in next version
-  - mapbox-gl: classic mapbox libraries - should work but will be dropped, recent versions are not open source and requires access for download, will be removed in next version
-
-## Mapbox Maps SDK v10
-
-Add `RNMapboxMapsImpl = "mapbox"` to your gradle file - see bellow for details.
-
-### Setting RNMapboxMapsImpl to v10
-
-*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.
-
-Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
-
-
-```groovy
-buildscript {
-    ext {
-        // ...
-        RNMapboxMapsImpl = "mapbox" // required for v10
-    }
-}
-```
+We're only supporting mabpox 10.0 releases. 11.0 beta has experimental support.
 
 ### Adding mapbox maven repo
 
@@ -67,124 +45,41 @@ Set `RNMapboxMapsLibs` in `android/build.gradle > buildscript > ext` section
 ```groovy
 buildscript {
     ext {
-        // ...
-        RNMapboxMapsImpl = "mapbox"
-
-        RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation 'com.mapbox.maps:android:10.6.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
-        }
+        RNMapboxMapsVersion = '10.6.0'
     }
 }
 ```
 
-
-
-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).
-
-## Using MapLibre
-
-[MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL.
-This is the default, and should work without any changes in gradle files.
-
-### Custom versions
-
-Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
+you can also customize all the libraries, should it be neccesary
 
 ```groovy
 buildscript {
     ext {
         // ...
-        RNMapboxMapsImpl = "maplibre" // optional - as this is the default
-
         RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation ("org.maplibre.gl:android-sdk:9.5.2")
-            implementation ("org.maplibre.gl:android-sdk-turf:5.9.0")
-
-            implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
+            implementation 'com.mapbox.maps:android:10.6.0'
+            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
         }
     }
 }
 ```
 
-Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/main/example/android/build.gradle) for inspiration!
-
-
-## Mapbox Maps GL Native SDK (pre v10)
-
-
-### Custom versions
-
-We've set up default Mapbox dependencies for you.  
-Feel free to check em out [here](https://github.com/rnmapbox/maps/blob/eca4858744cab134b06ae455bcdacc63233318a5/android/rctmgl/build.gradle#L55-L76)
-
-However, it is also possible to set a custom version of the [Mapbox SDK](https://github.com/mapbox/mapbox-gl-native-android)  
-Which will overwrite our defaults.
-
-Add something like the following to your `android/build.gradle > buildscript > ext` section:
+### Using v11
 
 ```groovy
-// android/build.gradle
-
 buildscript {
-    // ... stuff
     ext {
-        RNMapboxMapsImpl = "mapbox-gl"
-
-        // ... stuff
-        RNMapboxMapsLibs = {
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.7.1'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.7.0'
-
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.14.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v9:0.4.0'
-        }
-    // ... more stuff?
+        RNMapboxMapsUseV11 = true
+        RNMapboxMapsVersion = '10.6.0'
     }
 }
 ```
 
-NOTICE, If you are using newer versions of the SDK, you will need to authorize your download of the Maps SDK via a secret access token with the `DOWNLOADS:READ` scope.  
-This [guide](https://docs.mapbox.com/android/maps/guides/install/#configure-credentials) explains how to `Configure credentials` and `Configure your secret token`.
 
-Then under section `allprojects/repositories` add your data:
 
-```groovy
-// android/build.gradle
+# Trhoubleshooting
 
-allprojects {
-    repositories {
-        // ...other repos
-        maven {
-            url 'https://api.mapbox.com/downloads/v2/releases/maven'
-            authentication {
-                basic(BasicAuthentication)
-            }
-            credentials {
-                // Do not change the username below.
-                // This should always be `mapbox` (not your username).
-                username = 'mapbox'
-                // Use the secret token you stored in gradle.properties as the password
-                password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-            }
-        }
-        // ...even more repos?
-    }
-}
-```
-
-Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/main/example/android/build.gradle) for inspiration!
-
-<br>
-
----
-
-<br>
+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).
 
 
 ### Workaround for 2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs

package/android/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotation.kt

@@ -25,6 +25,8 @@ import com.mapbox.rctmgl.utils.BitmapUtils
 import com.mapbox.rctmgl.utils.LatLng
 import java.util.*
 
+import com.mapbox.rctmgl.v11compat.annotation.*;
+
 class RCTMGLPointAnnotation(private val mContext: Context, private val mManager: RCTMGLPointAnnotationManager) : AbstractMapFeature(mContext), View.OnLayoutChangeListener {
     var marker: PointAnnotation? = null
         private set
@@ -133,8 +135,8 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
 
     val latLng: LatLng?
         get() = mCoordinate?.let { GeoJSONUtils.toLatLng(it) }
-    val mapboxID: Long
-        get() = if (marker == null) -1 else marker!!.id
+    val mapboxID: AnnotationID
+        get() = if (marker == null) INVALID_ANNOTATION_ID else marker!!.id
 
     fun setCoordinate(point: Point) {
         mCoordinate = point

package/android/src/main/java-v10/com/mapbox/rctmgl/components/camera/CameraUpdateItem.kt

@@ -22,6 +22,8 @@ import com.mapbox.maps.plugin.animation.MapAnimationOptions.Companion.mapAnimati
 import com.mapbox.maps.plugin.animation.easeTo
 import com.mapbox.maps.plugin.animation.flyTo
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
+import com.mapbox.rctmgl.v11compat.mapboxmap.easeToV11
+import com.mapbox.rctmgl.v11compat.mapboxmap.flyToV11
 import java.lang.ref.WeakReference
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.RunnableFuture
@@ -78,16 +80,14 @@ class CameraUpdateItem(
             isCameraActionCancelled = true
             return
         }
-        val animationOptions = MapAnimationOptions.Builder().apply {
-            animatorListener(callback)
-        }
+        val animationOptions = MapAnimationOptions.Builder();
 
         // animateCamera / easeCamera only allows positive duration
         if (duration == 0 || mCameraMode == CameraMode.NONE) {
-            map.flyTo(mCameraUpdate, animationOptions.apply {
+            map.flyToV11(mCameraUpdate, animationOptions.apply {
                 duration(0)
-                animatorListener(callback)
-            }.build())
+            },
+            callback)
         }
 
         // On iOS a duration of -1 means default or dynamic duration (based on flight-path length)
@@ -96,16 +96,17 @@ class CameraUpdateItem(
             animationOptions.apply { duration(duration.toLong()) }
         }
         if (mCameraMode == CameraMode.FLIGHT) {
-            map.flyTo(mCameraUpdate, animationOptions.build())
+            map.flyToV11(mCameraUpdate, animationOptions, callback)
         } else if (mCameraMode == CameraMode.LINEAR) {
-            map.easeTo(
-                mCameraUpdate,
-                animationOptions.apply { interpolator(LinearInterpolator()) }.build()
+            map.easeToV11(
+                mCameraUpdate,animationOptions.apply { interpolator(LinearInterpolator()) },
+                callback
             )
         } else if (mCameraMode == CameraMode.EASE) {
-            map.easeTo(
+            map.easeToV11(
                 mCameraUpdate,
-                animationOptions.apply{ interpolator(AccelerateDecelerateInterpolator()) }.build()
+                animationOptions.apply{ interpolator(AccelerateDecelerateInterpolator()) },
+                callback
             )
         }
         null

package/android/src/main/java-v10/com/mapbox/rctmgl/components/camera/RCTMGLCamera.kt

@@ -16,9 +16,7 @@ import com.mapbox.maps.plugin.locationcomponent.OnIndicatorPositionChangedListen
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.mapbox.maps.*
-import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.maps.plugin.locationcomponent.location
-import com.mapbox.maps.plugin.locationcomponent.location2
 import com.mapbox.maps.plugin.viewport.ViewportStatus
 import com.mapbox.maps.plugin.viewport.ViewportStatusObserver
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateBearing
@@ -36,6 +34,7 @@ import com.mapbox.rctmgl.location.*
 import com.mapbox.rctmgl.utils.Logger
 import com.mapbox.rctmgl.utils.writableMapOf
 
+import com.mapbox.rctmgl.v11compat.location.*;
 
 class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCameraManager) :
     AbstractMapFeature(

package/android/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImage.kt

@@ -45,9 +45,11 @@ class RCTMGLImage(private val mContext: ReactApplicationContext, private val mMa
             return
         }
         val bitmap = BitmapUtils.viewToBitmap(v, left, top, right, bottom)
-        nativeImageUpdater?.let {
-            it.updateImage(name, bitmap, sdf, stretchX, stretchY, content, scale)
-            mBitmap = null;
+        bitmap?.let { bitmap ->
+            nativeImageUpdater?.let {
+                it.updateImage(name, bitmap, sdf, stretchX, stretchY, content, scale)
+                mBitmap = null;
+            }
         }
     }
 

package/android/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImages.kt

@@ -27,13 +27,15 @@ import java.util.ArrayList
 import java.util.HashMap
 import java.util.HashSet
 
+import com.mapbox.rctmgl.v11compat.image.*;
+
 fun Style.addBitmapImage(imageId: String, bitmap: Bitmap, sdf: Boolean = false, stretchX: List<ImageStretches> = listOf(), stretchY: List<ImageStretches> = listOf(), content: ImageContent? = null, scale: Double = 1.0) : Expected<String, None> {
     val byteBuffer = ByteBuffer.allocate(bitmap.byteCount)
     bitmap.copyPixelsToBuffer(byteBuffer)
     return this.addStyleImage(
         imageId,
         (1.0/((160.0/bitmap.density)) * scale).toFloat() ,
-        Image(bitmap.width, bitmap.height, byteBuffer.array()),
+        Image(bitmap.width, bitmap.height, byteBuffer.array().toImageData()),
         sdf,
         stretchX,
         stretchY,

package/android/src/main/java-v10/com/mapbox/rctmgl/components/location/LocationComponentManager.kt

@@ -9,11 +9,13 @@ import androidx.lifecycle.Lifecycle
 import com.mapbox.maps.plugin.locationcomponent.location
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.maps.plugin.LocationPuck2D
-import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.maps.plugin.lifecycle.lifecycle
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.location.LocationManager
 
+import com.mapbox.rctmgl.v11compat.location.PuckBearingSource;
+import com.mapbox.rctmgl.v11compat.image.*;
+
 /**
  * The LocationComponent on android implements display of user's current location.
  * But viewport seems to be tied to it in the sense that if location is not enabled then it's viewport user tracking is not working.
@@ -35,7 +37,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
         val showUserLocation: Boolean,
         val followUserLocation: Boolean,
         val tintColor: Int?, // tint of location puck
-        var bearingImage: Drawable?, // bearing image (background)
+        var bearingImage: ImageHolder?, // bearing image (background)
         var puckBearingSource: PuckBearingSource? // bearing source
     ) {
         val enabled: Boolean
@@ -79,7 +81,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
             if (fullUpdate || (newState.hidden != oldState.hidden) || (newState.tintColor != oldState.tintColor) || (newState.bearingImage != oldState.bearingImage)) {
                 if (newState.hidden) {
                     var emptyLocationPuck = LocationPuck2D()
-                    val empty = AppCompatResources.getDrawable(mContext, R.drawable.empty)
+                    val empty = AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.empty)
                     emptyLocationPuck.bearingImage = empty
                     emptyLocationPuck.shadowImage = empty
                     emptyLocationPuck.topImage = empty
@@ -90,18 +92,18 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
                     val mapboxBlueColor = Color.parseColor("#4A90E2")
                     val tintColor = newState.tintColor
                     val defaultLocationPuck = LocationPuck2D()
-                    var topImage = AppCompatResources.getDrawable(mContext, R.drawable.mapbox_user_icon)
+                    var topImage = AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.mapbox_user_icon)
                     if (tintColor != null) {
-                        val drawable = topImage as VectorDrawable?
+                        val drawable = AppCompatResources.getDrawable(mContext, R.drawable.mapbox_user_icon) as VectorDrawable?
                         drawable!!.setTint(tintColor)
-                        topImage = drawable
+                        topImage = drawable.toBitmapImageHolder()
                     }
                     defaultLocationPuck.topImage = topImage
-                    val defaultBearingImage = AppCompatResources.getDrawable(
+                    val defaultBearingImage = AppCompatResourcesV11.getDrawableImageHolder(
                         mContext, R.drawable.mapbox_user_stroke_icon
-                    );
+                    )
                     defaultLocationPuck.bearingImage = newState.bearingImage ?: defaultBearingImage
-                    val shadowImage = AppCompatResources.getDrawable(
+                    val shadowImage = AppCompatResourcesV11.getDrawableImageHolder(
                         mContext, R.drawable.mapbox_user_icon_shadow
                     )
                     defaultLocationPuck.shadowImage = shadowImage

package/android/src/main/java-v10/com/mapbox/rctmgl/components/location/RCTMGLNativeUserLocation.kt

@@ -7,12 +7,14 @@ import com.mapbox.rctmgl.components.mapview.OnMapReadyCallback
 import com.mapbox.maps.MapboxMap
 import com.mapbox.android.core.permissions.PermissionsManager
 import com.mapbox.maps.Style
-import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.rctmgl.R
 import com.mapbox.rctmgl.components.AbstractMapFeature
 import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 
+import com.mapbox.rctmgl.v11compat.location.PuckBearingSource
+import com.mapbox.rctmgl.v11compat.image.AppCompatResourcesV11
+
 enum class RenderMode {
     GPS, COMPASS, NORMAL
 }
@@ -69,10 +71,10 @@ class RCTMGLNativeUserLocation(context: Context) : AbstractMapFeature(context),
                 RenderMode.NORMAL ->
                     it.update { it.copy(bearingImage =  null, puckBearingSource = null)}
                 RenderMode.GPS -> it.update {
-                    it.copy(bearingImage =  AppCompatResources.getDrawable(
+                    it.copy(bearingImage =  AppCompatResourcesV11.getDrawableImageHolder(
                         mContext, R.drawable.mapbox_user_bearing_icon
                     ), puckBearingSource = PuckBearingSource.COURSE) }
-                RenderMode.COMPASS -> it.update{ it.copy(bearingImage=  AppCompatResources.getDrawable(
+                RenderMode.COMPASS -> it.update{ it.copy(bearingImage=  AppCompatResourcesV11.getDrawableImageHolder(
                     mContext, R.drawable.mapbox_user_puck_icon
                 ), puckBearingSource = PuckBearingSource.HEADING) }
             }

package/android/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapView.kt

@@ -24,7 +24,6 @@ import com.mapbox.maps.*
 import com.mapbox.maps.extension.localization.localizeLabels
 import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData
 import com.mapbox.maps.extension.observable.eventdata.RenderFrameFinishedEventData
-import com.mapbox.maps.extension.observable.getMapLoadingErrorEventData
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.layers.Layer
 import com.mapbox.maps.extension.style.layers.generated.*
@@ -72,10 +71,18 @@ import com.mapbox.rctmgl.events.MapClickEvent
 import com.mapbox.rctmgl.events.constants.EventTypes
 import com.mapbox.rctmgl.utils.*
 import com.mapbox.rctmgl.utils.extensions.toReadableArray
+import com.mapbox.rctmgl.v11compat.annotation.AnnotationID
+import com.mapbox.rctmgl.v11compat.annotation.INVALID_ANNOTATION_ID
 import org.json.JSONException
 import org.json.JSONObject
 import java.util.*
 
+import com.mapbox.maps.MapboxMap.*;
+
+import com.mapbox.rctmgl.v11compat.event.*
+import com.mapbox.rctmgl.v11compat.feature.*
+import com.mapbox.rctmgl.v11compat.mapboxmap.*
+import com.mapbox.rctmgl.v11compat.ornamentsettings.*
 
 data class OrnamentSettings(
     var enabled : Boolean? = false,
@@ -161,7 +168,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     private val mSources: MutableMap<String, RCTSource<*>>
     private val mImages: MutableList<RCTMGLImages>
     private var mPointAnnotationManager: PointAnnotationManager? = null
-    private var mActiveMarkerID: Long = -1
+    private var mActiveMarkerID: AnnotationID = INVALID_ANNOTATION_ID
     private var mProjection: ProjectionName = ProjectionName.MERCATOR
     private var mLocaleString: String? = null
     private var mLocaleLayerIds: List<String>? = null
@@ -458,7 +465,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
         } else if (feature is RCTMGLPointAnnotation) {
             val annotation = feature
             if (annotation.mapboxID == mActiveMarkerID) {
-                mActiveMarkerID = -1
+                mActiveMarkerID = INVALID_ANNOTATION_ID
             }
             mPointAnnotations.remove(annotation.iD)
         } else if (feature is RCTMGLImages) {
@@ -743,7 +750,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     fun deselectAnnotation(annotation: RCTMGLPointAnnotation) {
-        mActiveMarkerID = -1
+        mActiveMarkerID = INVALID_ANNOTATION_ID
         annotation.onDeselect()
     }
 
@@ -1022,13 +1029,15 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
             if (snapshot == null) {
                 response.error("snapshot failed")
             } else {
-                val uri: String = if (writeToDisk) BitmapUtils.createTempFile(
+                val uri: String? = if (writeToDisk) BitmapUtils.createTempFile(
                     mContext,
                     snapshot
                 ) else BitmapUtils.createBase64(snapshot)
 
                 response.success {
-                    it.putString("uri", uri)
+                    uri?.let { uri ->
+                        it.putString("uri", uri)
+                    }
                 }
             }
         }
@@ -1305,7 +1314,7 @@ open class RCTMGLMapView(private val mContext: Context, var mManager: RCTMGLMapV
     }
 
     // region Attribution
-    var mAttributionSettings = OrnamentSettings(enabled = AttributionSettings().enabled)
+    var mAttributionSettings = OrnamentSettings(enabled = getAttributionSettings().enabled)
 
     fun setReactAttributionEnabled(attributionEnabled: Boolean?) {
         mAttributionSettings.enabled = attributionEnabled
@@ -1479,87 +1488,4 @@ fun OrnamentSettings.setPosAndMargins(posAndMargins: ReadableMap?) {
     this.margins = margins
 }
 
-interface GenericOrnamentSettings {
-    fun setHMargins(left: Float?, right: Float?)
-    fun setVMargins(top: Float?, bottom: Float?)
-    var enabled: Boolean
-    var position: Int
-}
-
-fun ScaleBarSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private val settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) { settings.position = value }
-}
-
-fun CompassSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}
-
-fun LogoSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}
 
-fun AttributionSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings;
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}