From 4be2db305bac6600e1b782890322ca8caee6e778 Mon Sep 17 00:00:00 2001
From: Midgard <2885-Midgard@users.noreply.framagit.org>
Date: Thu, 24 Dec 2020 17:56:43 +0100
Subject: [PATCH] [trees] Add leafless and denotation
---
assets/themes/trees/leafless.svg | 26 ++++++
assets/themes/trees/trees.json | 155 ++++++++++++++++++++++++++++---
2 files changed, 166 insertions(+), 15 deletions(-)
create mode 100644 assets/themes/trees/leafless.svg
diff --git a/assets/themes/trees/leafless.svg b/assets/themes/trees/leafless.svg
new file mode 100644
index 000000000..b3f285d78
--- /dev/null
+++ b/assets/themes/trees/leafless.svg
@@ -0,0 +1,26 @@
+
+
diff --git a/assets/themes/trees/trees.json b/assets/themes/trees/trees.json
index 32c76c154..07dc9b3e8 100644
--- a/assets/themes/trees/trees.json
+++ b/assets/themes/trees/trees.json
@@ -50,8 +50,8 @@
"tagRenderings": [
{
"render": {
- "nl": "Bladertype van deze boom:",
- "en": "Leaf type of this tree:"
+ "nl": "Bladertype van de boom:",
+ "en": "Leaf type of the tree:"
},
"question": {
"nl": "Is dit een naald- of loofboom?",
@@ -65,8 +65,8 @@
]
},
"then": {
- "nl": " loofboom",
- "en": " broadleaved"
+ "nl": "Dit is een loofboom",
+ "en": "This tree is broadleaved"
}
},
{
@@ -76,36 +76,133 @@
]
},
"then": {
- "nl": " naaldboom",
- "en": " needleleaved"
+ "nl": "Dit is een naaldboom",
+ "en": "This tree is needleleaved"
}
},
{
"if": {
"and": [
- "leaf_type=needleleaved"
+ "leaf_type=leafless"
]
},
"then": {
- "nl": "permanent bladloos",
- "en": "permanently leafless"
+ "nl": "Deze boom is permanent bladloos",
+ "en": "This tree is permanently leafless"
+ },
+ "hideInAnswer": true
+ }
+ ]
+ },
+ {
+ "render": {
+ "nl": "Significantie van de boom:",
+ "en": "Significance of the tree:"
+ },
+ "question": {
+ "nl": "Hoe significant is deze boom? Kies het eerste antwoord dat van toepassing is.",
+ "en": "How significant is this tree? Choose the first answer that applies."
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "denotation=natural_monument"
+ ]
+ },
+ "then": {
+ "nl": "De boom is houtig erfgoed. Hij is bijzonder oud of van een zeldzame soort.",
+ "en": "The tree is a natural monument. It may be especially old, a valuable species."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "denotation=landmark"
+ ]
+ },
+ "then": {
+ "nl": "De boom valt op door zijn grootte of prominente locatie. Hij is nuttig voor navigatie.",
+ "en": "The tree is remarkable due to its size or prominent location. It is useful for navigation."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "denotation=agricultural"
+ ]
+ },
+ "then": {
+ "nl": "De boom wordt voor landbouwdoeleinden gebruikt, bijvoorbeeld in een boomgaard.",
+ "en": "The tree is used for agricultural purposes, e.g. in an orchard."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "denotation=park"
+ ]
+ },
+ "then": {
+ "nl": "De boom staat in een park of dergelijke (begraafplaats, schoolterrein, …).",
+ "en": "The tree is in a park or similar (cemetery, school grounds, …)."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "denotation=garden"
+ ]
+ },
+ "then": {
+ "nl": "De boom staat in de tuin bij een woning/flatgebouw.",
+ "en": "The tree is a residential garden."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "denotation=avenue"
+ ]
+ },
+ "then": {
+ "nl": "Dit is een laanboom.",
+ "en": "This is a tree along an avenue."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "denotation=urban"
+ ]
+ },
+ "then": {
+ "nl": "De boom staat in een woonkern.",
+ "en": "The tree is an urban area."
+ }
+ },
+ {
+ "if": {
+ "and": [
+ "denotation=none"
+ ]
+ },
+ "then": {
+ "nl": "De boom staat buiten een woonkern.",
+ "en": "The tree is outside of an urban area."
}
}
]
},
{
"render": {
- "nl": "Bladercyclus van deze boom:",
- "en": "Leaf cycle of this tree:"
+ "nl": "Bladercyclus van de boom:",
+ "en": "Leaf cycle of the tree:"
},
"question": {
"nl": "Is deze boom bladhoudend of bladverliezend?",
"en": "Is this tree evergreen or deciduous?"
},
- "freeform": {
- "key": null,
- "addExtraTags": []
- },
"mappings": [
{
"if": {
@@ -169,6 +266,34 @@
"render": "#00f"
},
"presets": [
+ {
+ "tags": [
+ "natural=tree",
+ "leaf_type=broadleaved"
+ ],
+ "title": {
+ "nl": "Loofboom",
+ "en": "Broadleaved tree"
+ },
+ "description": {
+ "nl": "Gebruik indien mogelijk de luchtfoto's om de boom zo nauwkeurig mogelijk te plaatsen.",
+ "en": "Use the aerial photos (if available) to position the tree as accurately as possible."
+ }
+ },
+ {
+ "tags": [
+ "natural=tree",
+ "leaf_type=needleleaved"
+ ],
+ "title": {
+ "nl": "Naaldboom",
+ "en": "Needleleaved tree"
+ },
+ "description": {
+ "nl": "Gebruik indien mogelijk de luchtfoto's om de boom zo nauwkeurig mogelijk te plaatsen.",
+ "en": "Use the aerial photos (if available) to position the tree as accurately as possible."
+ }
+ },
{
"tags": [
"natural=tree"
![\"\"/](\"./assets/themes/trees/broadleaved.svg\")
loofboom",
- "en": "![\"\"/](\"./assets/themes/trees/needleleaved.svg\")
naaldboom",
- "en": "![\"\"/](\"./assets/themes/trees/leafless.svg\")
permanent bladloos",
+ "en": "This tree is