[android] - optimise loaded style for location component, expose isFu…

…llyLoaded
mapbox · Dec 7, 2018 · 9f254c5 · 9f254c5
1 parent 767bb43
commit 9f254c5
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 16 deletions.
diff --git a/...boxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java b/...boxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationCameraController.java
@@ -6,7 +6,6 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.view.MotionEvent;
-
 import com.mapbox.android.gestures.AndroidGesturesManager;
 import com.mapbox.android.gestures.MoveGestureDetector;
 import com.mapbox.android.gestures.RotateGestureDetector;

diff --git a/...oid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/...oid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java
@@ -854,7 +854,8 @@ public void onStartLoadingMap() {
    */
   public void onFinishLoadingStyle() {
     if (isComponentInitialized) {
-      locationLayerController.initializeComponents(options);
+      style = mapboxMap.getStyle();
+      locationLayerController.initializeComponents(style, options);
       locationCameraController.initializeOptions(options);
       onLocationLayerStart();
     }
@@ -913,7 +914,10 @@ private void initialize(@NonNull final Context context, @NonNull Style style,
     if (isComponentInitialized) {
       return;
     }
-    isComponentInitialized = true;
+
+    if (!style.isFullyLoaded()) {
+      throw new IllegalStateException("Style hasn't fully loaded yet, can't initialize LocationComponent.");
+    }
 
     this.style = style;
     this.options = options;
@@ -946,6 +950,8 @@ private void initialize(@NonNull final Context context, @NonNull Style style,
     setRenderMode(RenderMode.NORMAL);
     setCameraMode(CameraMode.NONE);
 
+    isComponentInitialized = true;
+
     onLocationLayerStart();
   }
 

diff --git a/...pboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java b/...pboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationLayerController.java
@@ -62,7 +62,7 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
   private int renderMode;
 
   private final MapboxMap mapboxMap;
-  private final Style style;
+  private Style style;
   private final LayerSourceProvider layerSourceProvider;
   private final LayerBitmapProvider bitmapProvider;
   private LocationComponentOptions options;
@@ -81,11 +81,12 @@ final class LocationLayerController implements MapboxAnimator.OnLayerAnimationsV
     this.layerSourceProvider = layerSourceProvider;
     this.bitmapProvider = bitmapProvider;
     this.locationFeature = featureProvider.generateLocationFeature(locationFeature, options);
-    initializeComponents(options);
+    initializeComponents(style, options);
     setRenderMode(RenderMode.NORMAL);
   }
 
-  void initializeComponents(LocationComponentOptions options) {
+  void initializeComponents(Style style, LocationComponentOptions options) {
+    this.style = style;
     addLocationSource();
     addLayers(options.layerBelow());
     applyStyle(options);

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -101,7 +101,7 @@ void initialise(@NonNull Context context, @NonNull MapboxMapOptions options) {
    * Get the Style of the map asynchronously.
    */
   public void getStyle(@NonNull Style.OnStyleLoaded onStyleLoaded) {
-    if (style != null && style.isStyleLoaded()) {
+    if (style != null && style.isFullyLoaded()) {
       onStyleLoaded.onStyleLoaded(style);
     } else {
       styleLoadedCallbacks.add(onStyleLoaded);
@@ -118,7 +118,7 @@ public void getStyle(@NonNull Style.OnStyleLoaded onStyleLoaded) {
    */
   @Nullable
   public Style getStyle() {
-    if (style == null || !style.isStyleLoaded()) {
+    if (style == null || !style.isFullyLoaded()) {
       return null;
     } else {
       return style;