summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps
diff options
context:
space:
mode:
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java51
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java64
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java30
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java175
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Telemetry.java61
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java16
6 files changed, 4 insertions, 393 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
index a87a290fd7..e5b8722ca8 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
@@ -31,11 +31,6 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
private final CopyOnWriteArrayList<OnCameraMoveListener> onCameraMove = new CopyOnWriteArrayList<>();
private final CopyOnWriteArrayList<OnCameraIdleListener> onCameraIdle = new CopyOnWriteArrayList<>();
- private OnCameraMoveStartedListener onCameraMoveStartedListener;
- private OnCameraMoveCanceledListener onCameraMoveCanceledListener;
- private OnCameraMoveListener onCameraMoveListener;
- private OnCameraIdleListener onCameraIdleListener;
-
@Retention(SOURCE)
@IntDef( {MOVE_STARTED, MOVE, MOVE_CANCELED, IDLE})
@interface CameraChange {
@@ -67,26 +62,6 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
handler.scheduleMessage(IDLE);
}
- @Deprecated
- void setOnCameraMoveStartedListener(OnCameraMoveStartedListener onCameraMoveStartedListener) {
- this.onCameraMoveStartedListener = onCameraMoveStartedListener;
- }
-
- @Deprecated
- void setOnCameraMoveCanceledListener(OnCameraMoveCanceledListener onCameraMoveCanceledListener) {
- this.onCameraMoveCanceledListener = onCameraMoveCanceledListener;
- }
-
- @Deprecated
- void setOnCameraMoveListener(OnCameraMoveListener onCameraMoveListener) {
- this.onCameraMoveListener = onCameraMoveListener;
- }
-
- @Deprecated
- void setOnCameraIdleListener(OnCameraIdleListener onCameraIdleListener) {
- this.onCameraIdleListener = onCameraIdleListener;
- }
-
void addOnCameraIdleListener(@NonNull OnCameraIdleListener listener) {
onCameraIdle.add(listener);
}
@@ -132,13 +107,6 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
return;
}
idle = false;
-
- // deprecated API
- if (onCameraMoveStartedListener != null) {
- onCameraMoveStartedListener.onCameraMoveStarted(moveStartedReason);
- }
-
- // new API
if (!onCameraMoveStarted.isEmpty()) {
for (OnCameraMoveStartedListener cameraMoveStartedListener : onCameraMoveStarted) {
cameraMoveStartedListener.onCameraMoveStarted(moveStartedReason);
@@ -147,12 +115,6 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
}
private void executeOnCameraMove() {
- // deprecated API
- if (onCameraMoveListener != null && !idle) {
- onCameraMoveListener.onCameraMove();
- }
-
- // new API
if (!onCameraMove.isEmpty() && !idle) {
for (OnCameraMoveListener cameraMoveListener : onCameraMove) {
cameraMoveListener.onCameraMove();
@@ -161,12 +123,6 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
}
private void executeOnCameraMoveCancelled() {
- // deprecated API
- if (onCameraMoveCanceledListener != null && !idle) {
- onCameraMoveCanceledListener.onCameraMoveCanceled();
- }
-
- // new API
if (!onCameraMoveCanceled.isEmpty() && !idle) {
for (OnCameraMoveCanceledListener cameraMoveCanceledListener : onCameraMoveCanceled) {
cameraMoveCanceledListener.onCameraMoveCanceled();
@@ -179,13 +135,6 @@ class CameraChangeDispatcher implements MapboxMap.OnCameraMoveStartedListener, M
return;
}
idle = true;
-
- // deprecated API
- if (onCameraIdleListener != null) {
- onCameraIdleListener.onCameraIdle();
- }
-
- // new API
if (!onCameraIdle.isEmpty()) {
for (OnCameraIdleListener cameraIdleListener : onCameraIdle) {
cameraIdleListener.onCameraIdle();
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
index d589b2e0e3..d82eec45ea 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -47,12 +47,6 @@ final class MapGestureDetector {
private final AnnotationManager annotationManager;
private final CameraChangeDispatcher cameraChangeDispatcher;
- // deprecated map touch API
- private MapboxMap.OnMapClickListener onMapClickListener;
- private MapboxMap.OnMapLongClickListener onMapLongClickListener;
- private MapboxMap.OnFlingListener onFlingListener;
- private MapboxMap.OnScrollListener onScrollListener;
-
// new map touch API
private final CopyOnWriteArrayList<MapboxMap.OnMapClickListener> onMapClickListenerList
= new CopyOnWriteArrayList<>();
@@ -63,9 +57,6 @@ final class MapGestureDetector {
private final CopyOnWriteArrayList<MapboxMap.OnFlingListener> onFlingListenerList
= new CopyOnWriteArrayList<>();
- private final CopyOnWriteArrayList<MapboxMap.OnScrollListener> onScrollListenerList
- = new CopyOnWriteArrayList<>();
-
private final CopyOnWriteArrayList<MapboxMap.OnMoveListener> onMoveListenerList
= new CopyOnWriteArrayList<>();
@@ -457,7 +448,6 @@ final class MapGestureDetector {
// Scroll the map
transform.moveBy(-distanceX, -distanceY, 0 /*no duration*/);
- notifyOnScrollListeners();
notifyOnMoveListeners(detector);
}
return true;
@@ -920,12 +910,6 @@ final class MapGestureDetector {
}
void notifyOnMapClickListeners(PointF tapPoint) {
- // deprecated API
- if (onMapClickListener != null) {
- onMapClickListener.onMapClick(projection.fromScreenLocation(tapPoint));
- }
-
- // new API
for (MapboxMap.OnMapClickListener listener : onMapClickListenerList) {
if (listener.onMapClick(projection.fromScreenLocation(tapPoint))) {
return;
@@ -934,12 +918,6 @@ final class MapGestureDetector {
}
void notifyOnMapLongClickListeners(PointF longClickPoint) {
- // deprecated API
- if (onMapLongClickListener != null) {
- onMapLongClickListener.onMapLongClick(projection.fromScreenLocation(longClickPoint));
- }
-
- // new API
for (MapboxMap.OnMapLongClickListener listener : onMapLongClickListenerList) {
if (listener.onMapLongClick(projection.fromScreenLocation(longClickPoint))) {
return;
@@ -948,29 +926,11 @@ final class MapGestureDetector {
}
void notifyOnFlingListeners() {
- // deprecated API
- if (onFlingListener != null) {
- onFlingListener.onFling();
- }
-
- // new API
for (MapboxMap.OnFlingListener listener : onFlingListenerList) {
listener.onFling();
}
}
- void notifyOnScrollListeners() {
- //deprecated API
- if (onScrollListener != null) {
- onScrollListener.onScroll();
- }
-
- // new API
- for (MapboxMap.OnScrollListener listener : onScrollListenerList) {
- listener.onScroll();
- }
- }
-
void notifyOnMoveBeginListeners(MoveGestureDetector detector) {
for (MapboxMap.OnMoveListener listener : onMoveListenerList) {
listener.onMoveBegin(detector);
@@ -1043,22 +1003,6 @@ final class MapGestureDetector {
}
}
- void setOnMapClickListener(MapboxMap.OnMapClickListener onMapClickListener) {
- this.onMapClickListener = onMapClickListener;
- }
-
- void setOnMapLongClickListener(MapboxMap.OnMapLongClickListener onMapLongClickListener) {
- this.onMapLongClickListener = onMapLongClickListener;
- }
-
- void setOnFlingListener(MapboxMap.OnFlingListener onFlingListener) {
- this.onFlingListener = onFlingListener;
- }
-
- void setOnScrollListener(MapboxMap.OnScrollListener onScrollListener) {
- this.onScrollListener = onScrollListener;
- }
-
void addOnMapClickListener(MapboxMap.OnMapClickListener onMapClickListener) {
onMapClickListenerList.add(onMapClickListener);
}
@@ -1083,14 +1027,6 @@ final class MapGestureDetector {
onFlingListenerList.remove(onFlingListener);
}
- void addOnScrollListener(MapboxMap.OnScrollListener onScrollListener) {
- onScrollListenerList.add(onScrollListener);
- }
-
- void removeOnScrollListener(MapboxMap.OnScrollListener onScrollListener) {
- onScrollListenerList.remove(onScrollListener);
- }
-
void addOnMoveListener(MapboxMap.OnMoveListener listener) {
onMoveListenerList.add(listener);
}
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 90046dc5b8..3b1352e153 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
@@ -1026,11 +1026,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
private class GesturesManagerInteractionListener implements MapboxMap.OnGesturesManagerInteractionListener {
@Override
- public void onSetMapClickListener(MapboxMap.OnMapClickListener listener) {
- mapGestureDetector.setOnMapClickListener(listener);
- }
-
- @Override
public void onAddMapClickListener(MapboxMap.OnMapClickListener listener) {
mapGestureDetector.addOnMapClickListener(listener);
}
@@ -1041,11 +1036,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
}
@Override
- public void onSetMapLongClickListener(MapboxMap.OnMapLongClickListener listener) {
- mapGestureDetector.setOnMapLongClickListener(listener);
- }
-
- @Override
public void onAddMapLongClickListener(MapboxMap.OnMapLongClickListener listener) {
mapGestureDetector.addOnMapLongClickListener(listener);
}
@@ -1056,26 +1046,6 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
}
@Override
- public void onSetScrollListener(MapboxMap.OnScrollListener listener) {
- mapGestureDetector.setOnScrollListener(listener);
- }
-
- @Override
- public void onAddScrollListener(MapboxMap.OnScrollListener listener) {
- mapGestureDetector.addOnScrollListener(listener);
- }
-
- @Override
- public void onRemoveScrollListener(MapboxMap.OnScrollListener listener) {
- mapGestureDetector.removeOnScrollListener(listener);
- }
-
- @Override
- public void onSetFlingListener(MapboxMap.OnFlingListener listener) {
- mapGestureDetector.setOnFlingListener(listener);
- }
-
- @Override
public void onAddFlingListener(MapboxMap.OnFlingListener listener) {
mapGestureDetector.addOnFlingListener(listener);
}
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 fd80f899e0..7b9484d309 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
@@ -1792,29 +1792,6 @@ public final class MapboxMap {
//
/**
- * Sets a callback that's invoked on every change in camera position.
- *
- * @param listener The callback that's invoked on every camera change position.
- * To unset the callback, use null.
- */
- @Deprecated
- public void setOnCameraChangeListener(@Nullable OnCameraChangeListener listener) {
- transform.setOnCameraChangeListener(listener);
- }
-
- /**
- * Sets a callback that is invoked when camera movement has ended.
- *
- * @param listener the listener to notify
- * @deprecated use {@link #addOnCameraIdleListener(OnCameraIdleListener)}
- * and {@link #removeOnCameraIdleListener(OnCameraIdleListener)} instead
- */
- @Deprecated
- public void setOnCameraIdleListener(@Nullable OnCameraIdleListener listener) {
- cameraChangeDispatcher.setOnCameraIdleListener(listener);
- }
-
- /**
* Adds a callback that is invoked when camera movement has ended.
*
* @param listener the listener to notify
@@ -1833,18 +1810,6 @@ public final class MapboxMap {
}
/**
- * Sets a callback that is invoked when camera movement was cancelled.
- *
- * @param listener the listener to notify
- * @deprecated use {@link #addOnCameraMoveCancelListener(OnCameraMoveCanceledListener)} and
- * {@link #removeOnCameraMoveCancelListener(OnCameraMoveCanceledListener)} instead
- */
- @Deprecated
- public void setOnCameraMoveCancelListener(@Nullable OnCameraMoveCanceledListener listener) {
- cameraChangeDispatcher.setOnCameraMoveCanceledListener(listener);
- }
-
- /**
* Adds a callback that is invoked when camera movement was cancelled.
*
* @param listener the listener to notify
@@ -1863,18 +1828,6 @@ public final class MapboxMap {
}
/**
- * Sets a callback that is invoked when camera movement has started.
- *
- * @param listener the listener to notify
- * @deprecated use {@link #addOnCameraMoveStartedListener(OnCameraMoveStartedListener)} and
- * {@link #removeOnCameraMoveStartedListener(OnCameraMoveStartedListener)} instead
- */
- @Deprecated
- public void setOnCameraMoveStartedListener(@Nullable OnCameraMoveStartedListener listener) {
- cameraChangeDispatcher.setOnCameraMoveStartedListener(listener);
- }
-
- /**
* Adds a callback that is invoked when camera movement has started.
*
* @param listener the listener to notify
@@ -1893,18 +1846,6 @@ public final class MapboxMap {
}
/**
- * Sets a callback that is invoked when camera position changes.
- *
- * @param listener the listener to notify
- * @deprecated use {@link #addOnCameraMoveListener(OnCameraMoveListener)} and
- * {@link #removeOnCameraMoveListener(OnCameraMoveListener)}instead
- */
- @Deprecated
- public void setOnCameraMoveListener(@Nullable OnCameraMoveListener listener) {
- cameraChangeDispatcher.setOnCameraMoveListener(listener);
- }
-
- /**
* Adds a callback that is invoked when camera position changes.
*
* @param listener the listener to notify
@@ -1940,48 +1881,6 @@ public final class MapboxMap {
}
/**
- * Sets a callback that's invoked when the map is scrolled.
- *
- * @param listener The callback that's invoked when the map is scrolled.
- * To unset the callback, use null.
- * @deprecated Use {@link #addOnScrollListener(OnScrollListener)} instead.
- */
- @Deprecated
- public void setOnScrollListener(@Nullable OnScrollListener listener) {
- onGesturesManagerInteractionListener.onSetScrollListener(listener);
- }
-
- /**
- * Adds a callback that's invoked when the map is scrolled.
- *
- * @param listener The callback that's invoked when the map is scrolled.
- */
- public void addOnScrollListener(@NonNull OnScrollListener listener) {
- onGesturesManagerInteractionListener.onAddScrollListener(listener);
- }
-
- /**
- * Removes a callback that's invoked when the map is scrolled.
- *
- * @param listener The callback that's invoked when the map is scrolled.
- */
- public void removeOnScrollListener(@NonNull OnScrollListener listener) {
- onGesturesManagerInteractionListener.onRemoveScrollListener(listener);
- }
-
- /**
- * Sets a callback that's invoked when the map is flinged.
- *
- * @param listener The callback that's invoked when the map is flinged.
- * To unset the callback, use null.
- * @deprecated Use {@link #addOnFlingListener(OnFlingListener)} instead.
- */
- @Deprecated
- public void setOnFlingListener(@Nullable OnFlingListener listener) {
- onGesturesManagerInteractionListener.onSetFlingListener(listener);
- }
-
- /**
* Adds a callback that's invoked when the map is flinged.
*
* @param listener The callback that's invoked when the map is flinged.
@@ -2107,18 +2006,6 @@ public final class MapboxMap {
}
/**
- * Sets a callback that's invoked when the user clicks on the map view.
- *
- * @param listener The callback that's invoked when the user clicks on the map view.
- * To unset the callback, use null.
- * @deprecated Use {@link #addOnMapClickListener(OnMapClickListener)} instead.
- */
- @Deprecated
- public void setOnMapClickListener(@Nullable OnMapClickListener listener) {
- onGesturesManagerInteractionListener.onSetMapClickListener(listener);
- }
-
- /**
* Adds a callback that's invoked when the user clicks on the map view.
*
* @param listener The callback that's invoked when the user clicks on the map view.
@@ -2137,18 +2024,6 @@ public final class MapboxMap {
}
/**
- * Sets a callback that's invoked when the user long clicks on the map view.
- *
- * @param listener The callback that's invoked when the user long clicks on the map view.
- * To unset the callback, use null.
- * @deprecated Use {@link #addOnMapLongClickListener(OnMapLongClickListener)} instead.
- */
- @Deprecated
- public void setOnMapLongClickListener(@Nullable OnMapLongClickListener listener) {
- onGesturesManagerInteractionListener.onSetMapLongClickListener(listener);
- }
-
- /**
* Adds a callback that's invoked when the user long clicks on the map view.
*
* @param listener The callback that's invoked when the user long clicks on the map view.
@@ -2325,7 +2200,7 @@ public final class MapboxMap {
/**
* Interface definition for a callback to be invoked when the map is flinged.
*
- * @see MapboxMap#setOnFlingListener(OnFlingListener)
+ * @see MapboxMap#addOnFlingListener(OnFlingListener)
*/
public interface OnFlingListener {
/**
@@ -2335,20 +2210,6 @@ public final class MapboxMap {
}
/**
- * Interface definition for a callback to be invoked when the map is scrolled.
- *
- * @see MapboxMap#setOnScrollListener(OnScrollListener)
- * @deprecated Use {@link OnMoveListener} instead.
- */
- @Deprecated
- public interface OnScrollListener {
- /**
- * Called when the map is scrolled.
- */
- void onScroll();
- }
-
- /**
* Interface definition for a callback to be invoked when the map is moved.
*
* @see MapboxMap#addOnMoveListener(OnMoveListener)
@@ -2401,25 +2262,6 @@ public final class MapboxMap {
}
/**
- * Interface definition for a callback to be invoked when the camera changes position.
- *
- * @deprecated Replaced by {@link MapboxMap.OnCameraMoveStartedListener}, {@link MapboxMap.OnCameraMoveListener} and
- * {@link MapboxMap.OnCameraIdleListener}. The order in which the deprecated onCameraChange method will be called in
- * relation to the methods in the new camera change listeners is undefined.
- */
- @Deprecated
- public interface OnCameraChangeListener {
- /**
- * Called after the camera position has changed. During an animation,
- * this listener may not be notified of intermediate camera positions.
- * It is always called for the final position in the animation.
- *
- * @param position The CameraPosition at the end of the last camera change.
- */
- void onCameraChange(CameraPosition position);
- }
-
- /**
* Interface definition for a callback to be invoked for when the camera motion starts.
*/
public interface OnCameraMoveStartedListener {
@@ -2503,26 +2345,15 @@ public final class MapboxMap {
* related to touch and click events.
*/
interface OnGesturesManagerInteractionListener {
- void onSetMapClickListener(OnMapClickListener listener);
void onAddMapClickListener(OnMapClickListener listener);
void onRemoveMapClickListener(OnMapClickListener listener);
- void onSetMapLongClickListener(OnMapLongClickListener listener);
-
void onAddMapLongClickListener(OnMapLongClickListener listener);
void onRemoveMapLongClickListener(OnMapLongClickListener listener);
- void onSetScrollListener(OnScrollListener listener);
-
- void onAddScrollListener(OnScrollListener listener);
-
- void onRemoveScrollListener(OnScrollListener listener);
-
- void onSetFlingListener(OnFlingListener listener);
-
void onAddFlingListener(OnFlingListener listener);
void onRemoveFlingListener(OnFlingListener listener);
@@ -2554,7 +2385,7 @@ public final class MapboxMap {
/**
* Interface definition for a callback to be invoked when the user clicks on the map view.
*
- * @see MapboxMap#setOnMapClickListener(OnMapClickListener)
+ * @see MapboxMap#addOnMapClickListener(OnMapClickListener)
*/
public interface OnMapClickListener {
/**
@@ -2570,7 +2401,7 @@ public final class MapboxMap {
/**
* Interface definition for a callback to be invoked when the user long clicks on the map view.
*
- * @see MapboxMap#setOnMapLongClickListener(OnMapLongClickListener)
+ * @see MapboxMap#addOnMapLongClickListener(OnMapLongClickListener)
*/
public interface OnMapLongClickListener {
/**
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Telemetry.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Telemetry.java
deleted file mode 100644
index 833978d8fd..0000000000
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Telemetry.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mapbox.mapboxsdk.maps;
-
-import com.mapbox.android.telemetry.SessionInterval;
-import com.mapbox.mapboxsdk.module.telemetry.TelemetryImpl;
-
-/**
- * @deprecated use {@link TelemetryImpl} instead.
- */
-@Deprecated
-public class Telemetry {
-
- @Deprecated
- public static void initialize() {
- // no-op
- }
-
- /**
- * Set the debug logging state of telemetry.
- *
- * @param debugLoggingEnabled true to enable logging
- * @deprecated use {@link TelemetryImpl#updateDebugLoggingEnabled(boolean)} instead
- */
- @Deprecated
- public static void updateDebugLoggingEnabled(boolean debugLoggingEnabled) {
- TelemetryImpl.updateDebugLoggingEnabled(debugLoggingEnabled);
- }
-
- /**
- * Update the telemetry rotation session id interval
- *
- * @param interval the selected session interval
- * @return true if rotation session id was updated
- * @deprecated use {@link TelemetryImpl#setSessionIdRotationInterval(int)} instead
- */
- @Deprecated
- public static boolean updateSessionIdRotationInterval(SessionInterval interval) {
- return TelemetryImpl.updateSessionIdRotationInterval(interval);
- }
-
- /**
- * Method to be called when an end-user has selected to participate in telemetry collection.
- *
- * @deprecated use {@link TelemetryImpl#setUserTelemetryRequestState(boolean)}
- * with parameter true instead
- */
- @Deprecated
- public static void enableOnUserRequest() {
- TelemetryImpl.enableOnUserRequest();
- }
-
- /**
- * Method to be called when an end-user has selected to opt-out of telemetry collection.
- *
- * @deprecated use {@link TelemetryImpl#setUserTelemetryRequestState(boolean)}
- * with parameter false instead
- */
- @Deprecated
- public static void disableOnUserRequest() {
- TelemetryImpl.disableOnUserRequest();
- }
-} \ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
index 41bb70f9dc..6be45e3000 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
@@ -18,8 +18,7 @@ import static com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraMoveStartedListener;
/**
* Resembles the current Map transformation.
* <p>
- * Responsible for synchronising {@link CameraPosition} state and notifying
- * {@link com.mapbox.mapboxsdk.maps.MapboxMap.OnCameraChangeListener}.
+ * Responsible for synchronising {@link CameraPosition} state and notifying camera change listeners.
* </p>
*/
final class Transform implements MapView.OnCameraDidChangeListener {
@@ -34,8 +33,6 @@ final class Transform implements MapView.OnCameraDidChangeListener {
private CameraPosition cameraPosition;
private MapboxMap.CancelableCallback cameraCancelableCallback;
- private MapboxMap.OnCameraChangeListener onCameraChangeListener;
-
private CameraChangeDispatcher cameraChangeDispatcher;
private final MapView.OnCameraDidChangeListener moveByChangeListener = new MapView.OnCameraDidChangeListener() {
@@ -174,9 +171,6 @@ final class Transform implements MapView.OnCameraDidChangeListener {
}
this.cameraPosition = cameraPosition;
- if (onCameraChangeListener != null) {
- onCameraChangeListener.onCameraChange(this.cameraPosition);
- }
}
return cameraPosition;
}
@@ -216,14 +210,6 @@ final class Transform implements MapView.OnCameraDidChangeListener {
}
//
- // Camera change listener API
- //
-
- void setOnCameraChangeListener(@Nullable MapboxMap.OnCameraChangeListener listener) {
- this.onCameraChangeListener = listener;
- }
-
- //
// non Camera API
//