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

Add filters based on mappigns, use in artwork

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-04-08 01:58:07 +02:00
parent 8abfcae02f
commit 51c1448de8
4 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Models/ThemeConfig/Conversion/Validation.ts
View file

@ -432,7 +432,7 @@ export class DetectConflictingAddExtraTags extends DesugaringStep<TagRenderingCo
}
try {
const tagRendering = new TagRenderingConfig(json)
const tagRendering = new TagRenderingConfig(json, context.path.join("."))
for (let i = 0; i < tagRendering.mappings.length; i++) {
const mapping = tagRendering.mappings[i]
@ -632,7 +632,7 @@ export class DetectShadowedMappings extends DesugaringStep<TagRenderingConfigJso
const ifTags = TagUtils.Tag(m.if, c.enter("if"))
const hideInAnswer = m["hideInAnswer"]
if (hideInAnswer !== undefined && hideInAnswer !== false && hideInAnswer !== true) {
let conditionTags = TagUtils.Tag(hideInAnswer)
const conditionTags = TagUtils.Tag(hideInAnswer)
// Merge the condition too!
return new And([conditionTags, ifTags])
}