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

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

@@ -1,69 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import androidx.annotation.NonNull;
-
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Subclass of MarkerViewManager implementing removeViews and restoreViews
- */
-public class MarkerViewManager extends com.mapbox.mapboxsdk.plugins.markerview.MarkerViewManager {
-    private final List<MarkerView> markers = new ArrayList<>();
-    private MapView mapView;
-    private java.lang.reflect.Method markerUpdate;
-
-    public MarkerViewManager(MapView mapView, MapboxMap mapboxMap) {
-        super(mapView, mapboxMap);
-        this.mapView = mapView;
-        // this.mapboxMap = mapboxMap;
-
-        try {     
-            markerUpdate = MarkerView.class.getSuperclass().getDeclaredMethod("update");
-            markerUpdate.setAccessible(true);
-        } 
-        catch (NoSuchMethodException e) {System.out.println(e.toString());}
-    }
-
-    public void addMarker(@NonNull MarkerView markerView) {
-        super.addMarker(markerView);
-        markers.add(markerView);
-    }
-
-    public void removeMarker(@NonNull MarkerView markerView) {
-        super.removeMarker(markerView);
-        markers.remove(markerView);
-    }
-
-    public void removeViews() {
-        for (MarkerView marker: markers) {
-            mapView.removeView(marker.getView());
-        }
-    }
-
-    public void restoreViews() {
-        for (MarkerView marker: markers) {
-            mapView.addView(marker.getView());
-        }
-    }
-
-    public void updateMarkers(){
-        
-        try {   
-            if (markerUpdate != null) {       
-                for( int i = 0; i < markers.size(); i++ ){    
-                    markerUpdate.invoke(markers.get(i));
-                }
-             }
-         } 
-        catch (IllegalArgumentException e) { System.out.println(e.toString()); }
-        catch (IllegalAccessException e) { System.out.println(e.toString()); }
-        catch (InvocationTargetException e) { System.out.println(e.toString()); }
-    }
-
-}

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

