summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-07-25 12:50:36 +0200
committerTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-07-26 16:36:50 +0200
commitc39b1ecffc9859089075d17336487f7a14785958 (patch)
treee22d98d79fd4783df759dfb099231b5316489218
parentbc9ed9806dc1e7ff09448d326ce18576093d559d (diff)
downloadqtlocation-mapboxgl-c39b1ecffc9859089075d17336487f7a14785958.tar.gz
[android] - don't query for shape annotations if none were added
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java10
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 251e5afabe..712ab67de0 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
@@ -648,10 +648,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);