diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-06-23 10:18:19 +0200 |
---|---|---|
committer | Antonio Zugaldia <antonio@mapbox.com> | 2016-06-24 09:14:58 -0400 |
commit | 64da7fa6843b58b1686e5ffa48962c2c3b34aa15 (patch) | |
tree | 7fb92dead771f98b8d555ddb64a864eb614a4c8e | |
parent | b37de9f8f42d9a2ffd956310087532af3dc9e865 (diff) | |
download | qtlocation-mapboxgl-64da7fa6843b58b1686e5ffa48962c2c3b34aa15.tar.gz |
[android] Addresses marker view flat bug
Fixes #5427
2 files changed, 6 insertions, 2 deletions
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)); } }); } |