@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXViewportModule.kt

@@ -1,66 +0,0 @@
-package com.rnmapbox.rnmbx.components.camera
-
-import com.facebook.react.bridge.Callback
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
-import com.rnmapbox.rnmbx.NativeRNMBXViewportModuleSpec
-import com.rnmapbox.rnmbx.components.mapview.CommandResponse
-import com.rnmapbox.rnmbx.utils.ViewTagResolver
-
-class RNMBXViewportModule(context: ReactApplicationContext, val viewTagResolver: ViewTagResolver) : NativeRNMBXViewportModuleSpec(context) {
-    private fun withViewportOnUIThread(
-        viewRef: Double?,
-        reject: Promise,
-        fn: (RNMBXViewport) -> Unit
-    ) {
-        if (viewRef == null) {
-            reject.reject(Exception("viewRef is null"))
-        } else {
-            viewTagResolver.withViewResolved(viewRef.toInt(), reject, fn)
-        }
-    }
-
-    private fun createCommandResponse(promise: Promise): CommandResponse = object : CommandResponse {
-        override fun success(builder: (WritableMap) -> Unit) {
-            val payload: WritableMap = WritableNativeMap()
-            builder(payload)
-
-            promise.resolve(payload)
-        }
-
-        override fun error(message: String) {
-            promise.reject(Exception(message))
-        }
-    }
-
-    override fun getState(viewRef: Double?, promise: Promise) {
-        withViewportOnUIThread(viewRef, promise) {
-            promise.resolve(it.getState())
-        }
-    }
-
-    override fun transitionTo(
-        viewRef: Double?,
-        state: ReadableMap,
-        transition: ReadableMap?,
-        promise: Promise
-    ) {
-        withViewportOnUIThread(viewRef, promise) {
-            it.transitionTo(state, transition, promise)
-        }
-    }
-
-    override fun idle(viewRef: Double?, promise: Promise) {
-        withViewportOnUIThread(viewRef, promise) {
-            it.idle()
-            promise.resolve(true)
-        }
-    }
-
-    companion object {
-        const val NAME = "RNMBXViewportModule"
-    }
-}

package/android/src/main/java/com/rnmapbox/rnmbx/components/images/ImageManager.kt

@@ -1,53 +0,0 @@
-package com.rnmapbox.rnmbx.components.images
-
-import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
-import com.rnmapbox.rnmbx.v11compat.Cancelable
-import com.mapbox.maps.Image
-import com.rnmapbox.rnmbx.v11compat.image.toMapboxImage
-
-/**
-ImageManager helps to resolve images defined by any of RNMBXImages component.
- */
-
-fun interface Resolver {
-    fun resolved(name: String, image: Image)
-}
-class Subscription(val name:String, val resolver: Resolver, val manager: ImageManager): Cancelable {
-
-    fun resolved(name: String, image: Image) {
-        resolver.resolved(name, image)
-    }
-    override fun cancel() {
-        manager.unsubscribe(this)
-    }
-}
-
-class ImageManager {
-    var subscriptions: MutableMap<String, MutableList<Subscription>> = hashMapOf()
-
-    fun subscribe(name: String, resolved: Resolver) : Subscription {
-        val list = subscriptions.getOrPut(name) { mutableListOf() }
-        val result = Subscription(name, resolved, this)
-        list.add(result)
-        return result
-    }
-    fun unsubscribe(subscription: Subscription) {
-        var list = subscriptions[subscription.name]
-        list?.removeAll { it === subscription }
-    }
-
-    fun resolve(name: String, image: Image) {
-        subscriptions[name]?.forEach {
-            it.resolved(name, image)
-        }
-    }
-
-    fun resolve(name: String, image: Bitmap) {
-        resolve(name, image.toMapboxImage())
-    }
-
-    fun resolve(name: String, image: BitmapDrawable) {
-        resolve(name, image.bitmap)
-    }
-}

package/android/src/main/java/com/rnmapbox/rnmbx/components/location/RNMBXCustomLocationProvider.kt

