[android] - getMarkerViews in rect should return in bound views (#7016)

* [android] - getMarkerViews in rectangle should only return in bound views. * [android] - make calculating a density dependable rectangle part of getMarkersInRect/getMarkerViewInRect
mapbox · Nov 14, 2016 · 1d497d9 · 1d497d9
1 parent d310219
commit 1d497d9
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -1221,11 +1221,16 @@ void removeAnnotations(@NonNull long[] ids) {
         nativeMapView.removeAnnotations(ids);
     }
 
-    List<Marker> getMarkersInRect(@NonNull RectF rect) {
-        if (destroyed || rect == null) {
+    List<Marker> getMarkersInRect(@NonNull RectF rectangle) {
+        if (destroyed || rectangle == null) {
             return new ArrayList<>();
         }
 
+        RectF rect = new RectF(rectangle.left / screenDensity,
+                rectangle.top / screenDensity,
+                rectangle.right / screenDensity,
+                rectangle.bottom / screenDensity);
+
         long[] ids = nativeMapView.queryPointAnnotations(rect);
 
         List<Long> idsList = new ArrayList<>(ids.length);
@@ -1246,11 +1251,16 @@ List<Marker> getMarkersInRect(@NonNull RectF rect) {
         return new ArrayList<>(annotations);
     }
 
-    public List<MarkerView> getMarkerViewsInRect(@NonNull RectF rect) {
-        if (destroyed || rect == null) {
+    public List<MarkerView> getMarkerViewsInRect(@NonNull RectF rectangle) {
+        if (destroyed || rectangle == null) {
             return new ArrayList<>();
         }
 
+        RectF rect = new RectF(rectangle.left / screenDensity,
+                rectangle.top / screenDensity,
+                rectangle.right / screenDensity,
+                rectangle.bottom / screenDensity);
+
         long[] ids = nativeMapView.queryPointAnnotations(rect);
 
         List<Long> idsList = new ArrayList<>(ids.length);
@@ -1263,7 +1273,7 @@ public List<MarkerView> getMarkerViewsInRect(@NonNull RectF rect) {
         int count = annotationList.size();
         for (int i = 0; i < count; i++) {
             Annotation annotation = annotationList.get(i);
-            if (annotation instanceof MarkerView) {
+            if (annotation instanceof MarkerView && idsList.contains(annotation.getId())) {
                 annotations.add((MarkerView) annotation);
             }
         }
@@ -1871,10 +1881,10 @@ public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
             float toleranceSides = 4 * screenDensity;
             float toleranceTopBottom = 10 * screenDensity;
 
-            RectF tapRect = new RectF((tapPoint.x - averageIconWidth / 2 - toleranceSides) / screenDensity,
-                    (tapPoint.y - averageIconHeight / 2 - toleranceTopBottom) / screenDensity,
-                    (tapPoint.x + averageIconWidth / 2 + toleranceSides) / screenDensity,
-                    (tapPoint.y + averageIconHeight / 2 + toleranceTopBottom) / screenDensity);
+            RectF tapRect = new RectF(tapPoint.x - averageIconWidth / 2 - toleranceSides,
+                    tapPoint.y - averageIconHeight / 2 - toleranceTopBottom,
+                    tapPoint.x + averageIconWidth / 2 + toleranceSides,
+                    tapPoint.y + averageIconHeight / 2 + toleranceTopBottom);
 
             List<Marker> nearbyMarkers = getMarkersInRect(tapRect);
             long newSelectedMarkerId = -1;