@rnmapbox/maps 10.2.10-rc.2 → 10.3.0-beta.0

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterArraySourceManager.kt

@@ -1,59 +0,0 @@
-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.ViewGroupManager
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.viewmanagers.RNMBXRasterArraySourceManagerInterface
-import javax.annotation.Nonnull
-
-class RNMBXRasterArraySourceManager(reactApplicationContext: ReactApplicationContext) :
-    ViewGroupManager<RNMBXRasterArraySource>(),
-    RNMBXRasterArraySourceManagerInterface<RNMBXRasterArraySource> {
-    @Nonnull
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    @Nonnull
-    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXRasterArraySource {
-        throw UnsupportedOperationException("RasterArraySource is only supported in Mapbox v11+")
-    }
-
-    @ReactProp(name = "id")
-    override fun setId(source: RNMBXRasterArraySource, id: Dynamic) {}
-
-    @ReactProp(name = "url")
-    override fun setUrl(source: RNMBXRasterArraySource, url: Dynamic) {}
-
-    @ReactProp(name = "tileUrlTemplates")
-    override fun setTileUrlTemplates(source: RNMBXRasterArraySource, tileUrlTemplates: Dynamic) {}
-
-    @ReactProp(name = "tileSize")
-    override fun setTileSize(source: RNMBXRasterArraySource, tileSize: Dynamic) {}
-
-    @ReactProp(name = "minZoomLevel")
-    override fun setMinZoomLevel(source: RNMBXRasterArraySource, minZoomLevel: Dynamic) {}
-
-    @ReactProp(name = "maxZoomLevel")
-    override fun setMaxZoomLevel(source: RNMBXRasterArraySource, maxZoomLevel: Dynamic) {}
-
-    @ReactProp(name = "attribution")
-    fun setAttribution(source: RNMBXRasterArraySource, attribution: Dynamic) {}
-
-    fun customEvents(): Map<String, String>? {
-        return null
-    }
-
-    companion object {
-        const val REACT_CLASS = "RNMBXRasterArraySource"
-        const val isImplemented = false
-    }
-
-    @ReactProp(name = "existing")
-    override fun setExisting(source: RNMBXRasterArraySource, value: Dynamic) {}
-
-    @ReactProp(name = "sourceBounds")
-    override fun setSourceBounds(source: RNMBXRasterArraySource, value: Dynamic) {}
-}

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

@@ -1,40 +0,0 @@
-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 ViewAnnotationOptions.Builder.allowOverlapWithPuck(value: Boolean): ViewAnnotationOptions.Builder {
-  return this;
-}
-
-fun ViewAnnotationOptions.Builder.ignoreCameraPadding(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

@@ -1,15 +0,0 @@
-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/Event.kt

@@ -1,17 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.event;
-
-//import com.mapbox.maps.MapboxMap
-//import com.mapbox.maps.extension.observable.getMapLoadingErrorEventData
-
-//fun MapboxMap.subscribe(callback: (Any?)->Void) {
-//
-//}
-
-import com.mapbox.maps.Event
-import com.mapbox.maps.extension.observable.eventdata.MapLoadingErrorEventData
-import com.mapbox.maps.extension.observable.getMapLoadingErrorEventData as _getMapLoadingErrorEventData
-
-fun Event.getMapLoadingErrorEventData() : MapLoadingErrorEventData {
-    return _getMapLoadingErrorEventData()
-};
-

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

@@ -1,10 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.feature;
-
-import com.mapbox.geojson.Feature;
-
-import com.mapbox.maps.QueriedFeature as _QueriedFeature;
-
-typealias QueriedRenderedFeature = _QueriedFeature;
-
-typealias QueriedSourceFeature = _QueriedFeature;
-

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

@@ -1,22 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.httpinterceptor;
-
-import com.mapbox.common.*
-
-open class HttpServiceBase : HttpServiceInterceptorInterface {
-  override fun onRequest(request: HttpRequest): HttpRequest {
-        return request
-    }
-
-    override fun onDownload(download: DownloadOptions): DownloadOptions {
-        return download
-    }
-
-    override fun onResponse(response: HttpResponse): HttpResponse {
-        return response
-    }
-
-/*    override fun onUpload(options: UploadOptions): UploadOptions {
-        return options
-    }
-*/
-}

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

@@ -1,69 +0,0 @@
-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 com.mapbox.maps.Image
-import com.mapbox.maps.Style
-import com.rnmapbox.rnmbx.components.images.ImageInfo
-import java.nio.ByteBuffer
-
-typealias ImageHolder = Drawable;
-
-fun ByteArray.toByteArray(): ByteArray {
-    return this
-}
-
-fun ByteArray.toImageData() : ByteArray {
-    return this
-}
-
-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()*/)
-}
-
-fun Bitmap.toMapboxImage(): Image {
-    val byteBuffer = ByteBuffer.allocate(byteCount)
-    copyPixelsToBuffer(byteBuffer)
-    return Image(width, height, byteBuffer.array())
-}
-
-fun Style.addStyleImage(imageId: String, image: Image, info: ImageInfo, scale: Double = 1.0) {
-    addStyleImage(imageId, (info.getScaleOr(1.0) * scale).toFloat(), image, info.sdf, info.stretchX, info.stretchY, info.content)
-}
-
-fun Style.addBitmapImage(imageId: String, bitmap: Bitmap, info: ImageInfo, scale: Double = 1.0) {
-    addStyleImage(imageId, bitmap.toMapboxImage(), info, scale)
-}
-
-class AppCompatResourcesV11 {
-    companion object {
-        fun getDrawableImageHolder(context: Context, @DrawableRes resId: Int) : ImageHolder? {
-            return AppCompatResources.getDrawable(context, resId)
-        }
-    }
-}
-
-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

