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

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLMapViewManager.kt → java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt}

@@ -1,30 +1,30 @@
-package com.mapbox.rctmgl.components.mapview
+package com.rnmapbox.rnmbx.components.mapview
 
 import android.content.Context
 import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.*
 
-import com.mapbox.rctmgl.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.mapbox.rctmgl.events.constants.EventKeys
+import com.rnmapbox.rnmbx.events.constants.EventKeys
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ViewManagerDelegate
-import com.facebook.react.viewmanagers.MBXMapViewManagerDelegate
-import com.facebook.react.viewmanagers.MBXMapViewManagerInterface
+import com.facebook.react.viewmanagers.RNMBXMapViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXMapViewManagerInterface
 import com.mapbox.maps.MapInitOptions
 import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionName
 import com.mapbox.maps.plugin.gestures.gestures
 import com.mapbox.maps.plugin.logo.logo
-import com.mapbox.rctmgl.events.AndroidCallbackEvent
-import com.mapbox.rctmgl.utils.ConvertUtils
-import com.mapbox.rctmgl.utils.ExpressionParser
-import com.mapbox.rctmgl.utils.Logger
-import com.mapbox.rctmgl.utils.extensions.toCoordinate
-import com.mapbox.rctmgl.utils.extensions.toRectF
-import com.mapbox.rctmgl.utils.extensions.toScreenCoordinate
+import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
+import com.rnmapbox.rnmbx.utils.ConvertUtils
+import com.rnmapbox.rnmbx.utils.ExpressionParser
+import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.extensions.toCoordinate
+import com.rnmapbox.rnmbx.utils.extensions.toRectF
+import com.rnmapbox.rnmbx.utils.extensions.toScreenCoordinate
 import java.lang.Exception
 import java.util.HashMap
 
@@ -46,17 +46,17 @@ interface CommandResponse {
     fun error(message: String)
 }
 
