From 4a6ae2b0ed18aa8ad3398906a5e470beab7dc82b Mon Sep 17 00:00:00 2001 From: paczos Date: Thu, 14 Dec 2017 15:45:54 +0100 Subject: [android] new map touch listeners API comments --- .../mapbox/mapboxsdk/maps/MapGestureDetector.java | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) 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 9694be43f7..0fea5ce0ff 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 @@ -50,11 +50,13 @@ final class MapGestureDetector { private RotateGestureDetector rotateGestureDetector; private ShoveGestureDetector shoveGestureDetector; + // 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 onMapClickListenerList = new CopyOnWriteArrayList<>(); @@ -383,7 +385,10 @@ final class MapGestureDetector { @Override public void onLongPress(MotionEvent motionEvent) { PointF longClickPoint = new PointF(motionEvent.getX(), motionEvent.getY()); - notifyOnMapLongClickListeners(longClickPoint); + + if (!quickZoom) { + notifyOnMapLongClickListeners(longClickPoint); + } } @Override @@ -463,43 +468,48 @@ final class MapGestureDetector { } void notifyOnMapClickListeners(PointF tapPoint) { - // notify app of map click + // deprecated API if (onMapClickListener != null) { onMapClickListener.onMapClick(projection.fromScreenLocation(tapPoint)); } + // new API for (MapboxMap.OnMapClickListener listener : onMapClickListenerList) { listener.onMapClick(projection.fromScreenLocation(tapPoint)); } } void notifyOnMapLongClickListeners(PointF longClickPoint) { - if (!quickZoom) { - if (onMapLongClickListener != null) { - onMapLongClickListener.onMapLongClick(projection.fromScreenLocation(longClickPoint)); - } + // deprecated API + if (onMapLongClickListener != null) { + onMapLongClickListener.onMapLongClick(projection.fromScreenLocation(longClickPoint)); + } - for (MapboxMap.OnMapLongClickListener listener : onMapLongClickListenerList) { - listener.onMapLongClick(projection.fromScreenLocation(longClickPoint)); - } + // new API + for (MapboxMap.OnMapLongClickListener listener : onMapLongClickListenerList) { + listener.onMapLongClick(projection.fromScreenLocation(longClickPoint)); } } 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(); } -- cgit v1.2.1