diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java | 175 |
1 files changed, 3 insertions, 172 deletions
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 1fd1017c5f..f6ff1dd3ea 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 @@ -1775,29 +1775,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 @@ -1816,18 +1793,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 @@ -1846,18 +1811,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 @@ -1876,18 +1829,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 @@ -1923,48 +1864,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. @@ -2090,18 +1989,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. @@ -2120,18 +2007,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. @@ -2308,7 +2183,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 { /** @@ -2318,20 +2193,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) @@ -2384,25 +2245,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 { @@ -2486,26 +2328,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); @@ -2537,7 +2368,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 { /** @@ -2553,7 +2384,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 { /** |