Merge feature branch

src/Logic/ImageProviders/Panoramax.ts

@@ -12,7 +12,7 @@ import Panoramax_bw from "../../assets/svg/Panoramax_bw.svelte"
 import Link from "../../UI/Base/Link"
 
 export default class PanoramaxImageProvider extends ImageProvider {
-    public static readonly singleton = new PanoramaxImageProvider()
+    public static readonly singleton: PanoramaxImageProvider = new PanoramaxImageProvider()
     private static readonly xyz = new PanoramaxXYZ()
     private static defaultPanoramax = new AuthorizedPanoramax(
         Constants.panoramax.url,
@@ -126,7 +126,11 @@ export default class PanoramaxImageProvider extends ImageProvider {
         if (!Panoramax.isId(value)) {
             return undefined
         }
-        return [await this.getInfoFor(value).then((r) => this.featureToImage(<any>r))]
+        return [await this.getInfo(value)]
+    }
+
+    public async getInfo(hash: string): Promise<ProvidedImage> {
+      return  await this.getInfoFor(hash).then((r) => this.featureToImage(<any>r))
     }
 
     getRelevantUrls(tags: Record<string, string>, prefixes: string[]): Store<ProvidedImage[]> {

src/Logic/Osm/OsmObjectDownloader.ts

@@ -14,7 +14,7 @@ export default class OsmObjectDownloader {
         readonly isUploading: Store<boolean>
     }
     private readonly backend: string
-    private historyCache = new Map<string, UIEventSource<OsmObject[]>>()
+    private historyCache = new Map<string, Promise<OsmObject[]>>()
 
     constructor(
         backend: string = "https://api.openstreetmap.org",
@@ -75,49 +75,51 @@ export default class OsmObjectDownloader {
         return await this.applyPendingChanges(obj)
     }
 
-    public DownloadHistory(id: NodeId): UIEventSource<OsmNode[]>
-
-    public DownloadHistory(id: WayId): UIEventSource<OsmWay[]>
-
-    public DownloadHistory(id: RelationId): UIEventSource<OsmRelation[]>
-
-    public DownloadHistory(id: OsmId): UIEventSource<OsmObject[]>
-
-    public DownloadHistory(id: string): UIEventSource<OsmObject[]> {
-        if (this.historyCache.has(id)) {
-            return this.historyCache.get(id)
-        }
+    private async _downloadHistoryUncached(id: string): Promise<OsmObject[]> {
         const splitted = id.split("/")
         const type = splitted[0]
         const idN = Number(splitted[1])
-        const src = new UIEventSource<OsmObject[]>([])
-        this.historyCache.set(id, src)
-        Utils.downloadJsonCached(
+        const data = await Utils.downloadJsonCached(
             `${this.backend}api/0.6/${type}/${idN}/history`,
             10 * 60 * 1000
-        ).then((data) => {
-            const elements: any[] = data.elements
-            const osmObjects: OsmObject[] = []
-            for (const element of elements) {
-                let osmObject: OsmObject = null
-                element.nodes = []
-                switch (type) {
-                    case "node":
-                        osmObject = new OsmNode(idN, element)
-                        break
-                    case "way":
-                        osmObject = new OsmWay(idN, element)
-                        break
-                    case "relation":
-                        osmObject = new OsmRelation(idN, element)
-                        break
-                }
-                osmObject?.SaveExtraData(element, [])
-                osmObjects.push(osmObject)
+        )
+        const elements: [] = data["elements"]
+        const osmObjects: OsmObject[] = []
+        for (const element of elements) {
+            let osmObject: OsmObject = null
+            element["nodes"] = []
+            switch (type) {
+                case "node":
+                    osmObject = new OsmNode(idN, element)
+                    break
+                case "way":
+                    osmObject = new OsmWay(idN, element)
+                    break
+                case "relation":
+                    osmObject = new OsmRelation(idN, element)
+                    break
             }
-            src.setData(osmObjects)
-        })
-        return src
+            osmObject?.SaveExtraData(element, [])
+            osmObjects.push(osmObject)
+        }
+        return osmObjects
+    }
+
+    public downloadHistory(id: NodeId): Promise<OsmNode[]>
+
+    public downloadHistory(id: WayId): Promise<OsmWay[]>
+
+    public downloadHistory(id: RelationId): Promise<OsmRelation[]>
+
+    public downloadHistory(id: OsmId): Promise<OsmObject[]>
+
+    public async downloadHistory(id: string): Promise<OsmObject[]> {
+        if (this.historyCache.has(id)) {
+            return this.historyCache.get(id)
+        }
+        const promise = this._downloadHistoryUncached(id)
+        this.historyCache.set(id, promise)
+        return promise
     }
 
     /**

src/Logic/Osm/Overpass.ts

@@ -26,7 +26,10 @@ export class Overpass {
     ) {
         this._timeout = timeout ?? new ImmutableStore<number>(90)
         this._interpreterUrl = interpreterUrl
-        const optimized = filter.optimize()
+        if (filter === undefined && !extraScripts) {
+            throw "Filter is undefined. This is probably a bug. Alternatively, pass an 'extraScript'"
+        }
+        const optimized = filter?.optimize()
         if (optimized === true || optimized === false) {
             throw "Invalid filter: optimizes to true of false"
         }
@@ -85,7 +88,7 @@ export class Overpass {
      * new Overpass(new Tag("key","value"), [], "").buildScript("{{bbox}}") // => `[out:json][timeout:90]{{bbox}};(nwr["key"="value"];);out body;out meta;>;out skel qt;`
      */
     public buildScript(bbox: string, postCall: string = "", pretty = false): string {
-        const filters = this._filter.asOverpass()
+        const filters = this._filter?.asOverpass() ?? []
         let filter = ""
         for (const filterOr of filters) {
             if (pretty) {
@@ -97,12 +100,13 @@ export class Overpass {
             }
         }
         for (const extraScript of this._extraScripts) {
-            filter += "(" + extraScript + ");"
+            filter += extraScript
         }
         return `[out:json][timeout:${this._timeout.data}]${bbox};(${filter});out body;${
             this._includeMeta ? "out meta;" : ""
         }>;out skel qt;`
     }
+
     /**
      * Constructs the actual script to execute on Overpass with geocoding
      * 'PostCall' can be used to set an extra range, see 'AsOverpassTurboLink'

src/Logic/UIEventSource.ts

@@ -727,6 +727,7 @@ export class UIEventSource<T> extends Store<T> implements Writable<T> {
     }
 
     /**
+     * Parse the number and round to the nearest int
      *
      * @param source
      * UIEventSource.asInt(new UIEventSource("123")).data // => 123