@rnmapbox/maps 10.0.0-beta.46 → 10.0.0-beta.48

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

@@ -5,6 +5,27 @@ import com.facebook.react.views.view.ReactViewGroup
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
 
 abstract class AbstractMapFeature(context: Context?) : ReactViewGroup(context) {
-    abstract fun addToMap(mapView: RCTMGLMapView)
-    abstract fun removeFromMap(mapView: RCTMGLMapView)
+    protected var mMapView: RCTMGLMapView? = null;
+    private var mWithMapViewCallbacks: Array<((RCTMGLMapView) -> Unit)>? = null;
+
+    open fun addToMap(mapView: RCTMGLMapView) {
+        mMapView = mapView;
+        mWithMapViewCallbacks?.forEach { it(mapView) }
+        mWithMapViewCallbacks = null;
+    }
+
+    open fun removeFromMap(mapView: RCTMGLMapView) {
+        mMapView = null;
+    }
+
+    internal fun withMapView(callback: (mapView: RCTMGLMapView) -> Unit) {
+        val mapView = mMapView;
+        if (mapView == null) {
+            val callbacks = mWithMapViewCallbacks ?: arrayOf();
+            callbacks.plus(callback)
+            mWithMapViewCallbacks = callbacks
+        } else {
+            callback(mapView)
+        }
+    }
 }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerView.kt

@@ -23,8 +23,6 @@ class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerView
     View.OnLayoutChangeListener
 {
     // region Instance variables
-
-    private var mMapView: RCTMGLMapView? = null
     private var mView: View? = null
     private var didAddToMap = false
 
@@ -72,14 +70,15 @@ class RCTMGLMarkerView(context: Context?, private val mManager: RCTMGLMarkerView
 
     // endregion
 
-    // region RCTMGLMapComponent methods
+    // region AbstractMapFeature methods
 
     override fun addToMap(mapView: RCTMGLMapView) {
-        mMapView = mapView
+        super.addToMap(mapView)
         add()
     }
 
     override fun removeFromMap(mapView: RCTMGLMapView) {
+        super.removeFromMap(mapView)
         remove(mapView)
     }
 

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotation.kt

@@ -28,7 +28,6 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
     var marker: PointAnnotation? = null
         private set
     private var mMap: MapboxMap? = null
-    private var mMapView: RCTMGLMapView? = null
     private val mHasChildren = false
     private var mCoordinate: Point? = null
     var iD: String? = null
@@ -74,7 +73,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
-        mMapView = mapView
+        super.addToMap(mapView)
         mMap = mapView.getMapboxMap()
         makeMarker()
         if (mChildView != null) {
@@ -103,6 +102,7 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
         if (calloutView != null) {
             map.offscreenAnnotationViewContainer?.removeView(calloutView)
         }
+        super.removeFromMap(mapView)
     }
 
     override fun onLayoutChange(v: View, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int,

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

@@ -45,11 +45,12 @@ import com.mapbox.rctmgl.modules.RCTMGLLogging
 import com.mapbox.rctmgl.utils.LatLng
 import com.mapbox.rctmgl.utils.Logger
 
+
+
 class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCameraManager) :
     AbstractMapFeature(
         mContext
     ) {
-    private var mMapView: RCTMGLMapView? = null
     private var hasSentFirstRegion = false
     private var mDefaultStop: CameraStop? = null
     private var mCameraStop: CameraStop? = null
@@ -71,8 +72,8 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     private var mFollowZoomLevel : Double? = null
     private var mFollowHeading : Double? = null
     private var mZoomLevel = -1.0
-    private var mMinZoomLevel = -1.0
-    private var mMaxZoomLevel = -1.0
+    private var mMinZoomLevel : Double? = null
+    private var mMaxZoomLevel : Double? = null
     private var mMaxBounds: LatLngBounds? = null
     private var mFollowUserLocation = false
     private var mFollowUserMode: String? = null
@@ -117,9 +118,8 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
-        mMapView = mapView
+        super.addToMap(mapView)
         setInitialCamera()
-        updateMaxMinZoomLevel()
         updateMaxBounds()
         mCameraStop?.let { updateCamera(it) }
         if (mFollowUserLocation) {
@@ -128,7 +128,9 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         }
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView) {}
+    override fun removeFromMap(mapView: RCTMGLMapView) {
+        super.removeFromMap(mapView)
+    }
     fun setStop(stop: CameraStop) {
         mCameraStop = stop
         mCameraStop!!.setCallback(mCameraCallback)
@@ -161,27 +163,20 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
         updateMaxBounds()
     }
 
-    private fun updateMaxBounds() {
-        /*
-        MapboxMap map = getMapboxMap();
-        if (map != null && mMaxBounds != null) {
-            map.setLatLngBoundsForCameraTarget(mMaxBounds);
-        }
 
-         */
-    }
+    private fun updateMaxBounds() {
+        withMapView { mapView ->
+            val map = mapView.getMapboxMap()
+            val maxBounds = mMaxBounds
+            val builder = CameraBoundsOptions.Builder()
 
-    private fun updateMaxMinZoomLevel() {
-        /*
-        MapboxMap map = getMapboxMap();
-        if (map != null) {
-            if (mMinZoomLevel >= 0.0) {
-                map.setMinZoomPreference(mMinZoomLevel);
-            }
-            if (mMaxZoomLevel >= 0.0) {
-                map.setMaxZoomPreference(mMaxZoomLevel);
+            if (maxBounds != null) {
+                builder.bounds(maxBounds.toBounds())
             }
-        }*/
+            mMinZoomLevel?.let { builder.minZoom(it) }
+            mMaxZoomLevel?.let { builder.maxZoom(it) }
+            map.setBounds(builder.build())
+        }
     }
 
     private fun setInitialCamera() {
@@ -319,18 +314,18 @@ class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCa
             });
              */
         } else {
-            mLocationComponentManager!!.setCameraMode(CameraMode.NONE)
+            mLocationComponentManager!!.setCameraMode(com.mapbox.rctmgl.components.location.CameraMode.NONE)
         }
     }
 
