Refactoring of image detection, fix loading wikimedia images

UI/Image/AttributedImage.ts

@@ -1,30 +1,19 @@
 import Combine from "../Base/Combine";
 import Attribution from "./Attribution";
 import Img from "../Base/Img";
-import ImageAttributionSource from "../../Logic/ImageProviders/ImageAttributionSource";
+import {ProvidedImage} from "../../Logic/ImageProviders/ImageProvider";
 import BaseUIElement from "../BaseUIElement";
-import {VariableUiElement} from "../Base/VariableUIElement";
-import Loading from "../Base/Loading";
 
 
 export class AttributedImage extends Combine {
 
-    constructor(urlSource: string, imgSource: ImageAttributionSource) {
-        const preparedUrl = imgSource.PrepareUrl(urlSource)
+    constructor(imageInfo: ProvidedImage) {
         let img: BaseUIElement;
         let attr: BaseUIElement
-        if (typeof preparedUrl === "string") {
-            img = new Img(urlSource);
-            attr = new Attribution(imgSource.GetAttributionFor(urlSource), imgSource.SourceIcon())
-        } else {
-            img = new VariableUiElement(preparedUrl.map(url => {
-                if(url === undefined){
-                    return new Loading()
-                }
-                return new Img(url, false, {fallbackImage: './assets/svg/blocked.svg'});
-            }))
-            attr = new VariableUiElement(preparedUrl.map(_ => new Attribution(imgSource.GetAttributionFor(urlSource), imgSource.SourceIcon())))
-        }
+        img = new Img(imageInfo.url);
+        attr = new Attribution(imageInfo.provider.GetAttributionFor(imageInfo.url),
+                imageInfo.provider.SourceIcon(),
+        )
 
 
         super([img, attr]);

UI/Image/Attribution.ts

@@ -3,7 +3,7 @@ import Translations from "../i18n/Translations";
 import BaseUIElement from "../BaseUIElement";
 import {VariableUiElement} from "../Base/VariableUIElement";
 import {UIEventSource} from "../../Logic/UIEventSource";
-import {LicenseInfo} from "../../Logic/ImageProviders/Wikimedia";
+import {LicenseInfo} from "../../Logic/ImageProviders/LicenseInfo";
 
 export default class Attribution extends VariableUiElement {
 

UI/Image/ImageCarousel.ts

@@ -4,29 +4,35 @@ import Combine from "../Base/Combine";
 import DeleteImage from "./DeleteImage";
 import {AttributedImage} from "./AttributedImage";
 import BaseUIElement from "../BaseUIElement";
-import Img from "../Base/Img";
 import Toggle from "../Input/Toggle";
-import {Wikimedia} from "../../Logic/ImageProviders/Wikimedia";
-import {Imgur} from "../../Logic/ImageProviders/Imgur";
-import {Mapillary} from "../../Logic/ImageProviders/Mapillary";
+import ImageProvider from "../../Logic/ImageProviders/ImageProvider";
 
 export class ImageCarousel extends Toggle {
 
-    constructor(images: UIEventSource<{ key: string, url: string }[]>, tags: UIEventSource<any>) {
-        const uiElements = images.map((imageURLS: { key: string, url: string }[]) => {
+    constructor(images: UIEventSource<{ key: string, url: string, provider: ImageProvider }[]>, tags: UIEventSource<any>) {
+        const uiElements = images.map((imageURLS: { key: string, url: string, provider: ImageProvider }[]) => {
             const uiElements: BaseUIElement[] = [];
             for (const url of imageURLS) {
-                let image = ImageCarousel.CreateImageElement(url.url)
-                if (url.key !== undefined) {
-                    image = new Combine([
-                        image,
-                        new DeleteImage(url.key, tags).SetClass("delete-image-marker absolute top-0 left-0 pl-3")
-                    ]).SetClass("relative");
+
+                try {
+
+                    let image = new AttributedImage(url)
+
+                    if (url.key !== undefined) {
+                        image = new Combine([
+                            image,
+                            new DeleteImage(url.key, tags).SetClass("delete-image-marker absolute top-0 left-0 pl-3")
+                        ]).SetClass("relative");
+                    }
+                    image
+                        .SetClass("w-full block")
+                        .SetStyle("min-width: 50px; background: grey;")
+                    uiElements.push(image);
+                } catch (e) {
+                    console.error("Could not generate image element for", url.url, "due to", e)
                 }
-                image
-                    .SetClass("w-full block")
-                    .SetStyle("min-width: 50px; background: grey;")
-                uiElements.push(image);
+
+
             }
             return uiElements;
         });
@@ -38,33 +44,4 @@ export class ImageCarousel extends Toggle {
         )
         this.SetClass("block w-full");
     }
-
-    /***
-     * Creates either a 'simpleimage' or a 'wikimediaimage' based on the string
-     * @param url
-     * @constructor
-     */
-    private static CreateImageElement(url: string): BaseUIElement {
-        // @ts-ignore
-        let attrSource: ImageAttributionSource = undefined;
-        if (url.startsWith("File:")) {
-            attrSource = Wikimedia.singleton
-        } else if (url.toLowerCase().startsWith("https://commons.wikimedia.org/wiki/")) {
-            attrSource = Wikimedia.singleton;
-        } else if (url.toLowerCase().startsWith("https://i.imgur.com/")) {
-            attrSource = Imgur.singleton
-        } else if (url.toLowerCase().startsWith("https://www.mapillary.com/map/im/")) {
-            attrSource = Mapillary.singleton
-        } else {
-            return new Img(url);
-        }
-
-        try {
-            return new AttributedImage(url, attrSource)
-        } catch (e) {
-            console.error("Could not create an image: ", e)
-            return undefined;
-        }
-
-    }
 }

UI/SpecialVisualizations.ts

@@ -13,20 +13,19 @@ import Translations from "./i18n/Translations";
 import ReviewForm from "./Reviews/ReviewForm";
 import OpeningHoursVisualization from "./OpeningHours/OpeningHoursVisualization";
 import State from "../State";
-import {ImageSearcher} from "../Logic/Actors/ImageSearcher";
 import BaseUIElement from "./BaseUIElement";
 import Title from "./Base/Title";
 import Table from "./Base/Table";
 import Histogram from "./BigComponents/Histogram";
 import Loc from "../Models/Loc";
 import {Utils} from "../Utils";
-import BaseLayer from "../Models/BaseLayer";
 import LayerConfig from "../Models/ThemeConfig/LayerConfig";
 import ImportButton from "./BigComponents/ImportButton";
 import {Tag} from "../Logic/Tags/Tag";
 import StaticFeatureSource from "../Logic/FeatureSource/Sources/StaticFeatureSource";
 import ShowDataMultiLayer from "./ShowDataLayer/ShowDataMultiLayer";
 import Minimap from "./Base/Minimap";
+import AllImageProviders from "../Logic/ImageProviders/AllImageProviders";
 
 export interface SpecialVisualization {
     funcName: string,
@@ -76,9 +75,7 @@ export default class SpecialVisualizations {
                 constr: (state: State, tags, args) => {
                     const imagePrefix = args[0];
                     const loadSpecial = args[1].toLowerCase() === "true";
-                    const searcher: UIEventSource<{ key: string, url: string }[]> = ImageSearcher.construct(tags, imagePrefix, loadSpecial);
-
-                    return new ImageCarousel(searcher, tags);
+                    return new ImageCarousel(AllImageProviders.LoadImagesFor(tags, imagePrefix, loadSpecial), tags);
                 }
             },
             {