tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #4263 - have the ability to define multiple callbacks for OnMapReady

Browse Source
This commit is contained in:
Tobrun
2016-03-10 10:49:37 -05:00
parent bbfd2c3d5a
commit d03e87fa4d
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
View File

@@ -139,8 +139,9 @@ public class MapView extends FrameLayout {
private int mContentPaddingRight;
private int mContentPaddingBottom;
private OnMapReadyCallback mMapReadyCallback;
private String mStyleUrl;
private List<OnMapReadyCallback> mOnMapReadyCallbackList;
private boolean mInitialLoad;
private boolean mDestroyed;
@@ -170,6 +171,7 @@ public class MapView extends FrameLayout {
private void initialize(@NonNull Context context, @NonNull MapboxMapOptions options) {
mInitialLoad = true;
mOnMapReadyCallbackList = new ArrayList<>();
mOnMapChangedListener = new CopyOnWriteArrayList<>();
mMapboxMap = new MapboxMap(this);
mIcons = new ArrayList<>();
@@ -391,8 +393,13 @@ public class MapView extends FrameLayout {
adjustTopOffsetPixels();
if (mInitialLoad) {
mInitialLoad = false;
if (mMapReadyCallback != null) {
mMapReadyCallback.onMapReady(mMapboxMap);
if (mOnMapReadyCallbackList.size() > 0) {
Iterator<OnMapReadyCallback> iterator = mOnMapReadyCallbackList.iterator();
while (iterator.hasNext()) {
OnMapReadyCallback callback = iterator.next();
callback.onMapReady(mMapboxMap);
iterator.remove();
}
}
}
}
@@ -2418,10 +2425,11 @@ public class MapView extends FrameLayout {
*/
@UiThread
public void getMapAsync(@NonNull final OnMapReadyCallback callback) {
if (mMapReadyCallback == null && !mInitialLoad) {
if (!mInitialLoad) {
callback.onMapReady(mMapboxMap);
} else {
mOnMapReadyCallbackList.add(callback);
}
mMapReadyCallback = callback;
}
MapboxMap getMapboxMap() {