From 8ed0a32d153d4a434602c86a85eaf02881f6d480 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Sun, 21 May 2023 23:27:01 +0200
Subject: [PATCH] Fix: addnewpoint-dialog works again

---
 UI/Map/RasterLayerOverview.svelte       |  4 ++--
 UI/Map/RasterLayerPicker.svelte         | 10 +++++-----
 UI/Popup/AddNewPoint/AddNewPoint.svelte | 23 ++++++++++++++---------
 UI/SpecialVisualization.ts              |  3 +++
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/UI/Map/RasterLayerOverview.svelte b/UI/Map/RasterLayerOverview.svelte
index 5ffd43467..cc8e435de 100644
--- a/UI/Map/RasterLayerOverview.svelte
+++ b/UI/Map/RasterLayerOverview.svelte
@@ -45,8 +45,8 @@
         visible.setData(false)
     }
 
-    function getPref(type: CategoryType): UIEventSource<string> {
-        return userstate.osmConnection.GetPreference("preferred-layer-" + type)
+    function getPref(type: CategoryType): undefined | UIEventSource<string> {
+        return userstate?.osmConnection?.GetPreference("preferred-layer-" + type)
     }
 
 </script>
diff --git a/UI/Map/RasterLayerPicker.svelte b/UI/Map/RasterLayerPicker.svelte
index 01c6a6735..b8d11801a 100644
--- a/UI/Map/RasterLayerPicker.svelte
+++ b/UI/Map/RasterLayerPicker.svelte
@@ -17,7 +17,7 @@
     
     let dispatch = createEventDispatcher<{appliedLayer}>()
     
-    export let favourite : UIEventSource<string> = undefined
+    export let favourite : UIEventSource<string> | undefined = undefined
     
 
     let rasterLayer = new UIEventSource<RasterLayerPolygon>(availableLayers.data?.[0])
@@ -39,11 +39,11 @@
             }
             rasterLayer.setData(fav)
         }))
-    }
     
-    onDestroy(rasterLayer.addCallbackAndRunD(selected => {
-        favourite?.setData(selected.properties.id)
-    }))
+        onDestroy(rasterLayer.addCallbackAndRunD(selected => {
+            favourite?.setData(selected.properties.id)
+        }))
+    }
 
     let rasterLayerOnMap = UIEventSource.feedFrom(rasterLayer)
     
diff --git a/UI/Popup/AddNewPoint/AddNewPoint.svelte b/UI/Popup/AddNewPoint/AddNewPoint.svelte
index 9413fcd58..da8f4b9a2 100644
--- a/UI/Popup/AddNewPoint/AddNewPoint.svelte
+++ b/UI/Popup/AddNewPoint/AddNewPoint.svelte
@@ -31,7 +31,8 @@
     import BackButton from "../../Base/BackButton.svelte";
     import ToSvelte from "../../Base/ToSvelte.svelte";
     import Svg from "../../../Svg";
-    import RasterLayerOverview from "../../Map/RasterLayerOverview.svelte";
+    import MapControlButton from "../../Base/MapControlButton.svelte";
+    import {Square3Stack3dIcon} from "@babeard/svelte-heroicons/solid";
 
     export let coordinate: { lon: number, lat: number };
     export let state: SpecialVisualizationState;
@@ -197,7 +198,8 @@
                 <EyeOffIcon class="w-12"/>
                 <Tr t={Translations.t.general.add.disableFilters}/>
             </button>
-            <button class="flex w-full gap-x-1" on:click={() => {abort();state.guistate.openFilterView(selectedPreset.layer)}}>
+            <button class="flex w-full gap-x-1"
+                    on:click={() => {abort();state.guistate.openFilterView(selectedPreset.layer)}}>
                 <ToSvelte construct={Svg.layers_svg().SetClass("w-12")}/>
                 <Tr t={Translations.t.general.add.openLayerControl}/>
             </button>
@@ -263,11 +265,16 @@
             <Tr slot="message" t={Translations.t.general.cancel}/>
         </SubtleButton>
     {:else if !creating}
-        <div class="w-full p-1">
+        <div class="relative w-full p-1">
             <div class="w-full h-96 max-h-screen rounded-xl overflow-hidden">
-            <NewPointLocationInput value={preciseCoordinate} snappedTo={snappedToObject} {state} {coordinate}
-                                   targetLayer={selectedPreset.layer}
-                                   snapToLayers={selectedPreset.preset.preciseInput.snapToLayers}/>
+                <NewPointLocationInput value={preciseCoordinate} snappedTo={snappedToObject} {state} {coordinate}
+                                       targetLayer={selectedPreset.layer}
+                                       snapToLayers={selectedPreset.preset.preciseInput.snapToLayers}/>
+            </div>
+            <div class="absolute bottom-0 left-0 p-4">
+                <MapControlButton on:click={() => state.guistate.backgroundLayerSelectionIsOpened.setData(true)}>
+                    <Square3Stack3dIcon class="w-6 h-6"/>
+                </MapControlButton>
             </div>
         </div>
         <div class="flex flex-wrap-reverse md:flex-nowrap">
@@ -282,9 +289,7 @@
                 </div>
             </NextButton>
         </div>
-        
-        <RasterLayerOverview />
-        
+
     {:else}
         <Loading>Creating point...</Loading>
     {/if}
diff --git a/UI/SpecialVisualization.ts b/UI/SpecialVisualization.ts
index 4fcfc744c..6291247d3 100644
--- a/UI/SpecialVisualization.ts
+++ b/UI/SpecialVisualization.ts
@@ -14,6 +14,7 @@ import LayerConfig from "../Models/ThemeConfig/LayerConfig";
 import FeatureSwitchState from "../Logic/State/FeatureSwitchState";
 import { MenuState } from "../Models/MenuState";
 import OsmObjectDownloader from "../Logic/Osm/OsmObjectDownloader";
+import {RasterLayerPolygon} from "../Models/RasterLayers";
 
 /**
  * The state needed to render a special Visualisation.
@@ -69,6 +70,8 @@ export interface SpecialVisualizationState {
         readonly preferencesAsTags: Store<Record<string, string>>
     }
     readonly lastClickObject: WritableFeatureSource
+
+    readonly availableLayers: Store<RasterLayerPolygon[]>
 }
 
 export interface SpecialVisualization {