@@ -1,114 +0,0 @@
-package com.rnmapbox.rnmbx.components.location
-
-import android.content.Context
-import com.mapbox.geojson.Point
-import com.mapbox.maps.MapView
-import com.mapbox.maps.plugin.locationcomponent.DefaultLocationProvider
-import com.mapbox.maps.plugin.locationcomponent.LocationConsumer
-import com.mapbox.maps.plugin.locationcomponent.LocationProvider
-import com.mapbox.maps.plugin.locationcomponent.location
-import com.rnmapbox.rnmbx.components.AbstractMapFeature
-import com.rnmapbox.rnmbx.components.RemovalReason
-import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
-import com.rnmapbox.rnmbx.utils.PropertyChanges
-import com.rnmapbox.rnmbx.utils.PropertyUpdaterWithName
-
-class RNMBXCustomLocationProvider(context: Context) : AbstractMapFeature(context) {
-    val changes = PropertyChanges<RNMBXCustomLocationProvider>()
-
-    enum class Property(val _apply: (RNMBXCustomLocationProvider) -> Unit) :
-        PropertyUpdaterWithName<RNMBXCustomLocationProvider> {
-        COORDINATE(RNMBXCustomLocationProvider::applyCoordinate),
-        HEADING(RNMBXCustomLocationProvider::applyHeading);
-
-        override fun apply(locationProvider: RNMBXCustomLocationProvider) {
-            _apply(locationProvider)
-        }
-    }
-
-    var coordinate: Pair<Double, Double>? = null
-        set(value) {
-            field = value;
-            changes.add(Property.COORDINATE)
-        }
-
-    var heading: Double? = null
-        set(value) {
-            field = value
-            changes.add(Property.HEADING)
-        }
-
-    override fun addToMap(mapView: RNMBXMapView) {
-        super.addToMap(mapView)
-        installCustomLocationProviderIfNeeded(mapView.mapView)
-    }
-
-    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
-        removeCustomLocationProvider(mapView.mapView)
-        return super.removeFromMap(mapView, reason)
-    }
-
-    fun applyCoordinate() {
-        coordinate?.let {
-            updateCorodinate(it.second, it.first)
-        }
-    }
-
-    fun applyHeading() {
-        heading?.let {
-            updateHeading(it)
-        }
-    }
-
-    fun applyAllChanges() {
-        changes.apply(this)
-    }
-
-    fun updateCorodinate(latitude: Double, longitude: Double) {
-        val point = Point.fromLngLat(longitude, latitude)
-        locationConsumers.forEach {
-            it.onLocationUpdated(point)
-        }
-    }
-
-    fun updateHeading(heading: Double) {
-        locationConsumers.forEach {
-            it.onBearingUpdated(heading)
-        }
-    }
-
-    // region Location Provider
-    private var locationConsumers = mutableListOf<LocationConsumer>()
-    private var customLocationProvider: LocationProvider? = null
-    private var defaultLocationProvider: LocationProvider? = null
-
-    fun installCustomLocationProviderIfNeeded(mapView: MapView) {
-        var customLocationProvider: LocationProvider? = null
-        if (customLocationProvider == null) {
-            customLocationProvider = object : LocationProvider {
-                override fun registerLocationConsumer(locationConsumer: LocationConsumer) {
-                    locationConsumers.add(locationConsumer)
-                }
-
-                override fun unRegisterLocationConsumer(locationConsumer: LocationConsumer) {
-                    locationConsumers.remove(locationConsumer)
-                }
-            }
-        }
-        if (customLocationProvider != null) {
-            defaultLocationProvider = mapView.location.getLocationProvider()
-            mapView.location.setLocationProvider(customLocationProvider)
-            this.customLocationProvider = customLocationProvider
-        }
-    }
-
-    fun removeCustomLocationProvider(mapView: MapView) {
-        mapView.location.setLocationProvider(
-            defaultLocationProvider ?: DefaultLocationProvider(
-                context
-            )
-        )
-        customLocationProvider = null
-    }
-    // endregion
-}

package/android/src/main/java/com/rnmapbox/rnmbx/components/location/RNMBXCustomLocationProviderManager.kt

