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

Full code cleanup

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-26 21:40:38 +01:00
parent 3a4a2a2016
commit fa971ffbbf
300 changed files with 16352 additions and 19284 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -69,7 +69,7 @@ export default class PointRenderingConfig extends WithContextLoader {
if (iconPath !== undefined && iconPath.startsWith(Utils.assets_path)) {
const iconKey = iconPath.substr(Utils.assets_path.length);
if (Svg.All[iconKey] === undefined) {
throw context+": builtin SVG asset not found: " + iconPath;
throw context + ": builtin SVG asset not found: " + iconPath;
}
}
this.iconSize = this.tr("iconSize", "40,40,center");
@ -209,16 +209,16 @@ export default class PointRenderingConfig extends WithContextLoader {
} else {
iconAndBadges.SetClass("w-full h-full")
}
let label = this.GetLabel(tags)
let htmlEl : BaseUIElement;
if(icon === undefined && label === undefined){
let htmlEl: BaseUIElement;
if (icon === undefined && label === undefined) {
htmlEl = undefined
}else if(icon === undefined){
} else if (icon === undefined) {
htmlEl = new Combine([label])
}else if(label === undefined){
htmlEl = new Combine([iconAndBadges])
}else {
} else if (label === undefined) {
htmlEl = new Combine([iconAndBadges])
} else {
htmlEl = new Combine([iconAndBadges, label]).SetStyle("flex flex-col")
}