Themes(trees): refactor some special renderings, mark as not inline, fix #2469

assets/layers/tree/tree.json

@@ -1,5 +1,5 @@
 {
-  "id": "tree_node",
+  "id": "tree",
   "name": {
     "en": "Tree",
     "ca": "Arbre",
@@ -96,7 +96,7 @@
         },
         {
           "icon": {
-            "render": "./assets/layers/tree_node/unknown.svg",
+            "render": "./assets/layers/tree/unknown.svg",
             "mappings": [
               {
                 "if": {
@@ -104,7 +104,7 @@
                     "leaf_type=broadleaved"
                   ]
                 },
-                "then": "./assets/layers/tree_node/broadleaved.svg"
+                "then": "./assets/layers/tree/broadleaved.svg"
               },
               {
                 "if": {
@@ -112,7 +112,7 @@
                     "leaf_type=needleleaved"
                   ]
                 },
-                "then": "./assets/layers/tree_node/needleleaved.svg"
+                "then": "./assets/layers/tree/needleleaved.svg"
               },
               {
                 "if": {
@@ -120,7 +120,7 @@
                     "leaf_type=palm"
                   ]
                 },
-                "then": "./assets/layers/tree_node/palm.svg"
+                "then": "./assets/layers/tree/palm.svg"
               }
             ]
           }
@@ -272,6 +272,7 @@
       "freeform": {
         "key": "species:wikidata",
         "type": "wikidata",
+        "inline": false,
         "helperArgs": [
           "species",
           {
@@ -578,7 +579,7 @@
           },
           "icon": {
             "class": "small",
-            "path": "./assets/layers/tree_node/broadleaved.svg"
+            "path": "./assets/layers/tree/broadleaved.svg"
           }
         },
         {
@@ -601,7 +602,7 @@
           },
           "icon": {
             "class": "small",
-            "path": "./assets/layers/tree_node/needleleaved.svg"
+            "path": "./assets/layers/tree/needleleaved.svg"
           }
         },
         {
@@ -626,7 +627,7 @@
           "hideInAnswer": true,
           "icon": {
             "class": "small",
-            "path": "./assets/layers/tree_node/leafless.svg"
+            "path": "./assets/layers/tree/leafless.svg"
           }
         },
         {
@@ -714,7 +715,7 @@
       }
     },
     {
-      "id": "tree_node-name",
+      "id": "tree-name",
       "question": {
         "en": "Does the tree have a name?",
         "ca": "Té nom aquest arbre?",
@@ -819,7 +820,7 @@
           },
           "icon": {
             "class": "small",
-            "path": "./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg"
+            "path": "./assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg"
           }
         },
         {
@@ -915,7 +916,7 @@
       }
     },
     {
-      "id": "tree_node-ref:OnroerendErfgoed",
+      "id": "tree-ref:OnroerendErfgoed",
       "question": {
         "en": "What is the ID issued by Onroerend Erfgoed Flanders?",
         "ca": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?",
@@ -929,17 +930,25 @@
         "pt": "Qual é o ID emitido por Onroerend Erfgoed Flanders?"
       },
       "render": {
-        "en": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "ca": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/>Identifiació Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "cs": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "da": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "de": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed Kennung: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "es": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> ID de Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "fr": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Identifiant Onroerend Erfgoed : <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "it": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> ID Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "nl": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed-ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "ru": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+        "before": {
+          "en": "Onroerend Erfgoed ID: ",
+          "ca": "Identifiació Onroerend Erfgoed: ",
+          "cs": "Onroerend Erfgoed ID: ",
+          "da": "Onroerend Erfgoed ID: ",
+          "de": "Onroerend Erfgoed Kennung: ",
+          "es": "ID de Onroerend Erfgoed: ",
+          "fr": "Identifiant Onroerend Erfgoed : ",
+          "it": "ID Onroerend Erfgoed: ",
+          "nl": "Onroerend Erfgoed-ID: ",
+          "ru": "Onroerend Erfgoed ID:"
+        },
+        "special": {
+          "type": "link",
+          "href": "https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}",
+          "text": "{ref:OnroerendErfgoed}"
+        }
       },
+      "icon": "./assets/layers/tree/Onroerend_Erfgoed_logo_without_text.svg",
       "freeform": {
         "key": "ref:OnroerendErfgoed",
         "type": "nat"
@@ -966,16 +975,9 @@
         "pt": "Qual é o ID do Wikidata para esta árvore?"
       },
       "render": {
-        "en": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "ca": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/>Wikidata<a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "cs": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "da": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "de": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "es": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "fr": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata : <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "it": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "nl": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "ru": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+        "special": {
+          "type": "wikipedia"
+        }
       },
       "freeform": {
         "key": "wikidata",
@@ -990,9 +992,6 @@
       }
     }
   ],