-open class RCTMGLMapViewManager(context: ReactApplicationContext) :
-    AbstractEventEmitter<RCTMGLMapView>(context), MBXMapViewManagerInterface<RCTMGLMapView> {
-    private val mViews: MutableMap<Int, RCTMGLMapView>
+open class RNMBXMapViewManager(context: ReactApplicationContext) :
+    AbstractEventEmitter<RNMBXMapView>(context), RNMBXMapViewManagerInterface<RNMBXMapView> {
+    private val mViews: MutableMap<Int, RNMBXMapView>
 
-    private val mDelegate: ViewManagerDelegate<RCTMGLMapView>
+    private val mDelegate: ViewManagerDelegate<RNMBXMapView>
 
     init {
-        mDelegate = MBXMapViewManagerDelegate<RCTMGLMapView, RCTMGLMapViewManager>(this)
+        mDelegate = RNMBXMapViewManagerDelegate<RNMBXMapView, RNMBXMapViewManager>(this)
     }
 
-    override fun getDelegate(): ViewManagerDelegate<RCTMGLMapView>? {
+    override fun getDelegate(): ViewManagerDelegate<RNMBXMapView>? {
         return mDelegate
     }
 
@@ -72,7 +72,7 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
         return MapShadowNode::class.java
     }
 
-    override fun onAfterUpdateTransaction(mapView: RCTMGLMapView) {
+    override fun onAfterUpdateTransaction(mapView: RNMBXMapView) {
         super.onAfterUpdateTransaction(mapView)
         if (mapView.getMapboxMap() == null) {
             mViews[mapView.id] = mapView
@@ -80,19 +80,19 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
         }
     }
 
-    override fun addView(mapView: RCTMGLMapView?, childView: View?, childPosition: Int) {
+    override fun addView(mapView: RNMBXMapView?, childView: View?, childPosition: Int) {
         mapView!!.addFeature(childView, childPosition)
     }
 
-    override fun getChildCount(mapView: RCTMGLMapView?): Int {
+    override fun getChildCount(mapView: RNMBXMapView?): Int {
         return mapView!!.featureCount
     }
 
-    override fun getChildAt(mapView: RCTMGLMapView?, index: Int): View? {
+    override fun getChildAt(mapView: RNMBXMapView?, index: Int): View? {
         return mapView!!.getFeatureAt(index)
     }
 
-    override fun removeViewAt(mapView: RCTMGLMapView?, index: Int) {
+    override fun removeViewAt(mapView: RNMBXMapView?, index: Int) {
         mapView!!.removeFeatureAt(index)
     }
 
@@ -100,12 +100,12 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
         return activity ?: themedReactContext
     }
 
-    override fun createViewInstance(themedReactContext: ThemedReactContext): RCTMGLMapView {
+    override fun createViewInstance(themedReactContext: ThemedReactContext): RNMBXMapView {
         val context = getMapViewContext(themedReactContext)
-        return RCTMGLMapView(context, this, options=null)
+        return RNMBXMapView(context, this, options=null)
     }
 
-    override fun onDropViewInstance(mapView: RCTMGLMapView) {
+    override fun onDropViewInstance(mapView: RNMBXMapView) {
         val reactTag = mapView.id
         if (mViews.containsKey(reactTag)) {
             mViews.remove(reactTag)
@@ -114,35 +114,35 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
         super.onDropViewInstance(mapView)
     }
 
-    fun getByReactTag(reactTag: Int): RCTMGLMapView? {
+    fun getByReactTag(reactTag: Int): RNMBXMapView? {
         return mViews[reactTag]
     }
 
     // region React Props
     @ReactProp(name = "projection")
-    override fun setProjection(mapView: RCTMGLMapView, projection: String?) {
+    override fun setProjection(mapView: RNMBXMapView, projection: String?) {
         mapView.setReactProjection( if (projection == "globe") ProjectionName.GLOBE else ProjectionName.MERCATOR )
     }
 
     @ReactProp(name = "localizeLabels")
-    override fun setLocalizeLabels(mapView: RCTMGLMapView, localeMap: ReadableMap?) {
+    override fun setLocalizeLabels(mapView: RNMBXMapView, localeMap: ReadableMap?) {
         val locale = localeMap?.getString("locale")
         val layerIds = localeMap?.getArray("layerIds")?.toArrayList()?.mapNotNull {it?.toString()}
         mapView.setReactLocalizeLabels(locale, layerIds)
     }
 
     @ReactProp(name = "styleURL")
-    override fun setStyleURL(mapView: RCTMGLMapView, styleURL: String?) {
+    override fun setStyleURL(mapView: RNMBXMapView, styleURL: String?) {
         mapView.setReactStyleURL(styleURL!!)
     }
 
     @ReactProp(name = "preferredFramesPerSecond")
-    fun setPreferredFramesPerSecond(mapView: RCTMGLMapView?, preferredFramesPerSecond: Int) {
+    fun setPreferredFramesPerSecond(mapView: RNMBXMapView?, preferredFramesPerSecond: Int) {
         //mapView.setReactPreferredFramesPerSecond(preferredFramesPerSecond);
     }
 
     @ReactProp(name = "zoomEnabled")
-    override fun setZoomEnabled(map: RCTMGLMapView, zoomEnabled: Boolean) {
+    override fun setZoomEnabled(map: RNMBXMapView, zoomEnabled: Boolean) {
         val mapView = map.mapView
         mapView.gestures.pinchToZoomEnabled = zoomEnabled
         mapView.gestures.doubleTouchToZoomOutEnabled = zoomEnabled
@@ -150,130 +150,130 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
     }
 
     @ReactProp(name = "scrollEnabled")
-    override fun setScrollEnabled(map: RCTMGLMapView, scrollEnabled: Boolean) {
+    override fun setScrollEnabled(map: RNMBXMapView, scrollEnabled: Boolean) {
         val mapView = map.mapView
         mapView.gestures.scrollEnabled = scrollEnabled
     }
 
     @ReactProp(name = "pitchEnabled")
-    override fun setPitchEnabled(map: RCTMGLMapView, pitchEnabled: Boolean) {
+    override fun setPitchEnabled(map: RNMBXMapView, pitchEnabled: Boolean) {
         val mapView = map.mapView
         mapView.gestures.pitchEnabled = pitchEnabled
     }
 
     @ReactProp(name = "rotateEnabled")
-    override fun setRotateEnabled(map: RCTMGLMapView, rotateEnabled: Boolean) {
+    override fun setRotateEnabled(map: RNMBXMapView, rotateEnabled: Boolean) {
         val mapView = map.mapView
         mapView.gestures.rotateEnabled = rotateEnabled
     }
 
     @ReactProp(name = "attributionEnabled")
-    override fun setAttributionEnabled(mapView: RCTMGLMapView, attributionEnabled: Boolean) {
+    override fun setAttributionEnabled(mapView: RNMBXMapView, attributionEnabled: Boolean) {
         mapView.setReactAttributionEnabled(attributionEnabled)
     }
 
     @ReactProp(name = "attributionPosition")
-    fun setAttributionPosition(mapView: RCTMGLMapView, attributionPosition: ReadableMap) {
+    fun setAttributionPosition(mapView: RNMBXMapView, attributionPosition: ReadableMap) {
         mapView.setReactAttributionPosition(attributionPosition)
     }
 
     @ReactProp(name = "attributionViewMargins")
-    fun setAttributionViewMargins(mapView: RCTMGLMapView, scaleBarMargins: ReadableMap) {
+    fun setAttributionViewMargins(mapView: RNMBXMapView, scaleBarMargins: ReadableMap) {
         mapView.setReactAttributionViewMargins(scaleBarMargins)
     }
 
     @ReactProp(name = "attributionViewPosition")
-    fun setAttributionViewPosition(mapView: RCTMGLMapView, scaleBarPosition: Int) {
+    fun setAttributionViewPosition(mapView: RNMBXMapView, scaleBarPosition: Int) {
         mapView.setReactAttributionViewPosition(scaleBarPosition)
     }
 
     @ReactProp(name = "logoEnabled")
-    override fun setLogoEnabled(mapView: RCTMGLMapView, logoEnabled: Boolean) {
+    override fun setLogoEnabled(mapView: RNMBXMapView, logoEnabled: Boolean) {
         mapView.setReactLogoEnabled(logoEnabled)
     }
 
     @ReactProp(name = "logoPosition")
-    fun setLogoPosition(mapView: RCTMGLMapView, logoPosition: ReadableMap?) {
+    fun setLogoPosition(mapView: RNMBXMapView, logoPosition: ReadableMap?) {
         mapView.setReactLogoPosition(logoPosition)
     }
 
     @ReactProp(name = "scaleBarEnabled")
-    override fun setScaleBarEnabled(mapView: RCTMGLMapView, scaleBarEnabled: Boolean) {
+    override fun setScaleBarEnabled(mapView: RNMBXMapView, scaleBarEnabled: Boolean) {
         mapView.setReactScaleBarEnabled(scaleBarEnabled)
     }
 
     @ReactProp(name = "scaleBarViewMargins")
-    fun setScaleBarViewMargins(mapView: RCTMGLMapView, scaleBarMargins: ReadableMap) {
+    fun setScaleBarViewMargins(mapView: RNMBXMapView, scaleBarMargins: ReadableMap) {
         mapView.setReactScaleBarViewMargins(scaleBarMargins)
     }
 
     @ReactProp(name = "scaleBarViewPosition")
-    fun setScaleBarViewPosition(mapView: RCTMGLMapView, scaleBarPosition: Int) {
+    fun setScaleBarViewPosition(mapView: RNMBXMapView, scaleBarPosition: Int) {
         mapView.setReactScaleBarViewPosition(scaleBarPosition)
     }
 
     @ReactProp(name = "scaleBarPosition")
-    fun scaleBarViewPosition(mapView: RCTMGLMapView?, scaleBarPosition: ReadableMap) {
+    fun scaleBarViewPosition(mapView: RNMBXMapView?, scaleBarPosition: ReadableMap) {
         mapView!!.setReactScaleBarPosition(scaleBarPosition)
     }
 
     @ReactProp(name = "compassEnabled")
-    override fun setCompassEnabled(mapView: RCTMGLMapView, compassEnabled: Boolean) {
+    override fun setCompassEnabled(mapView: RNMBXMapView, compassEnabled: Boolean) {
         mapView.setReactCompassEnabled(compassEnabled)
     }
 
     @ReactProp(name = "compassFadeWhenNorth")
-    override fun setCompassFadeWhenNorth(mapView: RCTMGLMapView, compassFadeWhenNorth: Boolean) {
+    override fun setCompassFadeWhenNorth(mapView: RNMBXMapView, compassFadeWhenNorth: Boolean) {
         mapView.setReactCompassFadeWhenNorth(compassFadeWhenNorth)
     }
 
     @ReactProp(name = "compassViewMargins")
-    override fun setCompassViewMargins(mapView: RCTMGLMapView, compassViewMargins: ReadableMap?) {
+    override fun setCompassViewMargins(mapView: RNMBXMapView, compassViewMargins: ReadableMap?) {
         mapView.setReactCompassViewMargins(compassViewMargins ?: return)
     }
 
     @ReactProp(name = "compassViewPosition")
-    override fun setCompassViewPosition(mapView: RCTMGLMapView, compassViewPosition: Int) {
+    override fun setCompassViewPosition(mapView: RNMBXMapView, compassViewPosition: Int) {
         mapView.setReactCompassViewPosition(compassViewPosition)
     }
 
     @ReactProp(name = "compassPosition")
-    fun setCompassPosition(mapView: RCTMGLMapView, compassMargins: ReadableMap) {
+    fun setCompassPosition(mapView: RNMBXMapView, compassMargins: ReadableMap) {
         mapView.setReactCompassPosition(compassMargins)
     }
 
     @ReactProp(name = "contentInset")
-    fun setContentInset(mapView: RCTMGLMapView, array: ReadableArray) {
+    fun setContentInset(mapView: RNMBXMapView, array: ReadableArray) {
         //mapView.setReactContentInset(array);
     }
 
     @ReactProp(name = "tintColor", customType = "Color")
-    fun setTintColor(mapView: RCTMGLMapView, tintColor: Int) {
+    fun setTintColor(mapView: RNMBXMapView, tintColor: Int) {
         //mapView.setTintColor(tintColor);
     }
 
     @ReactProp(name = "requestDisallowInterceptTouchEvent")
-    override fun setRequestDisallowInterceptTouchEvent(mapView: RCTMGLMapView, requestDisallowInterceptTouchEvent: Boolean) {
+    override fun setRequestDisallowInterceptTouchEvent(mapView: RNMBXMapView, requestDisallowInterceptTouchEvent: Boolean) {
         mapView.requestDisallowInterceptTouchEvent = requestDisallowInterceptTouchEvent
     }
 
-    override fun setAttributionPosition(view: RCTMGLMapView, value: Dynamic) {
+    override fun setAttributionPosition(view: RNMBXMapView, value: Dynamic) {
         this.setAttributionPosition(view, value.asMap())
     }
 
-    override fun setLogoPosition(view: RCTMGLMapView, value: Dynamic) {
+    override fun setLogoPosition(view: RNMBXMapView, value: Dynamic) {
         this.setLogoPosition(view, value.asMap())
     }
 
-    override fun setCompassPosition(view: RCTMGLMapView, value: Dynamic) {
+    override fun setCompassPosition(view: RNMBXMapView, value: Dynamic) {
         this.setCompassPosition(view, value.asMap())
     }
 
-    override fun setCompassImage(view: RCTMGLMapView, value: String?) {
+    override fun setCompassImage(view: RNMBXMapView, value: String?) {
         // TODO: No-op on Android?
     }
 
-    override fun setScaleBarPosition(view: RCTMGLMapView, value: Dynamic) {
+    override fun setScaleBarPosition(view: RNMBXMapView, value: Dynamic) {
         // TODO: should this call setScaleBarViewPosition?
     }
 
@@ -297,7 +297,7 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
     }
     //endregion
 
-    private class MapShadowNode(private val mViewManager: RCTMGLMapViewManager) :
+    private class MapShadowNode(private val mViewManager: RNMBXMapViewManager) :
         LayoutShadowNode() {
         override fun dispose() {
             super.dispose()
@@ -323,8 +323,8 @@ open class RCTMGLMapViewManager(context: ReactApplicationContext) :
     }
 
     companion object {
-        const val LOG_TAG = "RCTMGLMapViewManager"
-        const val REACT_CLASS = "MBXMapView"
+        const val LOG_TAG = "RNMBXMapViewManager"
+        const val REACT_CLASS = "RNMBXMapView"
     }
 
     init {

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/mapview/helpers/CameraChangeTracker.kt

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.mapview.helpers
+package com.rnmapbox.rnmbx.components.mapview.helpers
 
 enum class CameraChangeReason {
     NONE,

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

@@ -1,16 +1,16 @@
-package com.mapbox.rctmgl.components.styles
+package com.rnmapbox.rnmbx.components.styles
 
 import android.content.Context
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.MapboxMap
-import com.mapbox.rctmgl.components.images.ImageInfo
-import com.mapbox.rctmgl.utils.ImageEntry
-import com.mapbox.rctmgl.utils.DownloadMapImageTask
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.components.images.ImageInfo
+import com.rnmapbox.rnmbx.utils.ImageEntry
+import com.rnmapbox.rnmbx.utils.DownloadMapImageTask
+import com.rnmapbox.rnmbx.utils.Logger
 import java.util.AbstractMap
 import java.util.ArrayList
 
-class RCTMGLStyle(private val mContext: Context, reactStyle: ReadableMap?, map: MapboxMap) {
+class RNMBXStyle(private val mContext: Context, reactStyle: ReadableMap?, map: MapboxMap) {
     private val mReactStyle: ReadableMap?
     private val mMap: MapboxMap
     val allStyleKeys: List<String>
@@ -29,19 +29,22 @@ class RCTMGLStyle(private val mContext: Context, reactStyle: ReadableMap?, map:
             return keys
         }
 
-    fun getStyleValueForKey(styleKey: String?): RCTMGLStyleValue? {
-        val styleValueConfig = mReactStyle!!.getMap(styleKey!!)
-            ?: // TODO: throw exeception here
-            return null
-        return RCTMGLStyleValue(styleValueConfig)
+    fun getStyleValueForKey(styleKey: String): RNMBXStyleValue {
+        val styleValueConfig = mReactStyle!!.getMap(styleKey)
+        if (styleValueConfig != null) {
+            return RNMBXStyleValue(styleValueConfig)
+        } else {
+            Logger.e("RNMBXStyle", "Value for ${styleKey} not found")
+            throw Exception("RNMBXStyle - Value for ${styleKey} not found")
+        }
     }
 
-    fun imageEntry(styleValue: RCTMGLStyleValue): ImageEntry {
+    fun imageEntry(styleValue: RNMBXStyleValue): ImageEntry {
         return ImageEntry(styleValue.imageURI!!, ImageInfo(scale=styleValue.imageScale, name=styleValue.imageURI!!))
     }
 
     @JvmOverloads
-    fun addImage(styleValue: RCTMGLStyleValue, styleKey: String, callback: DownloadMapImageTask.OnAllImagesLoaded? = null) {
+    fun addImage(styleValue: RNMBXStyleValue, styleKey: String, callback: DownloadMapImageTask.OnAllImagesLoaded? = null) {
         if (!styleValue.shouldAddImage()) {
             callback?.onAllImagesLoaded()
             return
@@ -64,6 +67,6 @@ class RCTMGLStyle(private val mContext: Context, reactStyle: ReadableMap?, map:
     }
 
     companion object {
-        const val LOG_TAG = "RCTMGLStyle"
+        const val LOG_TAG = "RNMBXStyle"
     }
 }