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

Correctly add elements to featureInfoBox

Browse source
This commit is contained in:
pietervdvn 2021-06-27 20:52:25 +02:00
parent 6af3d41886
commit 09ba1b37c6
1 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
UI/Popup/FeatureInfoBox.ts
View file

@ -12,7 +12,7 @@ import {Tag} from "../../Logic/Tags/Tag";
import Constants from "../../Models/Constants"; import Constants from "../../Models/Constants";
import SharedTagRenderings from "../../Customizations/SharedTagRenderings"; import SharedTagRenderings from "../../Customizations/SharedTagRenderings";
import BaseUIElement from "../BaseUIElement"; import BaseUIElement from "../BaseUIElement";
import AllKnownLayers from "../../Customizations/AllKnownLayers"; import {VariableUiElement} from "../Base/VariableUIElement";
export default class FeatureInfoBox extends ScrollableFullScreen { export default class FeatureInfoBox extends ScrollableFullScreen {
@ -54,7 +54,7 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
} }
let questionBoxIsUsed = false; let questionBoxIsUsed = false;
const renderings : BaseUIElement[] = layerConfig.tagRenderings.map(tr => { const renderings: BaseUIElement[] = layerConfig.tagRenderings.map(tr => {
if (tr.question === null) { if (tr.question === null) {
// This is the question box! // This is the question box!
questionBoxIsUsed = true; questionBoxIsUsed = true;
@ -65,23 +65,38 @@ export default class FeatureInfoBox extends ScrollableFullScreen {
if (!questionBoxIsUsed) { if (!questionBoxIsUsed) {
renderings.push(questionBox); renderings.push(questionBox);
} }
const hasMinimap = layerConfig.tagRenderings.some(tr => tr.hasMinimap()) const hasMinimap = layerConfig.tagRenderings.some(tr => tr.hasMinimap())
if(!hasMinimap){ if (!hasMinimap) {
renderings.push(new TagRenderingAnswer(tags, SharedTagRenderings.SharedTagRendering.get("minimap"))) renderings.push(new TagRenderingAnswer(tags, SharedTagRenderings.SharedTagRendering.get("minimap")))
} }
if (State.state.osmConnection.userDetails.data.csCount >= Constants.userJourney.historyLinkVisible || renderings.push(
State.state.featureSwitchIsDebugging.data == true || new VariableUiElement(
State.state.featureSwitchIsTesting.data == true) { State.state.osmConnection.userDetails.map(userdetails => {
renderings.push(new TagRenderingAnswer( tags, SharedTagRenderings.SharedTagRendering.get("last_edit"))) if (userdetails.csCount <= Constants.userJourney.historyLinkVisible
} && State.state.featureSwitchIsDebugging.data == false
&& State.state.featureSwitchIsTesting.data === false) {
return undefined
if (State.state.featureSwitchIsDebugging.data) { }
const config: TagRenderingConfig = new TagRenderingConfig({render: "{all_tags()}"}, new Tag("id", ""), "");
renderings.push(new TagRenderingAnswer(tags, config)) return new TagRenderingAnswer(tags, SharedTagRenderings.SharedTagRendering.get("last_edit"));
}
}, [State.state.featureSwitchIsDebugging])
)
)
renderings.push(
new VariableUiElement(
State.state.featureSwitchIsDebugging.map(isDebugging => {
if (isDebugging) {
const config: TagRenderingConfig = new TagRenderingConfig({render: "{all_tags()}"}, new Tag("id", ""), "");
return new TagRenderingAnswer(tags, config)
}
})
)
)
return new Combine(renderings).SetClass("block") return new Combine(renderings).SetClass("block")