From 5199e62574d10a19ac2aa18f77fe09ab23d8eb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?=
 <plepe@noreply.openstreetbrowser.org>
Date: Thu, 8 Feb 2018 09:59:41 +0100
Subject: [PATCH] Update 'edible-trees.json'

---
 edible-trees.json | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/edible-trees.json b/edible-trees.json
index 7441abf..736078d 100644
--- a/edible-trees.json
+++ b/edible-trees.json
@@ -1,25 +1,39 @@
 {
     "type": "overpass",
     "name": {
-        "en": "Edible Trees",
-        "de": "Essbare Bäume"
+        "en": "Edible Plants",
+        "de": "Essbare Gewächse"
     },
     "query": {
         "14": [
             "(",
-            "node[natural=tree][species~\"^(Malus|Pyrus|Morus|Prunus persica|Prunus cerasus)\"];",
+            "node[species~\"(Malus|Pyrus|Morus|Prunus persica|Prunus cerasus)\"];",
+            "node[taxon~\"(Malus|Pyrus|Morus|Prunus persica|Prunus cerasus)\"];",
             ");"
         ]
     },
     "feature": {
-        "description": "{{ localizedTag(tags, 'species') }}",
-        "markerSign": [
-            "{% for data in const %}",
-            "{% if tags.species|matches(data.match) %}",
-            "{{ data.icon }}",
+        "pre": [
+            "{% if tags.taxon %}",
+            "{% set species = tags.taxon %}",
+            "{% else %}",
+            "{% set species = tags.species %}",
+            "{% endif %}",
+            "",
+            "{% for d in const %}",
+            "{% if species|matches(d.match) %}",
+            "{% set data = d }}",
             "{% endif %}",
             "{% endfor %}"
-        ]
+        ],
+        "description": [
+            "{% if tags.taxon %}",
+            "{{ localizedTag(tags, 'taxon') }}",
+            "{% else %}",
+            "{{ localizedTag(tags, 'species') }}",
+            "{% endif %}"
+        ],
+        "markerSign": "{{ data.icon }}"
     },
     "info": [
         "<table>",