From aa47680a0205573178fdddf3b6a20a564ef766c2 Mon Sep 17 00:00:00 2001
From: Ivo van Dongen <ivovandongen@users.noreply.github.com>
Date: Tue, 20 Sep 2016 15:10:33 +0200
Subject: [PATCH] [android] fire onMapReady only after style is loaded (#6046)

---
 .../java/com/mapbox/mapboxsdk/maps/MapView.java   | 15 +++++++++++++--
 1 file changed, 13 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 a7823c270..02d352c7f 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
@@ -452,7 +452,7 @@ public class MapView extends FrameLayout {
         addOnMapChangedListener(new OnMapChangedListener() {
             @Override
             public void onMapChanged(@MapChange int change) {
-                if (change == WILL_START_RENDERING_MAP && initialLoad) {
+                if (change == DID_FINISH_LOADING_STYLE && initialLoad) {
                     initialLoad = false;
                     reloadIcons();
                     reloadMarkers();
@@ -2866,7 +2866,8 @@ public class MapView extends FrameLayout {
             DID_FINISH_RENDERING_FRAME_FULLY_RENDERED,
             WILL_START_RENDERING_MAP,
             DID_FINISH_RENDERING_MAP,
-            DID_FINISH_RENDERING_MAP_FULLY_RENDERED
+            DID_FINISH_RENDERING_MAP_FULLY_RENDERED,
+            DID_FINISH_LOADING_STYLE
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface MapChange {
@@ -3017,6 +3018,16 @@ public class MapView extends FrameLayout {
      */
     public static final int DID_FINISH_RENDERING_MAP_FULLY_RENDERED = 13;
 
+
+    /**
+     * <p>
+     * This {@link MapChange} is triggered when a style is loaded
+     * </p>
+     *
+     * @see MapView.OnMapChangedListener
+     */
+    public static final int DID_FINISH_LOADING_STYLE = 14;
+
     /**
      * Interface definition for a callback to be invoked when the displayed map view changes.
      *