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

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/IEvent.java

@@ -1,18 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import com.facebook.react.bridge.WritableMap;
-
-/**
- * Created by nickitaliano on 8/23/17.
- */
-
-public interface IEvent {
-    int getID();
-    String getKey();
-    String getType();
-    long getTimestamp();
-    boolean equals(IEvent event);
-    boolean canCoalesce();
-    WritableMap getPayload();
-    WritableMap toJSON();
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/LocationEvent.java

@@ -1,100 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.location.Location;
-import androidx.annotation.NonNull;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-
-import java.util.UUID;
-
-public class LocationEvent implements IEvent {
-    private UUID uuid;
-    private RCTMGLMapView mapView;
-    private Location location;
-
-    public LocationEvent(@NonNull Location location, RCTMGLMapView mapView) {
-        this.mapView = mapView;
-        this.location = location;
-        this.uuid = UUID.randomUUID();
-    }
-
-    public LocationEvent(Location location) {
-        this(location, null);
-    }
-
-    @Override
-    public int getID() {
-        if (mapView != null) {
-            return mapView.getId();
-        }
-        return -1;
-    }
-
-    public UUID getUUID() {
-        return uuid;
-    }
-
-    @Override
-    public String getKey() {
-        return EventKeys.USER_LOCATION_UPDATE;
-    }
-
-    @Override
-    public String getType() {
-        return EventTypes.USER_LOCATION_UPDATED;
-    }
-
-    @Override
-    public long getTimestamp() {
-        return System.currentTimeMillis();
-    }
-
-    @Override
-    public boolean equals(IEvent event) {
-        LocationEvent other = (LocationEvent) event;
-        return getUUID().equals(other.getUUID());
-    }
-
-    public boolean equals(LocationEvent event) {
-        return uuid.equals(event.getUUID());
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap positionProperties = new WritableNativeMap();
-        WritableMap coords = new WritableNativeMap();
-
-        coords.putDouble("longitude", location.getLongitude());
-        coords.putDouble("latitude", location.getLatitude());
-        coords.putDouble("altitude", location.getAltitude());
-        coords.putDouble("accuracy", location.getAccuracy());
-        // A better solution will be to pull the heading from the compass engine, 
-        // unfortunately the api is not publicly available in the mapbox sdk
-        coords.putDouble("heading", location.getBearing());
-        coords.putDouble("course", location.getBearing());
-        coords.putDouble("speed", location.getSpeed());
-
-        positionProperties.putMap("coords", coords);
-        positionProperties.putDouble("timestamp", location.getTime());
-
-        return positionProperties;
-    }
-
-    @Override
-    public WritableMap toJSON() {
-        WritableMap map = Arguments.createMap();
-        map.putString("type", getType());
-        map.putMap("payload", getPayload());
-        return map;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        return true;
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/MapChangeEvent.java

@@ -1,47 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.view.View;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-import com.mapbox.rctmgl.events.constants.EventKeys;
-
-/**
- * Created by nickitaliano on 8/27/17.
- */
-
-public class MapChangeEvent extends AbstractEvent {
-    private WritableMap mPayload;
-
-    public MapChangeEvent(View view, String eventType) {
-        this(view, eventType, Arguments.createMap());
-    }
-
-    public MapChangeEvent(View view, String eventType, WritableMap payload) {
-        super(view, eventType);
-        mPayload = payload;
-    }
-
-    @Override
-    public String getKey() {
-       return EventKeys.MAP_ONCHANGE;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        // FMTODO
-        WritableMap payloadClone = Arguments.createMap();
-        payloadClone.merge(mPayload);
-        return payloadClone;
-    }
-
-    @Override
-    public boolean canCoalesce() {
-        // Make sure EventDispatcher never merges EventKeys.MAP_ONCHANGE events.
-        // This event name is used to emit events with different
-        // com.mapbox.rctmgl.events.constants.EventTypes which are dispatched separately on
-        // the JS side
-        return false;
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/MapClickEvent.java

@@ -1,51 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.graphics.PointF;
-import androidx.annotation.NonNull;
-import android.view.View;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-
-/**
- * Created by nickitaliano on 8/23/17.
- */
-
-public class MapClickEvent extends AbstractEvent {
-    private LatLng mTouchedLatLng;
-    private PointF mScreenPoint;
-
-    public MapClickEvent(View view, @NonNull LatLng latLng, @NonNull PointF screenPoint) {
-        this(view, latLng, screenPoint, EventTypes.MAP_CLICK);
-    }
-
-    public MapClickEvent(View view, @NonNull LatLng latLng, @NonNull PointF screenPoint, String eventType) {
-        super(view, eventType);
-        mTouchedLatLng = latLng;
-        mScreenPoint = screenPoint;
-    }
-
-    @Override
-    public String getKey() {
-        String eventType = getType();
-
-        if (eventType.equals(EventTypes.MAP_LONG_CLICK)) {
-            return EventKeys.MAP_LONG_CLICK;
-        }
-
-        return EventKeys.MAP_CLICK;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap properties = new WritableNativeMap();
-        properties.putDouble("screenPointX", mScreenPoint.x);
-        properties.putDouble("screenPointY", mScreenPoint.y);
-        return GeoJSONUtils.toPointFeature(mTouchedLatLng, properties);
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/MapUserTrackingModeEvent.java

@@ -1,36 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.view.View;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.location.UserTrackingMode;
-
-/**
- * Created by nickitaliano on 12/19/17.
- */
-
-public class MapUserTrackingModeEvent extends AbstractEvent {
-    private int mUserTrackingMode;
-
-    public MapUserTrackingModeEvent(View view, int userTrackingMode) {
-        super(view, EventTypes.MAP_USER_TRACKING_MODE_CHANGE);
-        mUserTrackingMode = userTrackingMode;
-    }
-
-    @Override
-    public String getKey() {
-        return EventKeys.MAP_USER_TRACKING_MODE_CHANGE;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap payload = Arguments.createMap();
-        payload.putBoolean("followUserLocation", mUserTrackingMode != UserTrackingMode.NONE);
-        payload.putString("followUserMode", UserTrackingMode.toString(mUserTrackingMode));
-
-        return payload;
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/OfflineEvent.java

@@ -1,29 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-
-/**
- * Created by nickitaliano on 10/24/17.
- */
-
-public class OfflineEvent extends AbstractEvent {
-    private String mEventKey;
-    private WritableMap mPayload;
-
-    public OfflineEvent(String eventKey, String eventType, WritableMap payload) {
-        super(eventType);
-        mEventKey = eventKey;
-        mPayload = payload;
-    }
-
-    @Override
-    public String getKey() {
-        return mEventKey;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        return mPayload;
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/PointAnnotationClickEvent.java

@@ -1,46 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.graphics.PointF;
-import androidx.annotation.NonNull;
-import android.view.View;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.mapboxsdk.plugins.markerview.MarkerView;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotation;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.ConvertUtils;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-
-/**
- * Created by nickitaliano on 10/11/17.
- */
-
-public class PointAnnotationClickEvent extends MapClickEvent {
-    private RCTMGLPointAnnotation mView;
-    private LatLng mTouchedLatLng;
-    private PointF mScreenPoint;
-
-    public PointAnnotationClickEvent(RCTMGLPointAnnotation view, @NonNull LatLng latLng, @NonNull PointF screenPoint, String eventType) {
-        super(view, latLng, screenPoint, eventType);
-        mView = view;
-        mTouchedLatLng = latLng;
-        mScreenPoint = screenPoint;
-    }
-
-    @Override
-    public String getKey() {
-        return getType().equals(EventTypes.ANNOTATION_SELECTED) ? EventKeys.POINT_ANNOTATION_SELECTED : EventKeys.POINT_ANNOTATION_DESELECTED;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap properties = new WritableNativeMap();
-        properties.putString("id", mView.getID());
-        properties.putDouble("screenPointX", mScreenPoint.x);
-        properties.putDouble("screenPointY", mScreenPoint.y);
-        return GeoJSONUtils.toPointFeature(mTouchedLatLng, properties);
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/PointAnnotationDragEvent.java

@@ -1,51 +0,0 @@
-package com.mapbox.rctmgl.events;
-
-import android.graphics.PointF;
-import androidx.annotation.NonNull;
-import android.view.View;
-
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.mapbox.mapboxsdk.plugins.markerview.MarkerView;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.rctmgl.components.annotation.RCTMGLPointAnnotation;
-import com.mapbox.rctmgl.events.constants.EventKeys;
-import com.mapbox.rctmgl.events.constants.EventTypes;
-import com.mapbox.rctmgl.utils.ConvertUtils;
-import com.mapbox.rctmgl.utils.GeoJSONUtils;
-
-public class PointAnnotationDragEvent extends MapClickEvent {
-    RCTMGLPointAnnotation mView;
-    private LatLng mTouchedLatLng;
-    private PointF mScreenPoint;
-
-    public PointAnnotationDragEvent(RCTMGLPointAnnotation view, @NonNull LatLng latLng, @NonNull PointF screenPoint, String eventType) {
-        super(view, latLng, screenPoint, eventType);
-        mView = view;
-        mTouchedLatLng = latLng;
-        mScreenPoint = screenPoint;
-    }
-
-    @Override
-    public String getKey() {
-        String eventType = getType();
-
-        if (eventType.equals(EventTypes.ANNOTATION_DRAG_START)) {
-            return EventKeys.POINT_ANNOTATION_DRAG_START;
-        }
-        if (eventType.equals(EventTypes.ANNOTATION_DRAG_END)) {
-            return EventKeys.POINT_ANNOTATION_DRAG_END;
-        }
-
-        return EventKeys.POINT_ANNOTATION_DRAG;
-    }
-
-    @Override
-    public WritableMap getPayload() {
-        WritableMap properties = new WritableNativeMap();
-        properties.putString("id", mView.getID());
-        properties.putDouble("screenPointX", mScreenPoint.x);
-        properties.putDouble("screenPointY", mScreenPoint.y);
-        return GeoJSONUtils.toPointFeature(mTouchedLatLng, properties);
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/constants/EventKeys.java

@@ -1,39 +0,0 @@
-package com.mapbox.rctmgl.events.constants;
-
-/**
- * Created by nickitaliano on 8/27/17.
- */
-
-public class EventKeys {
-    public static final String NAMESPACE = "rct.mapbox";
-
-    // map events
-    public static final String MAP_CLICK = ns("map.press");
-    public static final String MAP_LONG_CLICK = ns("map.longpress");
-    public static final String MAP_ONCHANGE = ns("map.change");
-    public static final String MAP_ON_LOCATION_CHANGE = ns("map.location.change");
-    public static final String MAP_ANDROID_CALLBACK = ns("map.androidcallback");
-    public static final String MAP_USER_TRACKING_MODE_CHANGE = ns("map.usertrackingmodechange");
-
-    // point annotation events
-    public static final String POINT_ANNOTATION_SELECTED = ns("pointannotation.selected");
-    public static final String POINT_ANNOTATION_DESELECTED = ns("pointannotation.deselected");
-    public static final String POINT_ANNOTATION_DRAG_START = ns("pointannotation.dragstart");
-    public static final String POINT_ANNOTATION_DRAG = ns("pointannotation.drag");
-    public static final String POINT_ANNOTATION_DRAG_END = ns("pointannotation.dragend");
-
-    // source events
-    public static final String SHAPE_SOURCE_LAYER_CLICK = ns("shapesource.layer.pressed");
-    public static final String VECTOR_SOURCE_LAYER_CLICK = ns("vectorsource.layer.pressed");
-    public static final String RASTER_SOURCE_LAYER_CLICK = ns("rastersource.layer.pressed");
-
-    // images event
-    public static final String IMAGES_MISSING = ns("images.missing");
-
-    // location events
-    public static final String USER_LOCATION_UPDATE = ns("user.location.update");
-
-    private static String ns(String name) {
-        return String.format("%s.%s", NAMESPACE, name);
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/events/constants/EventTypes.java

@@ -1,51 +0,0 @@
-package com.mapbox.rctmgl.events.constants;
-
-/**
- * Created by nickitaliano on 8/24/17.
- */
-
-public class EventTypes {
-    // map event types
-    public static final String MAP_CLICK = "press";
-    public static final String MAP_LONG_CLICK = "longpress";
-    public static final String MAP_USER_TRACKING_MODE_CHANGE = "usertrackingmodechange";
-
-    public static final String REGION_WILL_CHANGE = "regionwillchange";
-    public static final String REGION_IS_CHANGING = "regionischanging";
-    public static final String REGION_DID_CHANGE  = "regiondidchange";
-    public static final String USER_LOCATION_UPDATED = "userlocationdupdated";
-
-    public static final String WILL_START_LOADING_MAP = "willstartloadingmap";
-    public static final String DID_FINISH_LOADING_MAP = "didfinishloadingmap";
-    public static final String DID_FAIL_LOADING_MAP = "didfailloadingmap";
-
-    public static final String WILL_START_RENDERING_FRAME = "willstartrenderingframe";
-    public static final String DID_FINISH_RENDERING_FRAME = "didfinishrenderingframe";
-    public static final String DID_FINISH_RENDERING_FRAME_FULLY = "didfinishrenderingframefully";
-
-    public static final String WILL_START_RENDERING_MAP = "willstartrenderingmap";
-    public static final String DID_FINISH_RENDERING_MAP = "didfinishrenderingmap";
-    public static final String DID_FINISH_RENDERING_MAP_FULLY = "didfinishrenderingmapfully";
-
-    public static final String DID_FINISH_LOADING_STYLE = "didfinishloadingstyle";
-
-    // point annotation event types
-    public static final String ANNOTATION_SELECTED = "annotationselected";
-    public static final String ANNOTATION_DESELECTED = "annotationdeselected";
-    public static final String ANNOTATION_DRAG_START = "annotationdragstart";
-    public static final String ANNOTATION_DRAG = "annotationdrag";
-    public static final String ANNOTATION_DRAG_END = "annotationdragend";
-
-    // offline event types
-    public static final String OFFLINE_ERROR = "offlineerror";
-    public static final String OFFLINE_TILE_LIMIT = "offlinetilelimit";
-    public static final String OFFLINE_STATUS = "offlinestatus";
-
-    // shape source event types
-    public static final String SHAPE_SOURCE_LAYER_CLICK = "shapesourcelayerpress";
-    public static final String VECTOR_SOURCE_LAYER_CLICK = "vectorsourcelayerpress";
-    public static final String RASTER_SOURCE_LAYER_CLICK = "rastersourcelayerpress";
-
-    // image missing event type
-    public static final String IMAGES_MISSING = "imagesmissing";
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/http/CustomHeadersInterceptor.java

@@ -1,38 +0,0 @@
-package com.mapbox.rctmgl.http;
-
-import android.util.Log;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import okhttp3.Interceptor;
-import okhttp3.Request;
-import okhttp3.Response;
-
-public class CustomHeadersInterceptor implements Interceptor {
-
-    public static final CustomHeadersInterceptor INSTANCE = new CustomHeadersInterceptor();
-    private Map<String, String> customHeaders = new HashMap<>();
-
-    public void addHeader(@NotNull final String headerName, @NotNull String headerValue) {
-        customHeaders.put(headerName, headerValue);
-    }
-
-    public void removeHeader(@NotNull final String headerName) {
-        customHeaders.remove(headerName);
-    }
-
-    @Override
-    public Response intercept(@NotNull Chain chain) throws IOException {
-        Request.Builder modifiedHeaderBuilder = chain.request().newBuilder();
-        for (Map.Entry<String, String> entry : customHeaders.entrySet()) {
-            modifiedHeaderBuilder.addHeader(entry.getKey(), entry.getValue());
-        }
-
-        Request request = modifiedHeaderBuilder.build();
-        return chain.proceed(request);
-    }
-}

package/android/src/main/java-mapboxgl/common/com/mapbox/rctmgl/location/LocationManager.java

@@ -1,147 +0,0 @@
-package com.mapbox.rctmgl.location;
-
-import android.content.Context;
-import android.location.Location;
-import android.os.Looper;
-import android.util.Log;
-
-import com.mapbox.rctmgl.impl.LocationManagerImpl;
-import com.mapbox.rctmgl.impl.LocationEngineCallbackImpl;
-import com.mapbox.rctmgl.impl.LocationEngineResultImpl;
-import com.mapbox.rctmgl.impl.PermissionsManagerImpl;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Created by nickitaliano on 12/12/17.
- */
-
-@SuppressWarnings({"MissingPermission"})
-public class LocationManager extends LocationEngineCallbackImpl {
-    static final long DEFAULT_FASTEST_INTERVAL_MILLIS = 1000;
-    static final long DEFAULT_INTERVAL_MILLIS = 1000;
-
-    public static final String LOG_TAG = "LocationManager";
-
-    LocationManagerImpl locationManagerImpl;
-    private Context context;
-    private List<OnUserLocationChange> listeners = new ArrayList<>();
-
-    private float mMinDisplacement = 0;
-    private boolean isActive = false;
-    private Location lastLocation = null;
-
-
-    private static WeakReference<LocationManager> INSTANCE = null;
-
-    public static LocationManager getInstance(Context context) {
-        if (INSTANCE == null) {
-            INSTANCE = new WeakReference<>(new LocationManager(context));
-        }
-        return INSTANCE.get();
-    }
-
-    public interface OnUserLocationChange {
-        void onLocationChange(Location location);
-    }
-
-    private LocationManager(Context context) {
-        this.context = context;
-        this.buildEngineRequest();
-
-    }
-    private void buildEngineRequest() {
-        locationManagerImpl = LocationManagerImpl.buildEngineRequest(this.context.getApplicationContext(), DEFAULT_INTERVAL_MILLIS, DEFAULT_FASTEST_INTERVAL_MILLIS, mMinDisplacement);
-    }
-
-    public void addLocationListener(OnUserLocationChange listener) {
-        if (!listeners.contains(listener)) {
-            listeners.add(listener);
-        }
-    }
-
-    public void removeLocationListener(OnUserLocationChange listener) {
-        if (listeners.contains(listener)) {
-            listeners.remove(listener);
-        }
-    }
-    public void setMinDisplacement(float minDisplacement) {
-        mMinDisplacement = minDisplacement;
-    }
-    public void enable() {
-        if (!PermissionsManagerImpl.areLocationPermissionsGranted(context)) {
-            return;
-        }
-
-        // remove existing listeners
-        locationManagerImpl.removeExistingListeners(this);
-
-        // refresh location engine request with new values
-        this.buildEngineRequest();
-
-        // add new listeners
-        locationManagerImpl.addNewListeners(this);
-        isActive = true;
-    }
-
-
-    public void disable() {
-        locationManagerImpl.removeExistingListeners(this);
-        isActive = false;
-    }
-
-    public void dispose() {
-        locationManagerImpl.dispose(this);
-        isActive = false;
-    }
-
-    public boolean isActive() {
-        return locationManagerImpl.isActive() && this.isActive;
-    }
-
-    public Location getLastKnownLocation() {
-        if (! locationManagerImpl.isActive()) {
-            return null;
-        }
-        return lastLocation;
-    }
-
-
-    public void getLastKnownLocation(LocationEngineCallbackImpl callback) {
-        if (! locationManagerImpl.isActive()) {
-            callback.onFailure(new Exception("LocationEngine not initialized"));
-        }
-
-        try {
-            locationManagerImpl.getLastLocation(callback);
-        }
-        catch(Exception exception) {
-            Log.w(LOG_TAG, exception);
-            callback.onFailure(exception);
-        }
-    }
-
-    public LocationManagerImpl getEngine() {
-        return locationManagerImpl;
-    }
-
-    public void onLocationChanged(Location location) {
-        lastLocation = location;
-        for (OnUserLocationChange listener : listeners) {
-            listener.onLocationChange(location);
-        }
-    }
-
-    @Override
-    public void onFailure(Exception exception) {
-        // FMTODO handle this.
-    }
-
-    @Override
-    public void onSuccess(LocationEngineResultImpl result) {
-        onLocationChanged(result.getLastLocation());
-    }
-}