From 3842ed4b39611f7351b269a4f01b8c63b4cca335 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Sun, 6 Jul 2025 03:30:17 +0200
Subject: [PATCH] UX: prefer 'best' raster layer by default, fix #2434

---
 src/UI/BigComponents/MenuDrawer.svelte | 11 ++---------
 src/UI/Map/RasterLayerPicker.svelte    |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte
index 4aafaa371..9591a6b7d 100644
--- a/src/UI/BigComponents/MenuDrawer.svelte
+++ b/src/UI/BigComponents/MenuDrawer.svelte
@@ -33,17 +33,10 @@
   import FavouritesFeatureSource from "../../Logic/FeatureSource/Sources/FavouritesFeatureSource"
   import Hotkeys from "../Base/Hotkeys"
   import MenuDrawerIndex from "./MenuDrawerIndex.svelte"
+  import ThemeViewState from "../../Models/ThemeViewState"
 
   export let onlyLink: boolean
-  export let state: {
-    favourites: FavouritesFeatureSource
-    guistate: MenuState
-    osmConnection: OsmConnection
-    theme?: ThemeConfig
-    featureSwitches: Partial<FeatureSwitchState>
-    mapProperties?: MapProperties
-    userRelatedState?: UserRelatedState
-  }
+  export let state: ThemeViewState
   let hotkeys = Hotkeys._docs
   let userdetails = state.osmConnection.userDetails
 
diff --git a/src/UI/Map/RasterLayerPicker.svelte b/src/UI/Map/RasterLayerPicker.svelte
index fa3f0e4b0..8fe847543 100644
--- a/src/UI/Map/RasterLayerPicker.svelte
+++ b/src/UI/Map/RasterLayerPicker.svelte
@@ -25,7 +25,7 @@
     [],
     (id) => availableLayers.find((l) => l.properties.id === id)
   )
-  rasterLayer.setData(availableLayers[0])
+  rasterLayer.setData(availableLayers.find(l => l.properties.best) ?? availableLayers[0])
 
   if (favourite) {
     onDestroy(