diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2016-07-22 15:56:51 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2016-07-24 09:36:52 +0200 |
commit | 494e6849c2a9a0b1191fe95e3252c5418c73509d (patch) | |
tree | 158edc1fae7a8f7cea818dbc0c55742cac9c7051 /platform | |
parent | e16c906bbfb7ca27d231eb8c9fcd6be2b7bbda73 (diff) | |
download | qtlocation-mapboxgl-494e6849c2a9a0b1191fe95e3252c5418c73509d.tar.gz |
[android] #5756 - correctly load style from xml attributes
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 6 |
1 files changed, 4 insertions, 2 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 34e0fadb0b..05d01f6773 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 @@ -156,6 +156,7 @@ public class MapView extends FrameLayout { private PointF mFocalPoint; private String mStyleUrl; + private String mInitalStyle; private List<OnMapReadyCallback> mOnMapReadyCallbackList; @@ -270,7 +271,7 @@ public class MapView extends FrameLayout { // style url String style = options.getStyle(); if (!TextUtils.isEmpty(style)) { - mMapboxMap.setStyleUrl(style); + mInitalStyle = style; } // MyLocationView @@ -567,8 +568,9 @@ public class MapView extends FrameLayout { mMyLocationView.onResume(); if (mStyleUrl == null) { + // user supplied style through xml // user has failed to supply a style url - setStyleUrl(Style.MAPBOX_STREETS); + setStyleUrl(mInitalStyle == null ? Style.MAPBOX_STREETS : mInitalStyle); } } |