@rnmapbox/maps 10.2.10 → 10.3.0-beta.0

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)
-   }
-}