Fix: fix sauna theme

assets/layers/sauna_at_leisure/sauna_at_leisure.json

@@ -30,8 +30,7 @@
     "images",
     "reviews",
     {
-      "builtin": "toilet_at_amenity.toilet-access",
+      "id": "sauna_access",
-      "override": {
       "condition": "leisure!=water_park",
       "question": {
         "en": "Is this sauna publicly accessible?",
@@ -39,16 +38,7 @@
       },
       "render": {
         "en": "Access is {sauna:access}",
-          "de": "Zugang ist {sauna:access}",
+        "de": "Zugang ist {sauna:access}"
-          "fr": "{sauna:access}",
-          "nl": "{sauna:access}",
-          "it": "{sauna:access}",
-          "es": "{sauna:access}",
-          "da": "{sauna:access}",
-          "ca": "{sauna:access}",
-          "cs": "{sauna:access}",
-          "sl": "{sauna:access}",
-          "uk": "{sauna:access}"
       },
       "freeform": {
         "key": "sauna:access"
@@ -113,7 +103,6 @@
           "hideInAnswer": true
         }
       ]
-      }
     },
     "contact",
     "fixme"

assets/themes/sauna/sauna.json

@@ -6,8 +6,8 @@
     "en": "Sauna"
   },
   "layers": [
-    "./assets/layers/sauna/sauna.json",
+    "sauna",
-    "./assets/layers/sauna/sauna_at_leisure.json"
+    "sauna_at_leisure"
   ],
   "description": {
     "en": "Sauna"

src/Models/ThemeConfig/Conversion/AddPrefixToTagRenderingConfig.ts

@@ -6,6 +6,7 @@ import {
     MappingConfigJson,
     QuestionableTagRenderingConfigJson,
 } from "../Json/QuestionableTagRenderingConfigJson"
+import { Utils } from "../../../Utils"
 
 export default class AddPrefixToTagRenderingConfig extends DesugaringStep<QuestionableTagRenderingConfigJson> {
     private readonly _prefix: string
@@ -18,6 +19,40 @@ export default class AddPrefixToTagRenderingConfig extends DesugaringStep<Questi
         this._prefix = prefix
     }
 
+    /**
+     *
+     * new AddPrefixToTagRenderingConfig("PREFIX").rewriteArguments("Some argument with a {key}") // => "Some argument with a {PREFIX:key}"
+     *
+     * // Don't rewrite metatags
+     * new AddPrefixToTagRenderingConfig("PREFIX").rewriteArguments("Some argument with a {_calculated_key}") // => "Some argument with a {_calculated_key}"
+     *
+
+     */
+    private rewriteArguments(txt: string) {
+        const regex = /(.*?){([^}]*)}(.*)/s
+        let match = txt.match(regex)
+        if (!match) {
+            return txt
+        }
+        let result = ""
+        while (match) {
+            const [_, normal, key, leftover] = match
+            if (key.startsWith("_")) {
+                result += normal + "{" + key + "}"
+            } else {
+                result += normal + "{" + this._prefix + ":" + key + "}"
+            }
+            match = leftover.match(regex)
+            if (!match) {
+                result += leftover
+            }
+        }
+        if(txt !== result){
+            console.log(">>> Rewritten", txt, "into", result)
+        }
+        return result
+    }
+
     /**
      *
      * const edit = new AddPrefixToTagRenderingConfig("PREFIX")
@@ -29,6 +64,9 @@ export default class AddPrefixToTagRenderingConfig extends DesugaringStep<Questi
      *
      * // Should prefix the default key in a special visualisation
      * new AddPrefixToTagRenderingConfig("PREFIX").updateString("{opening_hours_table()}") // => "{opening_hours_table(PREFIX:opening_hours,,)}"
+     *
+     * // Should prefix links, e.g. for 'phone'
+     * new AddPrefixToTagRenderingConfig("PREFIX").updateString("{link({phone},tel:{phone},,,,)}") // => "{link({PREFIX:phone},tel:{PREFIX:phone},,,,)}"
      */
     private updateString(str: string): string {
         const parsed = SpecialVisualizations.constructSpecification(str)
@@ -45,7 +83,7 @@ export default class AddPrefixToTagRenderingConfig extends DesugaringStep<Questi
                     if (argDoc.type === "key") {
                         newArgs.push(this._prefix + ":" + (argV ?? argDoc.defaultValue ?? ""))
                     } else {
-                        newArgs.push(argV ?? "")
+                        newArgs.push(this.rewriteArguments(argV ?? ""))
                     }
                 }
                 fixedSpec.push("{" + spec.func.funcName + "(" + newArgs.join(",") + ")}")