From 112789a76111d4dd38e50c73ae1e81e5c53dd59c Mon Sep 17 00:00:00 2001 From: Tobrun Date: Fri, 12 Aug 2016 22:15:38 -0400 Subject: [android] - make query source features depend on screendensity --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'platform') 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 index 1c2f8e59c5..3cb28ed395 100644 --- 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 @@ -77,7 +77,6 @@ import com.mapbox.mapboxsdk.constants.MyLocationTracking; import com.mapbox.mapboxsdk.constants.Style; import com.mapbox.mapboxsdk.exceptions.IconBitmapChangedException; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.location.LocationListener; import com.mapbox.mapboxsdk.location.LocationServices; import com.mapbox.mapboxsdk.maps.widgets.CompassView; @@ -1156,7 +1155,6 @@ public class MapView extends FrameLayout { return new ArrayList<>(); } - // TODO: filter in JNI using C++ parameter to queryPointAnnotations long[] ids = mNativeMapView.queryPointAnnotations(rect); List idsList = new ArrayList<>(ids.length); @@ -1182,7 +1180,6 @@ public class MapView extends FrameLayout { return new ArrayList<>(); } - // TODO: filter in JNI using C++ parameter to queryPointAnnotations long[] ids = mNativeMapView.queryPointAnnotations(rect); List idsList = new ArrayList<>(ids.length); @@ -1727,11 +1724,12 @@ public class MapView extends FrameLayout { PointF tapPoint = new PointF(e.getX(), e.getY()); float toleranceSides = 4 * mScreenDensity; float toleranceTopBottom = 10 * mScreenDensity; - RectF tapRect = new RectF(tapPoint.x - mAverageIconWidth / 2 - toleranceSides, - tapPoint.y - mAverageIconHeight / 2 - toleranceTopBottom, - tapPoint.x + mAverageIconWidth / 2 + toleranceSides, - tapPoint.y + mAverageIconHeight / 2 + toleranceTopBottom); + RectF tapRect = new RectF((tapPoint.x - mAverageIconWidth / 2 - toleranceSides) / mScreenDensity, + (tapPoint.y - mAverageIconHeight / 2 - toleranceTopBottom) / mScreenDensity, + (tapPoint.x + mAverageIconWidth / 2 + toleranceSides) / mScreenDensity, + (tapPoint.y + mAverageIconHeight / 2 + toleranceTopBottom) / mScreenDensity); + List nearbyMarkers = getMarkersInRect(tapRect); long newSelectedMarkerId = -1; -- cgit v1.2.1