@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/android/src/main/java/com/rnmapbox/rnmbx/utils/DownloadMapImageTask.kt

@@ -20,7 +20,6 @@ import com.facebook.imagepipeline.image.CloseableStaticBitmap
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.facebook.react.views.imagehelper.ImageSource
 import com.rnmapbox.rnmbx.components.images.ImageInfo
-import com.rnmapbox.rnmbx.components.images.ImageManager
 import java.io.File
 import java.lang.ref.WeakReference
 import java.util.HashMap
@@ -28,13 +27,12 @@ import com.rnmapbox.rnmbx.v11compat.image.*
 
 data class DownloadedImage(val name: String, val bitmap: Bitmap, val info: ImageInfo)
 
-class DownloadMapImageTask(context: Context, map: MapboxMap, imageManager: ImageManager?, callback: OnAllImagesLoaded? = null) :
+class DownloadMapImageTask(context: Context, map: MapboxMap, callback: OnAllImagesLoaded?) :
     AsyncTask<Map.Entry<String, ImageEntry>, Void?, List<DownloadedImage>>() {
     private val mContext: WeakReference<Context>
     private val mMap: WeakReference<MapboxMap>
     private val mCallback: OnAllImagesLoaded?
     private val mCallerContext: Any
-    private val mImageManager: WeakReference<ImageManager>
 
     interface OnAllImagesLoaded {
         fun onAllImagesLoaded()
@@ -99,7 +97,7 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, imageManager: Image
                 for (image in images) {
                     bitmapImages[image.name] = image.bitmap
                     val info = image.info
-                    mImageManager.get()?.resolve(image.name, image.bitmap)
+
                     style.addBitmapImage(image.name, image.bitmap, info)
                 }
             }
@@ -114,7 +112,6 @@ class DownloadMapImageTask(context: Context, map: MapboxMap, imageManager: Image
     init {
         mContext = WeakReference(context.applicationContext)
         mMap = WeakReference(map)
-        mImageManager = WeakReference(imageManager)
         mCallback = callback
         mCallerContext = this
     }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/GeoJSONUtils.kt

@@ -100,11 +100,6 @@ object GeoJSONUtils {
         val map: WritableMap = WritableNativeMap()
         map.putString("type", "Feature")
         map.putMap("geometry", toPointGeometry(latLng))
-        properties?.let {
-            if (it.hasKey("id") == true) {
-                map.putString("id", it.getString("id"));
-            }
-        }
         map.putMap("properties", properties)
         return map
     }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableArray.kt

@@ -2,16 +2,11 @@ package com.rnmapbox.rnmbx.utils.extensions
 
 import android.graphics.RectF
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.bridge.ReadableType
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
 import com.mapbox.geojson.Point
 import com.mapbox.maps.ScreenCoordinate
-import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.Logger
-import org.json.JSONArray
-import java.lang.Float.max
 import java.lang.Float.min
+import java.lang.Float.max
 
 fun ReadableArray.toCoordinate() : Point {
     if (this.size() != 2) {
@@ -41,18 +36,3 @@ fun ReadableArray.toRectF() : RectF? {
         max(getDouble(0).toFloat(), getDouble(2).toFloat())
     )
 }
-
-fun ReadableArray.toJsonArray() : JsonArray {
-    val result = JsonArray(size())
-    for (i in 0 until size()) {
-        when (getType(i)) {
-            ReadableType.Map -> result.add(getMap(i).toJsonObject())
-            ReadableType.Array -> result.add(getArray(i).toJsonArray())
-            ReadableType.Null -> result.add(null as JsonElement?)
-            ReadableType.Number -> result.add(getDouble(i))
-            ReadableType.String -> result.add(getString(i))
-            ReadableType.Boolean -> result.add(getBoolean(i))
-        }
-    }
-    return result
-}

package/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableMap.kt

@@ -2,21 +2,6 @@ package com.rnmapbox.rnmbx.utils.extensions
 
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
-import com.google.gson.JsonArray
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
-import com.mapbox.geojson.Feature
-import com.mapbox.geojson.FeatureCollection
-import com.mapbox.geojson.Geometry
-import com.mapbox.geojson.GeometryCollection
-import com.mapbox.geojson.LineString
-import com.mapbox.geojson.MultiLineString
-import com.mapbox.geojson.MultiPoint
-import com.mapbox.geojson.MultiPolygon
-import com.mapbox.geojson.Point
-import com.mapbox.geojson.Polygon
-import com.mapbox.maps.EdgeInsets
-import com.rnmapbox.rnmbx.utils.ConvertUtils
 import com.rnmapbox.rnmbx.utils.Logger
 
 fun ReadableMap.forEach(action: (String, Any) -> Unit) {
@@ -55,7 +40,6 @@ fun ReadableMap.getAndLogIfNotBoolean(key: String, tag:String = "RNMBXReadableMa
     }
 }
 
-/* If key is there it should be number or log otherwise */
 fun ReadableMap.getAndLogIfNotDouble(key: String, tag: String = "RNMBXReadableMap"): Double? {
     return if (hasKey(key)) {
         if (getType(key) == ReadableType.Number) {
@@ -68,98 +52,3 @@ fun ReadableMap.getAndLogIfNotDouble(key: String, tag: String = "RNMBXReadableMa
         null
     }
 }
-
-/* If key is there it should be string or log otherwise */
-fun ReadableMap.getAndLogIfNotString(key: String, tag: String = "RNMBXReadableMap"): String? {
-    return if (hasKey(key)) {
-        if (getType(key) == ReadableType.String) {
-            getString(key)
-        } else {
-            Logger.e("RNMBXReadableMap", "$key is expected to be a string but was: ${getType(key)}")
-            null
-        }
-    } else {
-        null
-    }
-}
-
-fun ReadableMap.getAndLogIfNotMap(key: String, tag: String = "RNMBXReadableMap"): ReadableMap? {
-    return if (hasKey(key)) {
-        if (getType(key) == ReadableType.Map) {
-            getMap(key)
-        } else {
-            Logger.e("RNMBXReadableMap", "$key is exected to be a Map but was: ${getType(key)}")
-            null
-        }
-    } else {
-        null
-    }
-}
-
-fun ReadableMap.toJsonObject() : JsonObject {
-    val result = JsonObject()
-    val it = keySetIterator()
-    while (it.hasNextKey()) {
-        val key = it.nextKey()
-        when (getType(key)) {
-            ReadableType.Map -> result.add(key, getMap(key)!!.toJsonObject())
-            ReadableType.Array -> result.add(key, getArray(key)!!.toJsonArray())
-            ReadableType.Null -> result.add(key, null)
-            ReadableType.Number -> result.addProperty(key, getDouble(key))
-            ReadableType.String -> result.addProperty(key, getString(key))
-            ReadableType.Boolean -> result.addProperty(key, getBoolean(key))
-        }
-    }
-    return result
-}
-
-fun ReadableMap.toJson(): String {
-    return toJsonObject().toString()
-}
-fun ReadableMap.toGeometry(): Geometry?
-{
-    return getAndLogIfNotString("type")?.let {kind ->
-        return when (kind) {
-            "geometrycollection", "GeometryCollection" -> GeometryCollection.fromJson(this.toJson())
-            "point", "Point" -> Point.fromJson(this.toJson())
-            "multipoint", "MultiPoint" -> MultiPoint.fromJson(this.toJson())
-            "polygon", "Polygon" -> Polygon.fromJson(this.toJson())
-            "multipolygon", "MultiPolygon" -> MultiPolygon.fromJson(this.toJson())
-            "linestring", "LineString" -> LineString.fromJson(this.toJson())
-            "mulilinestring", "MultilineString" -> MultiLineString.fromJson(this.toJson())
-            else -> {
-                Logger.e("ReadableMap.toGeometry", "Unexpected geometry kind: $kind")
-                null
-            }
-        }
-    }
-}
-
-fun ReadableMap.toPadding(tag: String = "RNMBXReadableMap", density: Float): EdgeInsets? {
-    var top: Double = 0.0
-    var bottom: Double = 0.0
-    var left: Double = 0.0
-    var right: Double = 0.0
-    var empty = true
-
-    getAndLogIfNotDouble("top", tag)?.let {
-        top = it * density.toDouble()
-        empty = false
-    }
-    getAndLogIfNotDouble("bottom", tag)?.let {
-        bottom = it * density.toDouble()
-        empty = false
-    }
-    getAndLogIfNotDouble("left", tag)?.let {
-        left = it * density.toDouble()
-        empty = false
-    }
-    getAndLogIfNotDouble("right", tag)?.let {
-        right = it * density.toDouble()
-        empty = false
-    }
-    if (empty) {
-        return null
-    }
-    return EdgeInsets(top, left, bottom, right)
-}

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt

@@ -1,36 +1,4 @@
 package com.rnmapbox.rnmbx.v11compat.annotation;
 
-import android.view.View
-import com.mapbox.maps.ScreenCoordinate
-import com.mapbox.maps.ViewAnnotationOptions
-import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener as _OnViewAnnotationUpdatedListener
-
-
 public const val INVALID_ANNOTATION_ID: Long = -1
-typealias AnnotationID = Long
-
-fun ViewAnnotationOptions.Builder.offsets(x: Double, y: Double): ViewAnnotationOptions.Builder {
-  return offsetX(x.toInt()).offsetY(y.toInt())
-} 
-
-fun ViewAnnotationOptions.Builder.width(value: Double): ViewAnnotationOptions.Builder {
-  return this.width(value.toInt())
-} 
-
-fun ViewAnnotationOptions.Builder.height(value: Double): ViewAnnotationOptions.Builder {
-  return this.height(value.toInt())
-}
-
-fun com.mapbox.maps.ViewAnnotationOptions.Builder.allowOverlapWithPuck(value: Boolean): ViewAnnotationOptions.Builder {
-  return this;
-}
-
-abstract class OnViewAnnotationUpdatedListener : _OnViewAnnotationUpdatedListener {
-  override fun onViewAnnotationPositionUpdated(
-    view: View,
-    leftTopCoordinate: ScreenCoordinate,
-    width: Int,
-    height: Int
-  ) {
-  }
-}
+typealias AnnotationID = Long

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Image.kt

@@ -1,9 +1,7 @@
 package com.rnmapbox.rnmbx.v11compat.image;
 
 import android.content.Context
-import android.content.res.Resources
 import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.VectorDrawable
 import androidx.annotation.DrawableRes
@@ -11,6 +9,7 @@ import androidx.appcompat.content.res.AppCompatResources
 import com.mapbox.maps.Image
 import com.mapbox.maps.Style
 import com.rnmapbox.rnmbx.components.images.ImageInfo
+import com.rnmapbox.rnmbx.components.images.addBitmapImage
 import java.nio.ByteBuffer
 
 typealias ImageHolder = Drawable;
@@ -27,10 +26,6 @@ fun VectorDrawable.toBitmapImageHolder(): Drawable {
     return this
 }
 
-fun BitmapDrawable.toBitmapImageHolder(): ImageHolder {
-    return this
-}
-
 fun emptyImage(width: Int, height: Int): Image {
     return Image(width, height, ByteArray(width * height * 4) /* ByteBuffer.allocateDirect(width * height * 4).array()*/)
 }
@@ -56,14 +51,3 @@ class AppCompatResourcesV11 {
         }
     }
 }
-
-fun Image.toDrawable(): Drawable {
-    val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-    bitmap.copyPixelsFromBuffer(ByteBuffer.wrap(data))
-
-    return BitmapDrawable(Resources.getSystem(), bitmap)
-}
-
-fun Image.toImageHolder(): ImageHolder {
-    return toDrawable()
-}

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Location.kt

@@ -3,32 +3,35 @@ package com.rnmapbox.rnmbx.v11compat.location;
 import android.Manifest.permission.ACCESS_COARSE_LOCATION
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.content.Context
+import android.location.LocationManager
 import android.os.Looper
 import androidx.annotation.RequiresPermission
 import com.mapbox.maps.MapView
 import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.maps.plugin.locationcomponent.LocationComponentPlugin2
 import com.mapbox.maps.plugin.locationcomponent.location2 as _location2
+
+
 import com.mapbox.android.core.location.LocationEngineResult as _LocationEngineResult
+
 import com.mapbox.android.core.location.LocationEngine as _LocationEngine
 import com.mapbox.android.core.location.LocationEngineCallback as _LocationEngineCallback
 import com.mapbox.android.core.location.LocationEngineRequest
 import com.mapbox.android.core.location.LocationEngineProvider
+import com.mapbox.common.location.LocationService
+import com.mapbox.common.location.LocationUpdatesReceiver
+import com.mapbox.common.location.LocationServiceFactory
 
 
 import android.location.Location as _Location
+//import com.mapbox.common.location.Location as _Location
 
 typealias Location = _Location;
-typealias PuckBearing = PuckBearingSource
+typealias PuckBearingSource = com.mapbox.maps.plugin.PuckBearingSource
 
 val MapView.location2 : LocationComponentPlugin2
     get() = _location2
 
-
-var LocationComponentPlugin2.puckBearing: PuckBearingSource
-    get() = this.puckBearingSource
-    set(value) { puckBearingSource = value }
-
 typealias LocationEngine = _LocationEngine
 typealias LocationEngineResult = _LocationEngineResult
 typealias LocationEngineCallback = _LocationEngineCallback<LocationEngineResult>

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt

@@ -1,14 +1,7 @@
 package com.rnmapbox.rnmbx.v11compat.mapboxmap;
 
 import android.animation.Animator
-import android.app.Activity
-import android.content.Context
-import android.content.ContextWrapper
-import androidx.activity.result.contract.ActivityResultContracts
-import com.mapbox.bindgen.Expected
-import com.mapbox.bindgen.None
 import com.mapbox.maps.CameraOptions
-import com.mapbox.maps.MapView
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.plugin.animation.MapAnimationOptions
 import com.mapbox.maps.plugin.animation.easeTo
@@ -36,7 +29,3 @@ fun MapboxMap.easeToV11(
 
     )
 }
-
-fun MapboxMap.Companion.clearData(context: Context, callback: (result: Expected<String, None>) -> Unit) {
-    MapView(context).getMapboxMap().clearData(callback)
-}

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt

@@ -1,8 +1,6 @@
 package com.rnmapbox.rnmbx.v11compat.offlinemanager;
 
 import com.mapbox.common.TileStore
-import com.mapbox.common.TileStoreOptions
-import com.mapbox.common.toValue
 import com.mapbox.maps.OfflineManager
 import com.mapbox.maps.OfflineRegionManager
 import com.mapbox.maps.ResourceOptions
@@ -18,8 +16,4 @@ fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): Offli
         tileStore
       ).build()
   )
