From 42c5272a0c0378cb5468ea2991fb4f23caee793e Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Thu, 17 Mar 2022 22:03:41 +0100
Subject: [PATCH] Remove some shadowed mappings, improve error message

---
 Models/ThemeConfig/Conversion/Validation.ts |  8 +++++++-
 assets/themes/buurtnatuur/buurtnatuur.json  | 11 +----------
 assets/themes/campersite/campersite.json    |  8 ++------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Models/ThemeConfig/Conversion/Validation.ts b/Models/ThemeConfig/Conversion/Validation.ts
index f8174c5b0e..46d426793b 100644
--- a/Models/ThemeConfig/Conversion/Validation.ts
+++ b/Models/ThemeConfig/Conversion/Validation.ts
@@ -276,7 +276,13 @@ export class DetectShadowedMappings extends DesugaringStep<TagRenderingConfigJso
     The mapping ${parsedConditions[i].asHumanString(false, false, {})} is fully matched by a previous mapping (namely ${j}), which matches:
     ${parsedConditions[j].asHumanString(false, false, {})}.
     
-    Move the mapping up to fix this problem
+    To fix this problem, you can try to:
+    - Move the shadowed mapping up
+    - Use "addExtraTags": ["key=value", ...] in order to avoid a different rendering
+         (e.g. [{"if": "fee=no",                     "then": "Free to use", "hideInAnswer":true},
+                {"if": {"and":["fee=no","charge="]}, "then": "Free to use"}]
+          can be replaced by
+               [{"if":"fee=no", "then": "Free to use", "addExtraTags": ["charge="]}]
 `)
                 }
             }
diff --git a/assets/themes/buurtnatuur/buurtnatuur.json b/assets/themes/buurtnatuur/buurtnatuur.json
index 97526b843c..7053975479 100644
--- a/assets/themes/buurtnatuur/buurtnatuur.json
+++ b/assets/themes/buurtnatuur/buurtnatuur.json
@@ -538,16 +538,7 @@
               ]
             },
             "then": "Beheer door een privépersoon",
-            "hideInAnswer": true
-          },
-          {
-            "if": {
-              "and": [
-                "operator:type=private",
-                "operator="
-              ]
-            },
-            "then": "Beheer door een privépersoon"
+            "addExtraTags": ["operator="]
           }
         ],
         "condition": {
diff --git a/assets/themes/campersite/campersite.json b/assets/themes/campersite/campersite.json
index bc792011e4..fedd612766 100644
--- a/assets/themes/campersite/campersite.json
+++ b/assets/themes/campersite/campersite.json
@@ -199,12 +199,8 @@
                 "nl": "Kan gratis gebruikt worden",
                 "pt_BR": "Pode ser usado de graça",
                 "de": "Nutzung kostenlos"
-              }
-            },
-            {
-              "if": "fee=no",
-              "then": "Can be used for free",
-              "hideInAnswer": true
+              },
+              "addExtraTags": ["charge="]
             }
           ]
         },