@@ -1,54 +0,0 @@
-package com.rnmapbox.rnmbx.components.location
-
-import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.ReadableType
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewGroupManager
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.viewmanagers.RNMBXCustomLocationProviderManagerInterface
-import com.rnmapbox.rnmbx.utils.Logger
-
-class RNMBXCustomLocationProviderManager : ViewGroupManager<RNMBXCustomLocationProvider>(),
-    RNMBXCustomLocationProviderManagerInterface<RNMBXCustomLocationProvider> {
-    override fun getName(): String {
-        return  REACT_CLASS
-    }
-
-    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXCustomLocationProvider {
-        return RNMBXCustomLocationProvider(reactContext);
-    }
-
-    @ReactProp(name = "coordinate")
-    override fun setCoordinate(view: RNMBXCustomLocationProvider, value: Dynamic?) {
-        if (value?.type == ReadableType.Array) {
-            val array = value.asArray()
-            if (array.size() == 2 && array.getType(0) == ReadableType.Number && array.getType(1) == ReadableType.Number) {
-                view.coordinate = Pair(array.getDouble(0), array.getDouble(1))
-            } else {
-                Logger.e(LOG_TAG, "coordinate is expected to be an array of numbers with 2 elements")
-            }
-        } else {
-            Logger.e(LOG_TAG, "coordinate is expected to be an array of numbers with 2 elements")
-        }
-    }
-
-    @ReactProp(name = "heading")
-    override fun setHeading(view: RNMBXCustomLocationProvider, value: Dynamic?) {
-        if (value?.type == ReadableType.Number) {
-            view.heading = value.asDouble()
-        } else {
-            Logger.e(LOG_TAG, "heading is expected to be a number")
-        }
-    }
-
-    override fun onAfterUpdateTransaction(view: RNMBXCustomLocationProvider) {
-        super.onAfterUpdateTransaction(view)
-
-        view.applyAllChanges()
-    }
-
-    companion object {
-        const val REACT_CLASS = "RNMBXCustomLocationProvider"
-        const val LOG_TAG = REACT_CLASS
-    }
-}

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

@@ -1,33 +0,0 @@
-package com.rnmapbox.rnmbx.components.styles.layers
-
-import android.content.Context
-import com.mapbox.maps.extension.style.layers.generated.ModelLayer
-import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
-import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
-import com.rnmapbox.rnmbx.utils.Logger
-
-class RNMBXModelLayer(context: Context?) : RNMBXLayer<ModelLayer?>(
-    context!!
-) {
-    private var mSourceLayerID: String? = null
-
-    override fun makeLayer(): ModelLayer? {
-        val layer = ModelLayer(iD!!, mSourceID!!)
-        if (mSourceLayerID != null) {
-            layer.sourceLayer(mSourceLayerID!!)
-        }
-        return layer
-    }
-
-    override fun addStyles() {
-        mLayer?.also {
-            RNMBXStyleFactory.setModelLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
-        } ?: run {
-            Logger.e("RNMBXLineLayer", "mLayer is null")
-        }
-    }
-
-    fun setSourceLayerID(value: String) {
-        mSourceLayerID = value
-    }
-}

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

@@ -1,85 +0,0 @@
-package com.rnmapbox.rnmbx.components.styles.layers
-
-import com.facebook.react.bridge.Dynamic
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewGroupManager
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.viewmanagers.RNMBXModelLayerManagerInterface
-
-
-class RNMBXModelLayerManager : ViewGroupManager<RNMBXModelLayer>(),
-    RNMBXModelLayerManagerInterface<RNMBXModelLayer> {
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    override fun createViewInstance(context: ThemedReactContext): RNMBXModelLayer {
-        return RNMBXModelLayer(context)
-    }
-
-    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXModelLayer"})}
-    @ReactProp(name = "id")
-    override fun setId(layer: RNMBXModelLayer, id: Dynamic) {
-        layer.iD = id.asString()
-    }
-
-    @ReactProp(name = "existing")
-    override fun setExisting(layer: RNMBXModelLayer, existing: Dynamic) {
-        layer.setExisting(existing.asBoolean())
-    }
-
-    @ReactProp(name = "sourceID")
-    override fun setSourceID(layer: RNMBXModelLayer, sourceID: Dynamic) {
-        layer.setSourceID(sourceID.asString())
-    }
-
-    @ReactProp(name = "aboveLayerID")
-    override fun setAboveLayerID(layer: RNMBXModelLayer, aboveLayerID: Dynamic) {
-        layer.setAboveLayerID(aboveLayerID.asString())
-    }
-
-    @ReactProp(name = "belowLayerID")
-    override fun setBelowLayerID(layer: RNMBXModelLayer, belowLayerID: Dynamic) {
-        layer.setBelowLayerID(belowLayerID.asString())
-    }
-
-    @ReactProp(name = "layerIndex")
-    override fun setLayerIndex(layer: RNMBXModelLayer, layerIndex: Dynamic) {
-        layer.setLayerIndex(layerIndex.asInt())
-    }
-
-    @ReactProp(name = "minZoomLevel")
-    override fun setMinZoomLevel(layer: RNMBXModelLayer, minZoomLevel: Dynamic) {
-        layer.setMinZoomLevel(minZoomLevel.asDouble())
-    }
-
-    @ReactProp(name = "maxZoomLevel")
-    override fun setMaxZoomLevel(layer: RNMBXModelLayer, maxZoomLevel: Dynamic) {
-        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
-    }
-
-    @ReactProp(name = "reactStyle")
-    override fun setReactStyle(layer: RNMBXModelLayer, style: Dynamic) {
-        layer.setReactStyle(style.asMap())
-    }
-
-    @ReactProp(name = "sourceLayerID")
-    override fun setSourceLayerID(layer: RNMBXModelLayer, sourceLayerID: Dynamic) {
-        layer.setSourceLayerID(sourceLayerID.asString())
-    }
-
-    @ReactProp(name = "filter")
-    override fun setFilter(layer: RNMBXModelLayer, filterList: Dynamic) {
-        layer.setFilter(filterList.asArray())
-    }
-
-    @ReactProp(name = "slot")
-    override fun setSlot(layer: RNMBXModelLayer, slot: Dynamic) {
-        layer.setSlot(slot.asString())
-    }
-    // @{codepart-replace-end}
-
-    companion object {
-        const val REACT_CLASS = "RNMBXModelLayer"
-    }
-}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/codeparts/LayerManagerCommonProps.codepart-kt.ejs

