refactoring: more fixes, first attempt at tagRenderingAnswer

This commit is contained in:
Pieter Vander Vennet 2023-03-30 04:51:56 +02:00
parent aaaaf1948d
commit 29372c465e
24 changed files with 278 additions and 113 deletions

View file

@ -78,6 +78,7 @@
</div>
{:else }
<input
type="search"
bind:this={inputElement}
on:keypress={keypr => keypr.key === "Enter" ? performSearch() : undefined}

View file

@ -83,9 +83,6 @@ export default class LeftControls extends Combine {
"filters",
guiState.filterViewIsOpened
)
const toggledFilter = new MapControlButton(Svg.layers_svg()).onClick(() =>
guiState.filterViewIsOpened.setData(true)
)
state.featureSwitchFilter.addCallbackAndRun((f) => {
Hotkeys.RegisterHotkey(
{ nomod: "B" },
@ -96,8 +93,6 @@ export default class LeftControls extends Combine {
)
})
const filterButton = new Toggle(toggledFilter, undefined, state.featureSwitchFilter)
const mapSwitch = new Toggle(
new BackgroundMapSwitch(state, state.backgroundLayer, { enableHotkeys: true }),
undefined,

View file

@ -4,6 +4,7 @@
import LayerConfig from "../../Models/ThemeConfig/LayerConfig";
import type { SpecialVisualizationState } from "../SpecialVisualization";
import TagRenderingAnswer from "../Popup/TagRenderingAnswer.svelte";
import TagRenderingQuestion from "../Popup/TagRenderingQuestion.svelte";
export let selectedElement: Feature;
export let layer: LayerConfig;
@ -41,7 +42,7 @@
<div class="flex flex-col sm:flex-row flex-grow justify-between">
<!-- Title element-->
<h3>
<TagRenderingAnswer config={layer.title} {tags} {selectedElement}></TagRenderingAnswer>
<TagRenderingAnswer config={layer.title} {selectedElement} {tags}></TagRenderingAnswer>
</h3>
<div class="flex flex-row flex-wrap pt-0.5 sm:pt-1 items-center mr-2">
@ -57,7 +58,11 @@
<div class="flex flex-col">
{#each layer.tagRenderings as config (config.id)}
<TagRenderingAnswer {tags} {config} {state}></TagRenderingAnswer>
{#if config.IsKnown($tags)}
<TagRenderingAnswer {tags} {config} {state}></TagRenderingAnswer>
{:else}
<TagRenderingQuestion {config} {tags} {state}></TagRenderingQuestion>
{/if}
{/each}
</div>