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