@rnmapbox/maps 10.1.0 → 10.1.2

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

@@ -2,11 +2,16 @@ 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 java.lang.Float.min
+import org.json.JSONArray
 import java.lang.Float.max
+import java.lang.Float.min
 
 fun ReadableArray.toCoordinate() : Point {
     if (this.size() != 2) {
@@ -36,3 +41,18 @@ 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,6 +2,21 @@ 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) {
@@ -40,6 +55,7 @@ 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) {
@@ -52,3 +68,98 @@ 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,4 +1,36 @@
 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
+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
+  ) {
+  }
+}

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

@@ -0,0 +1,15 @@
+package com.rnmapbox.rnmbx.v11compat
+/**
+ * Allows to cancel the associated asynchronous operation
+ *
+ * The associated asynchronous operation is not automatically canceled if this
+ * object goes out of scope.
+ */
+interface Cancelable {
+    /**
+     * Cancels the associated asynchronous operation
+     *
+     * If the associated asynchronous operation has already finished, this call is ignored.
+     */
+    fun cancel()
+}

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

@@ -1,7 +1,9 @@
 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
@@ -9,7 +11,6 @@ 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;
@@ -26,6 +27,10 @@ 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()*/)
 }
@@ -51,3 +56,14 @@ 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/Layer.kt

@@ -0,0 +1,7 @@
+package com.rnmapbox.rnmbx.v11compat.layer;
+
+import com.mapbox.maps.extension.style.layers.Layer
+
+fun Layer.slot(slot: String) {
+    // V11 only
+}

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

@@ -3,35 +3,32 @@ 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 PuckBearingSource = com.mapbox.maps.plugin.PuckBearingSource
+typealias PuckBearing = 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,7 +1,14 @@
 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
@@ -29,3 +36,7 @@ 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,6 +1,8 @@
 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
@@ -16,4 +18,8 @@ fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): Offli
         tileStore
       ).build()
   )
+}
+
+fun TileStore.setAccessToken(token: String) {
+  this.setOption(TileStoreOptions.MAPBOX_ACCESS_TOKEN, token.toValue());
 }