From 3456e086ac27c6f30978263e43eb82111e883e72 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Sun, 26 Jun 2016 23:19:51 +0200 Subject: [PATCH] [android] Fixes disappearing markers when crossing dateline, remove debug exception catch. Fixes #5402 --- .../main/java/com/mapbox/mapboxsdk/maps/MapView.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 index 8fe9568ea..3fcb58e31 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 @@ -1136,13 +1136,13 @@ public class MapView extends FrameLayout { for (int i = 0; i < ids.length; i++) { idsList.add(ids[i]); } - + List annotations = new ArrayList<>(ids.length); List annotationList = mMapboxMap.getAnnotations(); int count = annotationList.size(); for (int i = 0; i < count; i++) { Annotation annotation = annotationList.get(i); - if (annotation instanceof MarkerView && idsList.contains(annotation.getId())) { + if (annotation instanceof MarkerView) { annotations.add((MarkerView) annotation); } } @@ -1395,15 +1395,10 @@ public class MapView extends FrameLayout { if (mDestroyed) { return; } - mCompassView.update(getDirection()); mMyLocationView.update(); + mMapboxMap.getMarkerViewManager().update(); - try { - mMapboxMap.getMarkerViewManager().update(); - }catch (NullPointerException e){ - - } for (InfoWindow infoWindow : mMapboxMap.getInfoWindows()) { infoWindow.update(); }