From 4606df7d2b7251abb5c89f7b35869eafcaad8eb8 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Jun 2023 00:03:14 +0200
Subject: [PATCH] Refactoring: remove obsolete 'Loc'-interface

---
 UI/BigComponents/HiddenThemeList.svelte     |  3 +--
 UI/BigComponents/MoreScreen.ts              | 22 +++------------------
 UI/BigComponents/ThemeButton.svelte         | 20 +++----------------
 UI/BigComponents/ThemesList.svelte          |  3 +--
 UI/BigComponents/UnofficialThemeList.svelte |  2 --
 5 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/UI/BigComponents/HiddenThemeList.svelte b/UI/BigComponents/HiddenThemeList.svelte
index 83e638a95..288d85a30 100644
--- a/UI/BigComponents/HiddenThemeList.svelte
+++ b/UI/BigComponents/HiddenThemeList.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import {OsmConnection} from "../../Logic/Osm/OsmConnection"
     import {UIEventSource} from "../../Logic/UIEventSource"
-    import type Loc from "../../Models/Loc"
     import * as themeOverview from "../../assets/generated/theme_overview.json"
     import {Utils} from "../../Utils"
     import ThemesList from "./ThemesList.svelte"
@@ -10,7 +9,7 @@
     import LoginToggle from "../Base/LoginToggle.svelte";
 
     export let search: UIEventSource<string>
-    export let state: { osmConnection: OsmConnection; locationControl?: UIEventSource<Loc> }
+    export let state: { osmConnection: OsmConnection }
     export let onMainScreen: boolean = true
 
     const prefix = "mapcomplete-hidden-theme-"
diff --git a/UI/BigComponents/MoreScreen.ts b/UI/BigComponents/MoreScreen.ts
index cc1622000..3c3d509cd 100644
--- a/UI/BigComponents/MoreScreen.ts
+++ b/UI/BigComponents/MoreScreen.ts
@@ -2,8 +2,7 @@ import Svg from "../../Svg"
 import Combine from "../Base/Combine"
 import Translations from "../i18n/Translations"
 import LayoutConfig, {LayoutInformation} from "../../Models/ThemeConfig/LayoutConfig"
-import {ImmutableStore, Store, UIEventSource} from "../../Logic/UIEventSource"
-import Loc from "../../Models/Loc"
+import {ImmutableStore, Store} from "../../Logic/UIEventSource"
 import UserRelatedState from "../../Logic/State/UserRelatedState"
 import {Utils} from "../../Utils"
 import themeOverview from "../../assets/generated/theme_overview.json"
