diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-10-09 13:05:23 +0200 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2018-10-17 15:55:26 +0200 |
| commit | 1cd387129ee5a7f38ce26cf0bd18b79949dac6c7 (patch) | |
| tree | 764a0237788dc537c39d36b375ebb424cad89da2 | |
| parent | 7fb29186c87afcd9bcc3abc2458411bb28cc4380 (diff) | |
| download | qtlocation-mapboxgl-1cd387129ee5a7f38ce26cf0bd18b79949dac6c7.tar.gz | |
[android] - reverse order of prioritising shape vs marker click handling
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java index 1abf4e6b47..95795f6bb9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java @@ -379,17 +379,17 @@ class AnnotationManager { // boolean onTap(PointF tapPoint) { - ShapeAnnotationHit shapeAnnotationHit = getShapeAnnotationHitFromTap(tapPoint); - Annotation annotation = new ShapeAnnotationHitResolver(shapeAnnotations).execute(shapeAnnotationHit); - if (annotation != null) { - if (handleClickForShapeAnnotation(annotation)) { + MarkerHit markerHit = getMarkerHitFromTouchArea(tapPoint); + long markerId = new MarkerHitResolver(mapboxMap).execute(markerHit); + if (markerId != NO_ANNOTATION_ID) { + if (isClickHandledForMarker(markerId)) { return true; } } - MarkerHit markerHit = getMarkerHitFromTouchArea(tapPoint); - long markerId = new MarkerHitResolver(mapboxMap).execute(markerHit); - return markerId != NO_ANNOTATION_ID && isClickHandledForMarker(markerId); + ShapeAnnotationHit shapeAnnotationHit = getShapeAnnotationHitFromTap(tapPoint); + Annotation annotation = new ShapeAnnotationHitResolver(shapeAnnotations).execute(shapeAnnotationHit); + return annotation != null && handleClickForShapeAnnotation(annotation); } private ShapeAnnotationHit getShapeAnnotationHitFromTap(PointF tapPoint) { |