diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps')
8 files changed, 407 insertions, 181 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraUpdate.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraUpdate.java new file mode 100644 index 0000000000..0f3e710134 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraUpdate.java @@ -0,0 +1,12 @@ +package com.mapbox.mapboxsdk.maps; + +import android.support.annotation.NonNull; + +import com.mapbox.mapboxsdk.camera.CameraPosition; +import com.mapbox.mapboxsdk.maps.MapboxMap; + +public interface CameraUpdate { + + CameraPosition getCameraPosition(@NonNull MapboxMap mapboxMap); + +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraUpdateFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraUpdateFactory.java new file mode 100644 index 0000000000..38b340908a --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraUpdateFactory.java @@ -0,0 +1,362 @@ +package com.mapbox.mapboxsdk.maps; + +import android.graphics.Point; +import android.graphics.PointF; +import android.graphics.RectF; +import android.support.annotation.IntDef; +import android.support.annotation.NonNull; + +import com.mapbox.mapboxsdk.camera.CameraPosition; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLngBounds; +import com.mapbox.mapboxsdk.utils.MathUtils; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +public class CameraUpdateFactory { + + /** + * Returns a CameraUpdate that moves the camera to a specified CameraPosition. + * + * @param cameraPosition Camera Position to change to + * @return CameraUpdate Final Camera Position data + */ + public static CameraUpdate newCameraPosition(@NonNull CameraPosition cameraPosition) { + return new CameraPositionUpdate(cameraPosition.bearing, cameraPosition.target, cameraPosition.tilt, cameraPosition.zoom); + } + + /** + * Returns a CameraUpdate that moves the center of the screen to a latitude and longitude + * specified by a LatLng object. This centers the camera on the LatLng object. + * + * @param latLng + * @return + */ + public static CameraUpdate newLatLng(@NonNull LatLng latLng) { + return new CameraPositionUpdate(-1, latLng, -1, -1); + } + + /** + * Returns a CameraUpdate that transforms the camera such that the specified latitude/longitude + * bounds are centered on screen at the greatest possible zoom level. + * You can specify padding, in order to inset the bounding box from the map view's edges. + * The returned CameraUpdate has a bearing of 0 and a tilt of 0. + * + * @param bounds + * @param padding + * @return + */ + public static CameraUpdate newLatLngBounds(@NonNull LatLngBounds bounds, int padding) { + return newLatLngBounds(bounds, padding, padding, padding, padding); + } + + + /** + * Returns a CameraUpdate that transforms the camera such that the specified latitude/longitude + * bounds are centered on screen at the greatest possible zoom level. + * You can specify padding, in order to inset the bounding box from the map view's edges. + * The returned CameraUpdate has a bearing of 0 and a tilt of 0. + * + * @param bounds + * @param paddingLeft + * @param paddingTop + * @param paddingRight + * @param paddingBottom + * @return + */ + public static CameraUpdate newLatLngBounds(@NonNull LatLngBounds bounds, int paddingLeft, int paddingTop, int paddingRight, int paddingBottom) { + return new CameraBoundsUpdate(bounds, paddingLeft, paddingTop, paddingRight, paddingBottom); + } + +// /** +// * Returns a CameraUpdate that transforms the camera such that the specified latitude/longitude +// * bounds are centered on screen within a bounding box of specified dimensions at the greatest +// * possible zoom level. You can specify additional padding, to further restrict the size of +// * the bounding box. The returned CameraUpdate has a bearing of 0 and a tilt of 0. +// * +// * @param bounds +// * @param width +// * @param height +// * @param padding +// * @return +// */ +// public static CameraUpdate newLatLngBounds(@NonNull LatLngBounds bounds, int width, int height, int padding) { +// throw new UnsupportedOperationException("Not implemented yet"); +// } + + /** + * Returns a CameraUpdate that moves the center of the screen to a latitude and longitude specified by a LatLng object, and moves to the given zoom level. + * + * @param latLng + * @param zoom + * @return + */ + public static CameraUpdate newLatLngZoom(@NonNull LatLng latLng, float zoom) { + return new CameraPositionUpdate(-1, latLng, -1, zoom); + } + +// /** +// * Returns a CameraUpdate that scrolls the camera over the map, shifting the center of view by the specified number of pixels in the x and y directions. +// * +// * @param xPixel +// * @param yPixel +// * @return +// */ +// public static CameraUpdate scrollBy(float xPixel, float yPixel) { +// throw new UnsupportedOperationException("Not implemented yet"); +// } + + /** + * Returns a CameraUpdate that shifts the zoom level of the current camera viewpoint. + * + * @param amount + * @param focus + * @return + */ + public static CameraUpdate zoomBy(float amount, Point focus) { + return new ZoomUpdate(amount, focus.x, focus.y); + } + + /** + * Returns a CameraUpdate that shifts the zoom level of the current camera viewpoint. + * + * @param amount + * @return + */ + public static CameraUpdate zoomBy(float amount) { + return new ZoomUpdate(ZoomUpdate.ZOOM_BY, amount); + } + + /** + * Returns a CameraUpdate that zooms in on the map by moving the viewpoint's height closer to the Earth's surface. The zoom increment is 1.0. + * + * @return + */ + public static CameraUpdate zoomIn() { + return new ZoomUpdate(ZoomUpdate.ZOOM_IN); + } + + /** + * Returns a CameraUpdate that zooms out on the map by moving the viewpoint's height farther away from the Earth's surface. The zoom increment is -1.0. + * + * @return + */ + public static CameraUpdate zoomOut() { + return new ZoomUpdate(ZoomUpdate.ZOOM_OUT); + } + + /** + * Returns a CameraUpdate that moves the camera viewpoint to a particular zoom level. + * + * @param zoom + * @return + */ + public static CameraUpdate zoomTo(float zoom) { + return new ZoomUpdate(ZoomUpdate.ZOOM_TO, zoom); + } + + // + // CameraUpdate types + // + + public static class CameraPositionUpdate implements CameraUpdate { + + private final float bearing; + private final LatLng target; + private final float tilt; + private final float zoom; + + CameraPositionUpdate(float bearing, LatLng target, float tilt, float zoom) { + this.bearing = bearing; + this.target = target; + this.tilt = tilt; + this.zoom = zoom; + } + + public LatLng getTarget() { + return target; + } + + public float getBearing() { + return bearing; + } + + public float getTilt() { + return tilt; + } + + public float getZoom() { + return zoom; + } + + @Override + public CameraPosition getCameraPosition(@NonNull MapboxMap mapboxMap) { + return new CameraPosition.Builder(this).build(); + } + } + + public static class CameraBoundsUpdate implements CameraUpdate { + + private LatLngBounds bounds; + private RectF padding; + + public CameraBoundsUpdate(LatLngBounds bounds, RectF padding) { + this.bounds = bounds; + this.padding = padding; + } + + public CameraBoundsUpdate(LatLngBounds bounds, int[] padding) { + this(bounds, new RectF(padding[0], padding[1], padding[2], padding[3])); + } + + public CameraBoundsUpdate(LatLngBounds bounds, int paddingLeft, int paddingTop, int paddingRight, int paddingBottom) { + this(bounds, new int[]{paddingLeft, paddingTop, paddingRight, paddingBottom}); + } + + public LatLngBounds getBounds() { + return bounds; + } + + public RectF getPadding() { + return padding; + } + + @Override + public CameraPosition getCameraPosition(@NonNull MapboxMap mapboxMap) { + MapView mapView = mapboxMap.getMapView(); + RectF padding = getPadding(); + + // Calculate the bounds of the possibly rotated shape with respect to the viewport. + PointF nePixel = new PointF(-10000, -10000); + PointF swPixel = new PointF(1000, 10000); + float viewportHeight = mapView.getHeight(); + for (LatLng latLng : getBounds().toLatLngs()) { + PointF pixel = mapView.toScreenLocation(latLng); + swPixel.x = Math.min(swPixel.x, pixel.x); + nePixel.x = Math.max(nePixel.x, pixel.x); + swPixel.y = Math.min(swPixel.y, viewportHeight - pixel.y); + nePixel.y = Math.max(nePixel.y, viewportHeight - pixel.y); + } + + float width = nePixel.x - swPixel.x; + float height = nePixel.y - swPixel.y; + + // Calculate the zoom level. + float scaleX = (mapView.getWidth() - padding.left - padding.right) / width; + float scaleY = (mapView.getHeight() - padding.top - padding.bottom) / height; + float minScale = scaleX < scaleY ? scaleX : scaleY; + double zoom = Math.log(mapView.getScale() * minScale) / Math.log(2); + zoom = MathUtils.clamp(zoom, (float) mapView.getMinZoom(), (float) mapView.getMaxZoom()); + + // Calculate the center point of a virtual bounds that is extended in all directions by padding. + PointF paddedNEPixel = new PointF(nePixel.x + padding.right / minScale, nePixel.y + padding.top / minScale); + PointF paddedSWPixel = new PointF(swPixel.x - padding.left / minScale, swPixel.y - padding.bottom / minScale); + PointF centerPixel = new PointF((paddedNEPixel.x + paddedSWPixel.x) / 2, (paddedNEPixel.y + paddedSWPixel.y) / 2); + + centerPixel.y = viewportHeight - centerPixel.y; + + LatLng center = mapboxMap.fromScreenLocation(centerPixel); + + return new CameraPosition.Builder() + .target(center) + .zoom((float) zoom) + .tilt(0) + .bearing(0) + .build(); + } + } + + public static class ZoomUpdate implements CameraUpdate { + + @IntDef({ZOOM_IN, ZOOM_OUT, ZOOM_BY, ZOOM_TO, ZOOM_TO_POINT}) + @Retention(RetentionPolicy.SOURCE) + public @interface Type { + } + + public static final int ZOOM_IN = 0; + public static final int ZOOM_OUT = 1; + public static final int ZOOM_BY = 2; + public static final int ZOOM_TO = 3; + public static final int ZOOM_TO_POINT = 4; + + @Type + private final int type; + private final float zoom; + private float x; + private float y; + + ZoomUpdate(@Type int type) { + this.type = type; + this.zoom = 0; + } + + ZoomUpdate(@Type int type, float zoom) { + this.type = type; + this.zoom = zoom; + } + + ZoomUpdate(float zoom, float x, float y) { + this.type = ZOOM_TO_POINT; + this.zoom = zoom; + this.x = x; + this.y = y; + } + + public float getZoom() { + return zoom; + } + + @Type + public int getType() { + return type; + } + + public float getX() { + return x; + } + + public float getY() { + return y; + } + + public float transformZoom(float currentZoom) { + switch (getType()) { + case CameraUpdateFactory.ZoomUpdate.ZOOM_IN: + currentZoom++; + break; + case CameraUpdateFactory.ZoomUpdate.ZOOM_OUT: + currentZoom--; + if (currentZoom < 0) { + currentZoom = 0; + } + break; + case CameraUpdateFactory.ZoomUpdate.ZOOM_TO: + currentZoom = getZoom(); + break; + case CameraUpdateFactory.ZoomUpdate.ZOOM_BY: + currentZoom = currentZoom + getZoom(); + break; + case CameraUpdateFactory.ZoomUpdate.ZOOM_TO_POINT: + currentZoom = currentZoom + getZoom(); + break; + } + return currentZoom; + } + + @Override + public CameraPosition getCameraPosition(@NonNull MapboxMap mapboxMap) { + CameraPosition cameraPosition = mapboxMap.getCameraPosition(); + if (getType() != CameraUpdateFactory.ZoomUpdate.ZOOM_TO_POINT) { + return new CameraPosition.Builder(cameraPosition) + .zoom(transformZoom(cameraPosition.zoom)) + .build(); + } else { + return new CameraPosition.Builder(cameraPosition) + .zoom(transformZoom(cameraPosition.zoom)) + .target(mapboxMap.fromScreenLocation(new PointF(getX(), getY()))) + .build(); + } + } + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java index 51834adb51..2789e85ed8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java @@ -28,7 +28,6 @@ import com.mapbox.mapboxsdk.utils.ApiAccess; public class MapFragment extends Fragment { private MapView mMap; - private OnMapReadyCallback mMapReadyCallback; public static MapFragment newInstance(){ return new MapFragment(); @@ -61,9 +60,6 @@ public class MapFragment extends Fragment { public void onResume() { super.onResume(); mMap.onResume(); - if(mMapReadyCallback!=null){ - mMapReadyCallback.onMapReady(mMap.getMapboxMap()); - } } @Override @@ -99,6 +95,6 @@ public class MapFragment extends Fragment { @NonNull public void getMapAsync(@NonNull OnMapReadyCallback onMapReadyCallback){ - mMapReadyCallback = onMapReadyCallback; + mMap.getMapAsync(onMapReadyCallback); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index fc8ad0c255..a9fe3a7994 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -67,7 +67,6 @@ import com.mapbox.mapboxsdk.annotations.Polyline; import com.mapbox.mapboxsdk.annotations.PolylineOptions; import com.mapbox.mapboxsdk.annotations.IconFactory; import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.constants.MyBearingTracking; import com.mapbox.mapboxsdk.constants.MyLocationTracking; @@ -75,7 +74,6 @@ import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.exceptions.IconBitmapChangedException; import com.mapbox.mapboxsdk.exceptions.InvalidAccessTokenException; import com.mapbox.mapboxsdk.geometry.BoundingBox; -import com.mapbox.mapboxsdk.geometry.CoordinateBounds; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.layers.CustomLayer; import com.mapbox.mapboxsdk.utils.ApiAccess; @@ -1305,7 +1303,7 @@ public class MapView extends FrameLayout { * not included in `options`. * * @param bearing Bearing in Radians - * @param center Center Coordinate + * @param center Center LatLng * @param pitch Pitch in Radians * @param zoom Zoom Level */ @@ -1324,7 +1322,7 @@ public class MapView extends FrameLayout { * not included in `options`. * * @param bearing Bearing in Radians - * @param center Center Coordinate + * @param center Center LatLng * @param duration Animation time in Nanoseconds * @param pitch Pitch in Radians * @param zoom Zoom Level @@ -1358,7 +1356,7 @@ public class MapView extends FrameLayout { * Flying animation to a specified location/zoom/bearing with automatic curve. * * @param bearing Bearing in Radians - * @param center Center Coordinate + * @param center Center LatLng * @param duration Animation time in Nanoseconds * @param pitch Pitch in Radians * @param zoom Zoom Level @@ -1388,70 +1386,6 @@ public class MapView extends FrameLayout { mNativeMapView.flyTo(bearing, center, duration, pitch, zoom); } - /** - * Changes the map's viewport to fit the given coordinate bounds. - * - * @param bounds The bounds that the viewport will show in its entirety. - */ - @UiThread - void setVisibleCoordinateBounds(@NonNull CoordinateBounds bounds) { - setVisibleCoordinateBounds(bounds, false); - } - - /** - * Changes the map's viewing area to fit the given coordinate bounds, optionally animating the change. - * - * @param bounds The bounds that the viewport will show in its entirety. - * @param animated If true, animates the change. If false, immediately changes the map. - */ - @UiThread - void setVisibleCoordinateBounds(@NonNull CoordinateBounds bounds, boolean animated) { - setVisibleCoordinateBounds(bounds, new RectF(), animated); - } - - /** - * Changes the map’s viewport to fit the given coordinate bounds with additional padding at the - * edge of the map, optionally animating the change. - * - * @param bounds The bounds that the viewport will show in its entirety. - * @param padding The minimum padding (in pixels) that will be visible around the given coordinate bounds. - * @param animated If true, animates the change. If false, immediately changes the map. - */ - @UiThread - void setVisibleCoordinateBounds(@NonNull CoordinateBounds bounds, @NonNull RectF padding, boolean animated) { - LatLng[] coordinates = { - new LatLng(bounds.getNorthEast().getLatitude(), bounds.getSouthWest().getLongitude()), - bounds.getSouthWest(), - new LatLng(bounds.getSouthWest().getLatitude(), bounds.getNorthEast().getLongitude()), - bounds.getNorthEast() - - }; - setVisibleCoordinateBounds(coordinates, padding, animated); - } - - /** - * Changes the map’s viewport to fit the given coordinates, optionally some additional padding on each side - * and animating the change. - * - * @param coordinates The coordinates that the viewport will show. - * @param padding The minimum padding (in pixels) that will be visible around the given coordinate bounds. - * @param animated If true, animates the change. If false, immediately changes the map. - */ - @UiThread - void setVisibleCoordinateBounds(@NonNull LatLng[] coordinates, @NonNull RectF padding, boolean animated) { - setVisibleCoordinateBounds(coordinates, padding, getDirection(), animated); - } - - private void setVisibleCoordinateBounds(LatLng[] coordinates, RectF padding, double direction, boolean animated) { - setVisibleCoordinateBounds(coordinates, padding, direction, animated ? MapboxConstants.ANIMATION_DURATION : 0l); - } - - void setVisibleCoordinateBounds(LatLng[] coordinates, RectF padding, double direction, long duration) { - mNativeMapView.setVisibleCoordinateBounds(coordinates, new RectF(padding.left / mScreenDensity, - padding.top / mScreenDensity, padding.right / mScreenDensity, padding.bottom / mScreenDensity), - direction, duration); - } - private void adjustTopOffsetPixels() { int count = mAnnotations.size(); for (int i = 0; i < count; i++) { @@ -1513,6 +1447,10 @@ public class MapView extends FrameLayout { } } + double getScale() { + return mNativeMapView.getScale(); + } + // This class handles TextureView callbacks private class SurfaceTextureListener implements TextureView.SurfaceTextureListener { @@ -2826,8 +2764,15 @@ public class MapView extends FrameLayout { * @param callback The callback object that will be triggered when the map is ready to be used. */ @UiThread - public void getMapAsync(@NonNull OnMapReadyCallback callback) { - callback.onMapReady(mMapboxMap); + public void getMapAsync(@NonNull final OnMapReadyCallback callback) { + + // We need to put our callback on the message queue + post(new Runnable() { + @Override + public void run() { + callback.onMapReady(mMapboxMap); + } + }); } MapboxMap getMapboxMap() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java index 1a9780b92b..54b81229c6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java @@ -12,7 +12,6 @@ import android.support.annotation.RequiresPermission; import android.support.annotation.UiThread; import android.text.TextUtils; import android.util.Log; -import android.view.Gravity; import android.view.View; import com.mapbox.mapboxsdk.annotations.Annotation; @@ -24,8 +23,6 @@ import com.mapbox.mapboxsdk.annotations.PolygonOptions; import com.mapbox.mapboxsdk.annotations.Polyline; import com.mapbox.mapboxsdk.annotations.PolylineOptions; import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.camera.CameraUpdate; -import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.constants.MyBearingTracking; import com.mapbox.mapboxsdk.constants.MyLocationTracking; @@ -42,7 +39,7 @@ public class MapboxMap { private MapView mMapView; private UiSettings mUiSettings; - private CameraPosition mCurrentCameraPosition; + private CameraPosition mCameraPosition; private String mStyleUrl; private List<Marker> mSelectedMarkers; private List<InfoWindow> mInfoWindows; @@ -92,7 +89,7 @@ public class MapboxMap { * @return The current position of the Camera. */ public final CameraPosition getCameraPosition() { - return mCurrentCameraPosition; + return mCameraPosition; } /** @@ -115,52 +112,8 @@ public class MapboxMap { */ @UiThread public final void moveCamera(CameraUpdate update) { - CameraPosition cameraPosition; - if (update instanceof CameraUpdateFactory.PositionCameraUpdate) { - CameraUpdateFactory.PositionCameraUpdate positionCameraUpdate = (CameraUpdateFactory.PositionCameraUpdate) update; - cameraPosition = new CameraPosition.Builder(positionCameraUpdate).build(); - } else if (update instanceof CameraUpdateFactory.ZoomUpdate) { - CameraUpdateFactory.ZoomUpdate zoomUpdate = (CameraUpdateFactory.ZoomUpdate) update; - if(zoomUpdate.getType()!= CameraUpdateFactory.ZoomUpdate.ZOOM_TO_POINT){ - cameraPosition = new CameraPosition.Builder(mCurrentCameraPosition) - .zoom(getZoom(zoomUpdate, mCurrentCameraPosition.zoom)) - .build(); - }else{ - cameraPosition = new CameraPosition.Builder(mCurrentCameraPosition) - .zoom(getZoom(zoomUpdate, mCurrentCameraPosition.zoom)) - .target(fromScreenLocation(new PointF(zoomUpdate.getX(),zoomUpdate.getY()))) - .build(); - } - } else { - Log.e(MapboxConstants.TAG, "Unsupported CameraUpdate"); - return; - } - mCurrentCameraPosition = cameraPosition; - mMapView.jumpTo(cameraPosition.bearing, cameraPosition.target, cameraPosition.tilt, cameraPosition.zoom); - } - - private float getZoom(CameraUpdateFactory.ZoomUpdate update, float currentZoom) { - switch (update.getType()) { - case CameraUpdateFactory.ZoomUpdate.ZOOM_IN: - currentZoom++; - break; - case CameraUpdateFactory.ZoomUpdate.ZOOM_OUT: - currentZoom--; - if (currentZoom < 0) { - currentZoom = 0; - } - break; - case CameraUpdateFactory.ZoomUpdate.ZOOM_TO: - currentZoom = update.getZoom(); - break; - case CameraUpdateFactory.ZoomUpdate.ZOOM_BY: - currentZoom = currentZoom + update.getZoom(); - break; - case CameraUpdateFactory.ZoomUpdate.ZOOM_TO_POINT: - currentZoom = currentZoom + update.getZoom(); - break; - } - return currentZoom; + mCameraPosition = update.getCameraPosition(this); + mMapView.jumpTo(mCameraPosition.bearing, mCameraPosition.target, mCameraPosition.tilt, mCameraPosition.zoom); } /** @@ -185,28 +138,8 @@ public class MapboxMap { */ @UiThread public final void easeCamera(CameraUpdate update, int durationMs, final MapboxMap.CancelableCallback callback) { - CameraPosition cameraPosition; - if (update instanceof CameraUpdateFactory.PositionCameraUpdate) { - CameraUpdateFactory.PositionCameraUpdate positionCameraUpdate = (CameraUpdateFactory.PositionCameraUpdate) update; - cameraPosition = new CameraPosition.Builder(positionCameraUpdate).build(); - } else if (update instanceof CameraUpdateFactory.ZoomUpdate) { - CameraUpdateFactory.ZoomUpdate zoomUpdate = (CameraUpdateFactory.ZoomUpdate) update; - if(zoomUpdate.getType()!= CameraUpdateFactory.ZoomUpdate.ZOOM_TO_POINT){ - cameraPosition = new CameraPosition.Builder(mCurrentCameraPosition) - .zoom(getZoom(zoomUpdate, mCurrentCameraPosition.zoom)) - .build(); - }else{ - cameraPosition = new CameraPosition.Builder(mCurrentCameraPosition) - .zoom(getZoom(zoomUpdate, mCurrentCameraPosition.zoom)) - .target(fromScreenLocation(new PointF(zoomUpdate.getX(),zoomUpdate.getY()))) - .build(); - } - } else { - Log.e(MapboxConstants.TAG, "Unsupported CameraUpdate"); - return; - } - mCurrentCameraPosition = cameraPosition; - mMapView.easeTo(cameraPosition.bearing, cameraPosition.target, getDurationNano(durationMs), cameraPosition.tilt, cameraPosition.zoom, callback); + mCameraPosition = update.getCameraPosition(this); + mMapView.easeTo(mCameraPosition.bearing, mCameraPosition.target, getDurationNano(durationMs), mCameraPosition.tilt, mCameraPosition.zoom, callback); } /** @@ -257,28 +190,8 @@ public class MapboxMap { */ @UiThread public final void animateCamera(CameraUpdate update, int durationMs, final MapboxMap.CancelableCallback callback) { - CameraPosition cameraPosition; - if (update instanceof CameraUpdateFactory.PositionCameraUpdate) { - CameraUpdateFactory.PositionCameraUpdate positionCameraUpdate = (CameraUpdateFactory.PositionCameraUpdate) update; - cameraPosition = new CameraPosition.Builder(positionCameraUpdate).build(); - } else if (update instanceof CameraUpdateFactory.ZoomUpdate) { - CameraUpdateFactory.ZoomUpdate zoomUpdate = (CameraUpdateFactory.ZoomUpdate) update; - if(zoomUpdate.getType()!= CameraUpdateFactory.ZoomUpdate.ZOOM_TO_POINT){ - cameraPosition = new CameraPosition.Builder(mCurrentCameraPosition) - .zoom(getZoom(zoomUpdate, mCurrentCameraPosition.zoom)) - .build(); - }else { - cameraPosition = new CameraPosition.Builder(mCurrentCameraPosition) - .zoom(getZoom(zoomUpdate, mCurrentCameraPosition.zoom)) - .target(fromScreenLocation(new PointF(zoomUpdate.getX(), zoomUpdate.getY()))) - .build(); - } - } else { - Log.e(MapboxConstants.TAG, "Unsupported CameraUpdate"); - return; - } - mCurrentCameraPosition = cameraPosition; - mMapView.flyTo(cameraPosition.bearing, cameraPosition.target, getDurationNano(durationMs), cameraPosition.tilt, cameraPosition.zoom, callback); + mCameraPosition = update.getCameraPosition(this); + mMapView.flyTo(mCameraPosition.bearing, mCameraPosition.target, getDurationNano(durationMs), mCameraPosition.tilt, mCameraPosition.zoom, callback); } // internal time layer conversion @@ -1123,9 +1036,13 @@ public class MapboxMap { mMapView.invalidateCustomLayers(); } - // - // Interfaces - // + MapView getMapView(){ + return mMapView; + } + +// +// Interfaces +// /** * Interface definition for a callback to be invoked when the map is flinged. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 2671bfcfcc..1c44e62627 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -15,7 +15,6 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.geometry.ProjectedMeters; import com.mapbox.mapboxsdk.layers.CustomLayer; -import java.lang.ref.WeakReference; import java.util.List; // Class that wraps the native methods for convenience diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java index 2b268777a0..147cd31b5a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java @@ -28,7 +28,6 @@ import com.mapbox.mapboxsdk.utils.ApiAccess; public class SupportMapFragment extends Fragment { private MapView mMap; - private OnMapReadyCallback mMapReadyCallback; public static SupportMapFragment newInstance(){ return new SupportMapFragment(); @@ -61,9 +60,6 @@ public class SupportMapFragment extends Fragment { public void onResume() { super.onResume(); mMap.onResume(); - if(mMapReadyCallback!=null){ - mMapReadyCallback.onMapReady(mMap.getMapboxMap()); - } } @Override @@ -99,6 +95,6 @@ public class SupportMapFragment extends Fragment { @NonNull public void getMapAsync(@NonNull OnMapReadyCallback onMapReadyCallback){ - mMapReadyCallback = onMapReadyCallback; + mMap.getMapAsync(onMapReadyCallback); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UserLocationView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UserLocationView.java index a826ffdfe9..9f8261a0a7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UserLocationView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UserLocationView.java @@ -27,7 +27,6 @@ import android.view.ViewGroup; import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.constants.MyBearingTracking; import com.mapbox.mapboxsdk.constants.MyLocationTracking; import com.mapbox.mapboxsdk.geometry.LatLng; |