@rnmapbox/maps 10.0.0-beta.40 → 10.0.0-beta.42

package/.eslintrc.js

@@ -78,8 +78,9 @@ module.exports = {
     'no-unused-expressions': ['error', { allowTaggedTemplates: true }],
     'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],
     'react-native/no-inline-styles': 0,
+    '@typescript-eslint/no-explicit-any': ['error', { ignoreRestArgs: true }],
   },
-  ignorePatterns: ['**/rnmapbox.web.symlink'],
+  ignorePatterns: ['**/rnmapbox.web.symlink', 'plugin/build/'],
   overrides: [
     {
       // Match TypeScript Files

package/.github/workflows/ios-actions.yml

@@ -64,7 +64,7 @@ jobs:
           brew install xcbeautify
 
       - name: Build for detox
-        run: yarn detox build --configuration ios.debug | xcbeautify -qq
+        run: set -o pipefail && NSUnbufferedIO=YES  yarn detox build --configuration ios.debug 2>&1 | xcbeautify -qq
 
       - name: Test with detox
         run: |

package/android/rctmgl/src/main/java-v10/com/mapbox/rctmgl/RCTMGLPackage.java

@@ -20,6 +20,7 @@ import com.mapbox.rctmgl.components.images.RCTMGLImagesManager;
 import com.mapbox.rctmgl.components.location.RCTMGLNativeUserLocationManager;
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapViewManager;
 import com.mapbox.rctmgl.components.mapview.RCTMGLAndroidTextureMapViewManager;
+import com.mapbox.rctmgl.components.styles.atmosphere.RCTMGLAtmosphereManager;
 import com.mapbox.rctmgl.components.styles.layers.RCTMGLBackgroundLayerManager;
 import com.mapbox.rctmgl.components.styles.layers.RCTMGLCircleLayerManager;
 import com.mapbox.rctmgl.components.styles.layers.RCTMGLFillExtrusionLayerManager;
@@ -107,6 +108,7 @@ public class RCTMGLPackage implements ReactPackage {
         managers.add(new RCTMGLRasterLayerManager());
         managers.add(new RCTMGLSkyLayerManager());
         managers.add(new RCTMGLTerrainManager());
+        managers.add(new RCTMGLAtmosphereManager());
         managers.add(new RCTMGLBackgroundLayerManager());
 
         managers.add(new RCTMGLLightManager());

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

@@ -0,0 +1,10 @@
+package com.mapbox.rctmgl.components
+
+import android.content.Context
+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)
+}

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

@@ -0,0 +1,135 @@
+package com.mapbox.rctmgl.components.camera
+
+import android.animation.Animator
+import com.mapbox.maps.plugin.animation.MapAnimationOptions
+import com.mapbox.maps.MapboxMap
+import com.mapbox.maps.plugin.animation.CameraAnimationsPlugin
+import com.mapbox.rctmgl.components.camera.CameraStop
+import com.mapbox.rctmgl.components.camera.RCTMGLCamera
+import com.mapbox.maps.CameraOptions
+import android.view.animation.LinearInterpolator
+import android.view.animation.AccelerateDecelerateInterpolator
+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.RCTMGLCameraManager
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.bridge.ReadableMap
+import com.mapbox.maps.plugin.animation.MapAnimationOptions.Companion.mapAnimationOptions
+import com.mapbox.maps.plugin.animation.easeTo
+import com.mapbox.maps.plugin.animation.flyTo
+import com.mapbox.rctmgl.components.camera.constants.CameraMode
+import java.lang.ref.WeakReference
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.RunnableFuture
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+
+class CameraUpdateItem(
+    map: MapboxMap,
+    private val mCameraUpdate: CameraOptions,
+    val duration: Int,
+    private val mCallback: Animator.AnimatorListener?,
+    @param:CameraMode.Mode private val mCameraMode: Int
+) : RunnableFuture<Void?> {
+    private var isCameraActionFinished = false
+    private var isCameraActionCancelled = false
+    private val mMap: WeakReference<MapboxMap>
+
+    internal enum class CallbackMode {
+        START, END, CANCEL, REPEAT
+    }
+
+    init {
+        mMap = WeakReference(map)
+    }
+
+    override fun run() {
+        val callback: Animator.AnimatorListener = object : Animator.AnimatorListener {
+            override fun onAnimationStart(animator: Animator) {
+                isCameraActionCancelled = false
+                isCameraActionFinished = false
+                mCallback?.onAnimationStart(animator)
+            }
+
+            override fun onAnimationEnd(animator: Animator) {
+                isCameraActionCancelled = false
+                isCameraActionFinished = true
+                mCallback?.onAnimationEnd(animator)
+            }
+
+            override fun onAnimationCancel(animator: Animator) {
+                isCameraActionCancelled = true
+                isCameraActionFinished = false
+                mCallback?.onAnimationCancel(animator)
+            }
+
+            override fun onAnimationRepeat(animator: Animator) {
+                isCameraActionCancelled = false
+                isCameraActionFinished = false
+                mCallback?.onAnimationRepeat(animator)
+            }
+        }
+        val map = mMap.get()
+        if (map == null) {
+            isCameraActionCancelled = true
+            return
+        }
+        val animationOptions = MapAnimationOptions.Builder().apply {
+            animatorListener(callback)
+        }
+
+        // animateCamera / easeCamera only allows positive duration
+        if (duration == 0 || mCameraMode == CameraMode.NONE) {
+            map.flyTo(mCameraUpdate, animationOptions.apply {
+                duration(0)
+                animatorListener(callback)
+            }.build())
+        }
+
+        // On iOS a duration of -1 means default or dynamic duration (based on flight-path length)
+        // On Android we can fallback to Mapbox's default duration as there is no such API
+        if (duration > 0) {
+            animationOptions.apply { duration(duration.toLong()) }
+        }
+        if (mCameraMode == CameraMode.FLIGHT) {
+            map.flyTo(mCameraUpdate, animationOptions.build())
+        } else if (mCameraMode == CameraMode.LINEAR) {
+            map.easeTo(
+                mCameraUpdate,
+                animationOptions.apply { interpolator(LinearInterpolator()) }.build()
+            )
+        } else if (mCameraMode == CameraMode.EASE) {
+            map.easeTo(
+                mCameraUpdate,
+                animationOptions.apply{ interpolator(AccelerateDecelerateInterpolator()) }.build()
+            )
+        }
+        null
+    }
+
+    override fun cancel(mayInterruptIfRunning: Boolean): Boolean {
+        return false
+    }
+
+    override fun isCancelled(): Boolean {
+        return isCameraActionCancelled
+    }
+
+    override fun isDone(): Boolean {
+        return isCameraActionFinished
+    }
+
+    @Throws(InterruptedException::class, ExecutionException::class)
+    override fun get(): Void? {
+        return null
+    }
+
+    @Throws(InterruptedException::class, ExecutionException::class, TimeoutException::class)
+    override fun get(timeout: Long, unit: TimeUnit): Void? {
+        return null
+    }
+}

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

@@ -0,0 +1,68 @@
+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.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.bridge.ReadableMap
+import java.util.*
+
+class CameraUpdateQueue {
+    private var mQueue: Queue<CameraStop>
+    private var mCompleteListener: OnCompleteAllListener? = null
+
+    interface OnCompleteAllListener {
+        fun onCompleteAll()
+    }
+
+    init {
+        mQueue = LinkedList()
+    }
+
+    fun offer(item: CameraStop) {
+        mQueue.offer(item)
+    }
+
+    fun size(): Int {
+        return mQueue.size
+    }
+
+    val isEmpty: Boolean
+        get() = mQueue.isEmpty()
+
+    fun flush() {
+        while (mQueue.size > 0) {
+            mQueue.remove()
+        }
+        mQueue = LinkedList()
+    }
+
+    fun setOnCompleteAllListener(listener: OnCompleteAllListener?) {
+        mCompleteListener = listener
+    }
+
+    fun execute(map: RCTMGLMapView?) {
+        if (mQueue.isEmpty()) {
+            if (mCompleteListener != null) {
+                mCompleteListener!!.onCompleteAll()
+            }
+            return
+        }
+        val stop = mQueue.poll() ?: return
+        val item = stop.toCameraUpdate(map!!)
+        item.run()
+        execute(map)
+    }
+}