@rnmapbox/maps 10.1.0-beta.11 → 10.1.0-beta.14

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -34,6 +34,7 @@ import com.rnmapbox.rnmbx.components.styles.sources.RNMBXImageSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterDemSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXRasterSourceManager
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSourceManager
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXShapeSourceModule
 import com.rnmapbox.rnmbx.components.styles.sources.RNMBXVectorSourceManager
 import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrainManager
 import com.rnmapbox.rnmbx.modules.RNMBXLocationModule
@@ -45,12 +46,12 @@ import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
 class RNMBXPackage : TurboReactPackage() {
 
-    var mapViewTagResolver: ViewTagResolver<RNMBXMapView>? = null
-    fun getMapViewTagResolver(context: ReactApplicationContext) : ViewTagResolver<RNMBXMapView> {
-        val viewTagResolver = mapViewTagResolver
+    var viewTagResolver: ViewTagResolver? = null
+    fun getViewTagResolver(context: ReactApplicationContext) : ViewTagResolver {
+        val viewTagResolver = viewTagResolver
         if (viewTagResolver == null) {
-            val viewTagResolver = ViewTagResolver<RNMBXMapView>(context)
-            mapViewTagResolver = viewTagResolver
+            val viewTagResolver = ViewTagResolver(context)
+            this.viewTagResolver = viewTagResolver
             return viewTagResolver
         }
         return viewTagResolver
@@ -66,7 +67,8 @@ class RNMBXPackage : TurboReactPackage() {
             RNMBXOfflineModule.REACT_CLASS -> return RNMBXOfflineModule(reactApplicationContext)
             RNMBXSnapshotModule.REACT_CLASS -> return RNMBXSnapshotModule(reactApplicationContext)
             RNMBXLogging.REACT_CLASS -> return RNMBXLogging(reactApplicationContext)
-            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getMapViewTagResolver(reactApplicationContext))
+            NativeMapViewModule.NAME -> return NativeMapViewModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
+            RNMBXShapeSourceModule.NAME -> return RNMBXShapeSourceModule(reactApplicationContext, getViewTagResolver(reactApplicationContext))
         }
         return null
     }
@@ -81,8 +83,8 @@ class RNMBXPackage : TurboReactPackage() {
 
         // components
         managers.add(RNMBXCameraManager(reactApplicationContext))
-        managers.add(RNMBXAndroidTextureMapViewManager(reactApplicationContext, getMapViewTagResolver(reactApplicationContext)))
-        managers.add(RNMBXMapViewManager(reactApplicationContext, getMapViewTagResolver(reactApplicationContext)))
+        managers.add(RNMBXAndroidTextureMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
+        managers.add(RNMBXMapViewManager(reactApplicationContext, getViewTagResolver(reactApplicationContext)))
         managers.add(RNMBXStyleImportManager(reactApplicationContext))
 
         // annotations
@@ -176,6 +178,15 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // isCxxModule
                 isTurboModule // isTurboModule
             )
+            moduleInfos[RNMBXShapeSourceModule.NAME] = ReactModuleInfo(
+                RNMBXShapeSourceModule.NAME,
+                RNMBXShapeSourceModule.NAME,
+                false,  // canOverrideExistingModule
+                false,  // needsEagerInit
+                false,  // hasConstants
+                false,  // isCxxModule
+                isTurboModule // isTurboModule
+            )
             moduleInfos
         }
     }

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