@@ -1,15 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import android.content.Context;
-
-import com.facebook.react.views.view.ReactViewGroup;
-
-/**
- * Created by nickitaliano on 10/11/17.
- */
-
-public class RCTMGLCallout extends ReactViewGroup {
-    public RCTMGLCallout(Context context) {
-        super(context);
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.ViewGroupManager;
-
-/**
- * Created by nickitaliano on 10/11/17.
- */
-
-public class RCTMGLCalloutManager extends ViewGroupManager<RCTMGLCallout> {
-    public static final String REACT_CLASS = "RCTMGLCallout";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    protected RCTMGLCallout createViewInstance(ThemedReactContext reactContext) {
-        return new RCTMGLCallout(reactContext);
-    }
-}

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

@@ -1,112 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import android.content.Context;
-import android.graphics.PointF;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import com.mapbox.geojson.Point;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.rctmgl.components.AbstractMapFeature;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-
-public class RCTMGLMarkerView extends AbstractMapFeature implements MarkerView.OnPositionUpdateListener, View.OnLayoutChangeListener {
-    private RCTMGLMarkerViewManager mManager;
-    private RCTMGLMapView mMapView;
-
-    private View mChildView;
-
-    private MarkerViewManager mMarkerViewManager;
-
-    private MarkerView mMarkerView;
-    private Point mCoordinate;
-    private Float[] mAnchor;
-
-
-    public RCTMGLMarkerView(Context context, RCTMGLMarkerViewManager manager) {
-        super(context);
-        mManager = manager;
-    }
-
-    @Override
-    public void addView(View childView, int childPosition) {
-        mChildView = childView;
-    }
-
-    public void setCoordinate(Point point) {
-        mCoordinate = point;
-
-        if (mMarkerView != null) {
-            mMarkerView.setLatLng(GeoJSONUtils.toLatLng(point));
-        }
-    }
-
-    public void setAnchor(float x, float y) {
-        mAnchor = new Float[]{x, y};
-        refresh();
-    }
-
-    public void refresh() {
-        // this will cause position to be recalculated
-        if (mMarkerView != null) {
-            mMarkerView.setLatLng(GeoJSONUtils.toLatLng(mCoordinate));
-        }
-    }
-
-    @Override
-    public void addToMap(RCTMGLMapView mapView) {
-        mMapView = mapView;
-
-        final RCTMGLMarkerView rctmglMarkerView = this;
-
-        mMapView.getMapAsync(
-            new OnMapReadyCallback() {
-                @Override
-                public void onMapReady(@NonNull MapboxMap mapboxMap) {
-                    mMarkerViewManager = mMapView.getMarkerViewManager(mapboxMap);
-
-                    if (mChildView != null) {
-                        mMarkerView = new MarkerView(GeoJSONUtils.toLatLng(mCoordinate), mChildView);
-                        mMarkerView.setOnPositionUpdateListener(rctmglMarkerView);
-                        mChildView.addOnLayoutChangeListener(rctmglMarkerView);
-                        mMarkerViewManager.addMarker(mMarkerView);
-                    }
-                }
-            }
-        );
-    }
-
-    @Override
-    public PointF onUpdate(PointF pointF) {
-        if (mAnchor != null) {
-            return new PointF(
-                    pointF.x - mChildView.getWidth() * mAnchor[0],
-                    pointF.y - mChildView.getHeight() * mAnchor[1]
-                    );
-        }
-        return pointF;
-    }
-
-    @Override
-    public void removeFromMap(RCTMGLMapView mapView) {
-        if (mMarkerView != null) {
-            mMarkerViewManager.removeMarker(mMarkerView);
-            mChildView.removeOnLayoutChangeListener(this);
-            mMarkerView.setOnPositionUpdateListener(null);
-            mMarkerView = null;
-            mMarkerViewManager = null;
-        }
-    }
-
-    @Override
-    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop,
-                               int oldRight, int oldBottom) {
-        if (left != oldLeft || right != oldRight || top != oldTop || bottom != oldBottom) {
-            refresh();
-        }
-    }
-}
-

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

@@ -1,45 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-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.utils.GeoJSONUtils;
-
-import java.util.Map;
-
-public class RCTMGLMarkerViewManager extends AbstractEventEmitter<RCTMGLMarkerView> {
-    public static final String REACT_CLASS = "RCTMGLMarkerView";
-
-    public RCTMGLMarkerViewManager(ReactApplicationContext reactApplicationContext) {
-        super(reactApplicationContext);
-    }
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @ReactProp(name="coordinate")
-    public void setCoordinate(RCTMGLMarkerView markerView, String geoJSONStr) {
-        markerView.setCoordinate(GeoJSONUtils.toPointGeometry(geoJSONStr));
-    }
-
-    @ReactProp(name="anchor")
-    public void setAnchor(RCTMGLMarkerView markerView, ReadableMap map) {
-        markerView.setAnchor((float) map.getDouble("x"), (float) map.getDouble("y"));
-    }
-
-    @Override
-    protected RCTMGLMarkerView createViewInstance(ThemedReactContext reactContext) {
-        return new RCTMGLMarkerView(reactContext, this);
-    }
-
-    @Override
-    public Map<String, String> customEvents() {
-        return MapBuilder.<String, String>builder()
-                .build();
-    }
-}

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

@@ -1,360 +0,0 @@
-package com.mapbox.rctmgl.components.annotation;
-
-import android.content.Context;
-import android.graphics.PointF;
-import android.graphics.Bitmap;
-import android.view.View;
-import androidx.annotation.NonNull;
-
-import com.mapbox.geojson.Point;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.mapboxsdk.plugins.annotation.Symbol;
-import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager;
-import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.rctmgl.components.AbstractMapFeature;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView;
-import com.mapbox.rctmgl.events.PointAnnotationClickEvent;
-import com.mapbox.rctmgl.events.PointAnnotationDragEvent;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-import com.mapbox.rctmgl.utils.BitmapUtils;
-
-public class RCTMGLPointAnnotation extends AbstractMapFeature implements View.OnLayoutChangeListener {
-    private Context mContext;
-    private RCTMGLPointAnnotationManager mManager;
-    private Symbol mAnnotation;
-    private MapboxMap mMap;
-    private RCTMGLMapView mMapView;
-
-    private boolean mHasChildren;
-
-    private Point mCoordinate;
-
-    private String mID;
-    private String mTitle;
-    private String mSnippet;
-
-    private Float[] mAnchor;
-    private boolean mIsSelected;
-    private boolean mDraggable;
-
-    private View mChildView;
-    private Bitmap mChildBitmap;
-    private String mChildBitmapId;
-
-    private View mCalloutView;
-    private Symbol mCalloutSymbol;
-    private Bitmap mCalloutBitmap;
-    private String mCalloutBitmapId;
-
-    private static final String MARKER_IMAGE_ID = "MARKER_IMAGE_ID";
-
-    public RCTMGLPointAnnotation(Context context, RCTMGLPointAnnotationManager manager) {
-        super(context);
-        mContext = context;
-        mManager = manager;
-    }
-
-    @Override
-    public void addView(View childView, int childPosition) {
-        if (childView instanceof RCTMGLCallout) {
-            mCalloutView = childView;
-        } else {
-            mChildView = childView;
-        }
-        childView.addOnLayoutChangeListener(this);
-        if (mMapView != null) {
-            mMapView.offscreenAnnotationViewContainer().addView(childView);
-        }
-    }
-
-    @Override
-    public void removeView(View childView) {
-        if (mChildView != null) {
-            mMap.getStyle(new Style.OnStyleLoaded() {
-                @Override
-                public void onStyleLoaded(@NonNull Style style) {
-                    style.removeImage(mChildBitmapId);
-                    mChildView = null;
-                    mCalloutView = null;
-                    mChildBitmap = null;
-                    mChildBitmapId = null;
-                    updateOptions();
-                }
-            });
-        }
-        if (mMapView != null) {
-            mMapView.offscreenAnnotationViewContainer().removeView(childView);
-        }
-    }
-
-    @Override
-    public void addToMap(RCTMGLMapView mapView) {
-        mMapView = mapView;
-        mMap = mapView.getMapboxMap();
-        makeMarker();
-
-        if (mChildView != null) {
-            if (!mChildView.isAttachedToWindow()) {
-                mMapView.offscreenAnnotationViewContainer().addView(mChildView);
-            }
-            addBitmapToStyle(mChildBitmap, mChildBitmapId);
-            updateOptions();
-        }
-        if (mCalloutView != null) {
-            if (!mCalloutView.isAttachedToWindow()) {
-                mMapView.offscreenAnnotationViewContainer().addView(mCalloutView);
-            }
-            addBitmapToStyle(mCalloutBitmap, mCalloutBitmapId);
-        }
-    }
-
-    @Override
-    public void removeFromMap(RCTMGLMapView mapView) {
-        RCTMGLMapView map = (mMapView != null) ? mMapView : mapView;
-        if (map == null) {
-            return;
-        }
-
-        if (mAnnotation != null) {
-            map.getSymbolManager().delete(mAnnotation);
-        }
-        if (mChildView != null) {
-            map.offscreenAnnotationViewContainer().removeView(mChildView);
-        }
-        if (mCalloutView != null) {
-            map.offscreenAnnotationViewContainer().removeView(mCalloutView);
-        }
-    }
-
-    @Override
-    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop,
-            int oldRight, int oldBottom) {
-        if (left == 0 && top == 0 && right == 0 && bottom == 0) {
-            return;
-        }
-        if (left != oldLeft || right != oldRight || top != oldTop || bottom != oldBottom) {
-            refreshBitmap(v, left, top, right, bottom);
-        }
-    }
-
-    private void refreshBitmap(View v, int left, int top, int right, int bottom) {
-        Bitmap bitmap = BitmapUtils.viewToBitmap(v, left, top, right, bottom);
-        String bitmapId = Integer.toString(v.getId());
-        addBitmapToStyle(bitmap, bitmapId);
-        if (v instanceof RCTMGLCallout) {
-            mCalloutBitmap = bitmap;
-            mCalloutBitmapId = bitmapId;
-        } else {
-            if (bitmap != null) {
-                mChildBitmap = bitmap;
-                mChildBitmapId = bitmapId;
-                updateOptions();
-            }
-        }
-    }
-
-    private void refreshBitmap(View v) {
-        refreshBitmap(v, v.getLeft(), v.getTop(), v.getRight(), v.getBottom());
-    }
-
-    public LatLng getLatLng() {
-        return GeoJSONUtils.toLatLng(mCoordinate);
-    }
-
-    public long getMapboxID() {
-        return mAnnotation == null ? -1 : mAnnotation.getId();
-    }
-
-    public String getID() {
-        return mID;
-    }
-
-    public void setID(String id) {
-        mID = id;
-    }
-
-    public View getCalloutView() {
-        return mCalloutView;
-    }
-
-    public void setCoordinate(Point point) {
-        mCoordinate = point;
-
-        if (mAnnotation != null) {
-            mAnnotation.setLatLng(GeoJSONUtils.toLatLng(point));
-            mMapView.getSymbolManager().update(mAnnotation);
-        }
-        if (mCalloutSymbol != null) {
-            mCalloutSymbol.setLatLng(GeoJSONUtils.toLatLng(point));
-            mMapView.getSymbolManager().update(mCalloutSymbol);
-        }
-    }
-
-    public void setAnchor(float x, float y) {
-        mAnchor = new Float[]{x, y};
-
-        if (mAnnotation != null) {
-            updateAnchor();
-            mMapView.getSymbolManager().update(mAnnotation);
-        }
-    }
-
-    public void setDraggable(Boolean draggable) {
-        mDraggable = draggable;
-        if (mAnnotation != null) {
-            mAnnotation.setDraggable(draggable);
-            mMapView.getSymbolManager().update(mAnnotation);
-        }
-    }
-
-    public Symbol getMarker() {
-        return mAnnotation;
-    }
-
-    public void onSelect(boolean shouldSendEvent) {
-        if (mCalloutView != null) {
-            makeCallout();
-        }
-        if (shouldSendEvent) {
-            mManager.handleEvent(makeEvent(true));
-        }
-    }
-
-    public void onDeselect() {
-        mManager.handleEvent(makeEvent(false));
-        if (mCalloutSymbol != null) {
-            mMapView.getSymbolManager().delete(mCalloutSymbol);
-        }
-    }
-
-    public void onDragStart() {
-        LatLng latLng = mAnnotation.getLatLng();
-        mCoordinate = Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude());
-        mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG_START));
-    }
-
-    public void onDrag() {
-        LatLng latLng = mAnnotation.getLatLng();
-        mCoordinate = Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude());
-        mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG));
-    }
-
-    public void onDragEnd() {
-        LatLng latLng = mAnnotation.getLatLng();
-        mCoordinate = Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude());
-        mManager.handleEvent(makeDragEvent(EventTypes.ANNOTATION_DRAG_END));
-    }
-
-    public void makeMarker() {
-        SymbolOptions options = new SymbolOptions()
-            .withLatLng(GeoJSONUtils.toLatLng(mCoordinate))
-            .withDraggable(mDraggable)
-            .withIconSize(1.0f)
-            .withSymbolSortKey(10.0f);
-        SymbolManager symbolManager = mMapView.getSymbolManager();
-        if (symbolManager != null) {
-            mAnnotation = symbolManager.create(options);
-            updateOptions();
-        }
-    }
-
-    private void updateOptions() {
-        if (mAnnotation != null) {
-            updateIconImage();
-            updateAnchor();
-            mMapView.getSymbolManager().update(mAnnotation);
-        }
-    }
-
-    private void updateIconImage() {
-        if (mChildView != null) {
-            if (mChildBitmapId != null) {
-                mAnnotation.setIconImage(mChildBitmapId);
-            }
-        } else {
-            mAnnotation.setIconImage(MARKER_IMAGE_ID);
-            mAnnotation.setIconAnchor("bottom");
-        }
-    }
-
-    private void updateAnchor() {
-        if (mAnchor != null && mChildView != null && mChildBitmap != null) {
-            int w = mChildBitmap.getWidth();
-            int h = mChildBitmap.getHeight();
-            final float scale = getResources().getDisplayMetrics().density;
-            w = (int) (w / scale);
-            h = (int) (h / scale);
-            mAnnotation.setIconAnchor("top-left");
-            mAnnotation.setIconOffset(new PointF(w * mAnchor[0] * -1, h * mAnchor[1] * -1));
-        }
-    }
-
-    private void makeCallout() {
-        float yOffset = -28f;
-        if (mChildView != null) {
-            if (mChildBitmap != null) {
-                float scale = getResources().getDisplayMetrics().density;
-                int h = (int) mChildBitmap.getHeight() / 2;
-                h = (int) (h / scale);
-                yOffset = (float) h * -1;
-            }
-        }
-        SymbolOptions options = new SymbolOptions()
-            .withLatLng(GeoJSONUtils.toLatLng(mCoordinate))
-            .withIconImage(mCalloutBitmapId)
-            .withIconSize(1.0f)
-            .withIconAnchor("bottom")
-            .withIconOffset(new Float[] {0f, yOffset})
-            .withSymbolSortKey(11.0f)
-            .withDraggable(false);
-        SymbolManager symbolManager = mMapView.getSymbolManager();
-        if (symbolManager != null) {
-            mCalloutSymbol = symbolManager.create(options);
-        }
-    }
-
-    private void addBitmapToStyle(final Bitmap bitmap, final String bitmapId) {
-        if (mMap != null && bitmapId != null && bitmap != null) {
-            mMap.getStyle(new Style.OnStyleLoaded() {
-                @Override
-                public void onStyleLoaded(@NonNull Style style) {
-                    style.addImage(bitmapId, bitmap);
-                }
-            });
-        }
-    }
-
-    private PointAnnotationClickEvent makeEvent(boolean isSelect) {
-        String type = isSelect ? EventTypes.ANNOTATION_SELECTED : EventTypes.ANNOTATION_DESELECTED;
-        LatLng latLng = GeoJSONUtils.toLatLng(mCoordinate);
-        PointF screenPos = getScreenPosition(latLng);
-        return new PointAnnotationClickEvent(this, latLng, screenPos, type);
-    }
-
-    private PointAnnotationDragEvent makeDragEvent(String type) {
-        LatLng latLng = GeoJSONUtils.toLatLng(mCoordinate);
-        PointF screenPos = getScreenPosition(latLng);
-        return new PointAnnotationDragEvent(this, latLng, screenPos, type);
-    }
-
-    private float getDisplayDensity() {
-        return mContext.getResources().getDisplayMetrics().density;
-    }
-
-    private PointF getScreenPosition(LatLng latLng) {
-        PointF screenPos = mMap.getProjection().toScreenLocation(latLng);
-        float density = getDisplayDensity();
-        screenPos.x /= density;
-        screenPos.y /= density;
-        return screenPos;
-    }
-
-    public void refresh() {
-        if (mChildView != null) {
-            refreshBitmap(mChildView);
-        }
-    }
-}