From ce884baf6a3ad25c629dde9f6439080a1b364101 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Thu, 14 Oct 2021 18:59:21 +0200 Subject: [PATCH] Fix build --- UI/Popup/MoveWizard.ts | 13 +++++++++---- assets/svg/delete_not_allowed.svg.license_info.json | 8 -------- assets/svg/license_info.json | 8 ++++++++ 3 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 assets/svg/delete_not_allowed.svg.license_info.json diff --git a/UI/Popup/MoveWizard.ts b/UI/Popup/MoveWizard.ts index 81f8a850f..fa3966cba 100644 --- a/UI/Popup/MoveWizard.ts +++ b/UI/Popup/MoveWizard.ts @@ -16,9 +16,8 @@ import {Changes} from "../../Logic/Osm/Changes"; import ChangeLocationAction from "../../Logic/Osm/Actions/ChangeLocationAction"; import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"; import MoveConfig from "../../Models/ThemeConfig/MoveConfig"; -import AvailableBaseLayers from "../../Logic/Actors/AvailableBaseLayers"; import {ElementStorage} from "../../Logic/ElementStorage"; -import Img from "../Base/Img"; +import ValidatedTextField from "../Input/ValidatedTextField"; interface MoveReason { text: Translation | string, @@ -129,11 +128,17 @@ export default class MoveWizard extends Toggle { zoom: reason?.startZoom ?? 16 }) - + let background: string[] + if(typeof reason.background == "string"){ + background = [reason.background] + }else{ + background = reason.background + } + const locationInput = new LocationInput({ minZoom: reason.minZoom, centerLocation: loc, - mapBackground: AvailableBaseLayers.SelectBestLayerAccordingTo(loc, new UIEventSource(reason.background)) + mapBackground: ValidatedTextField.bestLayerAt(loc, new UIEventSource(background)) }) if (reason.lockBounds) { diff --git a/assets/svg/delete_not_allowed.svg.license_info.json b/assets/svg/delete_not_allowed.svg.license_info.json deleted file mode 100644 index b1e80899c..000000000 --- a/assets/svg/delete_not_allowed.svg.license_info.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "authors": [ - "Pieter Vander Vennet" - ], - "path": "delete_not_allowed.svg", - "license": "CC0", - "sources": [] -} \ No newline at end of file diff --git a/assets/svg/license_info.json b/assets/svg/license_info.json index ce03d2a3e..4d701f678 100644 --- a/assets/svg/license_info.json +++ b/assets/svg/license_info.json @@ -505,6 +505,14 @@ "https://commons.wikimedia.org/wiki/File:Trash_font_awesome.svg\rT" ] }, + { + "path": "delete_not_allowed.svg", + "license": "CC0", + "authors": [ + "Pieter Vander Vennet" + ], + "sources": [] + }, { "path": "direction.svg", "license": "CC0; trivial",