@rnmapbox/maps 10.0.0-beta.73 → 10.0.0-beta.75

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/camera/CameraStop.kt

@@ -2,42 +2,31 @@ package com.mapbox.rctmgl.components.camera
 
 import android.animation.Animator
 import android.content.Context
-import com.mapbox.maps.MapView
-import com.mapbox.maps.MapboxMap
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toPointGeometry
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLng
 import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLngBounds
 import com.mapbox.rctmgl.utils.LatLngBounds
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.camera.CameraUpdateItem
-import com.mapbox.maps.CameraState
 import com.mapbox.maps.CameraOptions
-import com.mapbox.rctmgl.components.camera.CameraStop
 import com.facebook.react.bridge.ReadableMap
-import com.mapbox.rctmgl.utils.GeoJSONUtils
-import android.util.DisplayMetrics
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.maps.EdgeInsets
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
 import com.mapbox.rctmgl.utils.LatLng
 
-/*
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
- */   class CameraStop {
+class CameraStop {
     private var mBearing: Double? = null
     private var mTilt: Double? = null
     private var mZoom: Double? = null
+
     private var mLatLng: LatLng? = null
     private var mBounds: LatLngBounds? = null
-    private var mBoundsPaddingLeft : Int? = null
-    private var mBoundsPaddingRight : Int? = null
-    private var mBoundsPaddingBottom : Int? = null
-    private var mBoundsPaddingTop : Int? = null
+
+    private var mPaddingLeft: Int? = null
+    private var mPaddingRight: Int? = null
+    private var mPaddingBottom: Int? = null
+    private var mPaddingTop: Int? = null
+
     private var mMode = CameraMode.EASE
     private var mDuration = 2000
     private var mCallback: Animator.AnimatorListener? = null
@@ -65,6 +54,18 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         mCallback = callback
     }
 
+    fun setPadding(
+        paddingLeft: Int?,
+        paddingRight: Int?,
+        paddingTop: Int?,
+        paddingBottom: Int?
+    ) {
+        mPaddingLeft = paddingLeft
+        mPaddingRight = paddingRight
+        mPaddingTop = paddingTop
+        mPaddingBottom = paddingBottom
+    }
+
     fun setBounds(
         bounds: LatLngBounds?,
         paddingLeft: Int?,
@@ -73,21 +74,18 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         paddingBottom: Int?
     ) {
         mBounds = bounds
-        mBoundsPaddingLeft = paddingLeft
-        mBoundsPaddingRight = paddingRight
-        mBoundsPaddingTop = paddingTop
-        mBoundsPaddingBottom = paddingBottom
+        this.setPadding(paddingLeft, paddingRight, paddingTop, paddingBottom)
     }
 
     fun setMode(@CameraMode.Mode mode: Int) {
         mMode = mode
     }
 
-    fun convert(value: IntArray): EdgeInsets {
-        val left = value[0].toDouble();
-        val top = value[1].toDouble();
-        val right = value[2].toDouble();
-        val bottom = value[3].toDouble();
+    private fun convert(value: IntArray): EdgeInsets {
+        val left = value[0].toDouble()
+        val top = value[1].toDouble()
+        val right = value[2].toDouble()
+        val bottom = value[3].toDouble()
         return EdgeInsets(
             top, left, bottom, right
         )
@@ -100,7 +98,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         builder.center(currentCamera.center)
         builder.bearing(currentCamera.bearing)
 
-        val currentPadding = currentCamera.padding;
+        val currentPadding = currentCamera.padding
 
         builder.padding(currentCamera.padding)
         builder.zoom(currentCamera.zoom)
@@ -110,33 +108,39 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         if (mTilt != null) {
             builder.pitch(mTilt)
         }
+
+        val paddingLeft: Int = mPaddingLeft ?: currentPadding.left.toInt()
+        val paddingTop: Int = mPaddingTop ?: currentPadding.top.toInt()
+        val paddingRight: Int = mPaddingRight ?: currentPadding.right.toInt()
+        val paddingBottom: Int = mPaddingBottom ?: currentPadding.bottom.toInt()
+        val cameraPadding = intArrayOf(paddingLeft, paddingTop, paddingRight, paddingBottom)
+        val cameraPaddingClipped = clippedPadding(cameraPadding, mapView)
+        val cameraPaddingEdgeInsets = convert(cameraPaddingClipped)
+
         if (mLatLng != null) {
             builder.center(mLatLng!!.point)
+            builder.padding(cameraPaddingEdgeInsets)
         } else if (mBounds != null) {
             val tilt = if (mTilt != null) mTilt!! else currentCamera.pitch
             val bearing = if (mBearing != null) mBearing!! else currentCamera.bearing
 
-            val paddingLeft: Int = mBoundsPaddingLeft ?: currentPadding.left.toInt()
-            val paddingTop: Int = mBoundsPaddingTop ?: currentPadding.top.toInt()
-            val paddingRight: Int = mBoundsPaddingRight ?: currentPadding.right.toInt()
-            val paddingBottom: Int = mBoundsPaddingBottom ?: currentPadding.bottom.toInt()
-
-            val cameraPadding = intArrayOf(paddingLeft, paddingTop, paddingRight, paddingBottom)
-            val cameraPaddingClipped = clippedPadding(cameraPadding, mapView)
             val boundsCamera = map.cameraForCoordinateBounds(
                 mBounds!!.toBounds(),
-                convert(cameraPaddingClipped),
+                cameraPaddingEdgeInsets,
                 bearing,
                 tilt
             )
+
             builder.center(boundsCamera.center)
             builder.anchor(boundsCamera.anchor)
             builder.zoom(boundsCamera.zoom)
             builder.padding(boundsCamera.padding)
         }
+
         if (mZoom != null) {
             builder.zoom(mZoom)
         }
+
         return CameraUpdateItem(map, builder.build(), mDuration, mCallback, mMode)
     }
 
@@ -148,35 +152,44 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
             callback: Animator.AnimatorListener?
         ): CameraStop {
             val stop = CameraStop()
+
             if (readableMap.hasKey("pitch")) {
                 stop.setTilt(readableMap.getDouble("pitch"))
             }
+
             if (readableMap.hasKey("heading")) {
                 stop.setBearing(readableMap.getDouble("heading"))
             }
+
             if (readableMap.hasKey("centerCoordinate")) {
                 val target = toPointGeometry(readableMap.getString("centerCoordinate"))
                 stop.setLatLng(toLatLng(target!!))
             }
+
             if (readableMap.hasKey("zoom")) {
                 stop.setZoom(readableMap.getDouble("zoom"))
             }
+
             if (readableMap.hasKey("duration")) {
                 stop.setDuration(readableMap.getInt("duration"))
             }
-            if (readableMap.hasKey("bounds")) {
-                val metrics = context.resources.displayMetrics
-                var paddingTop = getBoundsPaddingByKey(readableMap, metrics.density, "paddingTop")
-                var paddingRight = getBoundsPaddingByKey(readableMap, metrics.density, "paddingRight")
-                var paddingBottom = getBoundsPaddingByKey(readableMap, metrics.density, "paddingBottom")
-                var paddingLeft = getBoundsPaddingByKey(readableMap, metrics.density, "paddingLeft")
 
+            val metrics = context.resources.displayMetrics
+            val paddingTop = getBoundsPaddingByKey(readableMap, metrics.density, "paddingTop")
+            val paddingRight = getBoundsPaddingByKey(readableMap, metrics.density, "paddingRight")
+            val paddingBottom = getBoundsPaddingByKey(readableMap, metrics.density, "paddingBottom")
+            val paddingLeft = getBoundsPaddingByKey(readableMap, metrics.density, "paddingLeft")
+
+            if (readableMap.hasKey("bounds")) {
                 val collection = FeatureCollection.fromJson(readableMap.getString("bounds")!!)
                 stop.setBounds(
                     toLatLngBounds(collection), paddingLeft, paddingRight,
                     paddingTop, paddingBottom
                 )
+            } else {
+                stop.setPadding(paddingLeft, paddingRight, paddingTop, paddingBottom)
             }
+
             if (readableMap.hasKey("mode")) {
                 when (readableMap.getInt("mode")) {
                     CameraMode.FLIGHT -> stop.setMode(CameraMode.FLIGHT)
@@ -185,7 +198,9 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
                     else -> stop.setMode(CameraMode.EASE)
                 }
             }
+
             stop.setCallback(callback)
+
             return stop
         }
 
@@ -218,10 +233,10 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
         }
 
         private fun getBoundsPaddingByKey(map: ReadableMap, density: Float, key: String): Int? {
-            if (map.hasKey(key)) {
-                return (map.getInt(key) * density).toInt()
+            return if (map.hasKey(key)) {
+                (map.getInt(key) * density).toInt()
             } else {
-                return null;
+                null
             }
         }
     }

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

@@ -23,7 +23,7 @@ import com.mapbox.rctmgl.location.LocationManager
 class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
     var mMapView = mapView
     var mContext = context
-    private var mState = State(showUserLocation=false, followUserLocation=false, hidden=false, tintColor= null, bearingImage = null, puckBearingSource =null)
+    private var mState = State(showUserLocation=false, followUserLocation=false, tintColor= null, bearingImage = null, puckBearingSource =null)
 
     private var mLocationManager: LocationManager = LocationManager.getInstance(context)
 
@@ -34,13 +34,15 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
     data class State(
         val showUserLocation: Boolean,
         val followUserLocation: Boolean,
-        val hidden: Boolean, // in case it isn't native
         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) {

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/styles/layers/RCTLayer.kt

@@ -246,8 +246,13 @@ abstract class RCTLayer<T : Layer?>(protected var mContext: Context) : AbstractS
     }
 
     override fun removeFromMap(mapView: RCTMGLMapView) {
-        if (style != null) {
-            style!!.removeStyleLayer(mLayer!!.layerId)
+        style?.let {
+            val layer = mLayer
+            if (layer != null) {
+                it.removeStyleLayer(layer.layerId)
+            } else {
+                Logger.e("RCTLayer","mLayer is null on removal layer from map")
+            }
         }
         super.removeFromMap(mapView)
     }