-    fun setMinZoomLevel(zoomLevel: Double) {
+    fun setMinZoomLevel(zoomLevel: Double?) {
         mMinZoomLevel = zoomLevel
-        updateMaxMinZoomLevel()
+        updateMaxBounds()
     }
 
-    fun setMaxZoomLevel(zoomLevel: Double) {
+    fun setMaxZoomLevel(zoomLevel: Double?) {
         mMaxZoomLevel = zoomLevel
-        updateMaxMinZoomLevel()
+        updateMaxBounds()
     }
 
     fun setZoomLevel(zoomLevel: Double) {

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

@@ -1,24 +1,14 @@
 package com.mapbox.rctmgl.components.camera
 
-import com.mapbox.rctmgl.components.camera.CameraStop.Companion.fromReadableMap
-import com.mapbox.maps.MapboxMap
-import com.mapbox.maps.CameraOptions
-import com.mapbox.maps.plugin.animation.CameraAnimationsPlugin
-import android.view.animation.LinearInterpolator
-import android.view.animation.AccelerateDecelerateInterpolator
-import com.mapbox.rctmgl.components.camera.CameraStop
-import com.mapbox.rctmgl.components.camera.CameraUpdateQueue.OnCompleteAllListener
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
-import com.mapbox.rctmgl.components.camera.CameraUpdateItem
 import com.facebook.react.bridge.ReactApplicationContext
-import com.mapbox.rctmgl.components.AbstractEventEmitter
-import com.mapbox.rctmgl.components.camera.RCTMGLCamera
-import com.mapbox.rctmgl.components.camera.RCTMGLCameraManager
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.bridge.ReadableMap
-import java.lang.AssertionError
-import java.util.HashMap
+import com.mapbox.geojson.FeatureCollection
+import com.mapbox.rctmgl.components.AbstractEventEmitter
+import com.mapbox.rctmgl.components.camera.CameraStop.Companion.fromReadableMap
+import com.mapbox.rctmgl.utils.GeoJSONUtils.toLatLngBounds
+
 
 //import com.mapbox.rctmgl.utils.GeoJSONUtils;
 class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
@@ -53,15 +43,6 @@ class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
         }
     }
 
-    /*v10todo
-    @ReactProp(name="maxBounds")
-    public void setMaxBounds(RCTMGLCamera camera, String value) {
-        if (value != null) {
-            FeatureCollection collection = FeatureCollection.fromJson(value);
-            camera.setMaxBounds(GeoJSONUtils.toLatLngBounds(collection));
-        }
-    }
-*/
     @ReactProp(name = "userTrackingMode")
     fun setUserTrackingMode(camera: RCTMGLCamera, userTrackingMode: Int) {
         camera.setUserTrackingMode(userTrackingMode)
@@ -108,6 +89,16 @@ class RCTMGLCameraManager(private val mContext: ReactApplicationContext) :
         camera.setFollowZoomLevel(value)
     }
 
+    @ReactProp(name = "maxBounds")
+    fun setMaxBounds(camera: RCTMGLCamera, value: String?) {
+        if (value != null) {
+            val collection = FeatureCollection.fromJson(value)
+            camera.setMaxBounds(toLatLngBounds(collection))
+        } else {
+            camera.setMaxBounds(null)
+        }
+    }
+
     companion object {
         const val REACT_CLASS = "RCTMGLCamera"
     }

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImages.kt

@@ -82,6 +82,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
         mNativeImages = HashMap()
         mImages = HashMap()
         mCurrentImages = HashSet()
+        super.removeFromMap(mapView)
     }
 
     private fun removeImages(mapView: RCTMGLMapView) {
@@ -151,6 +152,7 @@ class RCTMGLImages(context: Context, private val mManager: RCTMGLImagesManager)
     }
 
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         // Wait for style before adding the source to the map
         // only then we can pre-load required images / placeholders into the style
         // before we add the ShapeSource to the map

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

@@ -17,13 +17,12 @@ import com.mapbox.mapboxsdk.maps.Style;
  */   class RCTMGLNativeUserLocation(context: Context?) : AbstractMapFeature(context), OnMapReadyCallback, Style.OnStyleLoaded {
     private var mEnabled = true
     private var mMap: MapboxMap? = null
-    private var mMapView: RCTMGLMapView? = null
 
     @RenderMode.Mode
     private var mRenderMode = RenderMode.COMPASS
     override fun addToMap(mapView: RCTMGLMapView) {
+        super.addToMap(mapView)
         mEnabled = true
-        mMapView = mapView
         mapView.getMapboxMap()
         mapView.getMapAsync(this)
         setRenderMode(mRenderMode)
@@ -32,6 +31,7 @@ import com.mapbox.mapboxsdk.maps.Style;
     override fun removeFromMap(mapView: RCTMGLMapView) {
         mEnabled = false
         mMap?.getStyle(this)
+        super.removeFromMap(mapView)
     }
 
     @SuppressLint("MissingPermission")