[android] #5756 - correctly load style from xml attributes

This commit is contained in:
Tobrun Van Nuland
2016-07-22 15:56:51 +02:00
committed by Tobrun
parent e16c906bbf
commit 494e6849c2

View File

@@ -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);
}
}