From 9f500858c77f93ce8948297be67d3e18d4b77568 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 20 Dec 2022 20:35:44 +0100
Subject: [PATCH] Add tree height and circumference to tree theme

---
 assets/layers/tree_node/tree_node.json | 68 +++++++++++---------------
 1 file changed, 29 insertions(+), 39 deletions(-)

diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json
index 634ca7e6e5..33f888ac55 100644
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@@ -70,44 +70,6 @@
   },
   "tagRenderings": [
     "images",
-    {
-      "id": "tree-height",
-      "render": {
-        "nl": "Hoogte: {height}",
-        "en": "Height: {height}",
-        "it": "Altezza: {height}",
-        "ru": "Высота: {height}",
-        "fr": "Hauteur : {height}",
-        "de": "Höhe: {height}",
-        "es": "Altura: {height}",
-        "id": "Tinggi: {height}",
-        "da": "Højde: {height}"
-      },
-      "condition": {
-        "and": [
-          "height~*"
-        ]
-      },
-      "mappings": [
-        {
-          "if": {
-            "and": [
-              "height~^[0-9.]+$"
-            ]
-          },
-          "then": {
-            "nl": "Hoogte: {height}&nbsp;m",
-            "en": "Height: {height}&nbsp;m",
-            "it": "Altezza: {height}&nbsp;m",
-            "ru": "Высота: {height}&nbsp;м",
-            "fr": "Hauteur&nbsp;: {height}&nbsp;m",
-            "de": "Höhe: {height}&nbsp;m",
-            "es": "Altura: {height}&nbsp;m",
-            "da": "Højde: {height}&nbsp;m"
-          }
-        }
-      ]
-    },
     {
       "id": "plantnet",
       "render": "{plantnet_detection()}",
@@ -154,6 +116,34 @@
         ]
       }
     },
+    {
+      "id": "circumference",
+      "question": {
+        "en": "What is the circumference of the tree trunk?<p class='subtle'>This is measured at a height of 1.30m</p>"
+      },
+      "render": {
+        "en": "The tree trunk has a circumference of {circumference} meter"
+      },
+      "freeform": {
+        "key": "circumference",
+        "inline": true,
+        "type": "pfloat"
+      }
+    },
+    {
+      "id": "height",
+      "question": {
+        "en": "What is the height of this tree?"
+      },
+      "freeform": {
+        "key": "height",
+        "type": "pfloat",
+        "inline": true
+      },
+      "render": {
+        "en": "This tree is {height} meter high"
+    }
+    },
     {
       "id": "tree-denotation",
       "question": {
@@ -811,4 +801,4 @@
     "fr": "Une couche montrant les arbres",
     "da": "Et lag, der viser træer"
   }
-}
\ No newline at end of file
+}