- 
diff --git a/src/UI/Popup/AddNewPoint/PresetList.svelte b/src/UI/Popup/AddNewPoint/PresetList.svelte
index 4676ec456..d476198f0 100644
--- a/src/UI/Popup/AddNewPoint/PresetList.svelte
+++ b/src/UI/Popup/AddNewPoint/PresetList.svelte
@@ -11,6 +11,9 @@
import LayerConfig from "../../../Models/ThemeConfig/LayerConfig"
import FromHtml from "../../Base/FromHtml.svelte"
import NextButton from "../../Base/NextButton.svelte"
+ import { UIElement } from "../../UIElement";
+ import ToSvelte from "../../Base/ToSvelte.svelte";
+ import BaseUIElement from "../../BaseUIElement";
/**
* This component lists all the presets and allows the user to select one
@@ -21,7 +24,7 @@
preset: PresetConfig
layer: LayerConfig
text: Translation
- icon: string
+ icon: BaseUIElement
tags: Record
}[] = []
@@ -49,10 +52,9 @@
for (const preset of layer.presets) {
const tags = TagUtils.KVtoProperties(preset.tags ?? [])
- const icon: string = layer.mapRendering[0]
+ const icon: BaseUIElement = layer.mapRendering[0]
.RenderIcon(new ImmutableStore(tags))
- .html.SetClass("w-12 h-12 block relative")
- .ConstructElement().innerHTML
+ .html.SetClass("w-12 h-12 block relative mr-4")
const description = preset.description?.FirstSentence()
@@ -84,7 +86,7 @@
{#each presets as preset}
dispatch("select", preset)}>
- preset.icon} />
- export let state: any
+ export let state: {layoutToUse: LayoutConfig} = undefined
const calculatedTags = [].concat(
...(state?.layoutToUse?.layers?.map((l) => l.calculatedTags?.map((c) => c[0]) ?? []) ?? [])
diff --git a/src/UI/Popup/TagRendering/TagRenderingEditable.svelte b/src/UI/Popup/TagRendering/TagRenderingEditable.svelte
index bf2291eda..28c90fabf 100644
--- a/src/UI/Popup/TagRendering/TagRenderingEditable.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingEditable.svelte
@@ -20,14 +20,12 @@
export let editingEnabled: Store | undefined = state?.featureSwitchUserbadge;
- export let clss = config.classes.join(" ")
-
export let highlightedRendering: UIEventSource = undefined;
export let showQuestionIfUnknown: boolean = false;
/**
* Indicates if this tagRendering currently shows the attribute or asks the question to _change_ the property
*/
- export let editMode = !config.IsKnown(tags.data) || showQuestionIfUnknown;
+ export let editMode = !config.IsKnown(tags.data) // || showQuestionIfUnknown;
if (tags) {
onDestroy(
tags.addCallbackD((tags) => {
@@ -73,7 +71,7 @@
}
-
+
@@ -41,9 +41,8 @@ export abstract class EditJsonState {
public readonly highlightedItem: UIEventSource = new UIEventSource(
undefined
)
- sendingUpdates = false
+ private sendingUpdates = false
private readonly _stores = new Map>()
- private boolean
constructor(schema: ConfigMeta[], server: StudioServer, category: "layers" | "themes") {
this.schema = schema
@@ -53,6 +52,7 @@ export abstract class EditJsonState {
this.messages = this.setupErrorsForLayers()
const layerId = this.getId()
+ this.highlightedItem.addCallbackD((hl) => console.log("Highlighted item is", hl))
this.configuration
.mapD((config) => {
if (!this.sendingUpdates) {
@@ -105,6 +105,9 @@ export abstract class EditJsonState {
this.setValueAt(path, v)
})
this._stores.set(key, store)
+ this.configuration.addCallbackD((config) => {
+ store.setData(this.getCurrentValueFor(path))
+ })
return store
}
@@ -310,7 +313,7 @@ export default class EditLayerState extends EditJsonState {
}
if (!tr["id"] && !tr["override"]) {
const qtr = tr
- let id = "" + i
+ let id = "" + i + "_" + Utils.randomString(5)
if (qtr?.freeform?.key) {
id = qtr?.freeform?.key
} else if (qtr.mappings?.[0]?.if) {
diff --git a/src/UI/Studio/MappingInput.svelte b/src/UI/Studio/MappingInput.svelte
index 9335034b4..6d741cc6f 100644
--- a/src/UI/Studio/MappingInput.svelte
+++ b/src/UI/Studio/MappingInput.svelte
@@ -1,8 +1,6 @@
@@ -84,7 +89,7 @@
{
store.setData(tgs["value"]);
});
@@ -99,9 +99,11 @@ const ignored = new Set(["labels", "description", "classes"]);
const freeformSchema = questionableTagRenderingSchemaRaw
.filter(schema => schema.path.length == 2 && schema.path[0] === "freeform" && ($allowQuestions || schema.path[1] === "key"));
const missing: string[] = questionableTagRenderingSchemaRaw.filter(schema => schema.path.length >= 1 && !items.has(schema.path[0]) && !ignored.has(schema.path[0])).map(schema => schema.path.join("."));
+console.log({state})
+
-{#if typeof value === "string"}
+{#if typeof $store === "string"}
{#if config.question && (!editingEnabled || $editingEnabled)}
{#if editMode}
diff --git a/src/UI/SpecialVisualizations.ts b/src/UI/SpecialVisualizations.ts
index 67f1bbfc6..f6980cacf 100644
--- a/src/UI/SpecialVisualizations.ts
+++ b/src/UI/SpecialVisualizations.ts
@@ -430,7 +430,7 @@ export default class SpecialVisualizations {
return new SvelteUIElement(AddNewPoint, {
state,
coordinate: { lon, lat },
- })
+ }).SetClass("w-full h-full")
},
},
{
diff --git a/src/UI/Studio/EditLayer.svelte b/src/UI/Studio/EditLayer.svelte
index 1d04e88d7..a20b342a7 100644
--- a/src/UI/Studio/EditLayer.svelte
+++ b/src/UI/Studio/EditLayer.svelte
@@ -24,7 +24,7 @@
let messages = state.messages;
let hasErrors = messages.mapD((m: ConversionMessage[]) => m.filter(m => m.level === "error").length);
const configuration = state.configuration;
-
+
const allNames = Utils.Dedup(layerSchema.map(meta => meta.hints.group));
const perRegion: Record = {};
@@ -57,10 +57,10 @@
return config;
}
- let requiredFields = ["id", "name", "description"];
+ let requiredFields = ["id", "name", "description", "source"];
let currentlyMissing = state.configuration.map(config => {
- if(!config){
- return []
+ if (!config) {
+ return [];
}
const missing = [];
for (const requiredField of requiredFields) {
@@ -73,29 +73,35 @@
let highlightedItem: UIEventSource = state.highlightedItem;
+ highlightedItem.setData(undefined)}>
-
- {/if}
+ {#if $highlightedItem !== undefined}
+ highlightedItem.setData(undefined)}>
+
+ {/if}
-{/if}
+ {/if}
+
diff --git a/src/UI/Studio/EditLayerState.ts b/src/UI/Studio/EditLayerState.ts
index 4e8e4cbce..eca1a6614 100644
--- a/src/UI/Studio/EditLayerState.ts
+++ b/src/UI/Studio/EditLayerState.ts
@@ -20,7 +20,7 @@ import { Feature, Point } from "geojson"
import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
import { LayoutConfigJson } from "../../Models/ThemeConfig/Json/LayoutConfigJson"
import { PrepareTheme } from "../../Models/ThemeConfig/Conversion/PrepareTheme"
-import { ConversionContext } from "../../Models/ThemeConfig/Conversion/ConversionContext";
+import { ConversionContext } from "../../Models/ThemeConfig/Conversion/ConversionContext"
export interface HighlightedTagRendering {
path: ReadonlyArray
-{#if $currentlyMissing.length > 0}
-
- {#each requiredFields as required}
-
- {#if $highlightedItem !== undefined}
-
-
-
+
-
-
+
+ {#if $currentlyMissing.length > 0}
+
+ {#each requiredFields as required}
+
+
+ {/if}
+ {#if $currentlyMissing.length > 0}
+
+ {:else if $hasErrors > 0}
+ Creating a new layer
+ {:else}Editing layer {$title}
- {#if $hasErrors > 0} -{$hasErrors} errors detected
- {:else}
-
- Try it out
- {$hasErrors} errors detected
+ {:else}
+
+ Try it out
+ General properties
@@ -150,22 +156,23 @@
")} />
-
- The testobject (which is used to render the questions in the 'information panel' item has the following tags:
+ The testobject (which is used to render the questions in the 'information panel' item has the following
+ tags:
-
+
-
-
+
+ Preview of this question
{#each $configs as config} -Could not create a preview of this tagRendering: {config.error}
+ {:else}
+ {#if config.condition && !config.condition.matchesProperties($tags)}
+ This tagRendering is currently not shown. It will appear if the feature matches the condition
+
+