From 1cd8ca38516ed044c17028161c0086e23275b3fe Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 17 Mar 2017 12:26:07 -0400 Subject: [PATCH] Use semiCombo field for output tags * crop, produce, product, trees, grape_variety --- data/presets.yaml | 7 +++++-- data/presets/fields.json | 17 +++++++++++------ data/presets/fields/crop.json | 4 ++-- data/presets/fields/grape_variety.json | 5 +++++ data/presets/fields/produce.json | 2 +- data/presets/fields/product.json | 4 ++-- data/presets/fields/trees.json | 2 +- data/presets/presets.json | 12 +++++++++++- data/presets/presets/landuse/vineyard.json | 12 +++++++++++- dist/locales/en.json | 7 +++++-- 10 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 data/presets/fields/grape_variety.json diff --git a/data/presets.yaml b/data/presets.yaml index c11160fde..cbe743337 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -356,7 +356,7 @@ en: label: Type crop: # crop=* - label: Crop + label: Crops crossing: # crossing=* label: Type @@ -537,6 +537,9 @@ en: label: Reference # golf_hole field placeholder placeholder: Hole number (1-18) + grape_variety: + # grape_variety=* + label: Grape Varieties handicap: # handicap=* label: Handicap @@ -977,7 +980,7 @@ en: label: Produce product: # product=* - label: Product + label: Products railway: # railway=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index a37bd0785..fac984430 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -465,8 +465,8 @@ }, "crop": { "key": "crop", - "type": "combo", - "label": "Crop" + "type": "semiCombo", + "label": "Crops" }, "crossing": { "key": "crossing", @@ -743,6 +743,11 @@ "label": "Reference", "placeholder": "Hole number (1-18)" }, + "grape_variety": { + "key": "grape_variety", + "type": "semiCombo", + "label": "Grape Varieties" + }, "handicap": { "key": "handicap", "type": "number", @@ -1287,13 +1292,13 @@ }, "produce": { "key": "produce", - "type": "combo", + "type": "semiCombo", "label": "Produce" }, "product": { "key": "product", - "type": "combo", - "label": "Product" + "type": "semiCombo", + "label": "Products" }, "railway": { "key": "railway", @@ -1738,7 +1743,7 @@ }, "trees": { "key": "trees", - "type": "combo", + "type": "semiCombo", "label": "Trees" }, "tunnel": { diff --git a/data/presets/fields/crop.json b/data/presets/fields/crop.json index 10c0a721c..1aac15422 100644 --- a/data/presets/fields/crop.json +++ b/data/presets/fields/crop.json @@ -1,5 +1,5 @@ { "key": "crop", - "type": "combo", - "label": "Crop" + "type": "semiCombo", + "label": "Crops" } diff --git a/data/presets/fields/grape_variety.json b/data/presets/fields/grape_variety.json new file mode 100644 index 000000000..827016846 --- /dev/null +++ b/data/presets/fields/grape_variety.json @@ -0,0 +1,5 @@ +{ + "key": "grape_variety", + "type": "semiCombo", + "label": "Grape Varieties" +} diff --git a/data/presets/fields/produce.json b/data/presets/fields/produce.json index 0e871752c..8bd8e07ff 100644 --- a/data/presets/fields/produce.json +++ b/data/presets/fields/produce.json @@ -1,5 +1,5 @@ { "key": "produce", - "type": "combo", + "type": "semiCombo", "label": "Produce" } diff --git a/data/presets/fields/product.json b/data/presets/fields/product.json index a5261de28..4ba4326d4 100644 --- a/data/presets/fields/product.json +++ b/data/presets/fields/product.json @@ -1,5 +1,5 @@ { "key": "product", - "type": "combo", - "label": "Product" + "type": "semiCombo", + "label": "Products" } diff --git a/data/presets/fields/trees.json b/data/presets/fields/trees.json index 3111f5cdc..9886a5f31 100644 --- a/data/presets/fields/trees.json +++ b/data/presets/fields/trees.json @@ -1,5 +1,5 @@ { "key": "trees", - "type": "combo", + "type": "semiCombo", "label": "Trees" } diff --git a/data/presets/presets.json b/data/presets/presets.json index ebe98e221..c0a62ca73 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6889,7 +6889,8 @@ }, "landuse/vineyard": { "fields": [ - "operator" + "operator", + "grape_variety" ], "geometry": [ "area" @@ -6897,6 +6898,15 @@ "tags": { "landuse": "vineyard" }, + "addTags": { + "landuse": "vineyard", + "crop": "grape" + }, + "removeTags": { + "landuse": "vineyard", + "crop": "grape", + "grape_variety": "*" + }, "terms": [ "grape", "wine" diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json index 9cf92713d..4ae176a9d 100644 --- a/data/presets/presets/landuse/vineyard.json +++ b/data/presets/presets/landuse/vineyard.json @@ -1,6 +1,7 @@ { "fields": [ - "operator" + "operator", + "grape_variety" ], "geometry": [ "area" @@ -8,6 +9,15 @@ "tags": { "landuse": "vineyard" }, + "addTags": { + "landuse": "vineyard", + "crop": "grape" + }, + "removeTags": { + "landuse": "vineyard", + "crop": "grape", + "grape_variety": "*" + }, "terms": [ "grape", "wine" diff --git a/dist/locales/en.json b/dist/locales/en.json index 7e1f66ebb..370d513af 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1041,7 +1041,7 @@ "label": "Type" }, "crop": { - "label": "Crop" + "label": "Crops" }, "crossing": { "label": "Type" @@ -1208,6 +1208,9 @@ "label": "Reference", "placeholder": "Hole number (1-18)" }, + "grape_variety": { + "label": "Grape Varieties" + }, "handicap": { "label": "Handicap", "placeholder": "1-18" @@ -1560,7 +1563,7 @@ "label": "Produce" }, "product": { - "label": "Product" + "label": "Products" }, "railway": { "label": "Type"