-}
-
-fun TileStore.setAccessToken(token: String) {
-  this.setOption(TileStoreOptions.MAPBOX_ACCESS_TOKEN, token.toValue());
 }

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Annotation.kt

@@ -1,32 +1,4 @@
 package com.rnmapbox.rnmbx.v11compat.annotation;
 
-import android.view.View
-import com.mapbox.geojson.Geometry
-import com.mapbox.geojson.Point
-import com.mapbox.maps.ScreenCoordinate
-import com.mapbox.maps.ViewAnnotationAnchor
-import com.mapbox.maps.ViewAnnotationAnchorConfig
-import com.mapbox.maps.ViewAnnotationOptions
-import com.mapbox.maps.viewannotation.geometry as _geometry
-
-import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener as _OnViewAnnotationUpdatedListener
-
-
-
 public const val INVALID_ANNOTATION_ID = ""
-typealias AnnotationID = String
-
-
-fun ViewAnnotationOptions.Builder.geometry(point: Geometry): ViewAnnotationOptions.Builder {
-  return _geometry(point)
-}
-
-fun ViewAnnotationOptions.Builder.offsets(x: Double, y: Double) {
-  this.variableAnchors(listOf(
-    ViewAnnotationAnchorConfig.Builder().anchor(ViewAnnotationAnchor.CENTER).offsetY(x).offsetY(y).build()
-  ))
-}
-
-abstract class OnViewAnnotationUpdatedListener : _OnViewAnnotationUpdatedListener {
-
-}
+typealias AnnotationID = String

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Image.kt