@@ -1,7 +0,0 @@
-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/Light.kt

@@ -1,15 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.light;
-
-import com.mapbox.maps.Style
-import com.mapbox.maps.extension.style.light.generated.Light as _Light;
-import com.mapbox.maps.extension.style.light.generated.setLight as _setLight
-
-typealias Light = _Light
-
-fun Style.setLight(light: Light) {
-    this._setLight(light)
-}
-
-fun createLight(): Light {
-    return Light()
-}

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

@@ -1,62 +0,0 @@
-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.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 android.location.Location as _Location
-
-typealias Location = _Location;
-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>
-
-const val DEFAULT_FASTEST_INTERVAL_MILLIS: Long = 1000
-const val DEFAULT_INTERVAL_MILLIS: Long = 1000
-
-@RequiresPermission(anyOf = [ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION])
-fun LocationEngine.requestLocationUpdatesV11(callback: LocationEngineCallback, looper: Looper?, minDisplacement: Float?) {
-  val builder = LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS)
-      .setFastestInterval(DEFAULT_FASTEST_INTERVAL_MILLIS)
-      .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
-  if (minDisplacement != null && minDisplacement > 0.0) {
-    builder.setDisplacement(minDisplacement)
-  }
-  val request = builder
-      .build();
-
-  this.requestLocationUpdates(
-    request,
-    callback,
-    looper
-  )
-}
-
-val Location.timestamp: Long
-  get() = this.time
-
-fun createLocationEngine(context: Context): LocationEngine {
-    return LocationEngineProvider.getBestLocationEngine(context)
-}

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

@@ -1,67 +0,0 @@
-
-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.ExpectedFactory
-import com.mapbox.bindgen.None
-import com.mapbox.bindgen.Value
-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
-import com.mapbox.maps.plugin.animation.flyTo
-
-fun MapboxMap.setFeatureStateCompat(
-    sourceId: String,
-    sourceLayerId: String?,
-    featureId: String,
-    state: Value,
-    callback: (Expected<String, None>) -> Unit
-) {
-    this.setFeatureState(sourceId, sourceLayerId, featureId, state)
-    callback(ExpectedFactory.createNone<String>())
-}
-
-fun MapboxMap.removeFeatureStateCompat(
-    sourceId: String,
-    sourceLayerId: String?,
-    featureId: String,
-    stateKey: String?,
-    callback: (Expected<String, None>) -> Unit
-) {
-    this.removeFeatureState(sourceId, sourceLayerId, featureId, stateKey)
-    callback(ExpectedFactory.createNone<String>())
-}
-
-fun MapboxMap.flyToV11(
-    cameraOptions: CameraOptions,
-    animationOptions: MapAnimationOptions.Builder,
-    callback: Animator.AnimatorListener
-) {
-    this.flyTo(
-        cameraOptions,
-        animationOptions.apply { animatorListener(callback) }.build(),
-    )
-}
-
-fun MapboxMap.easeToV11(
-    cameraOptions: CameraOptions,
-    animationOptions: MapAnimationOptions.Builder,
-    callback: Animator.AnimatorListener
-) {
-    this.easeTo(
-        cameraOptions,
-        animationOptions.apply { animatorListener(callback) }.build(),
-
-    )
-}
-
-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,51 +0,0 @@
-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
-import com.mapbox.maps.StylePackLoadOptions
-import com.mapbox.maps.TilesetDescriptorOptions
-import com.mapbox.maps.TilesetDescriptorOptionsForTilesets
-import com.mapbox.common.TilesetDescriptor
-
-fun getOfflineRegionManager(getAccessToken: () -> String): OfflineRegionManager {
-  return OfflineRegionManager(ResourceOptions.Builder().accessToken(getAccessToken()).build())
-}
-
-fun getOfflineManager(tileStore: TileStore, getAccessToken: () -> String): OfflineManager {
-  return OfflineManager(
-    ResourceOptions.Builder()
-      .accessToken(getAccessToken()).tileStore(
-        tileStore
-      ).build()
-  )
-}
-
-fun getTilesetDescriptors(offlineManager: OfflineManager, styleURI: String, minZoom: Byte, maxZoom: Byte, stylePackOptions: StylePackLoadOptions, tilesets: List<String>): ArrayList<TilesetDescriptor>{
-  val descriptorOptions = TilesetDescriptorOptions.Builder()
-    .styleURI(styleURI)
-    .minZoom(minZoom)
-    .maxZoom(maxZoom)
-    .stylePackOptions(stylePackOptions)
-    .pixelRatio(2.0f)
-    .build()
-  val descriptor = offlineManager.createTilesetDescriptor(descriptorOptions)
-  val descriptors = arrayListOf(descriptor)
-  if (tilesets.isNotEmpty()) {
-    val tilesetDescriptorOptions = TilesetDescriptorOptionsForTilesets.Builder()
-    .tilesets(tilesets)
-    .minZoom(minZoom)
-    .maxZoom(maxZoom)
-    .build()
-    val tilesetDescriptor = offlineManager.createTilesetDescriptor(tilesetDescriptorOptions)
-    descriptors.add(tilesetDescriptor)
-  }
-  return descriptors
-}
-
-fun TileStore.setAccessToken(token: String) {
-  this.setOption(TileStoreOptions.MAPBOX_ACCESS_TOKEN, token.toValue());
-}

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

