From be3ac93ecae43e3ec9b87a69998064351489a5e3 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Thu, 4 Nov 2021 22:34:22 +0100
Subject: [PATCH] Fix rotation attribute, small fixes to hackerspace theme

---
 Models/ThemeConfig/PointRenderingConfig.ts   | 2 +-
 assets/themes/hackerspaces/hackerspaces.json | 5 +----
 langs/themes/de.json                         | 7 -------
 langs/themes/en.json                         | 7 -------
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Models/ThemeConfig/PointRenderingConfig.ts b/Models/ThemeConfig/PointRenderingConfig.ts
index 666f9d0479..90fde701d4 100644
--- a/Models/ThemeConfig/PointRenderingConfig.ts
+++ b/Models/ThemeConfig/PointRenderingConfig.ts
@@ -132,7 +132,7 @@ export default class PointRenderingConfig extends WithContextLoader {
             return undefined;
         }
         return new VariableUiElement(tags.map(tags => {
-            const rotation = self.rotation?.GetRenderValue(tags)?.txt ?? "0deg"
+            const rotation = Utils.SubstituteKeys(self.rotation?.GetRenderValue(tags)?.txt ?? "0deg", tags)
             
             const htmlDefs = Utils.SubstituteKeys(self.icon.GetRenderValue(tags)?.txt, tags)
             let defaultPin : BaseUIElement = undefined
diff --git a/assets/themes/hackerspaces/hackerspaces.json b/assets/themes/hackerspaces/hackerspaces.json
index f177c45917..3b6ded6998 100644
--- a/assets/themes/hackerspaces/hackerspaces.json
+++ b/assets/themes/hackerspaces/hackerspaces.json
@@ -224,10 +224,7 @@
                     "hackerspace=makerspace"
                   ]
                 },
-                "then": {
-                  "en": "./assets/themes/hackerspaces/led.png",
-                  "de": "./assets/themes/hackerspaces/led.png"
-                }
+                "then":  "./assets/themes/hackerspaces/led.png"
               }
             ]
           },
diff --git a/langs/themes/de.json b/langs/themes/de.json
index f375807f57..aa51b8a747 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -769,13 +769,6 @@
         "layers": {
             "0": {
                 "description": "Hackerspace",
-                "icon": {
-                    "mappings": {
-                        "0": {
-                            "then": "./assets/themes/hackerspaces/led.png"
-                        }
-                    }
-                },
                 "name": "Hackerspace",
                 "presets": {
                     "0": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index cedade2d0b..37cd656030 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -809,13 +809,6 @@
         "layers": {
             "0": {
                 "description": "Hackerspace",
-                "icon": {
-                    "mappings": {
-                        "0": {
-                            "then": "./assets/themes/hackerspaces/led.png"
-                        }
-                    }
-                },
                 "name": "Hackerspace",
                 "presets": {
                     "0": {