@@ -19,7 +18,6 @@ export default class MoreScreen extends Combine {
 
     constructor(
         state: UserRelatedState & {
-            locationControl?: UIEventSource<Loc>
             layoutToUse?: LayoutConfig
         },
         onMainScreen: boolean = false
@@ -141,7 +139,7 @@ export default class MoreScreen extends Combine {
     private static createUrlFor(
         layout: { id: string; definition?: string },
         isCustom: boolean,
-        state?: { locationControl?: UIEventSource<{ lat; lon; zoom }>; layoutToUse?: { id } }
+        state?: { layoutToUse?: { id } }
     ): Store<string> {
         if (layout === undefined) {
             return undefined
@@ -155,8 +153,6 @@ export default class MoreScreen extends Combine {
             return undefined
         }
 
-        const currentLocation = state?.locationControl
-
         let path = window.location.pathname
         // Path starts with a '/' and contains everything, e.g. '/dir/dir/page.html'
         path = path.substr(0, path.lastIndexOf("/"))
@@ -179,18 +175,6 @@ export default class MoreScreen extends Combine {
             hash = "#" + btoa(JSON.stringify(layout.definition))
         }
 
-        return (
-            currentLocation?.map((currentLocation) => {
-                const params = [
-                    ["z", currentLocation?.zoom],
-                    ["lat", currentLocation?.lat],
-                    ["lon", currentLocation?.lon],
-                ]
-                    .filter((part) => part[1] !== undefined)
-                    .map((part) => part[0] + "=" + part[1])
-                    .join("&")
-                return `${linkPrefix}${params}${hash}`
-            }) ?? new ImmutableStore<string>(`${linkPrefix}`)
-        )
+        return new ImmutableStore<string>(`${linkPrefix}${hash}`)
     }
 }
diff --git a/UI/BigComponents/ThemeButton.svelte b/UI/BigComponents/ThemeButton.svelte
index be4ef9ed3..c03d1e55c 100644
--- a/UI/BigComponents/ThemeButton.svelte
+++ b/UI/BigComponents/ThemeButton.svelte
@@ -4,7 +4,6 @@
     import {ImmutableStore, Store, UIEventSource} from "../../Logic/UIEventSource"
     import UserDetails, {OsmConnection} from "../../Logic/Osm/OsmConnection"
     import Constants from "../../Models/Constants"
-    import type Loc from "../../Models/Loc"
     import type {LayoutInformation} from "../../Models/ThemeConfig/LayoutConfig"
     import Tr from "../Base/Tr.svelte"
     import SubtleLink from "../Base/SubtleLink.svelte";
@@ -12,7 +11,7 @@
     export let theme: LayoutInformation
     export let isCustom: boolean = false
     export let userDetails: UIEventSource<UserDetails>
-    export let state: { osmConnection: OsmConnection; locationControl?: UIEventSource<Loc> }
+    export let state: { layoutToUse: {id: string}, osmConnection: OsmConnection }
 
     $: title = new Translation(
         theme.title,
@@ -24,7 +23,7 @@
     function createUrl(
         layout: { id: string; definition?: string },
         isCustom: boolean,
-        state?: { locationControl?: UIEventSource<{ lat; lon; zoom }>; layoutToUse?: { id } }
+        state?: { layoutToUse?: { id } }
     ): Store<string> {
         if (layout === undefined) {
             return undefined
@@ -38,7 +37,6 @@
             return undefined
         }
 
-        const currentLocation = state?.locationControl
 
         let path = window.location.pathname
         // Path starts with a '/' and contains everything, e.g. '/dir/dir/page.html'
@@ -63,19 +61,7 @@
             hash = "#" + btoa(JSON.stringify(layout.definition))
         }
 
-        return (
-            currentLocation?.map((currentLocation) => {
-                const params = [
-                    ["z", currentLocation?.zoom],
-                    ["lat", currentLocation?.lat],
-                    ["lon", currentLocation?.lon],
-                ]
-                    .filter((part) => part[1] !== undefined)
-                    .map((part) => part[0] + "=" + part[1])
-                    .join("&")
-                return `${linkPrefix}${params}${hash}`
-            }) ?? new ImmutableStore<string>(`${linkPrefix}`)
-        )
+        return new ImmutableStore<string>(`${linkPrefix}${hash}`)
     }
 
     let href = createUrl(theme, isCustom, state)
diff --git a/UI/BigComponents/ThemesList.svelte b/UI/BigComponents/ThemesList.svelte
index 0f63d6238..1eeb64df6 100644
--- a/UI/BigComponents/ThemesList.svelte
+++ b/UI/BigComponents/ThemesList.svelte
@@ -3,14 +3,13 @@
 
   import {OsmConnection} from "../../Logic/Osm/OsmConnection"
   import {UIEventSource} from "../../Logic/UIEventSource"
-  import type Loc from "../../Models/Loc"
   import ThemeButton from "./ThemeButton.svelte"
   import {LayoutInformation} from "../../Models/ThemeConfig/LayoutConfig"
   import MoreScreen from "./MoreScreen"
 
   export let search: UIEventSource<string>
   export let themes: LayoutInformation[]
-  export let state: { osmConnection: OsmConnection; locationControl?: UIEventSource<Loc> }
+  export let state: { osmConnection: OsmConnection }
   export let isCustom: boolean = false
   export let onMainScreen: boolean = true
   export let hideThemes: boolean = true
diff --git a/UI/BigComponents/UnofficialThemeList.svelte b/UI/BigComponents/UnofficialThemeList.svelte
index c9d1a3f46..a9c8124a4 100644
--- a/UI/BigComponents/UnofficialThemeList.svelte
+++ b/UI/BigComponents/UnofficialThemeList.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import {OsmConnection} from "../../Logic/Osm/OsmConnection"
     import {Store, Stores, UIEventSource} from "../../Logic/UIEventSource"
-    import type Loc from "../../Models/Loc"
     import {Utils} from "../../Utils"
     import ThemesList from "./ThemesList.svelte"
     import Translations from "../i18n/Translations"
@@ -10,7 +9,6 @@
     export let search: UIEventSource<string>
     export let state: UserRelatedState & {
         osmConnection: OsmConnection
-        locationControl?: UIEventSource<Loc>
     }
     export let onMainScreen: boolean = true