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

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLShapeSourceManager.kt → java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceManager.kt}

@@ -1,9 +1,9 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.ReactApplicationContext
-import com.mapbox.rctmgl.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.bridge.ReadableMap
@@ -12,55 +12,55 @@ import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.MapBuilder
 import com.mapbox.bindgen.Value
 import com.mapbox.maps.extension.style.expressions.generated.Expression
-import com.mapbox.rctmgl.events.constants.EventKeys
-import com.mapbox.rctmgl.utils.ExpressionParser
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.utils.ExpressionParser
+import com.rnmapbox.rnmbx.utils.Logger
 import java.net.MalformedURLException
 import java.net.URL
 import java.util.ArrayList
 import java.util.HashMap
 
 
-class RCTMGLShapeSourceManager(private val mContext: ReactApplicationContext) :
-    AbstractEventEmitter<RCTMGLShapeSource>(
+class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext) :
+    AbstractEventEmitter<RNMBXShapeSource>(
         mContext
     ) {
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLShapeSource {
-        return RCTMGLShapeSource(reactContext, this)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXShapeSource {
+        return RNMBXShapeSource(reactContext, this)
     }
 
-    override fun getChildAt(source: RCTMGLShapeSource, childPosition: Int): View {
+    override fun getChildAt(source: RNMBXShapeSource, childPosition: Int): View {
         return source.getChildAt(childPosition)
     }
 
-    override fun getChildCount(source: RCTMGLShapeSource): Int {
+    override fun getChildCount(source: RNMBXShapeSource): Int {
         return source.childCount
     }
 
-    override fun addView(source: RCTMGLShapeSource, childView: View, childPosition: Int) {
+    override fun addView(source: RNMBXShapeSource, childView: View, childPosition: Int) {
         source.addLayer(childView, getChildCount(source))
     }
 
-    override fun removeViewAt(source: RCTMGLShapeSource, childPosition: Int) {
+    override fun removeViewAt(source: RNMBXShapeSource, childPosition: Int) {
         source.removeLayer(childPosition)
     }
 
     @ReactProp(name = "id")
-    fun setId(source: RCTMGLShapeSource, id: String) {
+    fun setId(source: RNMBXShapeSource, id: String) {
         source.iD = id
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(source: RCTMGLShapeSource, existing: Boolean) {
+    fun setExisting(source: RNMBXShapeSource, existing: Boolean) {
         source.mExisting = existing;
     }
 
     @ReactProp(name = "url")
-    fun setURL(source: RCTMGLShapeSource, urlStr: String) {
+    fun setURL(source: RNMBXShapeSource, urlStr: String) {
         try {
             source.setURL(URL(urlStr))
         } catch (e: MalformedURLException) {
@@ -69,27 +69,27 @@ class RCTMGLShapeSourceManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "shape")
-    fun setGeometry(source: RCTMGLShapeSource, geoJSONStr: String) {
+    fun setGeometry(source: RNMBXShapeSource, geoJSONStr: String) {
         source.setShape(geoJSONStr)
     }
 
     @ReactProp(name = "cluster")
-    fun setCluster(source: RCTMGLShapeSource, cluster: Int) {
+    fun setCluster(source: RNMBXShapeSource, cluster: Int) {
         source.setCluster(cluster == 1)
     }
 
     @ReactProp(name = "clusterRadius")
-    fun setClusterRadius(source: RCTMGLShapeSource, radius: Int) {
+    fun setClusterRadius(source: RNMBXShapeSource, radius: Int) {
         source.setClusterRadius(radius.toLong())
     }
 
     @ReactProp(name = "clusterMaxZoomLevel")
-    fun setClusterMaxZoomLevel(source: RCTMGLShapeSource, clusterMaxZoom: Int) {
+    fun setClusterMaxZoomLevel(source: RNMBXShapeSource, clusterMaxZoom: Int) {
         source.setClusterMaxZoom(clusterMaxZoom.toLong())
     }
 
     @ReactProp(name = "clusterProperties")
-    fun setClusterProperties(source: RCTMGLShapeSource, map: ReadableMap) {
+    fun setClusterProperties(source: RNMBXShapeSource, map: ReadableMap) {
         val properties = HashMap<String, Any>()
         val iterator = map.keySetIterator()
         while (iterator.hasNextKey()) {
@@ -117,32 +117,32 @@ class RCTMGLShapeSourceManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(source: RCTMGLShapeSource, maxZoom: Int) {
+    fun setMaxZoomLevel(source: RNMBXShapeSource, maxZoom: Int) {
         source.setMaxZoom(maxZoom.toLong())
     }
 
     @ReactProp(name = "buffer")
-    fun setBuffer(source: RCTMGLShapeSource, buffer: Int) {
+    fun setBuffer(source: RNMBXShapeSource, buffer: Int) {
         source.setBuffer(buffer.toLong())
     }
 
     @ReactProp(name = "tolerance")
-    fun setTolerance(source: RCTMGLShapeSource, tolerance: Double) {
+    fun setTolerance(source: RNMBXShapeSource, tolerance: Double) {
         source.setTolerance(tolerance)
     }
 
     @ReactProp(name = "lineMetrics")
-    fun setLineMetrics(source: RCTMGLShapeSource, lineMetrics: Boolean) {
+    fun setLineMetrics(source: RNMBXShapeSource, lineMetrics: Boolean) {
         source.setLineMetrics(lineMetrics)
     }
 
     @ReactProp(name = "hasPressListener")
-    fun setHasPressListener(source: RCTMGLShapeSource, hasPressListener: Boolean) {
+    fun setHasPressListener(source: RNMBXShapeSource, hasPressListener: Boolean) {
         source.setHasPressListener(hasPressListener)
     }
 
     @ReactProp(name = "hitbox")
-    fun setHitbox(source: RCTMGLShapeSource, map: ReadableMap) {
+    fun setHitbox(source: RNMBXShapeSource, map: ReadableMap) {
         source.setHitbox(map)
     }
 
@@ -162,7 +162,7 @@ class RCTMGLShapeSourceManager(private val mContext: ReactApplicationContext) :
             .build()
     }
 
-    override fun receiveCommand(source: RCTMGLShapeSource, commandID: Int, args: ReadableArray?) {
+    override fun receiveCommand(source: RNMBXShapeSource, commandID: Int, args: ReadableArray?) {
         if (args == null) {
             return
         }
@@ -192,8 +192,8 @@ class RCTMGLShapeSourceManager(private val mContext: ReactApplicationContext) :
     }
 
     companion object {
-        const val LOG_TAG = "RCTMGLShapeSourceMgr"
-        const val REACT_CLASS = "RCTMGLShapeSource"
+        const val LOG_TAG = "RNMBXShapeSourceMgr"
+        const val REACT_CLASS = "RNMBXShapeSource"
 
         //region React Methods
         const val METHOD_FEATURES = 103

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLTileSource.kt → java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSource.kt}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.accessibilityservice.GestureDescription
 import android.content.Context
@@ -7,7 +7,7 @@ import com.mapbox.maps.extension.style.sources.TileSet
 import com.mapbox.maps.extension.style.sources.generated.Scheme
 import java.util.*
 
-abstract class RCTMGLTileSource<T : Source?>(context: Context?) : RCTSource<T>(context) {
+abstract class RNMBXTileSource<T : Source?>(context: Context?) : RCTSource<T>(context) {
     var uRL: String? = null
     public var tileUrlTemplates: Collection<String> = ArrayList()
     var attribution: String? = null

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLTileSourceManager.kt → java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt}

@@ -1,13 +1,13 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.view.View
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.mapbox.rctmgl.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 
-abstract class RCTMGLTileSourceManager<T : RCTMGLTileSource<*>?> internal constructor(
+abstract class RNMBXTileSourceManager<T : RNMBXTileSource<*>?> internal constructor(
     reactApplicationContext: ReactApplicationContext
 ) : AbstractEventEmitter<T>(reactApplicationContext) {
     override fun getChildAt(source: T, childPosition: Int): View {

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLVectorSource.kt → java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXVectorSource.kt}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.content.Context
 import androidx.annotation.Size
@@ -10,12 +10,14 @@ import com.mapbox.maps.SourceQueryOptions
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.sources.generated.VectorSource
 import com.mapbox.maps.extension.style.sources.getSource
-import com.mapbox.rctmgl.events.AndroidCallbackEvent
-import com.mapbox.rctmgl.events.FeatureClickEvent
+import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
+import com.rnmapbox.rnmbx.events.FeatureClickEvent
 import java.util.*
 
-class RCTMGLVectorSource(context: Context?, private val mManager: RCTMGLVectorSourceManager) :
-    RCTMGLTileSource<VectorSource?>(context) {
+import com.rnmapbox.rnmbx.v11compat.feature.*
+
+class RNMBXVectorSource(context: Context?, private val mManager: RNMBXVectorSourceManager) :
+    RNMBXTileSource<VectorSource?>(context) {
     override fun onPress(event: OnPressEvent?) {
         mManager.handleEvent(FeatureClickEvent.makeVectorSourceEvent(this, event))
     }
@@ -71,7 +73,7 @@ class RCTMGLVectorSource(context: Context?, private val mManager: RCTMGLVectorSo
                 }
                 payload.putString("data", FeatureCollection.fromFeatures(features).toJson())
             }
-            val event = AndroidCallbackEvent(this@RCTMGLVectorSource, callbackID, payload)
+            val event = AndroidCallbackEvent(this@RNMBXVectorSource, callbackID, payload)
             mManager.handleEvent(event)
         }
     }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLVectorSourceManager.kt → java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXVectorSourceManager.kt}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
@@ -6,30 +6,30 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.mapbox.rctmgl.events.constants.EventKeys
-import com.mapbox.rctmgl.utils.ConvertUtils
-import com.mapbox.rctmgl.utils.ExpressionParser
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.utils.ConvertUtils
+import com.rnmapbox.rnmbx.utils.ExpressionParser
 import javax.annotation.Nonnull
 
-class RCTMGLVectorSourceManager(reactApplicationContext: ReactApplicationContext) :
-    RCTMGLTileSourceManager<RCTMGLVectorSource?>(reactApplicationContext) {
+class RNMBXVectorSourceManager(reactApplicationContext: ReactApplicationContext) :
+    RNMBXTileSourceManager<RNMBXVectorSource?>(reactApplicationContext) {
     @Nonnull
     override fun getName(): String {
         return REACT_CLASS
     }
 
     @Nonnull
-    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RCTMGLVectorSource {
-        return RCTMGLVectorSource(reactContext, this)
+    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXVectorSource {
+        return RNMBXVectorSource(reactContext, this)
     }
 
     @ReactProp(name = "hasPressListener")
-    fun setHasPressListener(source: RCTMGLVectorSource, hasPressListener: Boolean) {
+    fun setHasPressListener(source: RNMBXVectorSource, hasPressListener: Boolean) {
         source.setHasPressListener(hasPressListener)
     }
 
     @ReactProp(name = "hitbox")
-    fun setHitbox(source: RCTMGLVectorSource, map: ReadableMap?) {
+    fun setHitbox(source: RNMBXVectorSource, map: ReadableMap?) {
         source.setHitbox(map!!)
     }
 
@@ -47,7 +47,7 @@ class RCTMGLVectorSourceManager(reactApplicationContext: ReactApplicationContext
     }
 
     override fun receiveCommand(
-        vectorSource: RCTMGLVectorSource,
+        vectorSource: RNMBXVectorSource,
         commandID: Int,
         args: ReadableArray?
     ) {
@@ -61,7 +61,7 @@ class RCTMGLVectorSourceManager(reactApplicationContext: ReactApplicationContext
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLVectorSource"
+        const val REACT_CLASS = "RNMBXVectorSource"
 
         //region React Methods
         const val METHOD_FEATURES = 102

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/terrain/RCTMGLTerrain.kt → java/com/rnmapbox/rnmbx/components/styles/terrain/RNMBXTerrain.kt}

@@ -1,18 +1,18 @@
-package com.mapbox.rctmgl.components.styles.terrain
+package com.rnmapbox.rnmbx.components.styles.terrain
 
 import android.content.Context
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.extension.style.terrain.generated.Terrain
 import com.mapbox.maps.extension.style.terrain.generated.removeTerrain
-import com.mapbox.rctmgl.components.RemovalReason
-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.components.styles.sources.AbstractSourceConsumer
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
+import com.rnmapbox.rnmbx.utils.Logger
 
-class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
+class RNMBXTerrain(context: Context?) : AbstractSourceConsumer(context) {
     override var iD: String? = null
     protected var mSourceID: String? = null
     protected var mTerrain: Terrain? = null
@@ -36,7 +36,7 @@ class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
         mSourceID = sourceID
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         val terrain = makeTerrain()
@@ -45,7 +45,7 @@ class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
         mapView.savedStyle?.let { terrain.bindTo(it) }
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         mapView.savedStyle?.let { it.removeTerrain() }
         mMap = null
         return super.removeFromMap(mapView, reason)
@@ -56,11 +56,13 @@ class RCTMGLTerrain(context: Context?) : AbstractSourceConsumer(context) {
     }
 
     fun addStyles() {
-        RCTMGLStyleFactory.setTerrainLayerStyle(
-            mTerrain, RCTMGLStyle(
-                context, mReactStyle!!,
-                mMap!!
+        mTerrain?.also {
+            RNMBXStyleFactory.setTerrainLayerStyle(
+                it,
+                RNMBXStyle(context, mReactStyle, mMap!!)
             )
-        )
+        } ?: run {
+            Logger.e("RNMBXTerrainLayer", "mLayer is null")
+        }
     }
 }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/terrain/RCTMGLTerrainManager.kt → java/com/rnmapbox/rnmbx/components/styles/terrain/RNMBXTerrainManager.kt}

@@ -1,35 +1,35 @@
-package com.mapbox.rctmgl.components.styles.terrain
+package com.rnmapbox.rnmbx.components.styles.terrain
 
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 
-class RCTMGLTerrainManager : ViewGroupManager<RCTMGLTerrain>() {
+class RNMBXTerrainManager : ViewGroupManager<RNMBXTerrain>() {
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLTerrain {
-        return RCTMGLTerrain(reactContext)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXTerrain {
+        return RNMBXTerrain(reactContext)
     }
 
     @ReactProp(name = "id")
-    fun setId(layer: RCTMGLTerrain, id: String?) {
+    fun setId(layer: RNMBXTerrain, id: String?) {
         layer.iD = id
     }
 
     @ReactProp(name = "sourceID")
-    fun setSourceID(layer: RCTMGLTerrain, sourceID: String?) {
+    fun setSourceID(layer: RNMBXTerrain, sourceID: String?) {
         layer.setSourceID(sourceID)
     }
 
     @ReactProp(name = "reactStyle")
-    fun setReactStyle(terrain: RCTMGLTerrain, reactStyle: ReadableMap?) {
+    fun setReactStyle(terrain: RNMBXTerrain, reactStyle: ReadableMap?) {
         terrain.setReactStyle(reactStyle)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLTerrain"
+        const val REACT_CLASS = "RNMBXTerrain"
     }
 }

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/AbstractEvent.kt

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.events
+package com.rnmapbox.rnmbx.events
 
 import android.view.View
 import com.facebook.react.bridge.Arguments

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/AndroidCallbackEvent.java

@@ -1,10 +1,10 @@
-package com.mapbox.rctmgl.events;
+package com.rnmapbox.rnmbx.events;
 
 import android.view.View;
 
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.mapbox.rctmgl.events.constants.EventKeys;
+import com.rnmapbox.rnmbx.events.constants.EventKeys;
 
 public class AndroidCallbackEvent extends AbstractEvent {
     private final WritableMap mPayload;

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/EventEmitter.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.events;
+package com.rnmapbox.rnmbx.events;
 
 import android.util.Log;
 

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/FeatureClickEvent.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.events;
+package com.rnmapbox.rnmbx.events;
 
 import android.graphics.PointF;
 import android.view.View;
@@ -7,12 +7,12 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.mapbox.geojson.Feature;
-import com.mapbox.rctmgl.components.styles.sources.RCTSource;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.ConvertUtils;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-import com.mapbox.rctmgl.utils.LatLng;
+import com.rnmapbox.rnmbx.components.styles.sources.RCTSource;
+import com.rnmapbox.rnmbx.events.constants.EventKeys;
+import com.rnmapbox.rnmbx.events.constants.EventTypes;
+import com.rnmapbox.rnmbx.utils.ConvertUtils;
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils;
+import com.rnmapbox.rnmbx.utils.LatLng;
 
 import java.util.List;
 

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/IEvent.kt

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.events
+package com.rnmapbox.rnmbx.events
 
 import com.facebook.react.bridge.WritableMap
 

package/android/src/main/{java-mapboxgl/common/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/ImageMissingEvent.java

@@ -1,9 +1,9 @@
-package com.mapbox.rctmgl.events;
+package com.rnmapbox.rnmbx.events;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
+import com.rnmapbox.rnmbx.events.constants.EventKeys;
+import com.rnmapbox.rnmbx.events.constants.EventTypes;
 
 import android.view.View;
 

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/LocationEvent.kt

@@ -1,15 +1,16 @@
-package com.mapbox.rctmgl.events
+package com.rnmapbox.rnmbx.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
-import com.mapbox.rctmgl.events.constants.EventTypes
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.EventTypes
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import java.util.*
 
-class LocationEvent(private val location: Location, private val mapView: RCTMGLMapView?) : IEvent {
+import com.rnmapbox.rnmbx.v11compat.location.*
+
+class LocationEvent(private val location: Location, private val mapView: RNMBXMapView?) : IEvent {
     val uUID: UUID
 
     init {
@@ -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 → java/com/rnmapbox/rnmbx}/events/MapChangeEvent.kt

@@ -1,9 +1,9 @@
-package com.mapbox.rctmgl.events
+package com.rnmapbox.rnmbx.events
 
 import android.view.View
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
-import com.mapbox.rctmgl.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.EventKeys
 
 open
 class MapChangeEvent constructor(
@@ -24,7 +24,7 @@ class MapChangeEvent constructor(
     override fun canCoalesce(): Boolean {
         // Make sure EventDispatcher never merges EventKeys.MAP_ONCHANGE events.
         // This event name is used to emit events with different
-        // com.mapbox.rctmgl.events.constants.EventTypes which are dispatched separately on
+        // com.rnmapbox.rnmbx.events.constants.EventTypes which are dispatched separately on
         // the JS side
         return false
     }

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/MapClickEvent.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.events;
+package com.rnmapbox.rnmbx.events;
 
 import android.graphics.PointF;
 import androidx.annotation.NonNull;
@@ -9,10 +9,10 @@ import com.facebook.react.bridge.WritableNativeMap;
 // import com.mapbox.mapboxsdk.geometry.LatLng;
 
 import com.mapbox.maps.ScreenCoordinate;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-import com.mapbox.rctmgl.utils.LatLng;
+import com.rnmapbox.rnmbx.events.constants.EventKeys;
+import com.rnmapbox.rnmbx.events.constants.EventTypes;
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils;
+import com.rnmapbox.rnmbx.utils.LatLng;
 
 
 public class MapClickEvent extends AbstractEvent {

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/MapUserTrackingModeEvent.kt

@@ -1,11 +1,11 @@
-package com.mapbox.rctmgl.events
+package com.rnmapbox.rnmbx.events
 
 import android.view.View
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
-import com.mapbox.rctmgl.components.location.UserTrackingMode
-import com.mapbox.rctmgl.events.constants.EventKeys
-import com.mapbox.rctmgl.events.constants.EventTypes
+import com.rnmapbox.rnmbx.components.location.UserTrackingMode
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.EventTypes
 
 class MapUserTrackingModeEvent(view: View?, val userTrackingMode: Int, val basePayload: WritableMap? = null) : AbstractEvent(view, EventTypes.MAP_USER_TRACKING_MODE_CHANGE) {
     override val key

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/OfflineEvent.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.events;
+package com.rnmapbox.rnmbx.events;
 
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/events/PointAnnotationClickEvent.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.events;
+package com.rnmapbox.rnmbx.events;
 
 import android.graphics.PointF;
 import androidx.annotation.NonNull;
@@ -7,19 +7,19 @@ import android.view.View;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.mapbox.maps.ScreenCoordinate;
-import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotation;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.ConvertUtils;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-import com.mapbox.rctmgl.utils.LatLng;
+import com.rnmapbox.rnmbx.components.annotation.RNMBXPointAnnotation;
+import com.rnmapbox.rnmbx.events.constants.EventKeys;
+import com.rnmapbox.rnmbx.events.constants.EventTypes;
+import com.rnmapbox.rnmbx.utils.ConvertUtils;
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils;
+import com.rnmapbox.rnmbx.utils.LatLng;
 
 public class PointAnnotationClickEvent extends MapClickEvent {
-    private RCTMGLPointAnnotation mView;
+    private RNMBXPointAnnotation mView;
     private LatLng mTouchedLatLng;
     private ScreenCoordinate mScreenPoint;
 
-    public PointAnnotationClickEvent(RCTMGLPointAnnotation view, @NonNull LatLng latLng, @NonNull ScreenCoordinate screenPoint, String eventType) {
+    public PointAnnotationClickEvent(RNMBXPointAnnotation view, @NonNull LatLng latLng, @NonNull ScreenCoordinate screenPoint, String eventType) {
         super(view, latLng, screenPoint, eventType);
         mView = view;
         mTouchedLatLng = latLng;