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

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

@@ -0,0 +1,76 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import com.facebook.react.bridge.ReadableArray
+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 RNMBXSymbolLayerManager : ViewGroupManager<RNMBXSymbolLayer>() {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXSymbolLayer {
+        return RNMBXSymbolLayer(reactContext)
+    }
+
+    @ReactProp(name = "id")
+    fun setId(layer: RNMBXSymbolLayer, id: String?) {
+        layer.iD = id
+    }
+
+    @ReactProp(name = "existing")
+    fun setExisting(layer: RNMBXSymbolLayer, existing: Boolean) {
+        layer.setExisting(existing)
+    }
+
+    @ReactProp(name = "sourceID")
+    fun setSourceID(layer: RNMBXSymbolLayer, sourceID: String?) {
+        layer.setSourceID(sourceID)
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    fun setAboveLayerID(layer: RNMBXSymbolLayer, aboveLayerID: String?) {
+        layer.setAboveLayerID(aboveLayerID)
+    }
+
+    @ReactProp(name = "belowLayerID")
+    fun setBelowLayerID(layer: RNMBXSymbolLayer, belowLayerID: String?) {
+        layer.setBelowLayerID(belowLayerID)
+    }
+
+    @ReactProp(name = "layerIndex")
+    fun setLayerIndex(layer: RNMBXSymbolLayer, layerIndex: Int) {
+        layer.setLayerIndex(layerIndex)
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    fun setMinZoomLevel(layer: RNMBXSymbolLayer, minZoomLevel: Double) {
+        layer.setMinZoomLevel(minZoomLevel)
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    fun setMaxZoomLevel(layer: RNMBXSymbolLayer, maxZoomLevel: Double) {
+        layer.setMaxZoomLevel(maxZoomLevel)
+    }
+
+    @ReactProp(name = "reactStyle")
+    fun setReactStyle(layer: RNMBXSymbolLayer, style: ReadableMap?) {
+        layer.setReactStyle(style)
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    fun setSourceLayerId(layer: RNMBXSymbolLayer, sourceLayerID: String?) {
+        layer.setSourceLayerID(sourceLayerID)
+    }
+
+    @ReactProp(name = "filter")
+    fun setFilter(layer: RNMBXSymbolLayer, filterList: ReadableArray?) {
+        layer.setFilter(filterList)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXSymbolLayer"
+    }
+}

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

@@ -1,27 +1,27 @@
-package com.mapbox.rctmgl.components.styles.light
+package com.rnmapbox.rnmbx.components.styles.light
 
 import android.content.Context
-import com.mapbox.maps.extension.style.light.generated.setLight
-import com.mapbox.rctmgl.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
 import com.mapbox.maps.MapboxMap
 import com.facebook.react.bridge.ReadableMap
 import com.mapbox.maps.Style
-import com.mapbox.maps.extension.style.light.generated.Light
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.styles.RCTMGLStyleFactory
-import com.mapbox.rctmgl.components.styles.RCTMGLStyle
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
 
-class RCTMGLLight(context: Context?) : AbstractMapFeature(context) {
+import com.rnmapbox.rnmbx.v11compat.light.*
+
+class RNMBXLight(context: Context?) : AbstractMapFeature(context) {
     private var mMap: MapboxMap? = null
     private var mReactStyle: ReadableMap? = null
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         setLight()
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         // ignore there's nothing to remove just update the light style
         return super.removeFromMap(mapView, reason)
     }
@@ -32,13 +32,13 @@ class RCTMGLLight(context: Context?) : AbstractMapFeature(context) {
     }
 
     private fun setLight(light: Light) {
-        RCTMGLStyleFactory.setLightLayerStyle(light, RCTMGLStyle(context, mReactStyle!!, mMap!!))
+        RNMBXStyleFactory.setLightLayerStyle(light, RNMBXStyle(context, mReactStyle!!, mMap!!))
         style!!.setLight(light)
     }
 
     private fun setLight() {
         if (style != null) {
-            val light = Light()
+            val light = createLight()
             setLight(light)
         }
     }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/light/RCTMGLLightManager.java → java/com/rnmapbox/rnmbx/components/styles/light/RNMBXLightManager.java}

@@ -1,12 +1,12 @@
-package com.mapbox.rctmgl.components.styles.light;
+package com.rnmapbox.rnmbx.components.styles.light;
 
 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;
 
-public class RCTMGLLightManager extends ViewGroupManager<RCTMGLLight> {
-    public static final String REACT_CLASS = "RCTMGLLight";
+public class RNMBXLightManager extends ViewGroupManager<RNMBXLight> {
+    public static final String REACT_CLASS = "RNMBXLight";
 
     @Override
     public String getName() {
@@ -14,12 +14,12 @@ public class RCTMGLLightManager extends ViewGroupManager<RCTMGLLight> {
     }
 
     @Override
-    protected RCTMGLLight createViewInstance(ThemedReactContext reactContext) {
-        return new RCTMGLLight(reactContext);
+    protected RNMBXLight createViewInstance(ThemedReactContext reactContext) {
+        return new RNMBXLight(reactContext);
     }
 
     @ReactProp(name="reactStyle")
-    public void setReactStyle(RCTMGLLight light, ReadableMap reactStyle) {
+    public void setReactStyle(RNMBXLight light, ReadableMap reactStyle) {
         light.setReactStyle(reactStyle);
     }
 }

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

@@ -1,7 +1,7 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.content.Context
-import com.mapbox.rctmgl.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
 
 abstract class AbstractSourceConsumer(context: Context?) : AbstractMapFeature(context) {
     abstract val iD: String?

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

@@ -1,14 +1,14 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.content.Context
 import com.mapbox.maps.extension.style.sources.getSource
 import com.mapbox.maps.extension.style.sources.addSource
-import com.mapbox.rctmgl.components.AbstractMapFeature
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.mapbox.maps.MapboxMap
-import com.mapbox.rctmgl.components.styles.sources.AbstractSourceConsumer
+import com.rnmapbox.rnmbx.components.styles.sources.AbstractSourceConsumer
 import com.facebook.react.bridge.ReadableMap
-import com.mapbox.rctmgl.components.styles.sources.RCTSource
+import com.rnmapbox.rnmbx.components.styles.sources.RCTSource
 import android.graphics.PointF
 import android.view.View
 import com.facebook.react.common.MapBuilder
@@ -16,10 +16,10 @@ import com.mapbox.geojson.Feature
 import com.mapbox.maps.Style
 import com.mapbox.maps.extension.style.StyleContract
 import com.mapbox.maps.extension.style.sources.Source
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.styles.sources.RCTSource.OnPressEvent
-import com.mapbox.rctmgl.utils.LatLng
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.styles.sources.RCTSource.OnPressEvent
+import com.rnmapbox.rnmbx.utils.LatLng
+import com.rnmapbox.rnmbx.utils.Logger
 import java.lang.ClassCastException
 import java.util.ArrayList
 import java.util.HashMap
@@ -108,7 +108,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
             } else mTouchHitbox
         }
 
-    fun addToMap(existings: Boolean, style: Style, mapView: RCTMGLMapView) {
+    fun addToMap(existings: Boolean, style: Style, mapView: RNMBXMapView) {
         mSource = null
         val existingSource = getSourceAs(style, iD)
         if (existingSource != null) {
@@ -136,7 +136,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
         }
      }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         val map = mMap
@@ -157,7 +157,7 @@ abstract class RCTSource<T : Source?>(context: Context?) : AbstractMapFeature(co
 
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
 
         mSubFeatures.forEach { it
             var featureInfo = it

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

@@ -1,14 +1,14 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.content.Context
 import android.net.Uri
 import android.util.Log
 import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper
 import com.mapbox.maps.extension.style.sources.generated.ImageSource
-import com.mapbox.rctmgl.utils.LatLngQuad
+import com.rnmapbox.rnmbx.utils.LatLngQuad
 import java.net.URL
 
-class RCTMGLImageSource(context: Context?) : RCTSource<ImageSource?>(context) {
+class RNMBXImageSource(context: Context?) : RCTSource<ImageSource?>(context) {
     private var mURL: URL? = null
     private var mResourceId = 0
     private var mCoordQuad: LatLngQuad? = null
@@ -64,6 +64,6 @@ class RCTMGLImageSource(context: Context?) : RCTSource<ImageSource?>(context) {
     }
 
     companion object {
-        const val LOG_TAG = "RCTMGLImageSource"
+        const val LOG_TAG = "RNMBXImageSource"
     }
 }

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

@@ -1,54 +1,54 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.view.View
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLngQuad
+import com.rnmapbox.rnmbx.utils.GeoJSONUtils.toLatLngQuad
 
-class RCTMGLImageSourceManager : ViewGroupManager<RCTMGLImageSource>() {
+class RNMBXImageSourceManager : ViewGroupManager<RNMBXImageSource>() {
     override fun getName(): String {
         return REACT_CLASS
     }
 
-    override fun createViewInstance(reactContext: ThemedReactContext): RCTMGLImageSource {
-        return RCTMGLImageSource(reactContext)
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXImageSource {
+        return RNMBXImageSource(reactContext)
     }
 
-    override fun getChildAt(source: RCTMGLImageSource, childPosition: Int): View {
+    override fun getChildAt(source: RNMBXImageSource, childPosition: Int): View {
         return source.getChildAt(childPosition)
     }
 
-    override fun getChildCount(source: RCTMGLImageSource): Int {
+    override fun getChildCount(source: RNMBXImageSource): Int {
         return source.childCount
     }
 
-    override fun addView(source: RCTMGLImageSource, childView: View, childPosition: Int) {
+    override fun addView(source: RNMBXImageSource, childView: View, childPosition: Int) {
         source.addLayer(childView, childPosition)
     }
 
-    override fun removeViewAt(source: RCTMGLImageSource, childPosition: Int) {
+    override fun removeViewAt(source: RNMBXImageSource, childPosition: Int) {
         source.removeLayer(childPosition)
     }
 
     @ReactProp(name = "id")
-    fun setId(source: RCTMGLImageSource, id: String?) {
+    fun setId(source: RNMBXImageSource, id: String?) {
         source.iD = id
     }
 
     @ReactProp(name = "url")
-    fun setUrl(source: RCTMGLImageSource, url: String?) {
+    fun setUrl(source: RNMBXImageSource, url: String?) {
         source.setURL(url)
     }
 
     @ReactProp(name = "coordinates")
-    fun setCoordinates(source: RCTMGLImageSource, arr: ReadableArray?) {
+    fun setCoordinates(source: RNMBXImageSource, arr: ReadableArray?) {
         val quad = toLatLngQuad(arr) ?: return
         source.setCoordinates(quad)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLImageSource"
+        const val REACT_CLASS = "RNMBXImageSource"
     }
 }

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/styles/sources/RCTMGLRasterDemSource.kt → java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSource.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,15 +10,17 @@ import com.mapbox.maps.SourceQueryOptions
 import com.mapbox.maps.extension.style.expressions.generated.Expression
 import com.mapbox.maps.extension.style.sources.generated.RasterDemSource
 import com.mapbox.maps.extension.style.sources.getSource
-import com.mapbox.rctmgl.events.AndroidCallbackEvent
-import com.mapbox.rctmgl.events.FeatureClickEvent
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
+import com.rnmapbox.rnmbx.events.FeatureClickEvent
+import com.rnmapbox.rnmbx.utils.Logger
 import java.util.*
 
-// import com.mapbox.rctmgl.R;
-// import com.mapbox.rctmgl.utils.DownloadMapImageTask;
-class RCTMGLRasterDemSource(context: Context?, private val mManager: RCTMGLRasterDemSourceManager) :
-    RCTMGLTileSource<RasterDemSource?>(context) {
+import com.rnmapbox.rnmbx.v11compat.feature.*
+
+// import com.rnmapbox.rnmbx.R;
+// import com.rnmapbox.rnmbx.utils.DownloadMapImageTask;
+class RNMBXRasterDemSource(context: Context?, private val mManager: RNMBXRasterDemSourceManager) :
+    RNMBXTileSource<RasterDemSource?>(context) {
     override fun onPress(event: OnPressEvent?) {
         mManager.handleEvent(FeatureClickEvent.makeVectorSourceEvent(this, event))
     }
@@ -26,7 +28,7 @@ class RCTMGLRasterDemSource(context: Context?, private val mManager: RCTMGLRaste
     override fun makeSource(): RasterDemSource? {
         val id = iD
         if (id == null) {
-            Logger.w("RCTMGLRasterDemSource", "id is required")
+            Logger.w("RNMBXRasterDemSource", "id is required")
             return null
         }
         if (isDefaultSource(id)) {

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

@@ -0,0 +1,30 @@
+package com.rnmapbox.rnmbx.components.styles.sources
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.common.MapBuilder
+import com.facebook.react.uimanager.ThemedReactContext
+
+// import com.rnmapbox.rnmbx.components.annotation.RNMBXCallout;
+// import com.rnmapbox.rnmbx.utils.ResourceUtils;
+class RNMBXRasterDemSourceManager(private val mContext: ReactApplicationContext) :
+    RNMBXTileSourceManager<RNMBXRasterDemSource?>(
+        mContext
+    ) {
+    override fun customEvents(): Map<String, String>? {
+        return MapBuilder.builder<String, String>()
+            .build()
+    }
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXRasterDemSource {
+        return RNMBXRasterDemSource(reactContext, this)
+    }
+
+    companion object {
+        const val LOG_TAG = "RNMBXRasterDemSourceManager"
+        const val REACT_CLASS = "RNMBXRasterDemSource"
+    }
+}

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

@@ -1,9 +1,9 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.content.Context
 import com.mapbox.maps.extension.style.sources.generated.RasterSource
 
-class RCTMGLRasterSource(context: Context?) : RCTMGLTileSource<RasterSource?>(context) {
+class RNMBXRasterSource(context: Context?) : RNMBXTileSource<RasterSource?>(context) {
     private var mTileSize: Int? = null
     override fun makeSource(): RasterSource {
         val id = iD!!

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

@@ -1,24 +1,24 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import javax.annotation.Nonnull
 
-class RCTMGLRasterSourceManager(reactApplicationContext: ReactApplicationContext) :
-    RCTMGLTileSourceManager<RCTMGLRasterSource?>(reactApplicationContext) {
+class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext) :
+    RNMBXTileSourceManager<RNMBXRasterSource?>(reactApplicationContext) {
     @Nonnull
     override fun getName(): String {
         return REACT_CLASS
     }
 
     @Nonnull
-    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RCTMGLRasterSource {
-        return RCTMGLRasterSource(reactContext)
+    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXRasterSource {
+        return RNMBXRasterSource(reactContext)
     }
 
     @ReactProp(name = "tileSize")
-    fun setTileSize(source: RCTMGLRasterSource, tileSize: Int) {
+    fun setTileSize(source: RNMBXRasterSource, tileSize: Int) {
         source.setTileSize(tileSize)
     }
 
@@ -27,6 +27,6 @@ class RCTMGLRasterSourceManager(reactApplicationContext: ReactApplicationContext
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLRasterSource"
+        const val REACT_CLASS = "RNMBXRasterSource"
     }
 }

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

@@ -1,26 +1,28 @@
-package com.mapbox.rctmgl.components.styles.sources
+package com.rnmapbox.rnmbx.components.styles.sources
 
 import android.content.Context
 import com.mapbox.maps.extension.style.sources.generated.GeoJsonSource
-import com.mapbox.rctmgl.utils.ImageEntry
+import com.rnmapbox.rnmbx.utils.ImageEntry
 import android.graphics.drawable.BitmapDrawable
 import com.facebook.react.bridge.ReadableMap
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.events.FeatureClickEvent
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
+import com.rnmapbox.rnmbx.events.FeatureClickEvent
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.mapbox.bindgen.Value
 import com.mapbox.geojson.Feature
-import com.mapbox.rctmgl.events.AndroidCallbackEvent
+import com.rnmapbox.rnmbx.events.AndroidCallbackEvent
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.maps.*
 import com.mapbox.maps.extension.style.expressions.generated.Expression
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.utils.Logger
 import java.net.URL
 import java.util.ArrayList
 import java.util.HashMap
 
-class RCTMGLShapeSource(context: Context, private val mManager: RCTMGLShapeSourceManager) :
+import com.rnmapbox.rnmbx.v11compat.feature.*
+
+class RNMBXShapeSource(context: Context, private val mManager: RNMBXShapeSourceManager) :
     RCTSource<GeoJsonSource>(context) {
     private var mURL: URL? = null
     private var mShape: String? = null
@@ -39,11 +41,11 @@ class RCTMGLShapeSource(context: Context, private val mManager: RCTMGLShapeSourc
         return (mURL == null) && (mShape == null)
     }
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         // Wait for style before adding the source to the map
         mapView.getMapboxMap().getStyle {
             val map = mapView.getMapboxMap()
-            super@RCTMGLShapeSource.addToMap(mapView)
+            super@RNMBXShapeSource.addToMap(mapView)
         }
     }
 
@@ -158,7 +160,7 @@ class RCTMGLShapeSource(context: Context, private val mManager: RCTMGLShapeSourc
             )
         ) { features ->
             if (features.isError) {
-                Logger.e("RCTMGLShapeSource", String.format("Error: %s", features.error))
+                Logger.e("RNMBXShapeSource", String.format("Error: %s", features.error))
             } else {
                 val payload: WritableMap = WritableNativeMap()
                 val result: MutableList<Feature> = ArrayList(