Performance: cache panoramax requests more aggressively; reuse license information that comes from the search-api; lower picture limit; should relieve #2384 greatly

src/Logic/ImageProviders/ImageProvider.ts

@@ -20,7 +20,8 @@ export interface ProvidedImage {
     lat?: number
     lon?: number
     host?: string
-    isSpherical: boolean
+    isSpherical: boolean,
+    license?: LicenseInfo
 }
 
 export interface PanoramaView {

src/Logic/ImageProviders/Panoramax.ts

@@ -24,7 +24,7 @@ export default class PanoramaxImageProvider extends ImageProvider {
     public defaultKeyPrefixes: string[] = ["panoramax"]
     public readonly name: string = "panoramax"
 
-    private static knownMeta: Record<string, { data: ImageData; time: Date }> = {}
+    private static knownMeta: Record<string, { data: Promise<{ data: ImageData, url: string }>; time: Date }> = {}
 
     public SourceIcon(
         img?: { id: string; url: string },
@@ -45,8 +45,8 @@ export default class PanoramaxImageProvider extends ImageProvider {
         )
     }
 
-    public addKnownMeta(meta: ImageData) {
-        PanoramaxImageProvider.knownMeta[meta.id] = { data: meta, time: new Date() }
+    public addKnownMeta(meta: ImageData, url?: string) {
+        PanoramaxImageProvider.knownMeta[meta.id] = { data: Promise.resolve({ data: meta, url }), time: new Date() }
     }
 
     /**
@@ -102,16 +102,7 @@ export default class PanoramaxImageProvider extends ImageProvider {
         }
     }
 
-    private async getInfoFor(id: string): Promise<{ data: ImageData; url: string }> {
-        if (!id.match(/^[a-zA-Z0-9-]+$/)) {
-            return undefined
-        }
-        const cached = PanoramaxImageProvider.knownMeta[id]
-        if (cached) {
-            if (new Date().getTime() - cached.time.getTime() < 1000) {
-                return { data: cached.data, url: undefined }
-            }
-        }
+    private async getInfoForUncached(id: string) {
         try {
             return await this.getInfoFromMapComplete(id)
         } catch (e) {
@@ -125,6 +116,25 @@ export default class PanoramaxImageProvider extends ImageProvider {
         return undefined
     }
 
+    private async getInfoFor(id: string): Promise<{ data: ImageData; url: string }> {
+        if (!id.match(/^[a-zA-Z0-9-]+$/)) {
+            return undefined
+        }
+        const cached = PanoramaxImageProvider.knownMeta[id]
+        if (cached) {
+            if (new Date().getTime() - cached.time.getTime() < 5000) {
+                return await cached.data
+            }
+        }
+        const promise: Promise<{ data: ImageData; url: string }> = this.getInfoForUncached(id)
+        PanoramaxImageProvider.knownMeta[id] = {
+            time: new Date(),
+            data: promise
+        }
+        return await promise
+
+    }
+
     public async ExtractUrls(key: string, value: string): Promise<ProvidedImage[]> {
         if (!Panoramax.isId(value)) {
             return undefined
@@ -139,7 +149,7 @@ export default class PanoramaxImageProvider extends ImageProvider {
 
     getRelevantUrls(tags: Record<string, string>, prefixes: string[]): Store<ProvidedImage[]> {
         const source = UIEventSource.FromPromise(super.getRelevantUrlsFor(tags, prefixes))
-
+        console.trace("Getting relevant URLS for panoramax yielded", source.data)
         function hasLoading(data: ProvidedImage[]) {
             if (data === undefined) {
                 return true

src/Logic/Web/NearbyImagesSearch.ts

@@ -172,7 +172,7 @@ class ImagesFromPanoramaxFetcher implements ImageFetcher {
         "https://panoramax.mapcomplete.org",
     ]
 
-    constructor(url?: string, radius: number = 100) {
+    constructor(url?: string, radius: number = 50) {
         this._radius = radius
         if (url) {
             this._panoramax = new Panoramax(url)
@@ -182,12 +182,11 @@ class ImagesFromPanoramaxFetcher implements ImageFetcher {
     }
 
     public async fetchImages(lat: number, lon: number): Promise<P4CPicture[]> {
-        const bboxObj = new BBox([
-            GeoOperations.destination([lon, lat], this._radius * Math.sqrt(2), -45),
-            GeoOperations.destination([lon, lat], this._radius * Math.sqrt(2), 135),
-        ])
-        const bbox: [number, number, number, number] = bboxObj.toLngLatFlat()
-        const images = await this._panoramax.search({ bbox, limit: 1000 })
+        const images = await this._panoramax.search({
+            place: [lon, lat],
+            place_distance: this._radius ?? 50,
+            limit: 50
+        })
 
         return images.map((i) => {
             const [lng, lat] = i.geometry.coordinates