More refactoring

UI/Input/DirectionInput.ts

@@ -1,118 +0,0 @@
-import { InputElement } from "./InputElement"
-import { UIEventSource } from "../../Logic/UIEventSource"
-import Combine from "../Base/Combine"
-import Svg from "../../Svg"
-import BaseUIElement from "../BaseUIElement"
-import { FixedUiElement } from "../Base/FixedUiElement"
-import { Utils } from "../../Utils"
-import Loc from "../../Models/Loc"
-import Minimap from "../Base/Minimap"
-
-/**
- * Selects a direction in degrees
- */
-export default class DirectionInput extends InputElement<string> {
-    public readonly IsSelected: UIEventSource<boolean> = new UIEventSource<boolean>(false)
-    private readonly _location: UIEventSource<Loc>
-    private readonly value: UIEventSource<string>
-    private background
-
-    constructor(
-        mapBackground: UIEventSource<any>,
-        location: UIEventSource<Loc>,
-        value?: UIEventSource<string>
-    ) {
-        super()
-        this._location = location
-        this.value = value ?? new UIEventSource<string>(undefined)
-        this.background = mapBackground
-    }
-
-    GetValue(): UIEventSource<string> {
-        return this.value
-    }
-
-    IsValid(str: string): boolean {
-        const t = Number(str)
-        return !isNaN(t) && t >= 0 && t <= 360
-    }
-
-    protected InnerConstructElement(): HTMLElement {
-        let map: BaseUIElement = new FixedUiElement("")
-        if (!Utils.runningFromConsole) {
-            map = Minimap.createMiniMap({
-                background: this.background,
-                allowMoving: false,
-                location: this._location,
-            })
-        }
-
-        const element = new Combine([
-            Svg.direction_stroke_svg()
-                .SetStyle(
-                    `position: absolute;top: 0;left: 0;width: 100%;height: 100%;transform:rotate(${
-                        this.value.data ?? 0
-                    }deg);`
-                )
-                .SetClass("direction-svg relative")
-                .SetStyle("z-index: 1000"),
-            map.SetStyle(`position: absolute;top: 0;left: 0;width: 100%;height: 100%;`),
-        ])
-            .SetStyle("width: min(100%, 25em); height: 0; padding-bottom: 100%") // A bit a weird CSS   , see https://stackoverflow.com/questions/13851940/pure-css-solution-square-elements#19448481
-            .SetClass("relative block bg-white border border-black overflow-hidden rounded-full")
-            .ConstructElement()
-
-        this.value.addCallbackAndRunD((rotation) => {
-            const cone = element.getElementsByClassName("direction-svg")[0] as HTMLElement
-            cone.style.transform = `rotate(${rotation}deg)`
-        })
-
-        this.RegisterTriggers(element)
-        element.style.overflow = "hidden"
-        element.style.display = "block"
-
-        return element
-    }
-
-    private RegisterTriggers(htmlElement: HTMLElement) {
-        const self = this
-
-        function onPosChange(x: number, y: number) {
-            const rect = htmlElement.getBoundingClientRect()
-            const dx = -(rect.left + rect.right) / 2 + x
-            const dy = (rect.top + rect.bottom) / 2 - y
-            const angle = (180 * Math.atan2(dy, dx)) / Math.PI
-            const angleGeo = Math.floor((450 - angle) % 360)
-            self.value.setData("" + angleGeo)
-        }
-
-        htmlElement.ontouchmove = (ev: TouchEvent) => {
-            onPosChange(ev.touches[0].clientX, ev.touches[0].clientY)
-            ev.preventDefault()
-        }
-
-        htmlElement.ontouchstart = (ev: TouchEvent) => {
-            onPosChange(ev.touches[0].clientX, ev.touches[0].clientY)
-        }
-
-        let isDown = false
-
-        htmlElement.onmousedown = (ev: MouseEvent) => {
-            isDown = true
-            onPosChange(ev.clientX, ev.clientY)
-            ev.preventDefault()
-        }
-
-        htmlElement.onmouseup = (ev) => {
-            isDown = false
-            ev.preventDefault()
-        }
-
-        htmlElement.onmousemove = (ev: MouseEvent) => {
-            if (isDown) {
-                onPosChange(ev.clientX, ev.clientY)
-            }
-            ev.preventDefault()
-        }
-    }
-}