@@ -1,12 +1,11 @@
 package com.rnmapbox.rnmbx.v11compat.image;
 
 import android.content.Context
-import android.content.res.Resources
 import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.VectorDrawable
 import androidx.annotation.DrawableRes
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.drawable.toBitmap
 import com.mapbox.bindgen.DataRef
 import com.mapbox.maps.Image
@@ -38,10 +37,6 @@ fun VectorDrawable.toBitmapImageHolder(): ImageHolder {
     return ImageHolder.from(this.toBitmap())
 }
 
-fun BitmapDrawable.toBitmapImageHolder(): ImageHolder {
-    return ImageHolder.from(this.toBitmap())
-}
-
 class AppCompatResourcesV11 {
     companion object {
         fun getDrawableImageHolder(context: Context, @DrawableRes resId: Int) : ImageHolder? {
@@ -71,18 +66,3 @@ fun emptyImage(width: Int, height: Int): Image {
         width, height, DataRef.allocateNative(width * height * 4)
     )
 }
-
-fun Image.toDrawable(): Drawable {
-    val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-    bitmap.copyPixelsFromBuffer(data.buffer)
-
-    return BitmapDrawable(Resources.getSystem(), bitmap)
-}
-
-fun Image.toImageHolder(): ImageHolder {
-    val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-    bitmap.copyPixelsFromBuffer(data.buffer)
-
-    return ImageHolder.from(bitmap)
-}
-

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Location.kt

@@ -8,7 +8,7 @@ import com.mapbox.common.location.IntervalSettings
 import com.mapbox.common.location.LocationObserver
 import com.mapbox.common.location.Location as _Location
 import com.mapbox.maps.MapView
-import com.mapbox.maps.plugin.PuckBearing as _PuckBearing
+import com.mapbox.maps.plugin.PuckBearing
 import com.mapbox.maps.plugin.locationcomponent.LocationComponentPlugin
 import com.mapbox.maps.plugin.locationcomponent.location
 
@@ -19,7 +19,7 @@ import com.mapbox.common.location.LocationServiceFactory
 import com.rnmapbox.rnmbx.utils.Logger
 import kotlin.math.absoluteValue
 
-typealias PuckBearing = _PuckBearing
+typealias PuckBearingSource = PuckBearing
 
 const val DEFAULT_FASTEST_INTERVAL_MILLIS: Long = 1000
 const val DEFAULT_INTERVAL_MILLIS: Long = 1000

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/MapboxMap.kt

@@ -1,7 +1,6 @@
 package com.rnmapbox.rnmbx.v11compat.mapboxmap
 
 import android.animation.Animator
-import android.content.Context
 import com.mapbox.maps.AsyncOperationResultCallback
 import com.mapbox.maps.CameraOptions
 import com.mapbox.maps.MapboxMap
@@ -35,8 +34,4 @@ fun MapboxMap.easeToV11(
 
 fun MapboxMap.clearData(callback: AsyncOperationResultCallback) {
     return MapboxMap.clearData(callback)
-}
-
-fun MapboxMap.Companion.clearData(context: Context, callback: AsyncOperationResultCallback) {
-    this.clearData(callback)
 }

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/OfflineManager.kt

@@ -1,6 +1,5 @@
 package com.rnmapbox.rnmbx.v11compat.offlinemanager;
 
-import com.mapbox.common.MapboxOptions
 import com.mapbox.common.TileStore
 import com.mapbox.maps.OfflineManager
 import com.mapbox.maps.OfflineRegionManager
@@ -10,7 +9,4 @@ fun getOfflineRegionManager(getAccessToken: () -> String): OfflineRegionManager
 }
 fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): OfflineManager {
   return OfflineManager()
-}
-fun TileStore.setAccessToken(token: String) {
-  MapboxOptions.accessToken = token
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerDelegate.java

@@ -22,6 +22,9 @@ public class RNMBXCircleLayerManagerDelegate<T extends View, U extends BaseViewM
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
       case "sourceID":
         mViewManager.setSourceID(view, new DynamicFromObject(value));
         break;
@@ -40,6 +43,9 @@ public class RNMBXCircleLayerManagerDelegate<T extends View, U extends BaseViewM
       case "layerIndex":
         mViewManager.setLayerIndex(view, new DynamicFromObject(value));
         break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
       case "maxZoomLevel":
         mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
         break;
@@ -49,15 +55,6 @@ public class RNMBXCircleLayerManagerDelegate<T extends View, U extends BaseViewM
       case "sourceLayerID":
         mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
         break;
-      case "slot":
-        mViewManager.setSlot(view, new DynamicFromObject(value));
-        break;
-      case "id":
-        mViewManager.setId(view, new DynamicFromObject(value));
-        break;
-      case "reactStyle":
-        mViewManager.setReactStyle(view, new DynamicFromObject(value));
-        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerInterface.java

@@ -13,16 +13,15 @@ import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 
 public interface RNMBXCircleLayerManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
   void setSourceID(T view, Dynamic value);
   void setExisting(T view, Dynamic value);
   void setFilter(T view, Dynamic value);
   void setAboveLayerID(T view, Dynamic value);
   void setBelowLayerID(T view, Dynamic value);
   void setLayerIndex(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
   void setMaxZoomLevel(T view, Dynamic value);
   void setMinZoomLevel(T view, Dynamic value);
   void setSourceLayerID(T view, Dynamic value);
-  void setSlot(T view, Dynamic value);
-  void setId(T view, Dynamic value);
-  void setReactStyle(T view, Dynamic value);
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerDelegate.java

@@ -22,6 +22,9 @@ public class RNMBXFillLayerManagerDelegate<T extends View, U extends BaseViewMan
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
       case "sourceID":
         mViewManager.setSourceID(view, new DynamicFromObject(value));
         break;
@@ -40,6 +43,9 @@ public class RNMBXFillLayerManagerDelegate<T extends View, U extends BaseViewMan
       case "layerIndex":
         mViewManager.setLayerIndex(view, new DynamicFromObject(value));
         break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
       case "maxZoomLevel":
         mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
         break;
@@ -49,15 +55,6 @@ public class RNMBXFillLayerManagerDelegate<T extends View, U extends BaseViewMan
       case "sourceLayerID":
         mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
         break;
-      case "slot":
-        mViewManager.setSlot(view, new DynamicFromObject(value));
-        break;
-      case "id":
-        mViewManager.setId(view, new DynamicFromObject(value));
-        break;
-      case "reactStyle":
-        mViewManager.setReactStyle(view, new DynamicFromObject(value));
-        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerInterface.java

@@ -13,16 +13,15 @@ import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 
 public interface RNMBXFillLayerManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
   void setSourceID(T view, Dynamic value);
   void setExisting(T view, Dynamic value);
   void setFilter(T view, Dynamic value);
   void setAboveLayerID(T view, Dynamic value);
   void setBelowLayerID(T view, Dynamic value);
   void setLayerIndex(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
   void setMaxZoomLevel(T view, Dynamic value);
   void setMinZoomLevel(T view, Dynamic value);
   void setSourceLayerID(T view, Dynamic value);
-  void setSlot(T view, Dynamic value);
-  void setId(T view, Dynamic value);
-  void setReactStyle(T view, Dynamic value);
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerDelegate.java

@@ -22,6 +22,9 @@ public class RNMBXHeatmapLayerManagerDelegate<T extends View, U extends BaseView
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
       case "sourceID":
         mViewManager.setSourceID(view, new DynamicFromObject(value));
         break;
@@ -40,6 +43,9 @@ public class RNMBXHeatmapLayerManagerDelegate<T extends View, U extends BaseView
       case "layerIndex":
         mViewManager.setLayerIndex(view, new DynamicFromObject(value));
         break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
       case "maxZoomLevel":
         mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
         break;
@@ -49,15 +55,6 @@ public class RNMBXHeatmapLayerManagerDelegate<T extends View, U extends BaseView
       case "sourceLayerID":
         mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
         break;
-      case "slot":
-        mViewManager.setSlot(view, new DynamicFromObject(value));
-        break;
-      case "id":
-        mViewManager.setId(view, new DynamicFromObject(value));
-        break;
-      case "reactStyle":
-        mViewManager.setReactStyle(view, new DynamicFromObject(value));
-        break;
       default:
         super.setProperty(view, propName, value);
     }