@@ -1,59 +0,0 @@
-    @ReactProp(name = "id")
-    override fun setId(layer: <%= layerType %>, id: Dynamic) {
-        layer.iD = id.asString()
-    }
-
-    @ReactProp(name = "existing")
-    override fun setExisting(layer: <%= layerType %>, existing: Dynamic) {
-        layer.setExisting(existing.asBoolean())
-    }
-
-    @ReactProp(name = "sourceID")
-    override fun setSourceID(layer: <%= layerType %>, sourceID: Dynamic) {
-        layer.setSourceID(sourceID.asString())
-    }
-
-    @ReactProp(name = "aboveLayerID")
-    override fun setAboveLayerID(layer: <%= layerType %>, aboveLayerID: Dynamic) {
-        layer.setAboveLayerID(aboveLayerID.asString())
-    }
-
-    @ReactProp(name = "belowLayerID")
-    override fun setBelowLayerID(layer: <%= layerType %>, belowLayerID: Dynamic) {
-        layer.setBelowLayerID(belowLayerID.asString())
-    }
-
-    @ReactProp(name = "layerIndex")
-    override fun setLayerIndex(layer: <%= layerType %>, layerIndex: Dynamic) {
-        layer.setLayerIndex(layerIndex.asInt())
-    }
-
-    @ReactProp(name = "minZoomLevel")
-    override fun setMinZoomLevel(layer: <%= layerType %>, minZoomLevel: Dynamic) {
-        layer.setMinZoomLevel(minZoomLevel.asDouble())
-    }
-
-    @ReactProp(name = "maxZoomLevel")
-    override fun setMaxZoomLevel(layer: <%= layerType %>, maxZoomLevel: Dynamic) {
-        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
-    }
-
-    @ReactProp(name = "reactStyle")
-    override fun setReactStyle(layer: <%= layerType %>, style: Dynamic) {
-        layer.setReactStyle(style.asMap())
-    }
-
-    @ReactProp(name = "sourceLayerID")
-    override fun setSourceLayerID(layer: <%= layerType %>, sourceLayerID: Dynamic) {
-        layer.setSourceLayerID(sourceLayerID.asString())
-    }
-
-    @ReactProp(name = "filter")
-    override fun setFilter(layer: <%= layerType %>, filterList: Dynamic) {
-        layer.setFilter(filterList.asArray())
-    }
-
-    @ReactProp(name = "slot")
-    override fun setSlot(layer: <%= layerType %>, slot: Dynamic) {
-        layer.setSlot(slot.asString())
-    }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/model/RNMBXModels.kt

@@ -1,33 +0,0 @@
-package com.rnmapbox.rnmbx.components.styles.model
-
-import android.content.Context
-import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.ReadableMap
-import com.rnmapbox.rnmbx.components.AbstractMapFeature
-import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
-import java.net.URI
-
-class RNMBXModels(context: Context?) : AbstractMapFeature(context) {
-    private var models: Map<String, String>? = null;
-
-    fun setModels(value: Map<String,String>) {
-        this.models = value;
-        applyModels()
-    }
-
-    override fun addToMap(mapView: RNMBXMapView) {
-        super.addToMap(mapView)
-        applyModels()
-    }
-
-    private fun applyModels(){
-        mMapView?.mapView?.getMapboxMap()?.getStyle()?.let { style ->
-            models?.forEach { (modelId,modelUri) ->
-                val uri = URI.create(modelUri)
-                val modelUriWithoutQuery = URI(uri.scheme, uri.userInfo, uri.host, uri.port, uri.path, null, uri.fragment).toString()
-
-                style.addStyleModel(modelId, modelUriWithoutQuery)
-            }
-        }
-    }
-}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/model/RNMBXModelsManager.kt

