@rnmapbox/maps 10.0.15 → 10.1.0-beta.10

package/android/src/main/java-v10/com/mapbox/rctmgl/components/location/LocationComponentManager.kt

@@ -1,170 +0,0 @@
-package com.mapbox.rctmgl.components.location
-
-import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.VectorDrawable
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.lifecycle.Lifecycle
-import com.mapbox.maps.plugin.locationcomponent.location
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.maps.plugin.LocationPuck2D
-import com.mapbox.maps.plugin.PuckBearingSource
-import com.mapbox.maps.plugin.lifecycle.lifecycle
-import com.mapbox.rctmgl.R
-import com.mapbox.rctmgl.location.LocationManager
-
-/**
- * The LocationComponent on android implements display of user's current location.
- * But viewport seems to be tied to it in the sense that if location is not enabled then it's viewport user tracking is not working.
- * LocationComponentManager attempts to separate that, so that Camera can ask for location tracking independent of display of user current location.
- * And NativeUserLocation can ask for display of user's current location - independent of Camera's user tracking.
- */
-class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
-    var mMapView = mapView
-    var mContext = context
-    private var mState = State(showUserLocation=false, followUserLocation=false, tintColor= null, bearingImage = null, puckBearingSource =null)
-
-    private var mLocationManager: LocationManager = LocationManager.getInstance(context)
-
-    private var mNeedsFullUpdate = true
-
-    private var mLocationManagerStarted = false
-
-    data class State(
-        val showUserLocation: Boolean,
-        val followUserLocation: Boolean,
-        val tintColor: Int?, // tint of location puck
-        var bearingImage: Drawable?, // bearing image (background)
-        var puckBearingSource: PuckBearingSource? // bearing source
-    ) {
-        val enabled: Boolean
-            get() = showUserLocation || followUserLocation
-
-        val hidden: Boolean
-            get() = followUserLocation && !showUserLocation
-    }
-
-    fun update(newStateCallback: (currentState: State) -> State) {
-        val newState = newStateCallback(mState);
-        if (newState != mState) {
-            applyStateChanges(mState, newState)
-            mState = newState
-        }
-    }
-
-    private fun applyStateChanges(oldState: State, newState: State) {
-        mMapView.let {
-            val needsFullUpdate = mNeedsFullUpdate
-
-            applyStateChanges(it, oldState, newState,  needsFullUpdate)
-
-            mNeedsFullUpdate = false
-        }
-    }
-
-    private fun applyStateChanges(map: RCTMGLMapView, oldState: State, newState: State, fullUpdate: Boolean) {
-        val mapView = map.mapView
-        if (map.getLifecycleState() != Lifecycle.State.STARTED) {
-            // In case lifecycle was already stopped, so we're part of shutdown, do not call updateSettings as it'll just restart
-            // the loationComponent that will not be stopped. See https://github.com/mapbox/mapbox-maps-android/issues/2017
-            if (!newState.enabled) {
-                stopLocationManager()
-            }
-            return
-        }
-        mapView.location.updateSettings {
-            enabled = newState.enabled
-
-            if (fullUpdate || (newState.hidden != oldState.hidden) || (newState.tintColor != oldState.tintColor) || (newState.bearingImage != oldState.bearingImage)) {
-                if (newState.hidden) {
-                    var emptyLocationPuck = LocationPuck2D()
-                    val empty = AppCompatResources.getDrawable(mContext, R.drawable.empty)
-                    emptyLocationPuck.bearingImage = empty
-                    emptyLocationPuck.shadowImage = empty
-                    emptyLocationPuck.topImage = empty
-                    //emptyLocationPuck.opacity = 0.0
-                    locationPuck = emptyLocationPuck
-                    pulsingEnabled = false
-                } else {
-                    val mapboxBlueColor = Color.parseColor("#4A90E2")
-                    val tintColor = newState.tintColor
-                    val defaultLocationPuck = LocationPuck2D()
-                    var topImage = AppCompatResources.getDrawable(mContext, R.drawable.mapbox_user_icon)
-                    if (tintColor != null) {
-                        val drawable = topImage as VectorDrawable?
-                        drawable!!.setTint(tintColor)
-                        topImage = drawable
-                    }
-                    defaultLocationPuck.topImage = topImage
-                    val defaultBearingImage = AppCompatResources.getDrawable(
-                        mContext, R.drawable.mapbox_user_stroke_icon
-                    );
-                    defaultLocationPuck.bearingImage = newState.bearingImage ?: defaultBearingImage
-                    val shadowImage = AppCompatResources.getDrawable(
-                        mContext, R.drawable.mapbox_user_icon_shadow
-                    )
-                    defaultLocationPuck.shadowImage = shadowImage
-                    locationPuck = defaultLocationPuck
-                    pulsingEnabled = true
-                    if (tintColor != null) {
-                        pulsingColor = tintColor
-                    } else {
-                        pulsingColor = mapboxBlueColor
-                    }
-                }
-            }
-
-            if (fullUpdate || newState.enabled != mState.enabled) {
-                if (newState.enabled) {
-                    startLocationManager()
-                    useMapLocationProvider(map)
-                } else {
-                    stopLocationManager()
-                }
-            }
-        }
-    }
-
-    private fun startLocationManager() {
-        if (!mLocationManagerStarted) {
-            mLocationManager.startCounted()
-            mLocationManagerStarted = true
-        }
-    }
-
-    private fun stopLocationManager() {
-        if (mLocationManagerStarted) {
-            mLocationManager.stopCounted()
-            mLocationManagerStarted = false
-        }
-    }
-
-    private fun useMapLocationProvider(mapView: RCTMGLMapView) {
-        val provider = mapView.mapView.location.getLocationProvider()
-        if (provider != null) {
-            mLocationManager.provider = provider
-        }
-    }
-
-
-    fun showNativeUserLocation(showUserLocation: Boolean) {
-        update {
-            it.copy(showUserLocation = showUserLocation)
-        }
-    }
-
-    fun setFollowLocation(followUserLocation: Boolean) {
-        update {
-            it.copy(followUserLocation = followUserLocation)
-        }
-    }
-
-    fun update() {
-        update { it }
-    }
-
-    fun onDestroy() {
-        stopLocationManager();
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/location/RCTMGLNativeUserLocation.kt

@@ -1,81 +0,0 @@
-package com.mapbox.rctmgl.components.location
-
-import android.annotation.SuppressLint
-import android.content.Context
-import androidx.appcompat.content.res.AppCompatResources
-import com.mapbox.rctmgl.components.mapview.OnMapReadyCallback
-import com.mapbox.maps.MapboxMap
-import com.mapbox.android.core.permissions.PermissionsManager
-import com.mapbox.maps.Style
-import com.mapbox.maps.plugin.PuckBearingSource
-import com.mapbox.rctmgl.R
-import com.mapbox.rctmgl.components.AbstractMapFeature
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-
-enum class RenderMode {
-    GPS, COMPASS, NORMAL
-}
-
-class RCTMGLNativeUserLocation(context: Context) : AbstractMapFeature(context), OnMapReadyCallback, Style.OnStyleLoaded {
-    private var mEnabled = true
-    private var mMap: MapboxMap? = null
-    private var mRenderMode : RenderMode = RenderMode.NORMAL;
-    private var mContext : Context = context
-
-    override fun addToMap(mapView: RCTMGLMapView) {
-        super.addToMap(mapView)
-        mEnabled = true
-        mapView.getMapboxMap()
-        mapView.getMapAsync(this)
-        mMapView?.locationComponentManager?.showNativeUserLocation(true)
-        applyChanges()
-    }
-
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
-        mEnabled = false
-        mMapView?.locationComponentManager?.showNativeUserLocation(false)
-        mMap?.getStyle(this)
-        return super.removeFromMap(mapView, reason)
-    }
-
-    @SuppressLint("MissingPermission")
-    override fun onMapReady(mapboxMap: MapboxMap) {
-        mMap = mapboxMap
-        mapboxMap.getStyle(this)
-        applyChanges()
-    }
-
-    fun setAndroidRenderMode(renderMode: RenderMode) {
-        mRenderMode = renderMode;
-        applyChanges();
-    }
-
-    @SuppressLint("MissingPermission")
-    override fun onStyleLoaded(style: Style) {
-        val context = context
-        if (!PermissionsManager.areLocationPermissionsGranted(context)) {
-            return
-        }
-
-        mMapView?.locationComponentManager?.update()
-        mMapView?.locationComponentManager?.showNativeUserLocation(mEnabled)
-    }
-
-    fun applyChanges() {
-        mMapView?.locationComponentManager?.let {
-            // emulate https://docs.mapbox.com/android/legacy/maps/guides/location-component/
-            when (mRenderMode) {
-                RenderMode.NORMAL ->
-                    it.update { it.copy(bearingImage =  null, puckBearingSource = null)}
-                RenderMode.GPS -> it.update {
-                    it.copy(bearingImage =  AppCompatResources.getDrawable(
-                        mContext, R.drawable.mapbox_user_bearing_icon
-                    ), puckBearingSource = PuckBearingSource.COURSE) }
-                RenderMode.COMPASS -> it.update{ it.copy(bearingImage=  AppCompatResources.getDrawable(
-                    mContext, R.drawable.mapbox_user_puck_icon
-                ), puckBearingSource = PuckBearingSource.HEADING) }
-            }
-        }
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/location/RCTMGLNativeUserLocationManager.kt

@@ -1,32 +0,0 @@
-package com.mapbox.rctmgl.components.location
-
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewGroupManager
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.mapbox.rctmgl.utils.Logger
-import javax.annotation.Nonnull
-
-class RCTMGLNativeUserLocationManager : ViewGroupManager<RCTMGLNativeUserLocation>() {
-    @Nonnull
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    @ReactProp(name = "androidRenderMode")
-    fun setAndroidRenderMode(userLocation: RCTMGLNativeUserLocation, mode: String) {
-        when (mode) {
-            "compass" -> userLocation.setAndroidRenderMode(RenderMode.COMPASS);
-            "gps" -> userLocation.setAndroidRenderMode(RenderMode.GPS);
-            "normal" -> userLocation.setAndroidRenderMode(RenderMode.NORMAL);
-        }
-    }
-
-    @Nonnull
-    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RCTMGLNativeUserLocation {
-        return RCTMGLNativeUserLocation(reactContext)
-    }
-
-    companion object {
-        const val REACT_CLASS = "RCTMGLNativeUserLocation"
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/location/UserLocation.java

@@ -1,59 +0,0 @@
-package com.mapbox.rctmgl.components.location;
-
-import android.location.Location;
-
-import com.mapbox.rctmgl.utils.LatLng;
-
-public class UserLocation {
-    private Location currentLocation;
-    private Location previousLocation;
-
-    private int userTrackingMode = UserTrackingMode.NONE;
-
-    public UserLocation() {
-        this(null);
-    }
-
-    public UserLocation(Location currentLocation) {
-        this.currentLocation = currentLocation;
-    }
-
-    public Location getCurrentLocation() {
-        return currentLocation;
-    }
-
-    public double getBearing() {
-        if (currentLocation == null) {
-            return 0.0;
-        }
-        return currentLocation.getBearing();
-    }
-
-    public LatLng getCoordinate() {
-        if (currentLocation == null) {
-            return null;
-        }
-
-        return new LatLng(currentLocation.getLatitude(), currentLocation.getLongitude());
-    }
-
-    public void setCurrentLocation(Location currentLocation) {
-        this.previousLocation = this.currentLocation;
-        this.currentLocation = currentLocation;
-    }
-
-    public void setTrackingMode(int userTrackingMode) {
-        this.userTrackingMode = userTrackingMode;
-    }
-
-    public int getTrackingMode() {
-        return userTrackingMode;
-    }
-
-    public float getDistance(Location location) {
-        if (currentLocation == null) {
-            return 0.0f;
-        }
-        return currentLocation.distanceTo(location);
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/location/UserTrackingMode.kt

@@ -1,42 +0,0 @@
-package com.mapbox.rctmgl.components.location
-
-object UserTrackingMode {
-    const val NONE = 0
-    const val FOLLOW = 1
-    const val FollowWithCourse = 2
-    const val FollowWithHeading = 3
-    @CameraMode.Mode
-    fun getCameraMode(mode: Int): Int {
-        when (mode) {
-            NONE -> return CameraMode.NONE
-            FOLLOW -> return CameraMode.TRACKING
-            FollowWithCourse -> return CameraMode.TRACKING_GPS
-            FollowWithHeading -> return CameraMode.TRACKING_COMPASS
-        }
-        return CameraMode.NONE
-    }
-
-    fun isUserGesture(reason: Int): Boolean {
-        return reason == 1 || reason == 2 // user gesture or animation
-    }
-
-    fun toString(value: Int): String? {
-        when (value) {
-            FOLLOW -> return "normal"
-            FollowWithCourse -> return "course"
-            FollowWithHeading -> return "compass"
-        }
-        return null
-    }
-
-    fun fromString(value: String?): Int {
-        var value = value
-        if (value == null) value = ""
-        return when (value) {
-            "course" -> FollowWithCourse
-            "normal" -> FOLLOW
-            "compass" -> FollowWithHeading
-            else -> FOLLOW
-        }
-    }
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/mapview/OnMapReadyCallback.java

@@ -1,9 +0,0 @@
-package com.mapbox.rctmgl.components.mapview;
-
-import androidx.annotation.NonNull;
-
-import com.mapbox.maps.MapboxMap;
-
-public interface OnMapReadyCallback {
-  public void onMapReady(@NonNull MapboxMap mapboxMap);
-}

package/android/src/main/java-v10/com/mapbox/rctmgl/components/mapview/RCTMGLAndroidTextureMapViewManager.kt

@@ -1,23 +0,0 @@
-package com.mapbox.rctmgl.components.mapview
-
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ThemedReactContext
-import com.mapbox.maps.MapInitOptions
-
-class RCTMGLAndroidTextureMapViewManager(context: ReactApplicationContext) : RCTMGLMapViewManager(
-    context
-) {
-    override fun getName(): String {
-        return REACT_CLASS
-    }
-
-    override fun createViewInstance(themedReactContext: ThemedReactContext): RCTMGLMapView {
-        val context = getMapViewContext(themedReactContext)
-        val options = MapInitOptions(context = context, textureView= true)
-        return RCTMGLMapView(context, this, options)
-    }
-
-    companion object {
-        const val REACT_CLASS = "RCTMGLAndroidTextureMapView"
-    }
-}