Some refactoring, more work on the custom theme generator

Customizations/AllKnownLayouts.ts

@@ -13,6 +13,8 @@ import {MetaMap} from "./Layouts/MetaMap";
 import {Natuurpunt} from "./Layouts/Natuurpunt";
 import {Bookcases} from "./Layouts/Bookcases";
 import {GhostBikes} from "./Layouts/GhostBikes";
+import * as bookcases from "../assets/themes/bookcases/Bookcases.json";
+import {CustomLayoutFromJSON} from "./JSON/CustomLayoutFromJSON";
 
 export class AllKnownLayouts {
 
@@ -24,22 +26,26 @@ export class AllKnownLayouts {
         new GRB(),
         new Cyclofix(),
         new GhostBikes(),
-        new Bookcases(),
+       // new Bookcases(),
+        CustomLayoutFromJSON.LayoutFromJSON(bookcases),
         new MetaMap(),
         new StreetWidth(),
         new ClimbingTrees(),
         new Artworks(),
         new Smoothness(),
         new Groen(),
+        
         /*
         new Toilets(),
         */
     ];
+    
 
     public static allSets: Map<string, Layout> = AllKnownLayouts.AllLayouts();
 
     private static AllLayouts(): Map<string, Layout> {
 
+
         const all = new All();
         this.allLayers = new Map<string, LayerDefinition>();
         for (const layout of this.layoutsList) {

Customizations/JSON/CustomLayoutFromJSON.ts

@@ -127,7 +127,6 @@ export class CustomLayoutFromJSON {
         icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgaWQ9InN2ZzExMzgyIgogICBoZWlnaHQ9IjkwMCIKICAgd2lkdGg9IjkwMCIKICAgdmVyc2lvbj0iMS4wIj4KICA8bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGExMCI+CiAgICA8cmRmOlJERj4KICAgICAgPGNjOldvcmsKICAgICAgICAgcmRmOmFib3V0PSIiPgogICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PgogICAgICAgIDxkYzp0eXBlCiAgICAgICAgICAgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIgLz4KICAgICAgICA8ZGM6dGl0bGU+PC9kYzp0aXRsZT4KICAgICAgPC9jYzpXb3JrPgogICAgPC9yZGY6UkRGPgogIDwvbWV0YWRhdGE+CiAgPGRlZnMKICAgICBpZD0iZGVmczExMzg0IiAvPgogIDxnCiAgICAgaWQ9ImxheWVyMSIKICAgICB0cmFuc2Zvcm09Im1hdHJpeCgwLjkwMTAzMjU4LDAsMCwwLjkwMTAzMjU4LDExMi44NDA1OCwtMS45MDYwMTc3KSI+CiAgICA8ZwogICAgICAgaWQ9ImcxMTQ3NiI+CiAgICAgIDxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTE0NzIiCiAgICAgICAgIHN0eWxlPSJmb250LXN0eWxlOm5vcm1hbDtmb250LXdlaWdodDpub3JtYWw7Zm9udC1zaXplOjEyMDEuOTI0OTI2NzZweDtmb250LWZhbWlseTonQml0c3RyZWFtIFZlcmEgU2Fucyc7dGV4dC1hbGlnbjpjZW50ZXI7dGV4dC1hbmNob3I6bWlkZGxlO2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MXB4O3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO3N0cm9rZS1vcGFjaXR5OjEiCiAgICAgICAgIGQ9Ik0gNDc0LjUwODg4LDcxOC4yMjg0MSBIIDMwMy40OTU0NyB2IC0yMi4zMDEzNCBjIC0yLjRlLTQsLTM3Ljk1MTA4IDQuMzAzNTIsLTY4Ljc2MjExIDEyLjkxMTMsLTkyLjQzMzE5IDguNjA3MjgsLTIzLjY3MDMyIDIzLjYzMzUyLC00NS4yODY5NSA0MC42NTMyNCwtNjQuODQ5OTYgMTcuMDE5MTQsLTE5LjU2MjExIDQxLjk4NzM0LC0yNi4zMzI2NCAxMDEuNDU3OTMsLTc1LjYzMDg1IDMxLjY5MDk1LC0yNS44MjIwMyA1NS4yODEzLC03Ny4xNTIzIDU1LjI4MTc1LC05OC42NzE3NCAyLjIxMjMyLC01Ni45MjI0NSAtMTMuOTM5ODMsLTc5LjM0MjIgLTM0LjU2Mjg3LC05OS45NjUyNCAtMjIuNjczNTUsLTE5LjY3NzE3IC02MC42NzAyNywtMzAuMDY5OTggLTkwLjk5ODkyLC0zMC4wNjk5OCAtMjcuNzc5MjEsNi45ZS00IC02OC40NjczNSw4LjA4ODcxIC04Ny43NjY2LDI1LjM3MDQ3IC0yNS45MzgxNywxNy4yODMwOCAtNjUuMjM3NDcsNzMuNzA2MTEgLTU3LjA0Njg3LDEzMC41NDU3NyBsIC0xOTQuNTE2OTQzLDEuNzAyMjIgYyAwLC0xNTcuMjEzOTkgMjkuMzkzNjk5LC0xOTguNjk0NjUgOTkuMDA0MTEzLC0yNjMuMDMwMzIgNjcuMzk3MzksLTU0LjM3NjY0MyAxMjYuNTMxMjgsLTczLjI2ODM2NSAyNDMuODQ3NTcsLTczLjI2ODM2NSA4OS43MTc5MSwwIDE2MS44OTcyOCwxNy44MDI4MSAyMTQuMzI1NTIsNTMuNDA1ODU1IDcxLjIwNzE0LDQ4LjEyNDcyIDEyMi4zMDEwNSwxMTEuMTgzNTQgMTIyLjMwMTA1LDIzMC4xMTI4MSAtNi45ZS00LDQ0LjMyMDgxIC0xOS4xNTI1Myw5MC43ODYzOCAtNDMuMDcyNiwxMjguMzMyOTkgLTE4LjM4OTQ3LDMwLjkwOTM4IC02MC4zNzUxMSw2Ni40NTIzNiAtMTE4LjIxMjM3LDEwNC40MTYyOCAtNDIuODM2MDcsMjUuNzY4NiAtNjYuNjcxOTYsNTMuMTE5MjYgLTc3LjAzOTY0LDcyLjA5NDYgLTEwLjM2ODYzLDE4Ljk3NjAzIC0xNS41NTI3MSw0My43MjI2NyAtMTUuNTUyMjUsNzQuMjM5OTkgeiIgLz4KICAgICAgPHBhdGgKICAgICAgICAgaWQ9InBhdGgxMTQ3NCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MztzdHJva2UtbGluZWNhcDpzcXVhcmU7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLWRhc2hhcnJheTpub25lO3N0cm9rZS1kYXNob2Zmc2V0OjA7c3Ryb2tlLW9wYWNpdHk6MSIKICAgICAgICAgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMS4xMDYzODMsLTUuNTMxOTE0OSkiCiAgICAgICAgIGQ9Im0gNDgyLjM4Mjk4LDg2OS44MDkwMiBhIDk0LjA0MjU1Nyw3My4wMjEyNzggMCAxIDEgLTE4OC4wODUxMSwwIDk0LjA0MjU1Nyw3My4wMjEyNzggMCAxIDEgMTg4LjA4NTExLDAgeiIgLz4KICAgIDwvZz4KICA8L2c+Cjwvc3ZnPgo="
     }
 
-
     public static FromQueryParam(layoutFromBase64: string): Layout {
         if(layoutFromBase64 === "test"){
             console.log(btoa(JSON.stringify(CustomLayoutFromJSON.exampleLayout)));
@@ -259,7 +258,7 @@ export class CustomLayoutFromJSON {
         return new Translation(json);
     }
 
-    private static LayoutFromJSON(json: any) {
+    public static LayoutFromJSON(json: any) {
         const t = CustomLayoutFromJSON.MaybeTranslation;
         const layout = new Layout(json.name,
             [json.language],
@@ -274,9 +273,4 @@ export class CustomLayoutFromJSON {
         return layout;
     }
 
-
-    public static TagRenderingOptionsFromJson(spec: any): TagRenderingOptions {
-        return new TagRenderingOptions(spec);
-    }
-
 }

Customizations/Layers/Widths.ts

@@ -1,6 +1,5 @@
 import {LayerDefinition} from "../LayerDefinition";
 import {And, Not, Or, Tag} from "../../Logic/TagsFilter";
-import {UIEventSource} from "../../UI/UIEventSource";
 import {Park} from "./Park";
 import {TagRenderingOptions} from "../TagRenderingOptions";
 

Customizations/Layouts/StreetWidth.ts

@@ -1,7 +1,6 @@
 import {Layout} from "../Layout";
 import * as Layer from "../Layers/Bookcases";
 import {Widths} from "../Layers/Widths";
-import {UIEventSource} from "../../UI/UIEventSource";
 
 export class StreetWidth extends Layout{
     

Customizations/OnlyShowIf.ts

@@ -4,7 +4,7 @@
 import {TagDependantUIElement, TagDependantUIElementConstructor} from "./UIElementConstructor";
 import {TagsFilter, TagUtils} from "../Logic/TagsFilter";
 import {UIElement} from "../UI/UIElement";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "../Logic/UIEventSource";
 import {Changes} from "../Logic/Osm/Changes";
 
 

Customizations/Questions/AccessTag.ts

@@ -1,4 +1,3 @@
-import {UIEventSource} from "../../UI/UIEventSource";
 import {Changes} from "../../Logic/Osm/Changes";
 import {And, Tag} from "../../Logic/TagsFilter";
 import {TagRenderingOptions} from "../TagRenderingOptions";

Customizations/Questions/OperatorTag.ts

@@ -1,4 +1,3 @@
-import {UIEventSource} from "../../UI/UIEventSource";
 import {Changes} from "../../Logic/Osm/Changes";
 import {Tag} from "../../Logic/TagsFilter";
 import {TagRenderingOptions} from "../TagRenderingOptions";

Customizations/TagRendering.ts

@@ -1,5 +1,5 @@
 import {UIElement} from "../UI/UIElement";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "../Logic/UIEventSource";
 import {And, Tag, TagsFilter, TagUtils} from "../Logic/TagsFilter";
 import {FixedUiElement} from "../UI/Base/FixedUiElement";
 import {SaveButton} from "../UI/SaveButton";

Customizations/TagRenderingOptions.ts

@@ -4,7 +4,7 @@ import {parsePhoneNumberFromString} from "libphonenumber-js";
 import {UIElement} from "../UI/UIElement";
 import {TagsFilter, TagUtils} from "../Logic/TagsFilter";
 import {OnlyShowIfConstructor} from "./OnlyShowIf";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export class TagRenderingOptions implements TagDependantUIElementConstructor {
 

Customizations/UIElementConstructor.ts

@@ -1,5 +1,5 @@
-import {UIEventSource} from "../UI/UIEventSource";
 import {UIElement} from "../UI/UIElement";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 
 export interface Dependencies {

Customizations/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+  },
+  "exclude": [
+    "node_modules"
+  ]
+}