@@ -1,59 +0,0 @@
-package com.rnmapbox.rnmbx.components.styles.model
-
-import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.ReactApplicationContext
-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
-import com.facebook.react.viewmanagers.RNMBXModelLayerManagerInterface
-import com.facebook.react.viewmanagers.RNMBXModelsManagerInterface
-import com.rnmapbox.rnmbx.components.styles.terrain.RNMBXTerrainManager
-import com.rnmapbox.rnmbx.utils.Logger
-import com.rnmapbox.rnmbx.utils.extensions.forEach
-
-class RNMBXModelsManager(private val mContext: ReactApplicationContext) : ViewGroupManager<RNMBXModels>(),
-    RNMBXModelsManagerInterface<RNMBXModels> {
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    override fun createViewInstance(context: ThemedReactContext): RNMBXModels {
-        return RNMBXModels(context)
-    }
-
-    @ReactProp(name = "models")
-    override fun setModels(view: RNMBXModels, value: Dynamic?) {
-        val map = hashMapOf<String,String>()
-        value?.asMap()?.forEach { modelName, model ->
-            when (model) {
-                is ReadableMap -> {
-                    model.getString("uri")?.also {
-                        map.put(modelName, it)
-                    } ?: model.getString("url")?.also {
-                        map.put(modelName, it)
-                    } ?: run {
-                        Logger.e(
-                            LOG_TAG,
-                            "Invalid value for model key: ${modelName} => ${model} is not an uri/url"
-                        )
-                    }
-                }
-
-                else -> {
-                    Logger.e(
-                        LOG_TAG,
-                        "Invalid value for model key: ${modelName} => ${model} is not an uri/url"
-                    )
-
-                }
-            }
-        }
-        view.setModels(map)
-    }
-
-    companion object {
-        const val REACT_CLASS = "RNMBXModels"
-            const val LOG_TAG = "RNMBXModels"
-    }
-}

package/android/src/main/java/com/rnmapbox/rnmbx/events/constants/EventKeys.kt

@@ -1,44 +0,0 @@
-package com.rnmapbox.rnmbx.events.constants
-
-private fun ns(name: String): String {
-    val namespace = "rct.mapbox"
-    return String.format("%s.%s", namespace, name)
-}
-enum class EventKeys(val value: String) {
-    // map events
-    MAP_CLICK(ns("map.press")),
-    MAP_LONG_CLICK(ns("map.longpress")),
-    MAP_ONCHANGE(ns("map.change")),
-    MAP_ON_LOCATION_CHANGE(ns("map.location.change")),
-    MAP_ANDROID_CALLBACK(ns("map.androidcallback")),
-    MAP_USER_TRACKING_MODE_CHANGE(ns("map.usertrackingmodechange")),
-
-    // point annotation events
-    POINT_ANNOTATION_SELECTED(ns("pointannotation.selected")),
-    POINT_ANNOTATION_DESELECTED(ns("pointannotation.deselected")),
-    POINT_ANNOTATION_DRAG_START(ns("pointannotation.dragstart")),
-    POINT_ANNOTATION_DRAG(ns("pointannotation.drag")),
-    POINT_ANNOTATION_DRAG_END(ns("pointannotation.dragend")),
-
-    // source events
-    SHAPE_SOURCE_LAYER_CLICK(ns("shapesource.layer.pressed")),
-    VECTOR_SOURCE_LAYER_CLICK(ns("vectorsource.layer.pressed")),
-    RASTER_SOURCE_LAYER_CLICK(ns("rastersource.layer.pressed")),
-
-    // images event
-    IMAGES_MISSING(ns("images.missing")),
-
-    // location events
-    USER_LOCATION_UPDATE(ns("user.location.update")),
-
-    // viewport events
-    VIEWPORT_STATUS_CHANGE(ns("viewport.statuschange"))
-}
-
-fun eventMapOf(vararg values: Pair<EventKeys, String>): Map<String, String> {
-    val mapped = values.map { (k,v) -> Pair(k.value, v) }
-
-    return mapOf(
-        *mapped.toTypedArray()
-    )
-}