@rnmapbox/maps 10.1.0-beta.13 → 10.1.0-beta.15

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/atmosphere/RNMBXAtmosphereManager.kt

@@ -28,11 +28,6 @@ class RNMBXAtmosphereManager : ViewGroupManager<RNMBXAtmosphere>(), RNMBXAtmosph
         return RNMBXAtmosphere(reactContext)
     }
 
-    @ReactProp(name = "id")
-    fun setId(layer: RNMBXAtmosphere, id: String?) {
-        layer.iD = id
-    }
-
     @ReactProp(name = "reactStyle")
     override fun setReactStyle(atmosphere: RNMBXAtmosphere, reactStyle: Dynamic) {
         atmosphere.setReactStyle(reactStyle.asMap())

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/light/RNMBXLightManager.kt

@@ -0,0 +1,27 @@
+package com.rnmapbox.rnmbx.components.styles.light
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXLightManagerInterface
+
+class RNMBXLightManager : ViewGroupManager<RNMBXLight>(),
+    RNMBXLightManagerInterface<RNMBXLight> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXLight {
+        return RNMBXLight(reactContext)
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(light: RNMBXLight, reactStyle: Dynamic) {
+        light.setReactStyle(reactStyle.asMap())
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXLight"
+    }
+}

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/RNMBXImageSourceManager.kt

@@ -1,13 +1,15 @@
 package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.view.View
-import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXImageSourceManagerInterface
 import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngQuad
 
-class RNMBXImageSourceManager : ViewGroupManager<RNMBXImageSource>() {
+class RNMBXImageSourceManager : ViewGroupManager<RNMBXImageSource>(),
+    RNMBXImageSourceManagerInterface<RNMBXImageSource> {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -33,22 +35,28 @@ class RNMBXImageSourceManager : ViewGroupManager<RNMBXImageSource>() {
     }
 
     @ReactProp(name = "id")
-    fun setId(source: RNMBXImageSource, id: String?) {
-        source.iD = id
+    override fun setId(source: RNMBXImageSource, id: Dynamic) {
+        source.iD = id.asString()
     }
 
     @ReactProp(name = "url")
-    fun setUrl(source: RNMBXImageSource, url: String?) {
-        source.setURL(url)
+    override fun setUrl(source: RNMBXImageSource, url: Dynamic) {
+        source.setURL(url.asString())
     }
 
     @ReactProp(name = "coordinates")
-    fun setCoordinates(source: RNMBXImageSource, arr: ReadableArray?) {
-        val quad = toLatLngQuad(arr) ?: return
+    override fun setCoordinates(source: RNMBXImageSource, arr: Dynamic) {
+        val quad = toLatLngQuad(arr.asArray()) ?: return
         source.setCoordinates(quad)
     }
 
+    @ReactProp(name = "existing")
+    override fun setExisting(source: RNMBXImageSource, value: Dynamic) {
+        source.mExisting = value.asBoolean()
+    }
+
     companion object {
         const val REACT_CLASS = "RNMBXImageSource"
     }
+
 }

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

@@ -1,15 +1,19 @@
 package com.rnmapbox.rnmbx.components.styles.sources
 
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRasterDemSourceManagerInterface
+import com.rnmapbox.rnmbx.utils.Logger
 
 // import com.rnmapbox.rnmbx.components.annotation.RNMBXCallout;
 // import com.rnmapbox.rnmbx.utils.ResourceUtils;
 class RNMBXRasterDemSourceManager(private val mContext: ReactApplicationContext) :
     RNMBXTileSourceManager<RNMBXRasterDemSource?>(
         mContext
-    ) {
+    ), RNMBXRasterDemSourceManagerInterface<RNMBXRasterDemSource> {
     override fun customEvents(): Map<String, String>? {
         return MapBuilder.builder<String, String>()
             .build()
@@ -27,4 +31,14 @@ class RNMBXRasterDemSourceManager(private val mContext: ReactApplicationContext)
         const val LOG_TAG = "RNMBXRasterDemSourceManager"
         const val REACT_CLASS = "RNMBXRasterDemSource"
     }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(view: RNMBXRasterDemSource, value: Dynamic) {
+        view.mExisting = value.asBoolean()
+    }
+
+    @ReactProp(name = "tileSize")
+    override fun setTileSize(view: RNMBXRasterDemSource, value: Dynamic) {
+        Logger.e("RNMBXRasterDemSourceManager", "tileSize not implemented")
+    }
 }

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

@@ -1,12 +1,15 @@
 package com.rnmapbox.rnmbx.components.styles.sources
 
+import com.facebook.react.bridge.Dynamic
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXRasterSourceManagerInterface
 import javax.annotation.Nonnull
 
 class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext) :
-    RNMBXTileSourceManager<RNMBXRasterSource?>(reactApplicationContext) {
+    RNMBXTileSourceManager<RNMBXRasterSource?>(reactApplicationContext),
+    RNMBXRasterSourceManagerInterface<RNMBXRasterSource> {
     @Nonnull
     override fun getName(): String {
         return REACT_CLASS
@@ -18,8 +21,8 @@ class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext)
     }
 
     @ReactProp(name = "tileSize")
-    fun setTileSize(source: RNMBXRasterSource, tileSize: Int) {
-        source.setTileSize(tileSize)
+    override fun setTileSize(source: RNMBXRasterSource, tileSize: Dynamic) {
+        source.setTileSize(tileSize.asInt())
     }
 
     override fun customEvents(): Map<String, String>? {
@@ -29,4 +32,9 @@ class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext)
     companion object {
         const val REACT_CLASS = "RNMBXRasterSource"
     }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(source: RNMBXRasterSource, value: Dynamic) {
+        source.mExisting = value.asBoolean()
+    }
 }

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
@@ -34,8 +35,6 @@ class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceM
     private var mBuffer: Long? = null
     private var mTolerance: Double? = null
     private var mLineMetrics: Boolean? = null
-    private val mImages: List<Map.Entry<String, ImageEntry>>? = null
-    private val mNativeImages: List<Map.Entry<String, BitmapDrawable>>? = null
 
     override fun hasNoDataSoRefersToExisting(): Boolean {
         return (mURL == null) && (mShape == null)
@@ -176,18 +175,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 +193,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 +228,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 +253,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,15 +1,14 @@
 package com.rnmapbox.rnmbx.components.styles.sources
 
-import android.util.Log
 import android.view.View
+import com.facebook.react.bridge.Dynamic
 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.facebook.react.viewmanagers.RNMBXShapeSourceManagerInterface
 import com.mapbox.bindgen.Value
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.rnmapbox.rnmbx.events.constants.EventKeys
@@ -24,7 +23,7 @@ import java.util.HashMap
 class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext) :
     AbstractEventEmitter<RNMBXShapeSource>(
         mContext
-    ) {
+    ), RNMBXShapeSourceManagerInterface<RNMBXShapeSource> {
     override fun getName(): String {
         return REACT_CLASS
     }
@@ -50,51 +49,51 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "id")
-    fun setId(source: RNMBXShapeSource, id: String) {
-        source.iD = id
+    override fun setId(source: RNMBXShapeSource, id: Dynamic) {
+        source.iD = id.asString()
     }
 
     @ReactProp(name = "existing")
-    fun setExisting(source: RNMBXShapeSource, existing: Boolean) {
-        source.mExisting = existing;
+    override fun setExisting(source: RNMBXShapeSource, existing: Dynamic) {
+        source.mExisting = existing.asBoolean()
     }
 
     @ReactProp(name = "url")
-    fun setURL(source: RNMBXShapeSource, urlStr: String) {
+    override fun setUrl(source: RNMBXShapeSource, urlStr: Dynamic) {
         try {
-            source.setURL(URL(urlStr))
+            source.setURL(URL(urlStr.asString()))
         } catch (e: MalformedURLException) {
             Logger.w(LOG_TAG, e.localizedMessage ?: "Unknown URL error")
         }
     }
 
     @ReactProp(name = "shape")
-    fun setGeometry(source: RNMBXShapeSource, geoJSONStr: String) {
-        source.setShape(geoJSONStr)
+    override fun setShape(source: RNMBXShapeSource, geoJSONStr: Dynamic) {
+        source.setShape(geoJSONStr.asString())
     }
 
     @ReactProp(name = "cluster")
-    fun setCluster(source: RNMBXShapeSource, cluster: Int) {
-        source.setCluster(cluster == 1)
+    override fun setCluster(source: RNMBXShapeSource, cluster: Dynamic) {
+        source.setCluster(cluster.asInt() == 1)
     }
 
     @ReactProp(name = "clusterRadius")
-    fun setClusterRadius(source: RNMBXShapeSource, radius: Int) {
-        source.setClusterRadius(radius.toLong())
+    override fun setClusterRadius(source: RNMBXShapeSource, radius: Dynamic) {
+        source.setClusterRadius(radius.asInt().toLong())
     }
 
     @ReactProp(name = "clusterMaxZoomLevel")
-    fun setClusterMaxZoomLevel(source: RNMBXShapeSource, clusterMaxZoom: Int) {
-        source.setClusterMaxZoom(clusterMaxZoom.toLong())
+    override fun setClusterMaxZoomLevel(source: RNMBXShapeSource, clusterMaxZoom: Dynamic) {
+        source.setClusterMaxZoom(clusterMaxZoom.asInt().toLong())
     }
 
     @ReactProp(name = "clusterProperties")
-    fun setClusterProperties(source: RNMBXShapeSource, map: ReadableMap) {
+    override fun setClusterProperties(source: RNMBXShapeSource, map: Dynamic) {
         val properties = HashMap<String, Any>()
-        val iterator = map.keySetIterator()
+        val iterator = map.asMap().keySetIterator()
         while (iterator.hasNextKey()) {
             val name = iterator.nextKey()
-            val expressions = map.getArray(name)
+            val expressions = map.asMap().getArray(name)
             val builder: MutableList<Value> = ArrayList()
             for (iExp in 0 until expressions!!.size()) {
                 var argument: Expression
@@ -117,33 +116,33 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "maxZoomLevel")
-    fun setMaxZoomLevel(source: RNMBXShapeSource, maxZoom: Int) {
-        source.setMaxZoom(maxZoom.toLong())
+    override fun setMaxZoomLevel(source: RNMBXShapeSource, maxZoom: Dynamic) {
+        source.setMaxZoom(maxZoom.asInt().toLong())
     }
 
     @ReactProp(name = "buffer")
-    fun setBuffer(source: RNMBXShapeSource, buffer: Int) {
-        source.setBuffer(buffer.toLong())
+    override fun setBuffer(source: RNMBXShapeSource, buffer: Dynamic) {
+        source.setBuffer(buffer.asInt().toLong())
     }
 
     @ReactProp(name = "tolerance")
-    fun setTolerance(source: RNMBXShapeSource, tolerance: Double) {
-        source.setTolerance(tolerance)
+    override fun setTolerance(source: RNMBXShapeSource, tolerance: Dynamic) {
+        source.setTolerance(tolerance.asDouble())
     }
 
     @ReactProp(name = "lineMetrics")
-    fun setLineMetrics(source: RNMBXShapeSource, lineMetrics: Boolean) {
-        source.setLineMetrics(lineMetrics)
+    override fun setLineMetrics(source: RNMBXShapeSource, lineMetrics: Dynamic) {
+        source.setLineMetrics(lineMetrics.asBoolean())
     }
 
     @ReactProp(name = "hasPressListener")
-    fun setHasPressListener(source: RNMBXShapeSource, hasPressListener: Boolean) {
-        source.setHasPressListener(hasPressListener)
+    override fun setHasPressListener(source: RNMBXShapeSource, hasPressListener: Dynamic) {
+        source.setHasPressListener(hasPressListener.asBoolean())
     }
 
     @ReactProp(name = "hitbox")
-    fun setHitbox(source: RNMBXShapeSource, map: ReadableMap) {
-        source.setHitbox(map)
+    override fun setHitbox(source: RNMBXShapeSource, map: Dynamic) {
+        source.setHitbox(map.asMap())
     }
 
     override fun customEvents(): Map<String, String>? {
@@ -153,52 +152,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
     }
 }

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

@@ -0,0 +1,61 @@
+package com.rnmapbox.rnmbx.components.styles.sources
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.common.UIManagerType
+import com.rnmapbox.rnmbx.BuildConfig
+import com.rnmapbox.rnmbx.NativeRNMBXShapeSourceModuleSpec
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.utils.ViewTagResolver
+
+@ReactModule(name = RNMBXShapeSourceModule.NAME)
+class RNMBXShapeSourceModule(reactContext: ReactApplicationContext?, private val viewTagResolver: ViewTagResolver) :
+    NativeRNMBXShapeSourceModuleSpec(reactContext) {
+
+
+    private fun withShapeSourceOnUIThread(viewRef: Double?, reject: Promise, fn: (RNMBXShapeSource) -> Unit) {
+        if (viewRef == null) {
+            reject.reject(Exception("viewRef is null for RNMBXShapeSource"))
+        } else {
+            viewTagResolver.withViewResolved(viewRef.toInt(), reject, fn)
+        }
+    }
+
+    companion object {
+        const val NAME = "RNMBXShapeSourceModule"
+    }
+
+    @ReactMethod
+    override fun getClusterExpansionZoom(
+        viewRef: Double?,
+        featureJSON: String,
+        promise: Promise
+    ) {
+        withShapeSourceOnUIThread(viewRef, promise) {
+            it.getClusterExpansionZoom(featureJSON, promise)
+        }
+    }
+
+    @ReactMethod
+    override fun getClusterLeaves(
+        viewRef: Double?,
+        featureJSON: String,
+        number: Double,
+        offset: Double,
+        promise: Promise
+    ) {
+        withShapeSourceOnUIThread(viewRef, promise) {
+            it.getClusterLeaves(featureJSON, number.toInt(), offset.toInt(), promise)
+        }
+    }
+
+    @ReactMethod
+    override fun getClusterChildren(viewRef: Double?, featureJSON: String, promise: Promise) {
+        withShapeSourceOnUIThread(viewRef, promise) {
+            it.getClusterChildren(featureJSON, promise)
+        }
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/{RCTSource.kt → RNMBXSource.kt}

@@ -8,7 +8,7 @@ import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.mapbox.maps.MapboxMap
 import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
 import com.facebook.react.bridge.ReadableMap
-import com.rnmapbox.rnmbx.components.styles.sources.RCTSource
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource
 import android.graphics.PointF
 import android.view.View
 import com.facebook.react.common.MapBuilder
@@ -17,7 +17,7 @@ import com.mapbox.maps.Style
 import com.mapbox.maps.extension.style.StyleContract
 import com.mapbox.maps.extension.style.sources.Source
 import com.rnmapbox.rnmbx.components.RemovalReason
-import com.rnmapbox.rnmbx.components.styles.sources.RCTSource.OnPressEvent
+import com.rnmapbox.rnmbx.components.styles.sources.RNMBXSource.OnPressEvent
 import com.rnmapbox.rnmbx.utils.LatLng
 import com.rnmapbox.rnmbx.utils.Logger
 import java.lang.ClassCastException
@@ -27,9 +27,9 @@ import java.util.HashMap
 data class FeatureInfo(val feature: AbstractMapFeature?, var added: Boolean) {
 }
 
-abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(context) {
+abstract class RNMBXSource<T : Source?>(context: Context?) : AbstractMapFeature(context) {
     @JvmField
-    protected var mMap: MapboxMap? = null
+    var mMap: MapboxMap? = null
     var iD: String? = null
     @JvmField
     protected var mSource: T? = null
@@ -61,7 +61,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
                 if (hasNoDataSoRefersToExisting()) {
                     Logger.w(
                         LOG_TAG,
-                        "RCTSource: soure with id: $id seems to refer to existing value but existing flag is not set. This is deprecated."
+                        "RNMBXSource: source with id: $id seems to refer to existing value but existing flag is not set. This is deprecated."
                     )
                     result = true
                 } else {
@@ -141,7 +141,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
         mMap = mapView.getMapboxMap()
         val map = mMap
         if (map == null) {
-            Logger.e("RCTSource", "map is exepted to be valid but was null, $iD")
+            Logger.e("RNMBXSource", "map is exepted to be valid but was null, $iD")
             return
         }
         val style = map.getStyle()
@@ -171,7 +171,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
             try {
                 iD?.let { mMap?.getStyle()?.removeStyleSource(it) }
             } catch (ex: Throwable) {
-                Logger.w(LOG_TAG, String.format("RCTSource.removeFromMap: %s - %s", mSource, ex.message), ex)
+                Logger.w(LOG_TAG, String.format("RNMBXSource.removeFromMap: %s - %s", mSource, ex.message), ex)
             }
         }
         return super.removeFromMap(mapView, reason)
@@ -227,7 +227,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
 
     companion object {
         const val DEFAULT_ID = "composite"
-        const val LOG_TAG = "RCTSource"
+        const val LOG_TAG = "RNMBXSource"
         const val DEFAULT_HITBOX_WIDTH = 44.0
         const val DEFAULT_HITBOX_HEIGHT = 44.0
         @JvmStatic

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

@@ -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 RNMBXTileSource<T : Source?>(context: Context?) : RCTSource<T>(context) {
+abstract class RNMBXTileSource<T : Source?>(context: Context?) : RNMBXSource<T>(context) {
     var uRL: String? = null
     public var tileUrlTemplates: Collection<String> = ArrayList()
     var attribution: String? = null