Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

List which pins are allowed by default

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-05-08 01:58:33 +02:00
parent b583e930d3
commit 3b28e3ff21
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -11,6 +11,7 @@ import { FixedUiElement } from "../../UI/Base/FixedUiElement"
import Img from "../../UI/Base/Img"
import Combine from "../../UI/Base/Combine"
import { VariableUiElement } from "../../UI/Base/VariableUIElement"
import Constants from "../Constants";
export default class PointRenderingConfig extends WithContextLoader {
static readonly allowed_location_codes: ReadonlySet<string> = new Set<string>([
@ -86,7 +87,7 @@ export default class PointRenderingConfig extends WithContextLoader {
const iconPath = this.icon?.GetRenderValue({ id: "node/-1" })?.txt
if (iconPath !== undefined && iconPath.startsWith(Utils.assets_path)) {
const iconKey = iconPath.substr(Utils.assets_path.length)
if (Svg.All[iconKey] === undefined) {
if (Constants.defaultPinIcons.indexOf(iconKey) < 0) {
throw context + ": builtin SVG asset not found: " + iconPath
}
}
@ -109,7 +110,7 @@ export default class PointRenderingConfig extends WithContextLoader {
return undefined
}
const match = htmlSpec.match(/([a-zA-Z0-9_]*):([^;]*)/)
if (match !== null && Svg.All[match[1] + ".svg"] !== undefined) {
if (match !== null && Constants.defaultPinIcons.indexOf(match[1] ) >= 0) {
const svg = Svg.All[match[1] + ".svg"] as string
const targetColor = match[2]
const img = new Img(