@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.4

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotationManager.java

@@ -1,88 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.mapbox.rctmgl.components.AbstractEventEmitter;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-
-import java.util.Map;
-
-/**
- * Created by nickitaliano on 9/27/17.
- */
-
-public class RCTMGLPointAnnotationManager extends AbstractEventEmitter<RCTMGLPointAnnotation> {
-    public static final String REACT_CLASS = "RCTMGLPointAnnotation";
-
-    public RCTMGLPointAnnotationManager(ReactApplicationContext reactApplicationContext) {
-        super(reactApplicationContext);
-    }
-
-    @Override
-    public Map<String, String> customEvents() {
-        return MapBuilder.<String, String>builder()
-                .put(EventKeys.POINT_ANNOTATION_SELECTED, "onMapboxPointAnnotationSelected")
-                .put(EventKeys.POINT_ANNOTATION_DESELECTED, "onMapboxPointAnnotationDeselected")
-                .put(EventKeys.POINT_ANNOTATION_DRAG_START, "onMapboxPointAnnotationDragStart")
-                .put(EventKeys.POINT_ANNOTATION_DRAG, "onMapboxPointAnnotationDrag")
-                .put(EventKeys.POINT_ANNOTATION_DRAG_END, "onMapboxPointAnnotationDragEnd")
-                .build();
-    }
-
-    //region React Methods
-    public static final int METHOD_REFRESH = 2;
-
-    @Nullable
-    @Override
-    public Map<String, Integer> getCommandsMap() {
-        return MapBuilder.<String, Integer>builder()
-                .put("refresh", METHOD_REFRESH)
-                .build();
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected RCTMGLPointAnnotation createViewInstance(ThemedReactContext reactContext) {
-        return new RCTMGLPointAnnotation(reactContext, this);
-    }
-
-    @ReactProp(name="id")
-    public void setId(RCTMGLPointAnnotation annotation, String id) {
-        annotation.setID(id);
-    }
-
-    @ReactProp(name="coordinate")
-    public void setCoordinate(RCTMGLPointAnnotation annotation, String geoJSONStr) {
-        annotation.setCoordinate(GeoJSONUtils.toPointGeometry(geoJSONStr));
-    }
-
-    @ReactProp(name="anchor")
-    public void setAnchor(RCTMGLPointAnnotation annotation, ReadableMap map) {
-        annotation.setAnchor((float) map.getDouble("x"), (float) map.getDouble("y"));
-    }
-
-    @ReactProp(name="draggable")
-    public void setDraggable(RCTMGLPointAnnotation annotation, Boolean draggable) {
-        annotation.setDraggable(draggable);
-    }
-
-    @Override
-    public void receiveCommand(RCTMGLPointAnnotation annotation, int commandID, @Nullable ReadableArray args) {
-        switch (commandID) {
-            case METHOD_REFRESH:
-                annotation.refresh();
-                break;
-        }
-    }
-}

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

@@ -1,249 +0,0 @@
-package com.mapbox.rctmgl.components.camera;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-import android.util.DisplayMetrics;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.mapbox.geojson.FeatureCollection;
-import com.mapbox.geojson.Point;
-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;
-import com.mapbox.rctmgl.components.camera.constants.CameraMode;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView;
-
-/**
- * Created by nickitaliano on 9/5/17.
- */
-
-public class CameraStop {
-    private Double mBearing;
-    private Double mTilt;
-    private Double mZoom;
-    private LatLng mLatLng;
-
-    private LatLngBounds mBounds;
-    private int mPaddingLeft = 0;
-    private int mPaddingRight = 0;
-    private int mPaddingBottom = 0;
-    private int mPaddingTop = 0;
-
-    private int mMode = CameraMode.EASE;
-    private int mDuration = 2000;
-    private MapboxMap.CancelableCallback mCallback;
-
-    public CameraStop() {
-    }
-
-    public void setBearing(double bearing) {
-        mBearing = bearing;
-    }
-
-    public void setTilt(double tilt) {
-        mTilt = tilt;
-    }
-
-    public void setZoom(double zoom) {
-        mZoom = zoom;
-    }
-
-    public void setLatLng(LatLng latLng) {
-        mLatLng = latLng;
-    }
-
-    public void setDuration(int duration) {
-        mDuration = duration;
-    }
-
-    public void setCallback(MapboxMap.CancelableCallback callback) {
-        mCallback = callback;
-    }
-
-    public void setBounds(LatLngBounds bounds) {
-        mBounds = bounds;
-    }
-
-    public void setPadding(int paddingLeft, int paddingRight, int paddingTop, int paddingBottom) {
-        mPaddingLeft = paddingLeft;
-        mPaddingRight = paddingRight;
-        mPaddingTop = paddingTop;
-        mPaddingBottom = paddingBottom;
-    }
-
-    public void setMode(@CameraMode.Mode int mode) {
-        mMode = mode;
-    }
-
-    public CameraUpdateItem toCameraUpdate(RCTMGLMapView mapView) {
-        MapboxMap map = mapView.getMapboxMap();
-        CameraPosition currentCamera = map.getCameraPosition();
-        CameraPosition.Builder builder = new CameraPosition.Builder(currentCamera);
-
-        // Adding map padding to the camera padding which is the same behavior as
-        // mapbox native does on iOS
-        double[] contentInset = mapView.getContentInset();
-
-        int paddingLeft = Double.valueOf(contentInset[0] + mPaddingLeft).intValue();
-        int paddingTop = Double.valueOf(contentInset[1] + mPaddingTop).intValue();
-        int paddingRight = Double.valueOf(contentInset[2] + mPaddingRight).intValue();
-        int paddingBottom = Double.valueOf(contentInset[3] + mPaddingBottom).intValue();
-
-        int[] cameraPadding = {paddingLeft, paddingTop, paddingRight, paddingBottom};
-        int[] cameraPaddingClipped = clippedPadding(cameraPadding, mapView);
-
-        boolean hasSetZoom = false;
-
-        if (mLatLng != null) {
-            builder.target(mLatLng);
-            builder.padding(
-                cameraPaddingClipped[0],
-                cameraPaddingClipped[1],
-                cameraPaddingClipped[2],
-                cameraPaddingClipped[3]
-            );
-        } else if (mBounds != null) {
-            double tilt = mTilt != null ? mTilt : currentCamera.tilt;
-            double bearing = mBearing != null ? mBearing : currentCamera.bearing;
-
-            CameraPosition boundsCamera = map.getCameraForLatLngBounds(mBounds, cameraPaddingClipped, bearing, tilt);
-            if (boundsCamera != null) {
-                builder.target(boundsCamera.target);
-                builder.zoom(boundsCamera.zoom);
-                builder.padding(boundsCamera.padding);
-            } else {
-                CameraUpdate update = CameraUpdateFactory.newLatLngBounds(
-                    mBounds,
-                    cameraPaddingClipped[0],
-                    cameraPaddingClipped[1],
-                    cameraPaddingClipped[2],
-                    cameraPaddingClipped[3]
-                );
-                return new CameraUpdateItem(map, update, mDuration, mCallback, mMode);
-            }
-            hasSetZoom = true;
-        }
-
-        if (mBearing != null) {
-            builder.bearing(mBearing);
-        }
-
-        if (mTilt != null) {
-            builder.tilt(mTilt);
-        }
-
-        if (mZoom != null && !hasSetZoom) {
-            builder.zoom(mZoom);
-        }
-
-        return new CameraUpdateItem(map, CameraUpdateFactory.newCameraPosition(builder.build()), mDuration, mCallback, mMode);
-    }
-
-    public static CameraStop fromReadableMap(Context context, @NonNull ReadableMap readableMap, MapboxMap.CancelableCallback callback) {
-        CameraStop stop = new CameraStop();
-
-        if (readableMap.hasKey("pitch")) {
-            stop.setTilt(readableMap.getDouble("pitch"));
-        }
-
-        if (readableMap.hasKey("heading")) {
-            stop.setBearing(readableMap.getDouble("heading"));
-        }
-
-        int paddingTop = getPaddingByKey(readableMap, "paddingTop");
-        int paddingRight = getPaddingByKey(readableMap, "paddingRight");
-        int paddingBottom = getPaddingByKey(readableMap, "paddingBottom");
-        int paddingLeft = getPaddingByKey(readableMap, "paddingLeft");
-
-        // scale padding by pixel ratio
-        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        paddingTop = Float.valueOf(paddingTop * metrics.density).intValue();
-        paddingRight = Float.valueOf(paddingRight * metrics.density).intValue();
-        paddingBottom = Float.valueOf(paddingBottom * metrics.density).intValue();
-        paddingLeft = Float.valueOf(paddingLeft * metrics.density).intValue();
-
-        stop.setPadding(
-                paddingLeft,
-                paddingRight,
-                paddingTop,
-                paddingBottom
-        );
-
-        if (readableMap.hasKey("centerCoordinate")) {
-            Point target = GeoJSONUtils.toPointGeometry(readableMap.getString("centerCoordinate"));
-            stop.setLatLng(GeoJSONUtils.toLatLng(target));
-        }
-
-        if (readableMap.hasKey("zoom")) {
-            stop.setZoom(readableMap.getDouble("zoom"));
-        }
-
-        if (readableMap.hasKey("duration")) {
-            stop.setDuration(readableMap.getInt("duration"));
-        }
-
-        if (readableMap.hasKey("bounds")) {
-            FeatureCollection collection = FeatureCollection.fromJson(readableMap.getString("bounds"));
-            stop.setBounds(GeoJSONUtils.toLatLngBounds(collection));
-        }
-
-        if (readableMap.hasKey("mode")) {
-            switch (readableMap.getInt("mode")) {
-                case CameraMode.FLIGHT:
-                    stop.setMode(CameraMode.FLIGHT);
-                    break;
-                case CameraMode.LINEAR:
-                    stop.setMode(CameraMode.LINEAR);
-                    break;
-                case CameraMode.NONE:
-                    stop.setMode(CameraMode.NONE);
-                    break;
-                default:
-                    stop.setMode(CameraMode.EASE);
-            }
-        }
-
-        stop.setCallback(callback);
-        return stop;
-    }
-
-    private static int[] clippedPadding(int[] padding, RCTMGLMapView mapView) {
-        int mapHeight = mapView.getHeight();
-        int mapWidth = mapView.getWidth();
-
-        int left = padding[0];
-        int top = padding[1];
-        int right = padding[2];
-        int bottom = padding[3];
-
-        int resultLeft = left;
-        int resultTop = top;
-        int resultRight = right;
-        int resultBottom = bottom;
-
-        if (top + bottom >= mapHeight) {
-            double totalPadding = top + bottom;
-            double extra = totalPadding - mapHeight + 1.0; // add 1 to compensate for floating point math
-            resultTop -= (top * extra) / totalPadding;
-            resultBottom -= (bottom * extra) / totalPadding;
-        }
-
-        if (left + right >= mapWidth) {
-            double totalPadding = left + right;
-            double extra = totalPadding - mapWidth + 1.0; // add 1 to compensate for floating point math
-            resultLeft -= (left * extra) / totalPadding;
-            resultRight -= (right * extra) / totalPadding;
-        }
-
-        return new int[] {resultLeft, resultTop, resultRight, resultBottom};
-    }
-
-    private static int getPaddingByKey(ReadableMap map, String key) {
-        return map.hasKey(key) ? map.getInt(key) : 0;
-    }
-}

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);
-    }
-}