From 1c8517d48e25f8ac458d4ab1695de74ad2ac9099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Fri, 20 Jul 2018 11:32:47 +0200
Subject: [PATCH] [LLP] check if the layer is hidden when setting render mode

---
 .../locationlayer/LocationLayerTest.kt        | 19 ++++++
 .../plugins/locationlayer/LocationLayer.java  | 68 ++++++++++---------
 2 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerTest.kt b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerTest.kt
index 3e43ebee1..7f870262f 100644
--- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerTest.kt
+++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayerTest.kt
@@ -150,6 +150,25 @@ class LocationLayerTest {
     executePluginTest(pluginAction)
   }
 
+  @Test
+  fun dontShowPuckWhenRenderModeSetAndPluginDisabled() {
+    val pluginAction = object : GenericPluginAction.OnPerformGenericPluginAction<LocationLayerPlugin> {
+      override fun onGenericPluginAction(plugin: LocationLayerPlugin, mapboxMap: MapboxMap,
+                                         uiController: UiController, context: Context) {
+        plugin.forceLocationUpdate(location)
+        plugin.isLocationLayerEnabled = false
+        plugin.renderMode = RenderMode.GPS
+        uiController.loopMainThreadForAtLeast(MAP_RENDER_DELAY)
+        assertThat(mapboxMap.isLayerVisible(FOREGROUND_LAYER), `is`(false))
+        assertThat(mapboxMap.isLayerVisible(BACKGROUND_LAYER), `is`(false))
+        assertThat(mapboxMap.isLayerVisible(SHADOW_LAYER), `is`(false))
+        assertThat(mapboxMap.isLayerVisible(ACCURACY_LAYER), `is`(false))
+        assertThat(mapboxMap.isLayerVisible(BEARING_LAYER), `is`(false))
+      }
+    }
+    executePluginTest(pluginAction)
+  }
+
   @Test
   fun whenLocationLayerPluginDisabled_doesSetAllLayersToVisibilityNone() {
     val pluginAction = object : GenericPluginAction.OnPerformGenericPluginAction<LocationLayerPlugin> {
diff --git a/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java b/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java
index 35c139798..c9141658a 100644
--- a/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java
+++ b/plugin-locationlayer/src/main/java/com/mapbox/mapboxsdk/plugins/locationlayer/LocationLayer.java
@@ -134,38 +134,40 @@ void applyStyle(@NonNull LocationLayerOptions options) {
 
   void setRenderMode(@RenderMode.Mode int renderMode) {
     this.renderMode = renderMode;
-    boolean isStale = locationFeature.getBooleanProperty(PROPERTY_LOCATION_STALE);
-
-    switch (renderMode) {
-      case RenderMode.NORMAL:
-        styleForeground(options);
-        setLayerVisibility(SHADOW_LAYER, true);
-        setLayerVisibility(FOREGROUND_LAYER, true);
-        setLayerVisibility(BACKGROUND_LAYER, true);
-        setLayerVisibility(ACCURACY_LAYER, !isStale);
-        setLayerVisibility(BEARING_LAYER, false);
-        break;
-      case RenderMode.COMPASS:
-        styleForeground(options);
-        setLayerVisibility(SHADOW_LAYER, true);
-        setLayerVisibility(FOREGROUND_LAYER, true);
-        setLayerVisibility(BACKGROUND_LAYER, true);
-        setLayerVisibility(ACCURACY_LAYER, !isStale);
-        setLayerVisibility(BEARING_LAYER, true);
-        break;
-      case RenderMode.GPS:
-        styleForeground(options);
-        setLayerVisibility(SHADOW_LAYER, false);
-        setLayerVisibility(FOREGROUND_LAYER, true);
-        setLayerVisibility(BACKGROUND_LAYER, true);
-        setLayerVisibility(ACCURACY_LAYER, false);
-        setLayerVisibility(BEARING_LAYER, false);
-        break;
-      default:
-        break;
-    }
 
-    determineIconsSource(options);
+    if (!isHidden) {
+      boolean isStale = locationFeature.getBooleanProperty(PROPERTY_LOCATION_STALE);
+      switch (renderMode) {
+        case RenderMode.NORMAL:
+          styleForeground(options);
+          setLayerVisibility(SHADOW_LAYER, true);
+          setLayerVisibility(FOREGROUND_LAYER, true);
+          setLayerVisibility(BACKGROUND_LAYER, true);
+          setLayerVisibility(ACCURACY_LAYER, !isStale);
+          setLayerVisibility(BEARING_LAYER, false);
+          break;
+        case RenderMode.COMPASS:
+          styleForeground(options);
+          setLayerVisibility(SHADOW_LAYER, true);
+          setLayerVisibility(FOREGROUND_LAYER, true);
+          setLayerVisibility(BACKGROUND_LAYER, true);
+          setLayerVisibility(ACCURACY_LAYER, !isStale);
+          setLayerVisibility(BEARING_LAYER, true);
+          break;
+        case RenderMode.GPS:
+          styleForeground(options);
+          setLayerVisibility(SHADOW_LAYER, false);
+          setLayerVisibility(FOREGROUND_LAYER, true);
+          setLayerVisibility(BACKGROUND_LAYER, true);
+          setLayerVisibility(ACCURACY_LAYER, false);
+          setLayerVisibility(BEARING_LAYER, false);
+          break;
+        default:
+          break;
+      }
+
+      determineIconsSource(options);
+    }
   }
 
   int getRenderMode() {
@@ -177,15 +179,15 @@ int getRenderMode() {
   //
 
   void show() {
-    setRenderMode(renderMode);
     isHidden = false;
+    setRenderMode(renderMode);
   }
 
   void hide() {
+    isHidden = true;
     for (String layerId : layerMap) {
       setLayerVisibility(layerId, false);
     }
-    isHidden = true;
   }
 
   private void setLayerVisibility(String layerId, boolean visible) {