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

Fix tests, refactoring kindof works now

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-10-28 11:19:47 +01:00
parent 813e96f8df
commit 1447863fa7
11 changed files with 307 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

1
UI/Popup/QuestionBox.ts
View file

@ -27,7 +27,6 @@ export default class QuestionBox extends UIElement {
.map((tagRendering, i) => new TagRenderingQuestion(this._tags, tagRendering,
() => {
// We save
self._skippedQuestions.data.push(i)
self._skippedQuestions.ping();
},
Translations.t.general.skip.Clone()

5
UI/Popup/TagRenderingAnswer.ts
View file

@ -18,6 +18,11 @@ export default class TagRenderingAnswer extends UIElement {
}
InnerRender(): string {
if(this._configuration.condition !== undefined){
if(!this._configuration.condition.matchesProperties(this._tags.data)){
return "";
}
}
const tr = this._configuration.GetRenderValue(this._tags.data);
if(tr === undefined){
return "";

14
UI/Popup/TagRenderingQuestion.ts
View file

@ -5,7 +5,7 @@ import TagRenderingConfig from "../../Customizations/JSON/TagRenderingConfig";
import {InputElement} from "../Input/InputElement";
import {And, Tag, TagsFilter, TagUtils} from "../../Logic/Tags";
import ValidatedTextField from "../Input/ValidatedTextField";
import Translation from "../i18n/Translation";
import {Translation} from "../i18n/Translations";
import {FixedInputElement} from "../Input/FixedInputElement";
import {SubstitutedTranslation} from "../SpecialVisualizations";
import {RadioButton} from "../Input/RadioButton";
@ -18,8 +18,6 @@ import {Changes} from "../../Logic/Osm/Changes";
import {VariableUiElement} from "../Base/VariableUIElement";
import Translations from "../i18n/Translations";
import {FixedUiElement} from "../Base/FixedUiElement";
import {Util} from "leaflet";
import indexOf = Util.indexOf;
/**
* Shows the question element.
@ -114,16 +112,13 @@ export default class TagRenderingQuestion extends UIElement {
}
private SplitMultiAnswer(tags: TagsFilter) {
}
private GenerateMultiAnswer(elements: InputElement<TagsFilter>[], freeformField: InputElement<TagsFilter>): InputElement<TagsFilter> {
const possibleTags = elements.map(el => el.GetValue().data);
const checkBoxes = new CheckBoxes(elements);
const inputEl = new InputElementMap<number[], TagsFilter>(
checkBoxes,
(t0, t1) => {
console.log("IsEquiv?",t0, t1, t0?.isEquivalent(t1))
return t0?.isEquivalent(t1) ?? false
},
(indices) => {
@ -131,7 +126,8 @@ export default class TagRenderingQuestion extends UIElement {
return undefined;
}
const tags: TagsFilter[] = indices.map(i => elements[i].GetValue().data);
return TagUtils.FlattenMultiAnswer(tags);
const multi = TagUtils.FlattenMultiAnswer(tags);
return multi;
},
(tags: TagsFilter) => {
// {key --> values[]}
@ -171,7 +167,7 @@ export default class TagRenderingQuestion extends UIElement {
if (freeformField) {
if (freeformExtras.length > 0) {
freeformField.GetValue().setData(new Tag(this._configuration.freeform.key, freeformExtras.join(";")));
indices.push(indexOf(elements, freeformField))
indices.push(elements.indexOf(freeformField))
} else {
freeformField.GetValue().setData(undefined);
}