From 446bf406c66f31091ad827e2e2c2ea5374eef994 Mon Sep 17 00:00:00 2001 From: Binnette Date: Thu, 12 May 2022 19:28:10 +0200 Subject: [PATCH 01/11] Set common tags for trees --- data/presets/natural/tree.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/data/presets/natural/tree.json b/data/presets/natural/tree.json index f0c33d980..c0cf29351 100644 --- a/data/presets/natural/tree.json +++ b/data/presets/natural/tree.json @@ -1,14 +1,24 @@ { "icon": "maki-park", "fields": [ + "genus", + "species", + "taxon", "leaf_type_singular", "leaf_cycle_singular", - "denotation", - "height", - "diameter" + "start_date" ], "moreFields": [ + "protected", + "age", + "sex", + "operator", + "source", + "height", "circumference", + "diameter_crown", + "denotation", + "name", "species/wikidata" ], "geometry": [ From 57e7d972d5a58872cc0895255d32f873e690ca4a Mon Sep 17 00:00:00 2001 From: Binnette Date: Fri, 13 May 2022 10:02:10 +0200 Subject: [PATCH 02/11] Tree: keep only clear tags --- data/presets/natural/tree.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/presets/natural/tree.json b/data/presets/natural/tree.json index c0cf29351..3553160b2 100644 --- a/data/presets/natural/tree.json +++ b/data/presets/natural/tree.json @@ -9,10 +9,6 @@ "start_date" ], "moreFields": [ - "protected", - "age", - "sex", - "operator", "source", "height", "circumference", From 7a0b174d914528368f86285d24c9e245f4b4b8c0 Mon Sep 17 00:00:00 2001 From: Binnette Date: Fri, 13 May 2022 18:28:21 +0200 Subject: [PATCH 03/11] tree: sort preset attributes --- data/presets/natural/tree.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/presets/natural/tree.json b/data/presets/natural/tree.json index 3553160b2..125b23d07 100644 --- a/data/presets/natural/tree.json +++ b/data/presets/natural/tree.json @@ -1,21 +1,21 @@ { "icon": "maki-park", "fields": [ - "genus", - "species", - "taxon", "leaf_type_singular", "leaf_cycle_singular", - "start_date" + "height", + "circumference" ], "moreFields": [ - "source", - "height", - "circumference", - "diameter_crown", + "genus", + "species", + "species/wikidata", + "taxon", + "start_date", "denotation", + "diameter_crown", "name", - "species/wikidata" + "source" ], "geometry": [ "point", From 0d1df68e9f60a0ace533eb5f52156f9bd8a7fe9b Mon Sep 17 00:00:00 2001 From: Binnette Date: Fri, 13 May 2022 18:30:47 +0200 Subject: [PATCH 04/11] tree: restore attributes --- data/presets/natural/tree.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/presets/natural/tree.json b/data/presets/natural/tree.json index 125b23d07..9a806499e 100644 --- a/data/presets/natural/tree.json +++ b/data/presets/natural/tree.json @@ -4,6 +4,7 @@ "leaf_type_singular", "leaf_cycle_singular", "height", + "denotation", "circumference" ], "moreFields": [ @@ -12,8 +13,8 @@ "species/wikidata", "taxon", "start_date", - "denotation", "diameter_crown", + "diameter", "name", "source" ], From e857eb45d1268e5bc5261e05426b8abcf7390442 Mon Sep 17 00:00:00 2001 From: Binnette Date: Fri, 13 May 2022 18:33:37 +0200 Subject: [PATCH 05/11] Create diameter_crown.json --- data/fields/diameter_crown.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/fields/diameter_crown.json diff --git a/data/fields/diameter_crown.json b/data/fields/diameter_crown.json new file mode 100644 index 000000000..5ac131a9e --- /dev/null +++ b/data/fields/diameter_crown.json @@ -0,0 +1,7 @@ +{ + "key": "diameter_crown", + "type": "combo", + "label": "Crown diameter", + "snake_case": false, + "placeholder": "5 mm, 10 cm, 15 in…" +} From 56b28e3f27476c8628dc5e889560bdca4bac5c38 Mon Sep 17 00:00:00 2001 From: Binnette Date: Fri, 13 May 2022 18:39:04 +0200 Subject: [PATCH 06/11] tree: sort fields --- data/presets/natural/tree.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/natural/tree.json b/data/presets/natural/tree.json index 9a806499e..68bf80eae 100644 --- a/data/presets/natural/tree.json +++ b/data/presets/natural/tree.json @@ -3,8 +3,8 @@ "fields": [ "leaf_type_singular", "leaf_cycle_singular", - "height", "denotation", + "height", "circumference" ], "moreFields": [ From d134d486c68f9b6382eead7bfb8b5fa761d64d99 Mon Sep 17 00:00:00 2001 From: Binnette Date: Fri, 13 May 2022 18:41:39 +0200 Subject: [PATCH 07/11] tree: remove source --- data/presets/natural/tree.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/presets/natural/tree.json b/data/presets/natural/tree.json index 68bf80eae..f6dc584c5 100644 --- a/data/presets/natural/tree.json +++ b/data/presets/natural/tree.json @@ -15,8 +15,7 @@ "start_date", "diameter_crown", "diameter", - "name", - "source" + "name" ], "geometry": [ "point", From 69754cc7326e9ee9cb59243d3ea8d0debae4d97a Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Mon, 16 May 2022 12:42:57 +0200 Subject: [PATCH 08/11] use realistic examples in field's placeholder --- data/fields/diameter_crown.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/fields/diameter_crown.json b/data/fields/diameter_crown.json index 5ac131a9e..3b7224d76 100644 --- a/data/fields/diameter_crown.json +++ b/data/fields/diameter_crown.json @@ -3,5 +3,5 @@ "type": "combo", "label": "Crown diameter", "snake_case": false, - "placeholder": "5 mm, 10 cm, 15 in…" + "placeholder": "4 m, 9 ft, …" } From f3ea731238ed8def40bdb78811b45bd6e36a640d Mon Sep 17 00:00:00 2001 From: Binnette Date: Mon, 16 May 2022 13:09:01 +0200 Subject: [PATCH 09/11] Create genus.json --- data/fields/genus.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/fields/genus.json diff --git a/data/fields/genus.json b/data/fields/genus.json new file mode 100644 index 000000000..281e8859d --- /dev/null +++ b/data/fields/genus.json @@ -0,0 +1,7 @@ +{ + "key": "genus", + "type": "combo", + "label": "Genus", + "snake_case": false, + "placeholder": "Acer, Platanus, Quercus …" +} From ba987fc3135ea82e14e49ea5396966eb601d7349 Mon Sep 17 00:00:00 2001 From: Binnette Date: Mon, 16 May 2022 13:12:14 +0200 Subject: [PATCH 10/11] Create species.json --- data/fields/species.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/fields/species.json diff --git a/data/fields/species.json b/data/fields/species.json new file mode 100644 index 000000000..d11511b33 --- /dev/null +++ b/data/fields/species.json @@ -0,0 +1,7 @@ +{ + "key": "species", + "type": "combo", + "label": "Species", + "snake_case": false, + "placeholder": "Acer platanoides, Quercus robur, …" +} From ac6d4bb46b33a31db378a406cf2d8dd0f189aa02 Mon Sep 17 00:00:00 2001 From: Binnette Date: Mon, 16 May 2022 13:15:02 +0200 Subject: [PATCH 11/11] Create taxon.json --- data/fields/taxon.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/fields/taxon.json diff --git a/data/fields/taxon.json b/data/fields/taxon.json new file mode 100644 index 000000000..6bb407f72 --- /dev/null +++ b/data/fields/taxon.json @@ -0,0 +1,7 @@ +{ + "key": "taxon", + "type": "combo", + "label": "Taxon", + "snake_case": false, + "placeholder": "Acer platanoides Columnare, Pyrus calleryana Chanticleer …" +}