@rnmapbox/maps 10.0.15 → 10.1.0-beta.4

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/components/camera/CameraUpdateItem.java

@@ -1,125 +0,0 @@
-package com.mapbox.rctmgl.components.camera;
-
-import androidx.annotation.NonNull;
-
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.rctmgl.components.camera.constants.CameraMode;
-
-import java.lang.ref.WeakReference;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.RunnableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Created by nickitaliano on 9/5/17.
- */
-
-public class CameraUpdateItem implements RunnableFuture<Void> {
-    private int mDuration;
-    private MapboxMap.CancelableCallback mCallback;
-    private CameraUpdate mCameraUpdate;
-    private int mCameraMode;
-
-    private boolean isCameraActionFinished;
-    private boolean isCameraActionCancelled;
-
-    private WeakReference<MapboxMap> mMap;
-
-    public CameraUpdateItem(MapboxMap map, CameraUpdate update, int duration, MapboxMap.CancelableCallback callback, @CameraMode.Mode int cameraMode) {
-        mCameraUpdate = update;
-        mDuration = duration;
-        mCallback = callback;
-        mCameraMode = cameraMode;
-        mMap = new WeakReference<>(map);
-    }
-
-    public int getDuration() {
-        return mDuration;
-    }
-
-    @Override
-    public void run() {
-        final MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
-            @Override
-            public void onCancel() {
-                handleCallbackResponse(true);
-            }
-
-            @Override
-            public void onFinish() {
-                handleCallbackResponse(false);
-            }
-        };
-
-        MapboxMap map = mMap.get();
-        if (map == null) {
-            isCameraActionCancelled = true;
-            return;
-        }
-
-        // animateCamera / easeCamera only allows positive duration
-        if (mDuration == 0 || mCameraMode == CameraMode.NONE) {
-            map.moveCamera(mCameraUpdate, callback);
-            return;
-        }
-
-        // 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
-        int duration = mDuration < 0 ? MapboxConstants.ANIMATION_DURATION : mDuration;
-
-        if (mCameraMode == CameraMode.FLIGHT) {
-            map.animateCamera(mCameraUpdate, duration, callback);
-        } else if (mCameraMode == CameraMode.LINEAR) {
-            map.easeCamera(mCameraUpdate, duration, false, callback);
-        } else if (mCameraMode == CameraMode.EASE) {
-            map.easeCamera(mCameraUpdate, duration, true, callback);
-        }
-    }
-
-    @Override
-    public boolean cancel(boolean mayInterruptIfRunning) {
-        return false;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return isCameraActionCancelled;
-    }
-
-    @Override
-    public boolean isDone() {
-        return isCameraActionFinished;
-    }
-
-    @Override
-    public Void get() throws InterruptedException, ExecutionException {
-        return null;
-    }
-
-    @Override
-    public Void get(long timeout, @NonNull TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-        return null;
-    }
-
-    private void handleCallbackResponse(boolean isCancel) {
-        if (mCallback == null) {
-            return;
-        }
-
-        isCameraActionCancelled = isCancel;
-        isCameraActionFinished = !isCancel;
-
-        if (isCancel) {
-            mCallback.onCancel();
-        } else {
-            mCallback.onFinish();
-        }
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/components/camera/CameraUpdateQueue.java

@@ -1,73 +0,0 @@
-package com.mapbox.rctmgl.components.camera;
-
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
-
-
-/**
- * Created by nickitaliano on 9/5/17.
- */
-
-public class CameraUpdateQueue {
-    private Queue<CameraStop> mQueue;
-
-    private OnCompleteAllListener mCompleteListener;
-
-    public interface OnCompleteAllListener {
-        void onCompleteAll();
-    }
-
-    public CameraUpdateQueue() {
-        mQueue = new LinkedList<>();
-    }
-
-    public void offer(CameraStop item) {
-        mQueue.offer(item);
-    }
-
-    public int size() {
-        return mQueue.size();
-    }
-
-    public boolean isEmpty() {
-        return mQueue.isEmpty();
-    }
-
-    public void flush() {
-        while (mQueue.size() > 0) {
-            mQueue.remove();
-        }
-        mQueue = new LinkedList<>();
-    }
-
-    public void setOnCompleteAllListener(OnCompleteAllListener listener) {
-        mCompleteListener = listener;
-    }
-
-    public void execute(RCTMGLMapView map) {
-        if (mQueue.isEmpty()) {
-            if (mCompleteListener != null) {
-                mCompleteListener.onCompleteAll();
-            }
-            return;
-        }
-
-        final CameraStop stop = mQueue.poll();
-        if (stop == null) {
-            return;
-        }
-
-        CameraUpdateItem item = stop.toCameraUpdate(map);
-        item.run();
-        execute(map);
-    }
-}