From 3ac7a3c59e305fd04eab5066c35b451ad8e494c1 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Wed, 20 Oct 2021 00:19:33 +0200
Subject: [PATCH] Various cleanups

---
 Logic/ImageProviders/Mapillary.ts     |  4 +--
 Logic/Osm/OsmConnection.ts            |  2 --
 Logic/Osm/OsmObject.ts                |  4 +--
 UI/BigComponents/UploadFlowStateUI.ts | 45 ---------------------------
 Utils.ts                              |  2 +-
 5 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 UI/BigComponents/UploadFlowStateUI.ts

diff --git a/Logic/ImageProviders/Mapillary.ts b/Logic/ImageProviders/Mapillary.ts
index 68491a529..07e0473d4 100644
--- a/Logic/ImageProviders/Mapillary.ts
+++ b/Logic/ImageProviders/Mapillary.ts
@@ -1,11 +1,9 @@
 import ImageProvider, {ProvidedImage} from "./ImageProvider";
 import BaseUIElement from "../../UI/BaseUIElement";
-import {UIEventSource} from "../UIEventSource";
 import Svg from "../../Svg";
 import {Utils} from "../../Utils";
 import {LicenseInfo} from "./LicenseInfo";
 import Constants from "../../Models/Constants";
-import {fail} from "assert";
 
 export class Mapillary extends ImageProvider {
 
@@ -13,7 +11,7 @@ export class Mapillary extends ImageProvider {
     
     public static readonly singleton = new Mapillary();
     private static readonly valuePrefix = "https://a.mapillary.com"
-    public static readonly valuePrefixes = [Mapillary.valuePrefix, "http://mapillary.com","https://mapillary.com"]
+    public static readonly valuePrefixes = [Mapillary.valuePrefix, "http://mapillary.com","https://mapillary.com","http://www.mapillary.com","https://www.mapillary.com"]
 
     private static ExtractKeyFromURL(value: string, failIfNoMath = false): {
         key: string,
diff --git a/Logic/Osm/OsmConnection.ts b/Logic/Osm/OsmConnection.ts
index c0795aad0..7fd107838 100644
--- a/Logic/Osm/OsmConnection.ts
+++ b/Logic/Osm/OsmConnection.ts
@@ -8,7 +8,6 @@ import Svg from "../../Svg";
 import Img from "../../UI/Base/Img";
 import {Utils} from "../../Utils";
 import {OsmObject} from "./OsmObject";
-import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig";
 import {Changes} from "./Changes";
 
 export default class UserDetails {
@@ -97,7 +96,6 @@ export class OsmConnection {
                 self.AttemptLogin()
             }
         });
-        this.isLoggedIn.addCallbackAndRunD(li => console.log("User is logged in!", li))
         this._dryRun = options.dryRun;
 
         this.updateAuthObject();
diff --git a/Logic/Osm/OsmObject.ts b/Logic/Osm/OsmObject.ts
index 5d21f7d14..faf1ee79d 100644
--- a/Logic/Osm/OsmObject.ts
+++ b/Logic/Osm/OsmObject.ts
@@ -66,9 +66,7 @@ export abstract class OsmObject {
 
         const url = `${OsmObject.backendURL}api/0.6/${id}`;
         const rawData = await Utils.downloadJsonCached(url, 1000)
-        const tags = rawData.elements[0].tags
-        console.log("Tags are", tags)
-        return tags
+        return rawData.elements[0].tags
     }
 
     static async DownloadObjectAsync(id: string): Promise<OsmObject> {
diff --git a/UI/BigComponents/UploadFlowStateUI.ts b/UI/BigComponents/UploadFlowStateUI.ts
deleted file mode 100644
index c98c1a941..000000000
--- a/UI/BigComponents/UploadFlowStateUI.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import {UIEventSource} from "../../Logic/UIEventSource";
-import BaseUIElement from "../BaseUIElement";
-import {VariableUiElement} from "../Base/VariableUIElement";
-import Translations from "../i18n/Translations";
-
-/**
- * Shows that 'images are uploading', 'all images are uploaded' as relevant...
- */
-export default class UploadFlowStateUI extends VariableUiElement {
-
-
-    constructor(queue: UIEventSource<string[]>, failed: UIEventSource<string[]>, success: UIEventSource<string[]>) {
-        const t = Translations.t.image;
-
-        super(
-            queue.map(queue => {
-                const failedReasons = failed.data
-                const successCount = success.data.length
-                const pendingCount = queue.length - successCount - failedReasons.length;
-
-                let stateMessages: BaseUIElement[] = []
-
-                if (pendingCount == 1) {
-                    stateMessages.push(t.uploadingPicture.Clone().SetClass("alert"))
-                }
-                if (pendingCount > 1) {
-                    stateMessages.push(t.uploadingMultiple.Subs({count: "" + pendingCount}).SetClass("alert"))
-                }
-                if (failedReasons.length > 0) {
-                    stateMessages.push(t.uploadFailed.Clone().SetClass("alert"))
-                }
-                if (successCount > 0 && pendingCount == 0) {
-                    stateMessages.push(t.uploadDone.SetClass("thanks"))
-                }
-
-                stateMessages.forEach(msg => msg.SetStyle("display: block ruby"))
-
-                return stateMessages
-            }, [failed, success])
-        );
-
-
-    }
-
-}
\ No newline at end of file
diff --git a/Utils.ts b/Utils.ts
index 2aae7c869..a732f1ab8 100644
--- a/Utils.ts
+++ b/Utils.ts
@@ -330,7 +330,7 @@ export class Utils {
                 return cached.promise
             }
         }
-        const promise = Utils.downloadJson(url, headers)
+        const promise = /*NO AWAIT as we work with the promise directly */Utils.downloadJson(url, headers)
         Utils._download_cache.set(url, {promise, timestamp: new Date().getTime()})
         return await promise
     }