-  "deletion": {
-    "minNeededChangesets": 5
-  },
   "allowMove": {
     "enableRelocation": false,
     "enableImproveAccuracy": true

assets/themes/nature/nature.json

@@ -78,7 +78,7 @@
       }
     },
     {
-      "builtin": "tree_node",
+      "builtin": "tree",
       "override": {
         "minzoom": 18,
         "isCounted": false,

assets/themes/trees/trees.json

@@ -74,7 +74,7 @@
     "Midgard"
   ],
   "layers": [
-    "tree_node"
+    "tree"
   ],
   "osmApiTileSize": 18,
   "widenFactor": 0.2

langs/layers/ca.json

@@ -12584,7 +12584,7 @@
             "render": "Parada de transport públic"
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "Una capa que mostra arbres",
         "name": "Arbre",
         "presets": {
@@ -12685,10 +12685,7 @@
                 },
                 "question": "És un arbre de fulla ampla o d'agulla?"
             },
-            "tree-species-wikidata": {
-                "question": "De quina espècie és aquest arbre?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "L'arbre no té nom."
@@ -12697,13 +12694,17 @@
                 "question": "Té nom aquest arbre?",
                 "render": "Nom : {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/>Identifiació Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "Identifiació Onroerend Erfgoed: "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "De quina espècie és aquest arbre?"
             },
             "tree_node-wikidata": {
-                "question": "Quin és l'identificador de Wikidata d'aquest arbre?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/>Wikidata<a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "Quin és l'identificador de Wikidata d'aquest arbre?"
             }
         },
         "title": {

langs/layers/cs.json

@@ -13370,7 +13370,7 @@
             "render": "Tranzitní zastávka"
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "Vrstva zobrazující stromy",
         "name": "Strom",
         "presets": {
@@ -13477,10 +13477,7 @@
                 },
                 "question": "Jedná se o listnatý nebo jehličnatý strom?"
             },
-            "tree-species-wikidata": {
-                "question": "Jaký druh je tento strom?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "Strom nemá jméno."
@@ -13489,13 +13486,17 @@
                 "question": "Má strom nějaké jméno?",
                 "render": "Jméno: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "Jaké je ID vydané společností Onroerend Erfgoed Flanders?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "Onroerend Erfgoed ID: "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "Jaký druh je tento strom?"
             },
             "tree_node-wikidata": {
-                "question": "Jaké je ID Wikidata pro tento strom?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "Jaké je ID Wikidata pro tento strom?"
             }
         },
         "title": {

langs/layers/cy.json

@@ -835,7 +835,7 @@
             }
         }
     },
-    "tree_node": {
+    "tree": {
         "name": "Coeden",
         "tagRenderings": {
             "tree-decidouous": {

langs/layers/da.json

@@ -3510,7 +3510,7 @@
             "render": "Stoppested"
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "Et lag, der viser træer",
         "name": "Træ",
         "presets": {
@@ -3597,10 +3597,7 @@
                     }
                 }
             },
-            "tree-species-wikidata": {
-                "question": "Hvilken art er dette træ?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "Træet har ikke et navn."
@@ -3609,13 +3606,17 @@
                 "question": "Har træet et navn?",
                 "render": "Navn: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "Hvad er ID udstedt af Onroerend Erfgoed Flanders?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "Onroerend Erfgoed ID: "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "Hvilken art er dette træ?"
             },
             "tree_node-wikidata": {
-                "question": "Hvad er Wikidata-id'et for dette træ?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "Hvad er Wikidata-id'et for dette træ?"
             }
         },
         "title": {

langs/layers/de.json

@@ -12573,7 +12573,7 @@
             "render": "Haltestelle"
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "Eine Ebene, die Bäume zeigt",
         "name": "Bäume",
         "presets": {
@@ -12674,10 +12674,7 @@
                 },
                 "question": "Ist dies ein Laub- oder Nadelbaum?"
             },
-            "tree-species-wikidata": {
-                "question": "Um welche Baumart handelt es sich?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "Der Baum hat keinen Namen."
@@ -12686,13 +12683,17 @@
                 "question": "Hat der Baum einen Namen?",
                 "render": "Name: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "Wie lautet die Kennung der Onroerend Erfgoed Flanders?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed Kennung: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "Onroerend Erfgoed Kennung: "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "Um welche Baumart handelt es sich?"
             },
             "tree_node-wikidata": {
-                "question": "Was ist das passende Wikidata Element zu diesem Baum?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "Was ist das passende Wikidata Element zu diesem Baum?"
             }
         },
         "title": {

langs/layers/en.json

@@ -13690,7 +13690,7 @@
             "render": "Transit Stop"
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "A layer showing trees",
         "name": "Tree",
         "presets": {
@@ -13797,10 +13797,7 @@
                 },
                 "question": "Is this a broadleaved or needleleaved tree?"
             },
