From 5d95abf01fcde437c53410ee4babbdcf1fab1a2f Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Mon, 24 Jan 2022 00:24:51 +0100
Subject: [PATCH 1/3] Fix build

---
 Customizations/SharedTagRenderings.ts | 9 +++++++++
 scripts/generateLayerOverview.ts      | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/Customizations/SharedTagRenderings.ts b/Customizations/SharedTagRenderings.ts
index ad0aa83e2a..b0b8681431 100644
--- a/Customizations/SharedTagRenderings.ts
+++ b/Customizations/SharedTagRenderings.ts
@@ -31,14 +31,23 @@ export default class SharedTagRenderings {
 
         if (!iconsOnly) {
             for (const key in questions) {
+                if(key === "id"){
+                    continue
+                }
                 dict.set(key, <TagRenderingConfigJson>questions[key])
             }
         }
         for (const key in icons) {
+            if(key === "id"){
+                continue
+            }
             dict.set(key, <TagRenderingConfigJson>icons[key])
         }
 
         dict.forEach((value, key) => {
+            if(key === "id"){
+                return
+            }
             value.id = value.id ?? key;
         })
 
diff --git a/scripts/generateLayerOverview.ts b/scripts/generateLayerOverview.ts
index f0b63f47fb..2cdc402e18 100644
--- a/scripts/generateLayerOverview.ts
+++ b/scripts/generateLayerOverview.ts
@@ -72,6 +72,9 @@ class LayerOverviewUtils {
         const dict = new Map<string, TagRenderingConfigJson>();
 
         for (const key in questions["default"]) {
+            if(key === "id"){
+                continue
+            }
             questions[key].id = key;
             dict.set(key, <TagRenderingConfigJson>questions[key])
         }
@@ -84,6 +87,9 @@ class LayerOverviewUtils {
         }
 
         dict.forEach((value, key) => {
+            if(key === "id"){
+                return
+            }
             value.id = value.id ?? key;
         })
 

From c5abaac60d3f0fa77eccd7903b0fa8ad50076804 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Mon, 24 Jan 2022 00:53:29 +0100
Subject: [PATCH 2/3] Fix overrideAll-functionality

---
 .../Conversion/LegacyJsonConvert.ts           | 36 +++++++++++++++++--
 assets/themes/speelplekken/speelplekken.json  |  5 ++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
index df9408a8ea..4be0c136a2 100644
--- a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
+++ b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
@@ -1041,15 +1041,47 @@ class AddDefaultLayers extends DesugaringStep<LayoutConfigJson> {
 
 }
 
+export class ApplyOverrideAll extends DesugaringStep<LayoutConfigJson> {
+    
+    constructor() {
+        super("Applies 'overrideAll' onto every 'layer'. The 'overrideAll'-field is removed afterwards",["overrideAll","layers"]);
+    }
+
+    convert(state: DesugaringContext, json: LayoutConfigJson, context: string): { result: LayoutConfigJson; errors: string[]; warnings: string[] } {
+        
+        const overrideAll = json.overrideAll;
+        if(overrideAll === undefined){
+            return {result :json, warnings: [], errors: []}
+        }
+        
+        json = {...json}
+        
+        delete json.overrideAll
+        const newLayers = []
+        for (let layer of json.layers) {
+            layer = {...<LayerConfigJson>layer}
+            Utils.Merge(overrideAll,  layer)
+            newLayers.push(layer)
+        }
+        json.layers = newLayers
+        
+        
+        return {result :json, warnings: [], errors: []};
+    }
+    
+}
+
 export class PrepareTheme extends Fuse<LayoutConfigJson> {
     constructor() {
         super(
             "Fully prepares and expands a theme",
             new OnEveryConcat("layers", new SubstituteLayer()),
             new SetDefault("socialImage", "assets/SocialImage.png", true),
-            new AddDefaultLayers(),
-            new AddDependencyLayersToTheme(),
             new OnEvery("layers", new PrepareLayer()),
+            new ApplyOverrideAll(),
+            new AddDefaultLayers(),
+            
+            new AddDependencyLayersToTheme(),
             new OnEvery("layers", new AddMiniMap())
         );
     }
diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json
index adf40461a3..226c789153 100644
--- a/assets/themes/speelplekken/speelplekken.json
+++ b/assets/themes/speelplekken/speelplekken.json
@@ -277,11 +277,10 @@
         "render": "<iframe style='width: 100%; height: 300px' src=\"https://www.youtube-nocookie.com/embed/{_video:id}\" title=\"YouTube video player\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen></iframe>"
       }
     ],
-    "+iconOverlays": [
+    "+iconBadges": [
       {
         "if": "_video:id~*",
-        "then": "./assets/themes/speelplekken/youtube.svg",
-        "badge": true
+        "then": "./assets/themes/speelplekken/youtube.svg"
       }
     ],
     "isShown": {

From f0b79fe1d55a49399f7d16fd448f69cc655b7b6a Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Mon, 24 Jan 2022 00:53:47 +0100
Subject: [PATCH 3/3] Version bump

---
 Models/Constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Models/Constants.ts b/Models/Constants.ts
index 78f81b633c..4407fbacfc 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -2,7 +2,7 @@ import {Utils} from "../Utils";
 
 export default class Constants {
 
-    public static vNumber = "0.14.1";
+    public static vNumber = "0.14.2";
     public static ImgurApiKey = '7070e7167f0a25a'
     public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85"