UI/Input/FloorLevelInputElement.ts

@@ -1,5 +1,5 @@
 import { InputElement } from "./InputElement"
-import { Store, Stores, UIEventSource } from "../../Logic/UIEventSource"
+import { Store, UIEventSource } from "../../Logic/UIEventSource"
 import Combine from "../Base/Combine"
 import Slider from "./Slider"
 import { ClickableToggle } from "./Toggle"

UI/Input/LocationInput.ts

@@ -1,24 +1,17 @@
 import { ReadonlyInputElement } from "./InputElement"
 import Loc from "../../Models/Loc"
 import { Store, UIEventSource } from "../../Logic/UIEventSource"
-import Minimap, { MinimapObj } from "../Base/Minimap"
-import BaseLayer from "../../Models/BaseLayer"
 import Combine from "../Base/Combine"
 import Svg from "../../Svg"
 import { GeoOperations } from "../../Logic/GeoOperations"
-import ShowDataMultiLayer from "../ShowDataLayer/ShowDataMultiLayer"
 import StaticFeatureSource from "../../Logic/FeatureSource/Sources/StaticFeatureSource"
 import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
 import { BBox } from "../../Logic/BBox"
 import { FixedUiElement } from "../Base/FixedUiElement"
-import ShowDataLayer from "../ShowDataLayer/ShowDataLayer"
 import BaseUIElement from "../BaseUIElement"
-import Toggle from "./Toggle"
 import matchpoint from "../../assets/layers/matchpoint/matchpoint.json"
 import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"
 import FilteredLayer from "../../Models/FilteredLayer"
-import { ElementStorage } from "../../Logic/ElementStorage"
-import AvailableBaseLayers from "../../Logic/Actors/AvailableBaseLayers"
 import { RelationId, WayId } from "../../Models/OsmFeature"
 import { Feature, LineString, Polygon } from "geojson"
 import { OsmObject, OsmWay } from "../../Logic/Osm/OsmObject"
@@ -313,10 +306,6 @@ export default class LocationInput
                 [this.map.leafletMap]
             )
 
-            const animatedHand = Svg.hand_ui()
-                .SetStyle("width: 2rem; height: unset;")
-                .SetClass("hand-drag-animation block pointer-events-none")
-
             return new Combine([
                 new Combine([
                     Svg.move_arrows_ui()
@@ -328,10 +317,6 @@ export default class LocationInput
                         "background: rgba(255, 128, 128, 0.21); left: 50%; top: 50%; opacity: 0.5"
                     ),
 
-                new Toggle(undefined, animatedHand, hasMoved)
-                    .SetClass("block w-0 h-0 z-10 relative")
-                    .SetStyle("left: calc(50% + 3rem); top: calc(50% + 2rem); opacity: 0.7"),
-
                 this.map.SetClass("z-0 relative block w-full h-full bg-gray-100"),
             ]).ConstructElement()
         } catch (e) {
@@ -341,11 +326,4 @@ export default class LocationInput
                 .ConstructElement()
         }
     }
-
-    TakeScreenshot(format: "image"): Promise<string>
-    TakeScreenshot(format: "blob"): Promise<Blob>
-    TakeScreenshot(format: "image" | "blob"): Promise<string | Blob>
-    TakeScreenshot(format: "image" | "blob"): Promise<string | Blob> {
-        return this.map.TakeScreenshot(format)
-    }
 }

UI/Input/README.md

@@ -0,0 +1 @@
+This is the old, deprecated directory. New, SVelte-based items go into `InputElement`

UI/Input/SimpleDatePicker.ts

@@ -2,7 +2,6 @@ import { InputElement } from "./InputElement"
 import { UIEventSource } from "../../Logic/UIEventSource"
 
 export default class SimpleDatePicker extends InputElement<string> {
-    IsSelected: UIEventSource<boolean> = new UIEventSource<boolean>(false)
     private readonly value: UIEventSource<string>
     private readonly _element: HTMLElement
 

UI/Input/TextField.ts

@@ -50,10 +50,6 @@ export class TextField extends InputElement<string> {
         return this.value
     }
 
-    GetRawValue(): UIEventSource<string> {
-        return this._rawValue
-    }
-
     IsValid(t: string): boolean {
         if (t === undefined || t === null) {
             return false