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

TagRenderingConfig now automatically chooses an iconsize based on common icon sizes

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-07-10 17:47:29 +02:00
parent f9ce1e4db4
commit 4a8a07a10b
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -177,7 +177,8 @@ export default class TagRenderingConfig {
throw "Tagrendering has a 'mappings'-object, but expected a list (" + context + ")" throw "Tagrendering has a 'mappings'-object, but expected a list (" + context + ")"
} }
this.mappings = json.mappings.map((m, i) => TagRenderingConfig.ExtractMapping(m, i, translationKey, context, this.multiAnswer, this.question !== undefined)); const commonIconSize = Utils.NoNull(json.mappings.map(m => m.icon !== undefined ? m.icon["class"] : undefined))[0] ?? "small"
this.mappings = json.mappings.map((m, i) => TagRenderingConfig.ExtractMapping(m, i, translationKey, context, this.multiAnswer, this.question !== undefined, commonIconSize));
} }
if (this.question && this.freeform?.key === undefined && this.mappings === undefined) { if (this.question && this.freeform?.key === undefined && this.mappings === undefined) {
@ -288,7 +289,7 @@ export default class TagRenderingConfig {
public static ExtractMapping(mapping: MappingConfigJson, i: number, translationKey: string, public static ExtractMapping(mapping: MappingConfigJson, i: number, translationKey: string,
context: string, context: string,
multiAnswer?: boolean, isQuestionable?: boolean) { multiAnswer?: boolean, isQuestionable?: boolean, commonSize: string = "small") {
const ctx = `${translationKey}.mappings.${i}` const ctx = `${translationKey}.mappings.${i}`
if (mapping.if === undefined) { if (mapping.if === undefined) {
@ -327,7 +328,7 @@ export default class TagRenderingConfig {
} }
let icon = undefined; let icon = undefined;
let iconClass = "small" let iconClass = commonSize
if (mapping.icon !== undefined) { if (mapping.icon !== undefined) {
if (typeof mapping.icon === "string" && mapping.icon !== "") { if (typeof mapping.icon === "string" && mapping.icon !== "") {
icon = mapping.icon icon = mapping.icon