-            "tree-species-wikidata": {
-                "question": "What species is this tree?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "The tree does not have a name."
@@ -13809,13 +13806,17 @@
                 "question": "Does the tree have a name?",
                 "render": "Name: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "What is the ID issued by Onroerend Erfgoed Flanders?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "Onroerend Erfgoed ID: "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "What species is this tree?"
             },
             "tree_node-wikidata": {
-                "question": "What is the Wikidata ID for this tree?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "What is the Wikidata ID for this tree?"
             }
         },
         "title": {

langs/layers/eo.json

@@ -211,9 +211,9 @@
             }
         }
     },
-    "tree_node": {
+    "tree": {
         "tagRenderings": {
-            "tree_node-name": {
+            "tree-name": {
                 "render": "Nomo: {name}"
             }
         },

langs/layers/es.json

@@ -11452,7 +11452,7 @@
             "render": "Parada de transporte"
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "Una capa que muestra árboles",
         "name": "Árbol",
         "presets": {
@@ -11553,10 +11553,7 @@
                 },
                 "question": "¿Es este un árbol de hoja ancha o acicular?"
             },
-            "tree-species-wikidata": {
-                "question": "¿De qué especie es este árbol?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "El árbol no tiene nombre."
@@ -11565,13 +11562,17 @@
                 "question": "¿Tiene el árbol un nombre?",
                 "render": "Nombre: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "¿Cuál es el ID emitido por Onroerend Erfgoed Flandes?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> ID de Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "ID de Onroerend Erfgoed: "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "¿De qué especie es este árbol?"
             },
             "tree_node-wikidata": {
-                "question": "¿Cuál es el ID de Wikidata para este árbol?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "¿Cuál es el ID de Wikidata para este árbol?"
             }
         },
         "title": {

langs/layers/fr.json

@@ -6930,7 +6930,7 @@
             }
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "Une couche montrant les arbres",
         "name": "Arbre",
         "presets": {
@@ -7031,10 +7031,7 @@
                 },
                 "question": "Cet arbre est-il un feuillu ou un résineux ?"
             },
-            "tree-species-wikidata": {
-                "question": "Quelle est l'espèce de cet arbre ?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "L'arbre n'a pas de nom."
@@ -7043,13 +7040,17 @@
                 "question": "L'arbre a-t-il un nom ?",
                 "render": "Nom : {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "Quel est son identifiant donné par Onroerend Erfgoed ?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Identifiant Onroerend Erfgoed : <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "Identifiant Onroerend Erfgoed : "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "Quelle est l'espèce de cet arbre ?"
             },
             "tree_node-wikidata": {
-                "question": "Quel est l'identifiant Wikidata de cet arbre ?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata : <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "Quel est l'identifiant Wikidata de cet arbre ?"
             }
         },
         "title": {

langs/layers/id.json

@@ -764,7 +764,7 @@
             }
         }
     },
-    "tree_node": {
+    "tree": {
         "presets": {
             "2": {
                 "title": "Pohon"
@@ -804,10 +804,7 @@
                     }
                 }
             },
-            "tree-species-wikidata": {
-                "question": "Spesies pohon apa ini?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "Pohon ini tidak memiliki nama."
@@ -815,6 +812,9 @@
                 },
                 "question": "Apakah pohon ini memiliki nama?",
                 "render": "Nama: {name}"
+            },
+            "tree-species-wikidata": {
+                "question": "Spesies pohon apa ini?"
             }
         }
     },

langs/layers/it.json

@@ -13269,7 +13269,7 @@
             "render": "Fermata dei mezzi pubblici"
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "Un livello che mostra gli alberi",
         "name": "Albero",
         "presets": {
@@ -13376,10 +13376,7 @@
                 },
                 "question": "Questo è un albero latifoglie o aghifoglie?"
             },
-            "tree-species-wikidata": {
-                "question": "Di che specie è questo albero?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "L'albero non ha un nome."
@@ -13388,13 +13385,17 @@
                 "question": "L'albero ha un nome?",
                 "render": "Nome: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "Qual è l'ID rilasciato da Onroerend Erfgoed Fiandre?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> ID Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "ID Onroerend Erfgoed: "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "Di che specie è questo albero?"
             },
             "tree_node-wikidata": {
-                "question": "Qual è l'ID Wikidata per questo albero?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "Qual è l'ID Wikidata per questo albero?"
             }
         },
         "title": {

langs/layers/nl.json

@@ -10726,7 +10726,7 @@
             "render": "OV-halte"
         }
     },