@@ -15,6 +15,8 @@ abstract class AbstractMapFeature(context: Context?) : ReactViewGroup(context) {
     protected var mMapView: RNMBXMapView? = null;
     private var mWithMapViewCallbacks: Array<((RNMBXMapView) -> Unit)>? = null;
 
+    open var requiresStyleLoad = true;
+
     open fun addToMap(mapView: RNMBXMapView) {
         mMapView = mapView;
         mWithMapViewCallbacks?.forEach { it(mapView) }

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt

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

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

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

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

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

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

@@ -19,7 +19,7 @@ import com.rnmapbox.rnmbx.utils.ViewTagResolver
 import com.rnmapbox.rnmbx.utils.extensions.toCoordinate
 import com.rnmapbox.rnmbx.utils.extensions.toScreenCoordinate
 
-class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver<RNMBXMapView>) : NativeMapViewModuleSpec(context) {
+class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : NativeMapViewModuleSpec(context) {
     private fun withMapViewOnUIThread(
         viewRef: Double?,
         reject: Promise,

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

@@ -9,7 +9,7 @@ import com.facebook.react.viewmanagers.RNMBXMapViewManagerDelegate
 import com.mapbox.maps.MapInitOptions
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 
-class RNMBXAndroidTextureMapViewManager(context: ReactApplicationContext, viewTagResolver: ViewTagResolver<RNMBXMapView>) : RNMBXMapViewManager(
+class RNMBXAndroidTextureMapViewManager(context: ReactApplicationContext, viewTagResolver: ViewTagResolver) : RNMBXMapViewManager(
     context,
     viewTagResolver
 ), RNMBXAndroidTextureMapViewManagerInterface<RNMBXMapView> {

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

@@ -63,7 +63,7 @@ import com.rnmapbox.rnmbx.components.mapview.helpers.CameraChangeReason
 import com.rnmapbox.rnmbx.components.mapview.helpers.CameraChangeTracker
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLayer
 import com.rnmapbox.rnmbx.components.styles.light.RNMBXLight
-import com.rnmapbox.rnmbx.components.styles.sources.RCTSource
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource
 import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrain
 import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
 import com.rnmapbox.rnmbx.events.IEvent
@@ -190,7 +190,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
      */
     public var offscreenAnnotationViewContainer: ViewGroup? = null
 
-    private val mSources: MutableMap<String, RCTSource<*>>
+    private val mSources: MutableMap<String, RNMBXSource<*>>
     private val mImages: MutableList<RNMBXImages>
     private var mPointAnnotationManager: PointAnnotationManager? = null
     private var mActiveMarkerID: AnnotationID = INVALID_ANNOTATION_ID
@@ -309,7 +309,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         savedStyle = style
         styleLoaded = true
         setUpImage(style)
-        addFeaturesToMap()
+        addFeaturesToMap(true)
         applyLocalizeLabels()
         style.setProjection(Projection(mProjection))
     }
@@ -444,7 +444,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     // region Features
     fun addFeature(childView: View?, childPosition: Int) {
         var feature: AbstractMapFeature? = null
-        if (childView is RCTSource<*>) {
+        if (childView is RNMBXSource<*>) {
             val source = childView
             mSources[source.iD.toString()] = source
             feature = childView as AbstractMapFeature?
@@ -478,7 +478,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             }
         }
 
-        val addToMap = styleLoaded
+        val addToMap = styleLoaded || (feature?.requiresStyleLoad == false)
 
         var entry = FeatureEntry(feature, childView, false)
         if (addToMap) {
@@ -491,7 +491,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
     fun removeFeatureAt(childPosition: Int) {
         val entry = mFeatures[childPosition]
         val feature = entry.feature
-        if (feature is RCTSource<*>) {
+        if (feature is RNMBXSource<*>) {
             mSources.remove(feature.iD)
         } else if (feature is RNMBXPointAnnotation) {
             val annotation = feature
@@ -541,19 +541,21 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         }
     }
 
-    private fun addFeaturesToMap() {
+    private fun addFeaturesToMap(styleLoaded: Boolean = false) {
         mFeatures.forEach {
             if (!it.addedToMap) {
-                it.feature?.addToMap(this)
-                it.addedToMap = true
+                if (styleLoaded || it.feature?.requiresStyleLoad == false) {
+                    it.feature?.addToMap(this)
+                    it.addedToMap = true
+                }
             }
         }
     }
 
 
-    private val allTouchableSources: List<RCTSource<*>>
+    private val allTouchableSources: List<RNMBXSource<*>>
         private get() {
-            val sources: MutableList<RCTSource<*>> = ArrayList()
+            val sources: MutableList<RNMBXSource<*>> = ArrayList()
             for (key in mSources.keys) {
                 val source = mSources[key]
                 if (source != null && source.hasPressListener()) {
@@ -563,14 +565,14 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
             return sources
         }
 
-    private fun getTouchableSourceWithHighestZIndex(sources: List<RCTSource<*>>?): RCTSource<*>? {
+    private fun getTouchableSourceWithHighestZIndex(sources: List<RNMBXSource<*>>?): RNMBXSource<*>? {
         if (sources == null || sources.size == 0) {
             return null
         }
         if (sources.size == 1) {
             return sources[0]
         }
-        val layerToSourceMap: MutableMap<String, RCTSource<*>> = HashMap()
+        val layerToSourceMap: MutableMap<String, RNMBXSource<*>> = HashMap()
         for (source in sources) {
             val layerIDs: Array<out String>? = source.layerIDs.toTypedArray()
             if (layerIDs != null) {
@@ -654,18 +656,19 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
                             }
                         }
                 )
+                addFeaturesToMap(false)
             }
         }
     }
 
     interface HandleTap {
-        fun run(hitTouchableSources: List<RCTSource<*>?>?, hits: Map<String?, List<Feature?>?>)
+        fun run(hitTouchableSources: List<RNMBXSource<*>?>?, hits: Map<String?, List<Feature?>?>)
     }
 
     fun handleTapInSources(
-            sources: LinkedList<RCTSource<*>>, screenPoint: ScreenCoordinate,
+            sources: LinkedList<RNMBXSource<*>>, screenPoint: ScreenCoordinate,
             hits: HashMap<String?, List<Feature?>?>,
-            hitTouchableSources: ArrayList<RCTSource<*>?>,
+            hitTouchableSources: ArrayList<RNMBXSource<*>?>,
             handleTap: HandleTap
     ) {
         if (sources.isEmpty()) {
@@ -720,11 +723,11 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
         val hits = HashMap<String?, List<Feature?>?>()
         if (screenPoint != null) {
             handleTapInSources(LinkedList(touchableSources), screenPoint, hits, ArrayList(), object : HandleTap {
-                override fun run(hitTouchableSources: List<RCTSource<*>?>?, hits: Map<String?, List<Feature?>?>) {
+                override fun run(hitTouchableSources: List<RNMBXSource<*>?>?, hits: Map<String?, List<Feature?>?>) {
                     if (hits.size > 0) {
-                        val source = getTouchableSourceWithHighestZIndex(hitTouchableSources as List<RCTSource<*>>?)
+                        val source = getTouchableSourceWithHighestZIndex(hitTouchableSources as List<RNMBXSource<*>>?)
                         if (source != null && source.hasPressListener() && source.iD != null && source.iD in hits) {
-                            source.onPress(RCTSource.OnPressEvent(
+                            source.onPress(RNMBXSource.OnPressEvent(
                                     hits[source.iD] as List<Feature>,
                                     GeoJSONUtils.toLatLng(point),
                                     PointF(screenPoint.x.toFloat(), screenPoint.y.toFloat())

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

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

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

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

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXImageSource.kt

@@ -8,7 +8,7 @@ import com.mapbox.maps.extension.style.sources.generated.ImageSource
 import com.rnmapbox.rnmbx.utils.LatLngQuad
 import java.net.URL
 
-class RNMBXImageSource(context: Context?) : RCTSource<ImageSource?>(context) {
+class RNMBXImageSource(context: Context?) : RNMBXSource<ImageSource?>(context) {
     private var mURL: URL? = null
     private var mResourceId = 0
     private var mCoordQuad: LatLngQuad? = null

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSource.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.mapbox.maps.extension.style.sources.generated.GeoJsonSource
 import com.rnmapbox.rnmbx.utils.ImageEntry
 import android.graphics.drawable.BitmapDrawable
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
 import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.events.FeatureClickEvent
@@ -23,7 +24,7 @@ import java.util.HashMap
 import com.rnmapbox.rnmbx.v11compat.feature.*
 
 class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceManager) :
-    RCTSource<GeoJsonSource>(context) {
+    RNMBXSource<GeoJsonSource>(context) {
     private var mURL: URL? = null
     private var mShape: String? = null
     private var mCluster: Boolean? = null
@@ -176,18 +177,14 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
         }
     }
 
-    private fun callbackSuccess(callbackID: String, payload: WritableMap) {
-        val event = AndroidCallbackEvent(this, callbackID, payload)
-        mManager.handleEvent(event)
+    private fun callbackSuccess(payload: WritableMap, promise: Promise) {
+        promise.resolve(payload)
     }
-    private fun callbackError(callbackID: String, error: String, where: String) {
-        val payload: WritableMap = WritableNativeMap()
-        payload.putString("error", "$where: $error")
-        val event = AndroidCallbackEvent(this, callbackID, payload)
-        mManager.handleEvent(event)
+    private fun callbackError(error: String, where: String, promise: Promise) {
+        promise.reject("error", "$where: $error")
     }
 
-    fun getClusterExpansionZoom(callbackID: String, featureJSON: String) {
+    fun getClusterExpansionZoom(featureJSON: String, promise: Promise) {
         val feature = Feature.fromJson(featureJSON)
 
         mMap!!.getGeoJsonClusterExpansionZoom(iD!!, feature, QueryFeatureExtensionCallback { features ->
@@ -198,28 +195,29 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
                 if (contents is Long) {
                     val payload: WritableMap = WritableNativeMap()
                     payload.putInt("data", contents.toInt())
-                    callbackSuccess(callbackID, payload)
+                    callbackSuccess(payload, promise)
                     return@QueryFeatureExtensionCallback
                 } else {
                     callbackError(
-                        callbackID,
+
                         "Not a number: $contents",
-                        "getClusterExpansionZoom/getGeoJsonClusterExpansionZoom"
+                        "getClusterExpansionZoom/getGeoJsonClusterExpansionZoom",
+                        promise
                     )
                     return@QueryFeatureExtensionCallback
                 }
             } else {
                 callbackError(
-                    callbackID,
                     features.error ?: "Unknown error",
-                    "getClusterExpansionZoom/getGeoJsonClusterExpansionZoom"
+                    "getClusterExpansionZoom/getGeoJsonClusterExpansionZoom",
+                    promise
                 )
                 return@QueryFeatureExtensionCallback
             }
         })
     }
 
-    fun getClusterLeaves(callbackID: String, featureJSON: String, number: Int, offset: Int) {
+    fun getClusterLeaves(featureJSON: String, number: Int, offset: Int, promise: Promise) {
         val feature = Feature.fromJson(featureJSON)
 
         val _this = this
@@ -232,19 +230,19 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
                     "data",
                     FeatureCollection.fromFeatures(leaves!!).toJson()
                 )
-                callbackSuccess(callbackID, payload)
+                callbackSuccess(payload, promise)
             } else {
                 callbackError(
-                    callbackID,
                     features.error ?: "Unknown error",
-                    "getClusterLeaves/getGeoJsonClusterLeaves"
+                    "getClusterLeaves/getGeoJsonClusterLeaves",
+                    promise
                 )
                 return@QueryFeatureExtensionCallback
             }
         })
     }
 
-    fun getClusterChildren(callbackID: String, featureJSON: String) {
+    fun getClusterChildren(featureJSON: String, promise: Promise) {
         val feature = Feature.fromJson(featureJSON)
 
         val _this = this
@@ -257,12 +255,12 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
                     "data",
                     FeatureCollection.fromFeatures(children!!).toJson()
                 )
-                callbackSuccess(callbackID, payload)
+                callbackSuccess(payload, promise)
             }else {
                 callbackError(
-                    callbackID,
                     features.error ?: "Unknown error",
-                    "getClusterLeaves/queryFeatureExtensions"
+                    "getClusterLeaves/queryFeatureExtensions",
+                    promise
                 )
                 return@QueryFeatureExtensionCallback
             }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceManager.kt

@@ -1,13 +1,11 @@
 package com.rnmapbox.rnmbx.components.styles.sources
 
-import android.util.Log
 import android.view.View
 import com.facebook.react.bridge.ReactApplicationContext
 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
-import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.MapBuilder
 import com.mapbox.bindgen.Value
@@ -153,52 +151,8 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext) :
             .build()
     }
 
-    override fun getCommandsMap(): Map<String, Int>? {
-        return MapBuilder.builder<String, Int>()
-            .put("features", METHOD_FEATURES)
-            .put("getClusterExpansionZoom", METHOD_GET_CLUSTER_EXPANSION_ZOOM)
-            .put("getClusterLeaves", METHOD_GET_CLUSTER_LEAVES)
-            .put("getClusterChildren", METHOD_GET_CLUSTER_CHILDREN)
-            .build()
-    }
-
-    override fun receiveCommand(source: RNMBXShapeSource, commandID: Int, args: ReadableArray?) {
-        if (args == null) {
-            return
-        }
-
-        val callbackID = args.getString(0);
-
-        when (commandID) {
-            METHOD_FEATURES -> source.querySourceFeatures(
-                callbackID,
-                ExpressionParser.from(args.getArray(1))
-            )
-            METHOD_GET_CLUSTER_EXPANSION_ZOOM -> source.getClusterExpansionZoom(
-                callbackID,
-                args.getString(1)
-            )
-            METHOD_GET_CLUSTER_LEAVES -> source.getClusterLeaves(
-                callbackID,
-                args.getString(1),
-                args.getInt(2),
-                args.getInt(3)
-            )
-            METHOD_GET_CLUSTER_CHILDREN -> source.getClusterChildren(
-                callbackID,
-                args.getString(1)
-            )
-        }
-    }
-
     companion object {
         const val LOG_TAG = "RNMBXShapeSourceMgr"
         const val REACT_CLASS = "RNMBXShapeSource"
-
-        //region React Methods
-        const val METHOD_FEATURES = 103
-        const val METHOD_GET_CLUSTER_EXPANSION_ZOOM = 104
-        const val METHOD_GET_CLUSTER_LEAVES = 105
-        const val METHOD_GET_CLUSTER_CHILDREN = 106
     }
 }