[location] validate if style is still loading (#591)

mapbox · Nov 10, 2020 · f701a6a · f701a6a
1 parent 10ec5ea
commit f701a6a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/...GLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java b/...GLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/SymbolLocationLayerRenderer.java
@@ -11,6 +11,7 @@
 import com.mapbox.geojson.Point;
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.location.modes.RenderMode;
+import com.mapbox.mapboxsdk.log.Logger;
 import com.mapbox.mapboxsdk.maps.Style;
 import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.Layer;
@@ -59,6 +60,8 @@
 import static com.mapbox.mapboxsdk.utils.ColorUtils.colorToRgbaString;
 
 final class SymbolLocationLayerRenderer implements LocationLayerRenderer {
+
+  private static final String TAG = "mbgl-locationSymbol";
   private Style style;
   private final LayerSourceProvider layerSourceProvider;
 
@@ -179,6 +182,11 @@ public void setAccuracyRadius(Float accuracy) {
 
   @Override
   public void styleScaling(Expression scaleExpression) {
+    if (!style.isFullyLoaded()) {
+      Logger.w(TAG, "Style is not fully loaded, not able to get layer!");
+      return;
+    }
+
     for (String layerId : layerSet) {
       Layer layer = style.getLayer(layerId);
       if (layer instanceof SymbolLayer) {
@@ -244,6 +252,11 @@ private void updateForegroundBearing(float bearing) {
   }
 
   private void setLayerVisibility(@NonNull String layerId, boolean visible) {
+    if (!style.isFullyLoaded()) {
+      Logger.w(TAG, "Style is not fully loaded, not able to get layer!");
+      return;
+    }
+
     Layer layer = style.getLayer(layerId);
     if (layer != null) {
       String targetVisibility = visible ? VISIBLE : NONE;
@@ -266,6 +279,11 @@ public void adjustPulsingCircleLayerVisibility(boolean visible) {
    */
   @Override
   public void stylePulsingCircle(LocationComponentOptions options) {
+    if (!style.isFullyLoaded()) {
+      Logger.w(TAG, "Style is not fully loaded, not able to get layer!");
+      return;
+    }
+
     if (style.getLayer(PULSING_CIRCLE_LAYER) != null) {
       setLayerVisibility(PULSING_CIRCLE_LAYER, true);
       style.getLayer(PULSING_CIRCLE_LAYER).setProperties(
@@ -318,6 +336,11 @@ private void addLocationSource() {
   }
 
   private void refreshSource() {
+    if (!style.isFullyLoaded()) {
+      Logger.w(TAG, "Style is not fully loaded, not able to get source!");
+      return;
+    }
+
     GeoJsonSource source = style.getSourceAs(LOCATION_SOURCE);
     if (source != null) {
       locationSource.setGeoJson(locationFeature);

diff --git a/...GLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java b/...GLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
@@ -65,6 +65,7 @@ public class LocationLayerControllerTest {
   @Before
   public void before() {
     when(mapboxMap.getStyle()).thenReturn(style);
+    when(style.isFullyLoaded()).thenReturn(true);
   }
 
   @Test