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

Tweaks to question box

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-03-31 04:04:11 +02:00
parent cce14564dc
commit 64532d1faf
7 changed files with 97 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -620,6 +620,10 @@ export default class TagRenderingConfig {
singleSelectedMapping: number,
multiSelectedMapping: boolean[] | undefined
): UploadableTag {
freeformValue = freeformValue?.trim()
if (freeformValue === "") {
freeformValue = undefined
}
if (
freeformValue === undefined &&
singleSelectedMapping === undefined &&
@ -627,6 +631,7 @@ export default class TagRenderingConfig {
) {
return undefined
}
if (this.mappings === undefined && freeformValue === undefined) {
return undefined
}
@ -663,7 +668,13 @@ export default class TagRenderingConfig {
}
return TagUtils.FlattenMultiAnswer([...selectedMappings, ...unselectedMappings])
} else {
if (singleSelectedMapping === undefined) {
return undefined
}
if (singleSelectedMapping === this.mappings.length) {
if (freeformValue === undefined) {
return undefined
}
return new And([
new Tag(this.freeform.key, freeformValue),
...(this.freeform.addExtraTags ?? []),