@@ -1,96 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.ornamentsettings
-
-import com.mapbox.maps.plugin.attribution.generated.AttributionSettings
-import com.mapbox.maps.plugin.compass.generated.CompassSettings
-import com.mapbox.maps.plugin.logo.generated.LogoSettings
-import com.mapbox.maps.plugin.scalebar.generated.ScaleBarSettings
-import com.rnmapbox.rnmbx.components.mapview.OrnamentSettings
-
-fun getAttributionSettings(): AttributionSettings {
-    return AttributionSettings()
-}
-
-interface GenericOrnamentSettings {
-    fun setHMargins(left: Float?, right: Float?)
-    fun setVMargins(top: Float?, bottom: Float?)
-    var enabled: Boolean
-    var position: Int
-}
-
-fun ScaleBarSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private val settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) { settings.position = value }
-}
-
-fun CompassSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}
-
-fun LogoSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}
-
-fun AttributionSettings.toGenericOrnamentSettings() = object : GenericOrnamentSettings {
-    private var settings = this@toGenericOrnamentSettings;
-    override fun setHMargins(left: Float?, right: Float?) {
-        left?.let { settings.marginLeft = it }
-        right?.let { settings.marginRight = it }
-    }
-    override fun setVMargins(top: Float?, bottom: Float?) {
-        top?.let { settings.marginTop = it }
-        bottom?.let { settings.marginBottom = it }
-    }
-    override var enabled: Boolean
-        get() = settings.enabled
-        set(value) { settings.enabled = value }
-    override var position: Int
-        get() = settings.position
-        set(value) {
-            settings.position = value
-        }
-}

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

@@ -1,12 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.resourceoption;
-
-import android.content.Context
-import com.mapbox.maps.ResourceOptionsManager.Companion.getDefault
-
-fun setMapboxAccessToken(context: Context, accessToken: String?) {
-  getDefault(context, accessToken)
-}
-
-fun getMapboxAccessToken(context: Context?): String {
-  return getDefault((context)!!, null).resourceOptions.accessToken
-}

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

@@ -1,28 +0,0 @@
-package com.rnmapbox.rnmbx.v11compat.snapshot;
-
-import com.mapbox.maps.Image
-import com.mapbox.maps.MapSnapshotInterface;
-import com.mapbox.maps.MapSnapshotOptions
-import com.mapbox.maps.ResourceOptions;
-import com.mapbox.maps.Snapshotter
-import com.mapbox.maps.bitmap
-
-
-fun MapSnapshotOptions.Builder.accessToken(accessToken: String?) {
-  if (accessToken != null) {
-    this.resourceOptions(
-      ResourceOptions.Builder().accessToken(accessToken).build()
-    )
-  }
-}
-
-
-fun MapSnapshotInterface.toMapboxImage(): Image {
-    return this.image()
-}
-
-fun Snapshotter.startV11(callback: (MapSnapshotInterface?, String?) -> Unit) {
-   this.start { image ->
-      callback(image, if (image == null) "Snapshot error" else null)
-   }
-}