From 01cf8336316c07a403926825974fbb4467dfb9bf Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 27 Feb 2020 12:14:20 -0800 Subject: [PATCH] Add circumference field to trees (close #7371) --- data/presets.yaml | 6 ++++++ data/presets/fields.json | 1 + data/presets/fields/circumference.json | 7 +++++++ data/presets/presets.json | 2 +- data/presets/presets/natural/tree.json | 1 + data/taginfo.json | 1 + dist/locales/en.json | 5 +++++ 7 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/circumference.json diff --git a/data/presets.yaml b/data/presets.yaml index 17a466edf..c643e8429 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -448,6 +448,12 @@ en: label: Last Checked Date # check_date field placeholder placeholder: YYYY-MM-DD + circumference: + # circumference=* + label: Circumference + # circumference field placeholder + placeholder: '1 m, 20 cm, 30 in…' + terms: '[translate with synonyms or related terms for ''Circumference'', separated by commas]' clothes: # clothes=* label: Clothes diff --git a/data/presets/fields.json b/data/presets/fields.json index b3ccd7ddd..49a893a33 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -70,6 +70,7 @@ "charge_fee": {"key": "charge", "type": "text", "label": "Fee Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "fee", "valueNot": "no"}}, "charge_toll": {"key": "charge", "type": "text", "label": "Toll Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "toll", "valueNot": "no"}}, "check_date": {"key": "check_date", "type": "text", "label": "Last Checked Date", "placeholder": "YYYY-MM-DD"}, + "circumference": {"key": "circumference", "type": "combo", "label": "Circumference", "snake_case": false, "placeholder": "1 m, 20 cm, 30 in…"}, "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"}, "club": {"key": "club", "type": "typeCombo", "label": "Type"}, "collection_times": {"key": "collection_times", "type": "text", "label": "Collection Times"}, diff --git a/data/presets/fields/circumference.json b/data/presets/fields/circumference.json new file mode 100644 index 000000000..596fb7739 --- /dev/null +++ b/data/presets/fields/circumference.json @@ -0,0 +1,7 @@ +{ + "key": "circumference", + "type": "combo", + "label": "Circumference", + "snake_case": false, + "placeholder": "1 m, 20 cm, 30 in…" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index b6ca1f2cf..eb9079742 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -824,7 +824,7 @@ "natural/spring": {"icon": "maki-water", "fields": ["name", "drinking_water", "intermittent"], "geometry": ["point", "vertex"], "tags": {"natural": "spring"}, "terms": ["aquifer", "hydro", "seep", "water source"], "name": "Spring"}, "natural/stone": {"icon": "temaki-boulder1", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "stone", "rock"], "name": "Unattached Stone / Boulder"}, "natural/tree_row": {"icon": "temaki-tree_row", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"}, - "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation", "diameter"], "moreFields": ["species/wikidata"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"}, + "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation", "diameter"], "moreFields": ["circumference", "species/wikidata"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"}, "natural/valley": {"icon": "temaki-valley", "fields": ["name", "elevation", "description"], "geometry": ["vertex", "point", "line"], "tags": {"natural": "valley"}, "terms": ["canyon", "dale", "dell", "dene", "depression", "glen", "gorge", "gully", "gulley", "gultch", "hollow", "ravine", "rift", "vale"], "name": "Valley"}, "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["mountain", "crater"], "name": "Volcano"}, "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"}, diff --git a/data/presets/presets/natural/tree.json b/data/presets/presets/natural/tree.json index 41c560044..413250db5 100644 --- a/data/presets/presets/natural/tree.json +++ b/data/presets/presets/natural/tree.json @@ -7,6 +7,7 @@ "diameter" ], "moreFields": [ + "circumference", "species/wikidata" ], "geometry": [ diff --git a/data/taginfo.json b/data/taginfo.json index b7a9036dc..a5b6b0f91 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1378,6 +1378,7 @@ {"key": "changing_table", "description": "🄵 Diaper Changing Table"}, {"key": "charge", "description": "🄵 Fee Amount, 🄵 Toll Amount"}, {"key": "check_date", "description": "🄵 Last Checked Date"}, + {"key": "circumference", "description": "🄵 Circumference"}, {"key": "clothes", "description": "🄵 Clothes"}, {"key": "collection_times", "description": "🄵 Collection Times"}, {"key": "colour", "description": "🄵 Color"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index e250f051a..debd7deaf 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2968,6 +2968,11 @@ "label": "Last Checked Date", "placeholder": "YYYY-MM-DD" }, + "circumference": { + "label": "Circumference", + "terms": "", + "placeholder": "1 m, 20 cm, 30 in…" + }, "clothes": { "label": "Clothes" },