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

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/RCTMGLStyleValue.kt

@@ -9,6 +9,7 @@ import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.light.LightPosition
 import com.mapbox.rctmgl.utils.ExpressionParser
+import com.mapbox.rctmgl.utils.Logger
 import java.util.ArrayList
 
 class RCTMGLStyleValue(config: ReadableMap) {
@@ -97,12 +98,17 @@ class RCTMGLStyleValue(config: ReadableMap) {
 
         return stringArr;
     } */
-    fun getStringArray(key: String?): List<String?> {
+    fun getStringArray(key: String?): List<String> {
         val arr = getArray(key)
-        val result = ArrayList<String?>(arr!!.size())
+        val result = ArrayList<String>(arr!!.size())
         for (i in 0 until arr.size()) {
             val item = arr.getMap(i)
-            result.add(item.getString("value"))
+            val value = item.getString("value")
+            if (value != null) {
+                result.add(value)
+            } else {
+                Logger.e("RCTMGLStyleValue", "getStringArray: null value for item: $i")
+            }
         }
         return result
     }

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/atmosphere/RCTMGLAtmosphere.kt

@@ -52,11 +52,15 @@ class RCTMGLAtmosphere(context: Context?) : AbstractSourceConsumer(context) {
     }
 
     fun addStyles() {
-        RCTMGLStyleFactory.setAtmosphereLayerStyle(
-            mAtmosphere, RCTMGLStyle(
-                context, mReactStyle!!,
-                mMap!!
+        mAtmosphere?.also {
+            RCTMGLStyleFactory.setAtmosphereLayerStyle(
+                it, RCTMGLStyle(
+                    context, mReactStyle!!,
+                    mMap!!
+                )
             )
-        )
+        } ?: run {
+            Logger.e("RCTMGLAtmosphere", "mAtmosphere is null")
+        }
     }
 }

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLBackgroundLayer.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.mapbox.maps.extension.style.layers.generated.BackgroundLayer
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLBackgroundLayer(context: Context?) : RCTLayer<BackgroundLayer?>(
     context!!
@@ -13,9 +14,13 @@ class RCTMGLBackgroundLayer(context: Context?) : RCTLayer<BackgroundLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setBackgroundLayerStyle(
-            mLayer,
-            RCTMGLStyle(context, mReactStyle, mMap!!)
-        )
+        mLayer?.also {
+            RCTMGLStyleFactory.setBackgroundLayerStyle(
+                it,
+                RCTMGLStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RCTMGLBackgroundLayer", "mLayer is null")
+        }
     }
 }

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLCircleLayer.kt

@@ -6,6 +6,7 @@ import com.mapbox.maps.extension.style.layers.generated.CircleLayer
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLCircleLayer(context: Context?) : RCTLayer<CircleLayer?>(
     context!!
@@ -28,7 +29,12 @@ class RCTMGLCircleLayer(context: Context?) : RCTLayer<CircleLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setCircleLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RCTMGLStyleFactory.setCircleLayerStyle(it, RCTMGLStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RCTMGLCircleLayer", "mLayer is null")
+        }
+
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLFillExtrusionLayer.kt

@@ -6,6 +6,7 @@ import com.mapbox.maps.extension.style.layers.generated.FillExtrusionLayer
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLFillExtrusionLayer(context: Context?) : RCTLayer<FillExtrusionLayer?>(
     context!!
@@ -28,10 +29,14 @@ class RCTMGLFillExtrusionLayer(context: Context?) : RCTLayer<FillExtrusionLayer?
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setFillExtrusionLayerStyle(
-            mLayer,
-            RCTMGLStyle(context, mReactStyle, mMap!!)
-        )
+        mLayer?.also {
+            RCTMGLStyleFactory.setFillExtrusionLayerStyle(
+                it,
+                RCTMGLStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RCTMGLFillExtrusionLayer", "Layer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLFillLayer.kt

@@ -6,6 +6,7 @@ import com.mapbox.maps.extension.style.layers.generated.FillLayer
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLFillLayer(context: Context?) : RCTLayer<FillLayer?>(
     context!!
@@ -28,7 +29,12 @@ class RCTMGLFillLayer(context: Context?) : RCTLayer<FillLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setFillLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RCTMGLStyleFactory.setFillLayerStyle(it, RCTMGLStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RCTMGLStyleFactory", "mLayer is null")
+        }
+
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLHeatmapLayer.kt

@@ -6,6 +6,7 @@ import com.mapbox.maps.extension.style.layers.generated.HeatmapLayer
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLHeatmapLayer(context: Context?) : RCTLayer<HeatmapLayer?>(
     context!!
@@ -28,7 +29,14 @@ class RCTMGLHeatmapLayer(context: Context?) : RCTLayer<HeatmapLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setHeatmapLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RCTMGLStyleFactory.setHeatmapLayerStyle(
+                it,
+                RCTMGLStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RCTMGLHeatmapLayer", "mLayer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLLineLayer.kt

@@ -6,6 +6,7 @@ import com.mapbox.maps.extension.style.layers.generated.LineLayer
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLLineLayer(context: Context?) : RCTLayer<LineLayer?>(
     context!!
@@ -28,7 +29,11 @@ class RCTMGLLineLayer(context: Context?) : RCTLayer<LineLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setLineLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RCTMGLStyleFactory.setLineLayerStyle(it, RCTMGLStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RCTMGLLineLayer", "mLayer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLRasterLayer.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.mapbox.maps.extension.style.layers.generated.RasterLayer
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLRasterLayer(context: Context?) : RCTLayer<RasterLayer?>(
     context!!
@@ -13,6 +14,10 @@ class RCTMGLRasterLayer(context: Context?) : RCTLayer<RasterLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setRasterLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RCTMGLStyleFactory.setRasterLayerStyle(it, RCTMGLStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RCTMGLRasterLayer", "mLayer is null")
+        }
     }
 }

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLSkyLayer.kt

@@ -8,6 +8,7 @@ import com.mapbox.rctmgl.utils.Logger.e
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLSkyLayer(context: Context?) : RCTLayer<SkyLayer?>(
     context!!
@@ -26,7 +27,14 @@ class RCTMGLSkyLayer(context: Context?) : RCTLayer<SkyLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setSkyLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle!!, mMap!!))
+        mLayer?.also {
+            RCTMGLStyleFactory.setSkyLayerStyle(
+                it,
+                RCTMGLStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RCTMGLSkyLayer", "mLayer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTMGLSymbolLayer.kt

@@ -6,6 +6,7 @@ import com.mapbox.maps.extension.style.layers.generated.SymbolLayer
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
+import com.mapbox.rctmgl.utils.Logger
 
 class RCTMGLSymbolLayer(context: Context?) : RCTLayer<SymbolLayer?>(
     context!!
@@ -28,7 +29,14 @@ class RCTMGLSymbolLayer(context: Context?) : RCTLayer<SymbolLayer?>(
     }
 
     override fun addStyles() {
-        RCTMGLStyleFactory.setSymbolLayerStyle(mLayer, RCTMGLStyle(context, mReactStyle, mMap!!))
+        mLayer?.also {
+            RCTMGLStyleFactory.setSymbolLayerStyle(
+                it,
+                RCTMGLStyle(context, mReactStyle, mMap!!)
+            )
+        } ?: run {
+            Logger.e("RCTMGLSymbolLayer", "mLayer is null")
+        }
     }
 
     fun setSourceLayerID(sourceLayerID: String?) {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/light/RCTMGLLight.kt

@@ -1,17 +1,17 @@
 package com.mapbox.rctmgl.components.styles.light
 
 import android.content.Context
-import com.mapbox.maps.extension.style.light.generated.setLight
 import com.mapbox.rctmgl.components.AbstractMapFeature
 import com.mapbox.maps.MapboxMap
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.Style
-import com.mapbox.maps.extension.style.light.generated.Light
 import com.mapbox.rctmgl.components.RemovalReason
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
 import com.mapbox.rctmgl.components.styles.RCTMGLStyle
 
+import com.mapbox.rctmgl.v11compat.light.*
+
 class RCTMGLLight(context: Context?) : AbstractMapFeature(context) {
     private var mMap: MapboxMap? = null
     private var mReactStyle: ReadableMap? = null
@@ -38,7 +38,7 @@ class RCTMGLLight(context: Context?) : AbstractMapFeature(context) {
 
     private fun setLight() {
         if (style != null) {
-            val light = Light()
+            val light = createLight()
             setLight(light)
         }
     }

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLRasterDemSource.kt

@@ -15,6 +15,8 @@ import com.mapbox.rctmgl.events.FeatureClickEvent
 import com.mapbox.rctmgl.utils.Logger
 import java.util.*
 
+import com.mapbox.rctmgl.v11compat.feature.*
+
 // import com.mapbox.rctmgl.R;
 // import com.mapbox.rctmgl.utils.DownloadMapImageTask;
 class RCTMGLRasterDemSource(context: Context?, private val mManager: RCTMGLRasterDemSourceManager) :

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLShapeSource.kt

@@ -20,6 +20,8 @@ import java.net.URL
 import java.util.ArrayList
 import java.util.HashMap
 
+import com.mapbox.rctmgl.v11compat.feature.*
+
 class RCTMGLShapeSource(context: Context, private val mManager: RCTMGLShapeSourceManager) :
     RCTSource<GeoJsonSource>(context) {
     private var mURL: URL? = null

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLVectorSource.kt

@@ -14,6 +14,8 @@ import com.mapbox.rctmgl.events.AndroidCallbackEvent
 import com.mapbox.rctmgl.events.FeatureClickEvent
 import java.util.*
 
+import com.mapbox.rctmgl.v11compat.feature.*
+
 class RCTMGLVectorSource(context: Context?, private val mManager: RCTMGLVectorSourceManager) :
     RCTMGLTileSource<VectorSource?>(context) {
     override fun onPress(event: OnPressEvent?) {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/styles/terrain/RCTMGLTerrain.kt

@@ -56,11 +56,13 @@ class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
     }
 
     fun addStyles() {
-        RCTMGLStyleFactory.setTerrainLayerStyle(
-            mTerrain, RCTMGLStyle(
-                context, mReactStyle!!,
-                mMap!!
+        mTerrain?.also {
+            RCTMGLStyleFactory.setTerrainLayerStyle(
+                it,
+                RCTMGLStyle(context, mReactStyle, mMap!!)
             )
-        )
+        } ?: run {
+            Logger.e("RCTMGLTerrainLayer", "mLayer is null")
+        }
     }
 }

package/android/src/main/java-v10/com/mapbox/rctmgl/events/LocationEvent.kt

@@ -1,6 +1,5 @@
 package com.mapbox.rctmgl.events
 
-import android.location.Location
 import com.facebook.react.bridge.Arguments
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 import com.mapbox.rctmgl.events.constants.EventKeys
@@ -9,6 +8,8 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import java.util.*
 
+import com.mapbox.rctmgl.v11compat.location.*
+
 class LocationEvent(private val location: Location, private val mapView: RCTMGLMapView?) : IEvent {
     val uUID: UUID
 
@@ -45,15 +46,22 @@ class LocationEvent(private val location: Location, private val mapView: RCTMGLM
         val coords: WritableMap = WritableNativeMap()
         coords.putDouble("longitude", location.longitude)
         coords.putDouble("latitude", location.latitude)
-        coords.putDouble("altitude", location.altitude)
+        location.altitude?.let {
+            coords.putDouble("altitude", it)
+        }
         coords.putDouble("accuracy", location.accuracy.toDouble())
         // A better solution will be to pull the heading from the compass engine,
         // unfortunately the api is not publicly available in the mapbox sdk
-        coords.putDouble("heading", location.bearing.toDouble())
-        coords.putDouble("course", location.bearing.toDouble())
-        coords.putDouble("speed", location.speed.toDouble())
+        location.bearing?.let {
+            coords.putDouble("heading", it.toDouble())
+            coords.putDouble("course", it.toDouble())
+        }
+        location.speed?.let {
+            coords.putDouble("speed", it.toDouble())
+        }
         positionProperties.putMap("coords", coords)
-        positionProperties.putDouble("timestamp", location.time.toDouble())
+
+        positionProperties.putDouble("timestamp", location.timestamp.toDouble())
         return positionProperties
     }
 

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

@@ -2,13 +2,7 @@ package com.mapbox.rctmgl.location
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.location.Location
-import com.mapbox.android.core.location.LocationEngine
-import com.mapbox.android.core.location.LocationEngineCallback
-import com.mapbox.android.core.location.LocationEngineResult
 import com.mapbox.maps.plugin.locationcomponent.LocationConsumer
-import com.mapbox.android.core.location.LocationEngineRequest
-import com.mapbox.android.core.location.LocationEngineProvider
 import com.mapbox.android.core.permissions.PermissionsManager
 import android.os.Looper
 import android.util.Log
@@ -18,6 +12,8 @@ import java.lang.ref.WeakReference
 import java.util.ArrayList
 import kotlin.Exception
 
+import com.mapbox.rctmgl.v11compat.location.*
+
 
 open class SingletonHolder<out T, in A>(creator: (A) -> T) {
     private var creator: ((A) -> T)? = creator
@@ -43,24 +39,18 @@ open class SingletonHolder<out T, in A>(creator: (A) -> T) {
     }
 }
 
-internal class LocationProviderForEngine(var mEngine: LocationEngine?, val context: Context) : LocationProvider, LocationEngineCallback<LocationEngineResult> {
+internal class LocationProviderForEngine(var mEngine: LocationEngine?, val context: Context) : LocationProvider, LocationEngineCallback {
     var mConsumers = ArrayList<LocationConsumer>()
     @SuppressLint("MissingPermission")
     fun beforeAddingFirstConsumer() {
-        val request = LocationEngineRequest.Builder(LocationManager.DEFAULT_INTERVAL_MILLIS
-        )
-            .setFastestInterval(LocationManager.DEFAULT_FASTEST_INTERVAL_MILLIS)
-            .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
-            .build();
-
         if (!PermissionsManager.areLocationPermissionsGranted(context)) {
             return
         }
 
-        mEngine?.requestLocationUpdates(
-          request,
+        mEngine?.requestLocationUpdatesV11(
           this,
-          Looper.getMainLooper()
+          Looper.getMainLooper(),
+            null
         )
 
     }
@@ -85,13 +75,14 @@ internal class LocationProviderForEngine(var mEngine: LocationEngine?, val conte
         for (consumer in mConsumers) {
             val points = Point.fromLngLat(location.longitude, location.latitude)
             consumer.onLocationUpdated(points)
-            val bearings = location.bearing.toDouble()
-            consumer.onBearingUpdated(bearings)
+            location.bearing?.toDouble()?.also {
+                consumer.onBearingUpdated(it)
+            }
         }
     }
 
     // * LocationEngineCallback
-    override fun onSuccess(locationEngineResult: LocationEngineResult?) {
+    override fun onSuccess(locationEngineResult: LocationEngineResult) {
         val location = locationEngineResult?.lastLocation
         location?.let { notifyLocationUpdates(it) }
     }
@@ -99,14 +90,14 @@ internal class LocationProviderForEngine(var mEngine: LocationEngine?, val conte
     override fun onFailure(e: Exception) {}
 }
 
-class LocationManager private constructor(private val context: Context) : LocationEngineCallback<LocationEngineResult> {
+class LocationManager private constructor(private val context: Context) : LocationEngineCallback {
     var engine: LocationEngine? = null
         private set
     private val listeners: MutableList<OnUserLocationChange> = ArrayList()
     private var mMinDisplacement = 0f
     private var isActive = false
     private var lastLocation: Location? = null
-    private var locationEngineRequest: LocationEngineRequest? = null
+    // private var locationEngineRequest: LocationEngineRequest? = null
     private var locationProvider: LocationProvider? = null
     private var nStarts : Int = 0
     private var isPaused : Boolean = false
@@ -164,6 +155,7 @@ class LocationManager private constructor(private val context: Context) : Locati
 
     ////
 
+    /*
     private fun buildEngineRequest() {
         engine = LocationEngineProvider.getBestLocationEngine(context.applicationContext)
         locationEngineRequest = LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS)
@@ -171,7 +163,7 @@ class LocationManager private constructor(private val context: Context) : Locati
                 .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
                 .setDisplacement(mMinDisplacement)
                 .build()
-    }
+    }*/
 
     fun addLocationListener(listener: OnUserLocationChange) {
         if (!listeners.contains(listener)) {
@@ -203,13 +195,12 @@ class LocationManager private constructor(private val context: Context) : Locati
         engine?.removeLocationUpdates(this)
 
         // refresh location engine request with new values
-        buildEngineRequest()
 
         // add new listeners
-        engine?.requestLocationUpdates(
-                locationEngineRequest!!,
-                this,
-                Looper.getMainLooper()
+        engine?.requestLocationUpdatesV11(
+            this,
+            Looper.getMainLooper(),
+            mMinDisplacement
         )
         isActive = true
     }
@@ -236,13 +227,13 @@ class LocationManager private constructor(private val context: Context) : Locati
         } else lastLocation
 
     @SuppressLint("MissingPermission")
-    fun getLastKnownLocation(callback: LocationEngineCallback<LocationEngineResult>) {
+    fun getLastKnownLocation(callback: LocationEngineCallback) {
         if (engine == null) {
             callback.onFailure(Exception("LocationEngine not initialized"))
         }
         try {
-            engine?.getLastLocation(object : LocationEngineCallback<LocationEngineResult> {
-                override fun onSuccess(result: LocationEngineResult?) {
+            engine?.getLastLocation(object : LocationEngineCallback {
+                override fun onSuccess(result: LocationEngineResult) {
                     if (result == null) {
                         callback.onFailure( NullPointerException("LocationEngineResult is null"))
                     } else {
@@ -271,7 +262,7 @@ class LocationManager private constructor(private val context: Context) : Locati
         // FMTODO handle this.
     }
 
-    override fun onSuccess(result: LocationEngineResult?) {
+    override fun onSuccess(result: LocationEngineResult) {
         onLocationChanged(result?.lastLocation)
         val provider = locationProvider
         if (provider != null && provider is LocationProviderForEngine) {
@@ -287,6 +278,6 @@ class LocationManager private constructor(private val context: Context) : Locati
     }
 
     init {
-        buildEngineRequest()
+        // buildEngineRequest()
     }
 }

package/android/src/main/java-v10/com/mapbox/rctmgl/modules/CustomHttpHeaders.kt

@@ -2,7 +2,9 @@ package com.mapbox.rctmgl.modules
 
 import com.mapbox.common.*
 
-object CustomHttpHeaders : HttpServiceInterceptorInterface {
+import com.mapbox.rctmgl.v11compat.httpinterceptor.*
+
+object CustomHttpHeaders : HttpServiceBase() {
     init {}
 
     val map = mutableMapOf<String, String>()
@@ -35,5 +37,11 @@ object CustomHttpHeaders : HttpServiceInterceptorInterface {
     override fun onResponse(response: HttpResponse): HttpResponse {
         return response
     }
+
+    /*
+    override fun onUpload(options: UploadOptions): UploadOptions {
+        return options;
+    }
+    */
 }
 

package/android/src/main/java-v10/com/mapbox/rctmgl/modules/RCTMGLLocationModule.kt

@@ -1,17 +1,16 @@
 package com.mapbox.rctmgl.modules
 
-import android.location.Location
 import com.facebook.react.bridge.*
 import com.mapbox.rctmgl.location.LocationManager
 import com.facebook.react.module.annotations.ReactModule
 import com.mapbox.rctmgl.location.LocationManager.OnUserLocationChange
 import com.mapbox.rctmgl.events.LocationEvent
-import com.mapbox.android.core.location.LocationEngineCallback
-import com.mapbox.android.core.location.LocationEngineResult
 import com.mapbox.rctmgl.events.EventEmitter
 import com.mapbox.rctmgl.location.LocationManager.Companion.getInstance
 import java.lang.Exception
 
+import com.mapbox.rctmgl.v11compat.location.*
+
 data class LocationEventThrottle(var waitBetweenEvents: Double? = null, var lastSentTimestamp: Long? = null) {
 }
 
@@ -104,7 +103,7 @@ class RCTMGLLocationModule(reactContext: ReactApplicationContext) :
     @ReactMethod
     fun getLastKnownLocation(promise: Promise) {
         locationManager!!.getLastKnownLocation(
-            object : LocationEngineCallback<LocationEngineResult> {
+            object : LocationEngineCallback {
                 override fun onSuccess(result: LocationEngineResult) {
                     val location = result.lastLocation
                     if (location != null) {

package/android/src/main/java-v10/com/mapbox/rctmgl/modules/RCTMGLModule.kt

@@ -3,7 +3,6 @@ package com.mapbox.rctmgl.modules
 import android.os.Handler
 import com.facebook.react.bridge.Promise
 import com.mapbox.maps.extension.style.layers.properties.generated.LineJoin
-import com.mapbox.maps.ResourceOptionsManager.Companion.getDefault
 import com.facebook.react.module.annotations.ReactModule
 import com.mapbox.rctmgl.modules.RCTMGLModule
 import com.facebook.react.bridge.ReactApplicationContext
@@ -20,6 +19,8 @@ import com.mapbox.maps.plugin.attribution.attribution
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
 import java.util.HashMap
 
+import com.mapbox.rctmgl.v11compat.resourceoption.*
+
 @ReactModule(name = RCTMGLModule.REACT_CLASS)
 class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactContextBaseJavaModule(
     mReactContext
@@ -130,9 +131,7 @@ class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactCo
     @ReactMethod
     fun setAccessToken(accessToken: String?, promise: Promise) {
         mReactContext.runOnUiQueueThread(Runnable {
-            getDefault(
-                reactApplicationContext, accessToken
-            )
+            setMapboxAccessToken(reactApplicationContext, accessToken)
             promise.resolve(accessToken)
         })
     }
@@ -157,7 +156,7 @@ class RCTMGLModule(private val mReactContext: ReactApplicationContext) : ReactCo
         private val customHeaderInterceptorAdded = false
         @JvmStatic
         fun getAccessToken(reactContext: ReactApplicationContext?): String {
-            return getDefault((reactContext)!!, null).resourceOptions.accessToken
+            return getMapboxAccessToken(reactContext)
         }
     }
 }