diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-07-25 12:50:36 +0200 |
---|---|---|
committer | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-07-25 12:50:36 +0200 |
commit | 254d286b5af7e504e9f7699d1720dab1801aac66 (patch) | |
tree | 8f77d3d5202a76f203ccc5ac5636f8cedfd4415b | |
parent | a1782481393ad7fe5fa976bda348127248c6bd3b (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-query-if-layers.tar.gz |
[android] - don't query for shape annotations if none were addedupstream/tvn-query-if-layers
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java | 10 |
1 files changed, 6 insertions, 4 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 22e5cf4322..aa5f8cfa55 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 @@ -370,10 +370,12 @@ class AnnotationManager { // boolean onTap(PointF tapPoint) { - ShapeAnnotationHit shapeAnnotationHit = getShapeAnnotationHitFromTap(tapPoint); - long shapeAnnotationId = new ShapeAnnotationHitResolver(mapboxMap).execute(shapeAnnotationHit); - if (shapeAnnotationId != NO_ANNOTATION_ID) { - handleClickForShapeAnnotation(shapeAnnotationId); + if (!shapeAnnotationIds.isEmpty()) { + ShapeAnnotationHit shapeAnnotationHit = getShapeAnnotationHitFromTap(tapPoint); + long shapeAnnotationId = new ShapeAnnotationHitResolver(mapboxMap).execute(shapeAnnotationHit); + if (shapeAnnotationId != NO_ANNOTATION_ID) { + handleClickForShapeAnnotation(shapeAnnotationId); + } } MarkerHit markerHit = getMarkerHitFromTouchArea(tapPoint); |