Refactoring: refactoring of all Conversions

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: Record<string, ConfigMeta[]> = {};
@@ -27,7 +27,7 @@
     perRegion[region] = layerSchema.filter(meta => meta.hints.group === region);
   }
 
-  const baselayerRegions: string[] = ["Basic", "presets", "filters", "advanced", "expert"];
+  const baselayerRegions: string[] = ["Basic", "presets", "filters"];
   for (const baselayerRegion of baselayerRegions) {
     if (perRegion[baselayerRegion] === undefined) {
       console.error("BaseLayerRegions in editLayer: no items have group '" + baselayerRegion + "\"");
@@ -38,8 +38,6 @@
 </script>
 
 <h3>Editing layer {$title}</h3>
-<h4>Leftover regions</h4>
-{leftoverRegions.join("; ")}
 <div class="m4">
   <TabbedGroup tab={new UIEventSource(2)}>
     <div slot="title0">General properties</div>
@@ -47,9 +45,6 @@
       {#each baselayerRegions as region}
         <Region {state} configs={perRegion[region]} title={region} />
       {/each}
-      {#each leftoverRegions as region}
-        <Region {state} configs={perRegion[region]} title={region} />
-      {/each}
     </div>
     <div slot="title1">Information panel (questions and answers)</div>
     <div slot="content1">
@@ -63,8 +58,14 @@
       <Region configs={perRegion["linerendering"]} {state} />
       <Region configs={perRegion["pointrendering"]} {state} />
     </div>
-    <div slot="title3">Configuration file</div>
+    
+    <div slot="title3">Advanced functionality</div>
     <div slot="content3">
+      <Region configs={perRegion["advanced"]} {state} />
+      <Region configs={perRegion["expert"]} {state} />
+    </div>
+    <div slot="title4">Configuration file</div>
+    <div slot="content4">
       <div>
         Below, you'll find the raw configuration file in `.json`-format.
         This is mostly for debugging purposes

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 = <UIEventSource<[]>>state.getStoreFor(path);
+    store.data.splice(index, 1)
     values.ping();
+    store.ping()
   }
 
 </script>

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<Record<string, string>>({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 @@
     <span class="alert">{err}</span>
 {:else}
     <div class="w-full flex flex-col">
-      <span class="subtle">{path.join(".")}</span>
         <TagRenderingEditable {config} selectedElement={undefined} showQuestionIfUnknown={true} {state} {tags}/>
     </div>
 {/if}

src/UI/Studio/SchemaBasedMultiType.svelte

@@ -214,5 +214,4 @@
                         path={[...subpath, (subschema?.path?.at(-1) ?? "???")]}></SchemaBasedInput>
     {/each}
   {/if}
-  {chosenOption}
 </div>

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<Set<string>> {
+        const { allFiles } = <{ allFiles: string[] }>(
+            await Utils.downloadJson(this._url + "/overview")
+        )
+        const layers = allFiles
+            .filter((f) => f.startsWith("layers/"))
+            .map((l) => l.substring(l.lastIndexOf("/") + 1, l.length - ".json".length))
+            .filter((layerId) => Constants.priviliged_layers.indexOf(<any>layerId) < 0)
+        return new Set<string>(layers)
+    }
+
+    async fetchLayer(layerId: string, checkNew: boolean = false): Promise<LayerConfigJson> {
+        try {
+            return await Utils.downloadJson(
+                this._url +
+                    "/layers/" +
+                    layerId +
+                    "/" +
+                    layerId +
+                    ".json" +
+                    (checkNew ? ".new.json" : "")
+            )
+        } catch (e) {
+            return undefined
+        }
+    }
+}