-    "tree_node": {
+    "tree": {
         "description": "Een laag die bomen toont",
         "name": "Boom",
         "presets": {
@@ -10833,10 +10833,7 @@
                 },
                 "question": "Is dit een naald- of loofboom?"
             },
-            "tree-species-wikidata": {
-                "question": "Wat is de boomsoort?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "De boom heeft geen naam."
@@ -10845,13 +10842,17 @@
                 "question": "Heeft de boom een naam?",
                 "render": "Naam: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?",
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed-ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+                "render": {
+                    "before": "Onroerend Erfgoed-ID: "
+                }
+            },
+            "tree-species-wikidata": {
+                "question": "Wat is de boomsoort?"
             },
             "tree_node-wikidata": {
-                "question": "Wat is het Wikidata-ID van deze boom?",
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+                "question": "Wat is het Wikidata-ID van deze boom?"
             }
         },
         "title": {

langs/layers/pl.json

@@ -3583,7 +3583,7 @@
             "render": "Ścieżka"
         }
     },
-    "tree_node": {
+    "tree": {
         "tagRenderings": {
             "tree-leaf_type": {
                 "mappings": {

langs/layers/pt.json

@@ -1777,7 +1777,7 @@
             }
         }
     },
-    "tree_node": {
+    "tree": {
         "name": "Árvore",
         "presets": {
             "0": {
@@ -1872,10 +1872,7 @@
                 },
                 "question": "Esta é uma árvore de folhas largas ou acículas?"
             },
-            "tree-species-wikidata": {
-                "question": "Que espécie é esta árvore?"
-            },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "A árvore não tem nome."
@@ -1884,9 +1881,12 @@
                 "question": "A árvore tem nome?",
                 "render": "Nome: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
+            "tree-ref:OnroerendErfgoed": {
                 "question": "Qual é o ID emitido por Onroerend Erfgoed Flanders?"
             },
+            "tree-species-wikidata": {
+                "question": "Que espécie é esta árvore?"
+            },
             "tree_node-wikidata": {
                 "question": "Qual é o ID do Wikidata para esta árvore?"
             }

langs/layers/pt_BR.json

@@ -1611,7 +1611,7 @@
             }
         }
     },
-    "tree_node": {
+    "tree": {
         "name": "Árvore",
         "presets": {
             "2": {

langs/layers/ru.json

@@ -1977,7 +1977,7 @@
             }
         }
     },
-    "tree_node": {
+    "tree": {
         "name": "Дерево",
         "presets": {
             "0": {
@@ -2004,7 +2004,7 @@
                 },
                 "question": "Это дерево вечнозелёное или листопадное?"
             },
-            "tree_node-name": {
+            "tree-name": {
                 "mappings": {
                     "0": {
                         "then": "У этого дерева нет названия."
@@ -2013,11 +2013,10 @@
                 "question": "Есть ли у этого дерева название?",
                 "render": "Название: {name}"
             },
-            "tree_node-ref:OnroerendErfgoed": {
-                "render": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
-            },
-            "tree_node-wikidata": {
-                "render": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+            "tree-ref:OnroerendErfgoed": {
+                "render": {
+                    "before": "Onroerend Erfgoed ID:"
+                }
             }
         },
         "title": {

langs/layers/uk.json

@@ -2998,7 +2998,7 @@
             }
         }
     },
-    "tree_node": {
+    "tree": {
         "tagRenderings": {
             "tree-species-wikidata": {
                 "question": "Якого виду це дерево?"

src/UI/InputElement/Validators/WikidataValidator.ts

@@ -106,6 +106,10 @@ Another example is to search for species and trees:
         if (str === undefined) {
             return false
         }
+        if (str.length === 0) {
+            // Don't show an exclamation mark if empty, the other code will prevent saving
+            return true
+        }
         if (str.length == 1) {
             return false
         }

src/UI/Popup/TagRendering/FreeformInput.svelte

@@ -34,7 +34,7 @@
   onDestroy(
     value.addCallbackD(() => {
       dispatch("selected")
-    })
+    }),
   )
 
   function getCountry() {
@@ -55,17 +55,17 @@
           on:submit
         />
       {:else}
-      <ValidatedInput
-        {feedback}
-        {getCountry}
-        {unit}
-        on:selected
-        on:submit
-        type={config.freeform.type}
-        {placeholder}
-        {value}
-        range={config.freeform.range}
-      />
+        <ValidatedInput
+          {feedback}
+          {getCountry}
+          {unit}
+          on:selected
+          on:submit
+          type={config.freeform.type}
+          {placeholder}
+          {value}
+          range={config.freeform.range}
+        />
       {/if}
     </Inline>
   {:else if !hideInput}
@@ -84,13 +84,13 @@
   {/if}
 
   {#if !(inline && hideInput)}
-  <InputHelper
-    args={config.freeform.args}
-    {feature}
-    type={config.freeform.type}
-    {value}
-    {state}
-    on:submit
-  />
+    <InputHelper
+      args={config.freeform.args}
+      {feature}
+      type={config.freeform.type}
+      {value}
+      {state}
+      on:submit
+    />
   {/if}
 </div>