Fix: improve background layer switching code, might improve #1481

UI/Map/MapLibreAdaptor.ts

@@ -1,7 +1,7 @@
 import { Store, UIEventSource } from "../../Logic/UIEventSource"
 import type { Map as MLMap } from "maplibre-gl"
 import { Map as MlMap, SourceSpecification } from "maplibre-gl"
-import { RasterLayerPolygon } from "../../Models/RasterLayers"
+import { AvailableRasterLayers, RasterLayerPolygon } from "../../Models/RasterLayers"
 import { Utils } from "../../Utils"
 import { BBox } from "../../Logic/BBox"
 import { ExportableMap, MapProperties } from "../../Models/MapProperties"
@@ -370,9 +370,18 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
     private removeCurrentLayer(map: MLMap): void {
         if (this._currentRasterLayer) {
             // hide the previous layer
+            try {
+                if (map.getLayer(this._currentRasterLayer)) {
                     map.removeLayer(this._currentRasterLayer)
+                }
+                if (map.getSource(this._currentRasterLayer)) {
                     map.removeSource(this._currentRasterLayer)
                 }
+                this._currentRasterLayer = undefined
+            } catch (e) {
+                console.warn("Could not remove the previous layer")
+            }
+        }
     }
 
     private async setBackground(): Promise<void> {
@@ -381,47 +390,58 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
             return
         }
         const background: RasterLayerProperties = this.rasterLayer?.data?.properties
-        if (background !== undefined && this._currentRasterLayer === background.id) {
+        console.log("Setting background to", background)
+        if (!background) {
+            console.error(
+                "Attempting to 'setBackground', but the background is",
+                background,
+                "for",
+                map.getCanvas()
+            )
+            return
+        }
+        if (this._currentRasterLayer === background.id) {
             // already the correct background layer, nothing to do
             return
         }
-        // await this.awaitStyleIsLoaded()
 
-        if (background !== this.rasterLayer?.data?.properties) {
-            // User selected another background in the meantime... abort
-            return
-        }
-
-        if (background !== undefined && this._currentRasterLayer === background.id) {
-            // already the correct background layer, nothing to do
-            return
-        }
         if (!background?.url) {
             // no background to set
             this.removeCurrentLayer(map)
-            this._currentRasterLayer = undefined
             return
         }
 
         if (background.type === "vector") {
-            console.log("Background layer is vector")
+            console.log("Background layer is vector", background.id)
+            this.removeCurrentLayer(map)
             map.setStyle(background.url)
             return
         }
 
-        map.addSource(background.id, MapLibreAdaptor.prepareWmsSource(background))
-
-        map.resize()
-
         let addLayerBeforeId = "aeroway_fill" // this is the first non-landuse item in the stylesheet, we add the raster layer before the roads but above the landuse
         if (background.category === "osmbasedmap" || background.category === "map") {
             // The background layer is already an OSM-based map or another map, so we don't want anything from the baselayer
-            let layers = map.getStyle().layers
+            addLayerBeforeId = undefined
-            // THe last index of the maptiler layers
+            this.removeCurrentLayer(map)
-            let lastIndex = layers.findIndex((layer) => layer.id === "housenumber")
+        } else {
-            addLayerBeforeId = layers[lastIndex + 1]?.id ?? "housenumber"
+            // Make sure that the default maptiler style is loaded as it gives an overlay with roads
+            const maptiler = AvailableRasterLayers.maplibre.properties
+            if (!map.getSource(maptiler.id)) {
+                this.removeCurrentLayer(map)
+                map.addSource(maptiler.id, MapLibreAdaptor.prepareWmsSource(maptiler))
+                map.setStyle(maptiler.url)
+                await this.awaitStyleIsLoaded()
+            }
         }
 
+        if (!map.getLayer(addLayerBeforeId)) {
+            addLayerBeforeId = undefined
+        }
+        if (!map.getSource(background.id)) {
+            map.addSource(background.id, MapLibreAdaptor.prepareWmsSource(background))
+        }
+        map.resize()
+        if (!map.getLayer(background.id)) {
             map.addLayer(
                 {
                     id: background.id,
@@ -431,6 +451,7 @@ export class MapLibreAdaptor implements MapProperties, ExportableMap {
                 },
                 addLayerBeforeId
             )
+        }
         await this.awaitStyleIsLoaded()
         this.removeCurrentLayer(map)
         this._currentRasterLayer = background?.id

UI/Map/ShowDataLayer.ts

@@ -380,6 +380,9 @@ class LineRenderingLayer {
             if (this._listenerInstalledOn.has(id)) {
                 continue
             }
+            if (!map.getSource(this._layername)) {
+                continue
+            }
             if (this._fetchStore === undefined) {
                 map.setFeatureState(
                     { source: this._layername, id },