UX: fix #2416, small code cleanup

src/Logic/ImageProviders/AllImageProviders.ts

@@ -85,9 +85,9 @@ export default class AllImageProviders {
         let count = 0
 
         const sources = [
+            Panoramax.singleton,
             Imgur.singleton,
             Mapillary.singleton,
-            Panoramax.singleton,
             AllImageProviders.genericImageProvider,
         ]
         const allPrefixes = Utils.Dedup(
@@ -138,8 +138,8 @@ export default class AllImageProviders {
             allSources.push(singleSource)
         }
         const source = Stores.fromStoresArray(allSources).map((result) => {
-            const all = [].concat(...result)
-            return Utils.DedupOnId(all, (i) => i?.id ?? i?.url)
+            const all = Utils.concat(result)
+            return Utils.DedupOnId(all, (i) => [i?.id, i?.url, i?.alt_id])
         })
         this._cachedImageStores[cachekey] = source
         return source

src/Logic/ImageProviders/ImageProvider.ts

@@ -10,6 +10,10 @@ export interface ProvidedImage {
     key: string
     provider: ImageProvider
     id: string
+    /**
+     * An alternative ID, used to deduplicate some images
+     */
+    alt_id?: string,
     date?: Date
     status?: string | "ready"
     /**

src/Logic/ImageProviders/ImageUploadQueue.ts

@@ -47,10 +47,11 @@ export default class ImageUploadQueue {
     applyRemapping(oldId: string, newId: string) {
         let hasChange = false
         for (const img of this._imagesInQueue.data) {
-            if (img.featureId === oldId) {
-                img.featureId = newId
-                hasChange = true
+            if (img.featureId !== oldId) {
+                continue
             }
+            img.featureId = newId
+            hasChange = true
         }
         if (hasChange) {
             this._imagesInQueue.ping()

src/Logic/ImageProviders/Panoramax.ts

@@ -22,7 +22,15 @@ export default class PanoramaxImageProvider extends ImageProvider {
         3000
     )
 
-    public defaultKeyPrefixes: string[] = ["panoramax"]
+    /**
+     *
+     * const url = "https://panoramax.mapcomplete.org/api/pictures/e931ce57-4591-4dd5-aa4c-595e89c37e84/hd.jpg"
+     * const match = url.match(PanoramaxImageProvider.isDirectLink)
+     * match[1] // => "e931ce57-4591-4dd5-aa4c-595e89c37e84"
+     */
+    public static readonly isDirectLink = /https:\/\/panoramax.mapcomplete.org\/api\/pictures\/([0-9a-f-]+)\/(hd)|(sd)|(thumb).jpg/
+
+    public defaultKeyPrefixes: string[] = ["panoramax", "image"]
     public readonly name: string = "panoramax"
 
     private static knownMeta: Record<
@@ -154,10 +162,18 @@ export default class PanoramaxImageProvider extends ImageProvider {
     }
 
     public async ExtractUrls(key: string, value: string): Promise<ProvidedImage[]> {
+        const match = value.match(PanoramaxImageProvider.isDirectLink)
+        let alt_id = undefined
+        if (match) {
+            alt_id = value
+            value = match[1] // The ID
+        }
         if (!Panoramax.isId(value)) {
             return undefined
         }
-        return [await this.getInfo(value)]
+        const providedImage = await this.getInfo(value)
+        providedImage.alt_id = alt_id
+        return [providedImage]
     }
 
     public async getInfo(hash: string): Promise<ProvidedImage> {

src/Logic/Osm/ChangesetHandler.ts

@@ -359,6 +359,9 @@ export class ChangesetHandler {
         }
         for (const mapping of mappings) {
             const [oldId, newId] = mapping
+            if (oldId === newId) {
+                continue
+            }
             this.allElements?.addAlias(oldId, newId)
             if (newId !== undefined) {
                 this._remappings.set(oldId, newId)

src/Logic/Search/FilterSearch.ts

@@ -1,6 +1,5 @@
 import { Utils } from "../../Utils"
 import Locale from "../../UI/i18n/Locale"
-import Constants from "../../Models/Constants"
 import FilterConfig, { FilterConfigOption } from "../../Models/ThemeConfig/FilterConfig"
 import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
 import LayerState from "../State/LayerState"
@@ -89,41 +88,6 @@ export default class FilterSearch {
         }
         return possibleFilters
     }
-
-    /**
-     * Create a random list of filters
-     */
-    getSuggestions(): FilterSearchResult[] {
-        const result: FilterSearchResult[] = []
-        for (const [id, filteredLayer] of this._state.layerState.filteredLayers) {
-            if (!Array.isArray(filteredLayer.layerDef.filters)) {
-                continue
-            }
-            if (Constants.isPriviliged(id)) {
-                continue
-            }
-            for (const filter of filteredLayer.layerDef.filters) {
-                const singleFilterResults: FilterSearchResult[] = []
-                for (let i = 0; i < Math.min(filter.options.length, 5); i++) {
-                    const option = filter.options[i]
-                    if (option.osmTags === undefined) {
-                        continue
-                    }
-                    singleFilterResults.push({
-                        option,
-                        filter,
-                        index: i,
-                        layer: filteredLayer.layerDef,
-                    })
-                }
-                Utils.shuffle(singleFilterResults)
-                result.push(...singleFilterResults.slice(0, 3))
-            }
-        }
-        Utils.shuffle(result)
-        return result.slice(0, 6)
-    }
-
     /**
      * Partitions the list of filters in such a way that identically appearing filters will be in the same sublist.
      *