From 573a2e0045ad5ff7cba92a8524b996d496b33add Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Fri, 22 Mar 2024 09:58:06 +0100
Subject: [PATCH] Fix style loading indicator

---
 src/UI/Map/RasterLayerPicker.svelte     | 1 -
 src/UI/Map/StyleLoadingIndicator.svelte | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/UI/Map/RasterLayerPicker.svelte b/src/UI/Map/RasterLayerPicker.svelte
index a22d5e7d83..7f48304ea6 100644
--- a/src/UI/Map/RasterLayerPicker.svelte
+++ b/src/UI/Map/RasterLayerPicker.svelte
@@ -5,7 +5,6 @@
   import { Store, UIEventSource } from "../../Logic/UIEventSource"
   import { Map as MlMap } from "maplibre-gl"
   import { createEventDispatcher, onDestroy } from "svelte"
-  import StyleLoadingIndicator from "./StyleLoadingIndicator.svelte"
 
   /***
    * Chooses a background-layer out of available options
diff --git a/src/UI/Map/StyleLoadingIndicator.svelte b/src/UI/Map/StyleLoadingIndicator.svelte
index 2d3dc092c9..cd8a554df6 100644
--- a/src/UI/Map/StyleLoadingIndicator.svelte
+++ b/src/UI/Map/StyleLoadingIndicator.svelte
@@ -6,6 +6,9 @@
 
   let isLoading = false
   export let map: UIEventSource<MlMap>
+  /**
+   * Optional. Only used for the 'global' change indicator so that it won't spin on pan/zoom but only when a change _actually_ occured
+   */
   export let rasterLayer: UIEventSource<any> = undefined
   
   let didChange = undefined
@@ -16,7 +19,7 @@
   onDestroy(Stores.Chronic(250).addCallback(
     () => {
       const mapIsLoading = !map.data?.isStyleLoaded()
-      isLoading = mapIsLoading && didChange
+      isLoading = mapIsLoading && (didChange || rasterLayer === undefined)
       if(didChange && !mapIsLoading){
         didChange = false
       }