+ {#each icons as icon}
+
+{/if}
diff --git a/src/UI/Map/Icon.svelte b/src/UI/Map/Icon.svelte
index 9586e5c9cb..237dedfb33 100644
--- a/src/UI/Map/Icon.svelte
+++ b/src/UI/Map/Icon.svelte
@@ -1,6 +1,4 @@
-{#if iconItem}
+{#if icon}
- {#if iconItem === "pin"}
+ {#if icon === "pin"}
+ 
{/if}
{/if}
diff --git a/src/UI/Map/Marker.svelte b/src/UI/Map/Marker.svelte
index 26864a3ba1..656f2b6deb 100644
--- a/src/UI/Map/Marker.svelte
+++ b/src/UI/Map/Marker.svelte
@@ -1,21 +1,17 @@
-{#if config !== undefined}
+{#if icons !== undefined && icons.length > 0}
{#each icons as icon}
-
{/if}
diff --git a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
index 10431d2165..7fb20d181d 100644
--- a/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
+++ b/src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
@@ -235,6 +235,7 @@
bind:group={selectedMapping}
name={"mappings-radio-" + config.id}
value={i}
+ on:keypress={e => {console.log(e) ; if(e.key === "Enter") onSave()}}
/>
{/each}
diff --git a/src/UI/Studio/EditLayer.svelte b/src/UI/Studio/EditLayer.svelte
index 078360bc93..c267b2f3eb 100644
--- a/src/UI/Studio/EditLayer.svelte
+++ b/src/UI/Studio/EditLayer.svelte
@@ -19,7 +19,7 @@
* Blacklist of regions for the general area tab
* These are regions which are handled by a different tab
*/
- const regionBlacklist = ["hidden", undefined, "infobox", "tagrenderings", "maprendering", "editing", "title"];
+ const regionBlacklist = ["hidden", undefined, "infobox", "tagrenderings", "maprendering", "editing", "title","linerendering","pointrendering"];
const allNames = Utils.Dedup(layerSchema.map(meta => meta.hints.group));
const perRegion: RecordEditing layer {$title}
-Leftover regions
-{leftoverRegions.join("; ")}General properties
@@ -47,9 +45,6 @@
{#each baselayerRegions as region}
Information panel (questions and answers)
@@ -63,8 +58,14 @@
- Configuration file
+
+ Advanced functionality
+
+ Configuration file
+
Below, you'll find the raw configuration file in `.json`-format.
This is mostly for debugging purposes
diff --git a/src/UI/Studio/SchemaBasedArray.svelte b/src/UI/Studio/SchemaBasedArray.svelte
index 9a8418f330..0675ccd0a8 100644
--- a/src/UI/Studio/SchemaBasedArray.svelte
+++ b/src/UI/Studio/SchemaBasedArray.svelte
@@ -65,8 +65,13 @@ console.log("For ", schema.path, "got subparts", subparts)
}
function del(value) {
- values.data.splice(values.data.indexOf(value));
+ const index = values.data.indexOf(value)
+ console.log("Deleting",value, index)
+ values.data.splice(index, 1);
+ const store = >state.getStoreFor(path);
+ store.data.splice(index, 1)
values.ping();
+ store.ping()
}
diff --git a/src/UI/Studio/SchemaBasedField.svelte b/src/UI/Studio/SchemaBasedField.svelte
index 3cd1996547..7354e1c4f0 100644
--- a/src/UI/Studio/SchemaBasedField.svelte
+++ b/src/UI/Studio/SchemaBasedField.svelte
@@ -96,13 +96,13 @@
err = path.join(".") + " " + e
}
let startValue = state.getCurrentValueFor(path)
- if (typeof startValue !== "string") {
- startValue = JSON.stringify(startValue)
- }
const tags = new UIEventSource>({value: startValue ?? ""})
try {
onDestroy(state.register(path, tags.map(tgs => {
const v = tgs["value"];
+ if(typeof v !== "string"){
+ return v
+ }
if (schema.type === "boolan") {
return v === "true" || v === "yes" || v === "1"
}
@@ -135,7 +135,6 @@
{err}
{:else}
diff --git a/src/UI/Studio/StudioServer.ts b/src/UI/Studio/StudioServer.ts
new file mode 100644
index 0000000000..fe783b7ebb
--- /dev/null
+++ b/src/UI/Studio/StudioServer.ts
@@ -0,0 +1,38 @@
+import { Utils } from "../../Utils"
+import Constants from "../../Models/Constants"
+import { LayerConfigJson } from "../../Models/ThemeConfig/Json/LayerConfigJson"
+
+export default class StudioServer {
+ private _url: string
+
+ constructor(url: string) {
+ this._url = url
+ }
+
+ public async fetchLayerOverview(): Promise
- {path.join(".")}
{/if}
diff --git a/src/UI/Studio/SchemaBasedMultiType.svelte b/src/UI/Studio/SchemaBasedMultiType.svelte
index 75f4e75029..7c53ba74b7 100644
--- a/src/UI/Studio/SchemaBasedMultiType.svelte
+++ b/src/UI/Studio/SchemaBasedMultiType.svelte
@@ -214,5 +214,4 @@
path={[...subpath, (subschema?.path?.at(-1) ?? "???")]}>
{/each}
{/if}
- {chosenOption}
+
+ Please log in to use MapComplete Studio
+
+
{#if state === undefined}
MapComplete Studio
@@ -58,13 +76,16 @@
{:else if state === "edit_layer"}
- {#each $layers as layerId}
+ {#each Array.from($layers) as layerId}
{
console.log("Editing layer",layerId)
state = "loading"
- initialLayerConfig = await Utils.downloadJson(studioUrl+"/layers/"+layerId+"/"+layerId+".json")
+ initialLayerConfig = await studio.fetchLayer(layerId)
state = "editing_layer"
}}>
+
{/each}
@@ -76,12 +97,22 @@
{$layerIdFeedback}
{:else }
-
+
{layerId}
+
{:else if state === "editing_layer"}