From 64da7fa6843b58b1686e5ffa48962c2c3b34aa15 Mon Sep 17 00:00:00 2001 From: Tobrun Van Nuland Date: Thu, 23 Jun 2016 10:18:19 +0200 Subject: [android] Addresses marker view flat bug Fixes #5427 --- .../src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java | 6 ++++++ .../mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'platform/android') diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java index f84776230f..9e7877f313 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java @@ -332,6 +332,12 @@ public class MarkerView extends Marker { @Override public void setMapboxMap(MapboxMap mapboxMap) { super.setMapboxMap(mapboxMap); + + if(isFlat()) { + // initial tilt value if MapboxMap is started with a tilt attribute + tiltValue = (float) mapboxMap.getCameraPosition().tilt; + } + markerViewManager = mapboxMap.getMarkerViewManager(); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java index 7899c79545..0c4eeae5ad 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/MarkerViewActivity.java @@ -163,8 +163,6 @@ public class MarkerViewActivity extends AppCompatActivity { .icon(IconFactory.getInstance(mMapView.getContext()) .fromResource(R.drawable.ic_arsenal)) ); - - mMapboxMap.getUiSettings().setFocalPoint(new PointF(mMapView.getMeasuredWidth() / 2, mMapView.getMeasuredHeight() / 4)); } }); } -- cgit v1.2.1