More refactoring to fix the tests

Logic/State/FeaturePipelineState.ts

@@ -121,50 +121,7 @@ export default class FeaturePipelineState extends MapState {
         })
     }
 
-    public setupClickDialogOnMap(filterViewIsOpened: UIEventSource<boolean>, leafletMap: UIEventSource<any>) {
-
-        const self = this
-        function setup(){
-            let presetCount = 0;
-            for (const layer of self.layoutToUse.layers) {
-                for (const preset of layer.presets) {
-                    presetCount++;
-                }
-            }
-            if (presetCount == 0) {
-                return;
-            }
-
-            const newPointDialogIsShown = new UIEventSource<boolean>(false);
-            const addNewPoint = new ScrollableFullScreen(
-                () => Translations.t.general.add.title.Clone(),
-                () => new SimpleAddUI(newPointDialogIsShown, filterViewIsOpened, self),
-                "new",
-                newPointDialogIsShown
-            );
-            addNewPoint.isShown.addCallback((isShown) => {
-                if (!isShown) {
-                    self.LastClickLocation.setData(undefined);
-                }
-            });
-
-            new StrayClickHandler(
-                self.LastClickLocation,
-                self.selectedElement,
-                self.filteredLayers,
-                leafletMap,
-                addNewPoint
-            );
-        }
-
-        this.featureSwitchAddNew.addCallbackAndRunD(addNewAllowed => {
-            if (addNewAllowed) {
-                setup()
-                return true;
-            }
-        })
-
-    }
+  
 
 
 

Logic/State/MapState.ts

@@ -7,9 +7,6 @@ import BackgroundLayerResetter from "../Actors/BackgroundLayerResetter";
 import Attribution from "../../UI/BigComponents/Attribution";
 import Minimap, {MinimapObj} from "../../UI/Base/Minimap";
 import {Tiles} from "../../Models/TileRange";
-import * as L from "leaflet";
-import Img from "../../UI/Base/Img";
-import Svg from "../../Svg";
 import BaseUIElement from "../../UI/BaseUIElement";
 import FilteredLayer from "../../Models/FilteredLayer";
 import TilesourceConfig from "../../Models/ThemeConfig/TilesourceConfig";
@@ -26,7 +23,7 @@ export default class MapState extends UserRelatedState {
     /**
      The leaflet instance of the big basemap
      */
-    public leafletMap = new UIEventSource<L.Map>(undefined, "leafletmap");
+    public leafletMap = new UIEventSource<any /*L.Map*/>(undefined, "leafletmap");
     /**
      * A list of currently available background layers
      */
@@ -67,7 +64,6 @@ export default class MapState extends UserRelatedState {
      */
     public overlayToggles: { config: TilesourceConfig, isDisplayed: UIEventSource<boolean> }[]
 
-    
 
     constructor(layoutToUse: LayoutConfig) {
         super(layoutToUse);
@@ -120,57 +116,19 @@ export default class MapState extends UserRelatedState {
             lastClickLocation: this.LastClickLocation
         })
 
-       
+
         this.overlayToggles = this.layoutToUse.tileLayerSources.filter(c => c.name !== undefined).map(c => ({
             config: c,
             isDisplayed: QueryParameters.GetQueryParameter("overlay-" + c.id, "" + c.defaultState, "Wether or not the overlay " + c.id + " is shown").map(str => str === "true", [], b => "" + b)
         }))
         this.filteredLayers = this.InitializeFilteredLayers()
-        
-        
+
+
         this.lockBounds()
         this.AddAllOverlaysToMap(this.leafletMap)
-        this.addHomeMarker()
-
-
-
     }
 
-    private addHomeMarker() {
-        const leafletMap = this.leafletMap
-        const osmConnection = this.osmConnection
 
-        function addHomeMarker() {
-            const userDetails = osmConnection.userDetails.data;
-            if (userDetails === undefined) {
-                return false;
-            }
-            const home = userDetails.home;
-            if (home === undefined) {
-                return userDetails.loggedIn; // If logged in, the home is not set and we unregister. If not logged in, we stay registered if a login still comes
-            }
-            const leaflet = leafletMap.data;
-            if (leaflet === undefined) {
-                return false;
-            }
-            const color = getComputedStyle(document.body).getPropertyValue(
-                "--subtle-detail-color"
-            );
-            const icon = L.icon({
-                iconUrl: Img.AsData(
-                    Svg.home_white_bg.replace(/#ffffff/g, color)
-                ),
-                iconSize: [30, 30],
-                iconAnchor: [15, 15],
-            });
-            const marker = L.marker([home.lat, home.lon], {icon: icon});
-            marker.addTo(leaflet);
-            return true;
-        }
-
-        osmConnection.userDetails.addCallbackAndRunD(_ => addHomeMarker());
-        leafletMap.addCallbackAndRunD(_ => addHomeMarker())
-    }
 
     private lockBounds() {
         const layout = this.layoutToUse;
@@ -198,6 +156,7 @@ export default class MapState extends UserRelatedState {
             })
         }
     }
+
     private InitializeFilteredLayers() {
         // Initialize the filtered layers state
 
@@ -252,8 +211,8 @@ export default class MapState extends UserRelatedState {
         return new UIEventSource<FilteredLayer[]>(flayers);
     }
 
-    public AddAllOverlaysToMap(leafletMap: UIEventSource<any>){
-        const initialized =new Set()
+    public AddAllOverlaysToMap(leafletMap: UIEventSource<any>) {
+        const initialized = new Set()
         for (const overlayToggle of this.overlayToggles) {
             new ShowOverlayLayer(overlayToggle.config, leafletMap, overlayToggle.isDisplayed)
             initialized.add(overlayToggle.config)

Logic/State/UserRelatedState.ts

@@ -9,6 +9,8 @@ import {Utils} from "../../Utils";
 import Locale from "../../UI/i18n/Locale";
 import ElementsState from "./ElementsState";
 import SelectedElementTagsUpdater from "../Actors/SelectedElementTagsUpdater";
+import StaticFeatureSource from "../FeatureSource/Sources/StaticFeatureSource";
+import FeatureSource from "../FeatureSource/FeatureSource";
 
 /**
  * The part of the state which keeps track of user-related stuff, e.g. the OSM-connection,
@@ -34,6 +36,10 @@ export default class UserRelatedState extends ElementsState {
      * WHich other themes the user previously visited
      */
     public installedThemes: UIEventSource<{ layout: LayoutConfig; definition: string }[]>;
+    /**
+     * A feature source containing the current home location of the user
+     */
+    public homeLocation: FeatureSource
 
     constructor(layoutToUse: LayoutConfig) {
         super(layoutToUse);
@@ -104,4 +110,37 @@ export default class UserRelatedState extends ElementsState {
             .ping();
     }
 
+    private initHomeLocation() {
+        const empty = []
+        const feature = UIEventSource.ListStabilized(this.osmConnection.userDetails.map(userDetails => {
+
+            if (userDetails === undefined) {
+                return undefined;
+            }
+            const home = userDetails.home;
+            if (home === undefined) {
+                return undefined;
+            }
+            return [home.lon, home.lat]
+        })).map(homeLonLat => {
+            if(homeLonLat === undefined){
+                return empty
+            }
+            return [{
+                "type": "Feature",
+                "properties": {
+                    "user:home": "yes",
+                    "_lon": homeLonLat[0],
+                    "_lat": homeLonLat[1]
+                },
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": homeLonLat
+                }
+            }]
+        })
+
+        this.homeLocation = new StaticFeatureSource(feature, false)
+    }
+    
 }