contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Custom themes: fix loading of external images in iconBadges, see #1927

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-04-28 01:08:28 +02:00
parent 504cc1fe33
commit 9827f07433
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -12,6 +12,8 @@ import { VariableUiElement } from "../../UI/Base/VariableUIElement"
import { TagRenderingConfigJson } from "./Json/TagRenderingConfigJson" import { TagRenderingConfigJson } from "./Json/TagRenderingConfigJson"
import SvelteUIElement from "../../UI/Base/SvelteUIElement" import SvelteUIElement from "../../UI/Base/SvelteUIElement"
import DynamicMarker from "../../UI/Map/DynamicMarker.svelte" import DynamicMarker from "../../UI/Map/DynamicMarker.svelte"
import { UIElement } from "../../UI/UIElement"
import Img from "../../UI/Base/Img"
export class IconConfig extends WithContextLoader { export class IconConfig extends WithContextLoader {
public static readonly defaultIcon = new IconConfig({ icon: "pin", color: "#ff9939" }) public static readonly defaultIcon = new IconConfig({ icon: "pin", color: "#ff9939" })
@ -121,9 +123,14 @@ export default class PointRenderingConfig extends WithContextLoader {
context + ".rotationAlignment" context + ".rotationAlignment"
) )
} }
private static FromHtmlMulti(multiSpec: string, tags: Store<Record<string, string>>) { private static FromHtmlMulti(multiSpec: string, tags: Store<Record<string, string>>): BaseUIElement {
const icons: IconConfig[] = [] const icons: IconConfig[] = []
for (const subspec of multiSpec.split(";")) { for (const subspec of multiSpec.split(";")) {
if(subspec.startsWith("http://") || subspec.startsWith("https://")){
icons.push(new IconConfig({icon: subspec}))
continue
}
const [icon, color] = subspec.split(":") const [icon, color] = subspec.split(":")
icons.push(new IconConfig({ icon, color })) icons.push(new IconConfig({ icon, color }))
} }