Add custom generator link in morescreen, fix #95

Customizations/AllKnownLayouts.ts

@@ -38,9 +38,6 @@ export class AllKnownLayouts {
         new Smoothness(),
         new Groen(),
 
-        /*
-        new Toilets(),
-        */
     ];
     
 

Customizations/JSON/CustomLayoutFromJSON.ts

@@ -9,17 +9,18 @@ import {ImageCarouselWithUploadConstructor} from "../../UI/Image/ImageCarouselWi
 import {UIEventSource} from "../../Logic/UIEventSource";
 import {TagDependantUIElementConstructor} from "../UIElementConstructor";
 import {Map} from "../Layers/Map";
+import {UIElement} from "../../UI/UIElement";
 
 
 export interface TagRenderingConfigJson {   
     // If this key is present, then...
     key?: string,
     // Use this string to render
-    render: string,
+    render?: string | any,
     // One of string, int, nat, float, pfloat, email, phone. Default: string
     type?: string,
     // If it is not known (and no mapping below matches), this question is asked; a textfield is inserted in the rendering above
-    question?: string,
+    question?: string | any,
     // If a value is added with the textfield, this extra tag is addded. Optional field
     addExtraTags?: string | { k: string, v: string }[];
     // Extra tags: rendering is only shown/asked if these tags are present
@@ -29,7 +30,7 @@ export interface TagRenderingConfigJson {
     mappings?:
         {
             if: string,
-            then: string
+            then: string | any
         }[]
 }
 
@@ -43,23 +44,27 @@ export interface LayerConfigJson {
     color?: TagRenderingConfigJson;
     width?: TagRenderingConfigJson;
     overpassTags: string | { k: string, v: string }[];
-    wayHandling: number,
-    presets: Preset[]
-    ,
+    wayHandling?: number,
+    presets: {
+        tags: string,
+        title: string | any,
+        description?: string | any,
+        icon?: string
+    }[],
     tagRenderings: TagRenderingConfigJson []
 }
 
 export interface LayoutConfigJson {
-    widenFactor: number;
+    widenFactor?: number;
     name: string;
-    title: string;
-    description: string;
+    title: string | any;
+    description: string | any;
     maintainer: string;
-    language: string[];
+    language: string | string[];
     layers: LayerConfigJson[],
-    startZoom: number;
-    startLat: number;
-    startLon: number;
+    startZoom: string | number;
+    startLat: string | number;
+    startLon: string | number;
     /**
      * Either a URL or a base64 encoded value (which should include 'data:image/svg+xml;base64,'
      */
@@ -271,17 +276,19 @@ export class CustomLayoutFromJSON {
 
     public static LayoutFromJSON(json: LayoutConfigJson) {
         const t = CustomLayoutFromJSON.MaybeTranslation;
-        let languages = json.language;
+        let languages : string[] ;
         if(typeof (json.language) === "string"){
             languages = [json.language];
+        }else{
+            languages = json.language
         }
         const layout = new Layout(json.name,
             languages,
             t(json.title),
             json.layers.map(CustomLayoutFromJSON.LayerFromJson),
-            json.startZoom,
-            json.startLat,
-            json.startLon,
+            parseInt(""+json.startZoom),
+            parseFloat(""+json.startLat),
+            parseFloat(""+json.startLon),
             new Combine(['<h3>', t(json.title), '</h3><br/>', t(json.description)])
         );
         layout.icon = json.icon;

Customizations/LayerDefinition.ts

@@ -3,7 +3,7 @@ import {UIElement} from "../UI/UIElement";
 import {TagDependantUIElementConstructor} from "./UIElementConstructor";
 import {TagRenderingOptions} from "./TagRenderingOptions";
 import Translation from "../UI/i18n/Translation";
-import {LayerConfigJson} from "./JSON/CustomLayoutFromJSON";
+import {LayerConfigJson, TagRenderingConfigJson} from "./JSON/CustomLayoutFromJSON";
 
 export interface Preset {
     tags: Tag[],
@@ -128,7 +128,7 @@ export class LayerDefinition {
         this.wayHandling = options.wayHandling ?? LayerDefinition.WAYHANDLING_DEFAULT;
     }
 
-
+/*
     ToJson() {
 
         function t(translation: string | Translation | UIElement) {
@@ -144,8 +144,16 @@ export class LayerDefinition {
             return translation.InnerRender();
         }
 
+        function tr(tagRendering : TagRenderingOptions) : TagRenderingConfigJson{
+            const o = tagRendering.options;
+            return {
+                key: o.freeform.key,
+                render: o.freeform.renderTemplate,
+                type: o.freeform.template.
+            }
+        }
         
-        const layerConfig /* : LayerConfigJson */= {
+        const layerConfig  : LayerConfigJson = {
             name: t(this.name),
             description: t(this.description),
             maxAllowedOverlapPercentage: this.maxAllowedOverlapPercentage,
@@ -161,5 +169,5 @@ export class LayerDefinition {
         };
         
         return JSON.stringify(layerConfig)
-    }
+    }*/
 }