From 94c363abcf3ff8550612ae129a1a55f70fd3d02f Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Mon, 6 Nov 2017 15:08:11 -0200 Subject: [PATCH 1/2] add shop=agrarian preset and agrarian=* field --- data/presets.yaml | 8 ++++++++ data/presets/fields.json | 5 +++++ data/presets/fields/agrarian.json | 5 +++++ data/presets/presets.json | 27 +++++++++++++++++++++++++ data/presets/presets/shop/agrarian.json | 27 +++++++++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 7 +++++++ 7 files changed, 83 insertions(+) create mode 100644 data/presets/fields/agrarian.json create mode 100644 data/presets/presets/shop/agrarian.json diff --git a/data/presets.yaml b/data/presets.yaml index c97d09abb6..3ce2f83083 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -165,6 +165,9 @@ en: aeroway: # aeroway=* label: Type + agrarian: + # agrarian=* + label: Products amenity: # amenity=* label: Type @@ -4513,6 +4516,11 @@ en: # shop=* name: Shop terms: '' + shop/agrarian: + # shop=agrarian + name: Agriculture Shop + # 'terms: agricultural inputs,agricultural machines,seeds,pesticides,fertilizer,agricultural tools' + terms: '' shop/alcohol: # shop=alcohol name: Liquor Store diff --git a/data/presets/fields.json b/data/presets/fields.json index 0b957ac057..8ed7e0b6ed 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -201,6 +201,11 @@ "type": "typeCombo", "label": "Type" }, + "agrarian": { + "key": "agrarian", + "type": "semiCombo", + "label": "Products" + }, "amenity": { "key": "amenity", "type": "typeCombo", diff --git a/data/presets/fields/agrarian.json b/data/presets/fields/agrarian.json new file mode 100644 index 0000000000..d6072e167a --- /dev/null +++ b/data/presets/fields/agrarian.json @@ -0,0 +1,5 @@ +{ + "key": "agrarian", + "type": "semiCombo", + "label": "Products" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 2e27f81619..7052f35ca1 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -13519,6 +13519,33 @@ "name": "Vacant Shop", "searchable": false }, + "shop/agrarian": { + "icon": "shop", + "fields": [ + "name", + "brand", + "agrarian", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "agricultural inputs", + "agricultural machines", + "seeds", + "pesticides", + "fertilizer", + "agricultural tools" + ], + "tags": { + "shop": "agrarian" + }, + "name": "Agriculture Shop" + }, "shop/alcohol": { "icon": "alcohol-shop", "fields": [ diff --git a/data/presets/presets/shop/agrarian.json b/data/presets/presets/shop/agrarian.json new file mode 100644 index 0000000000..080de0705b --- /dev/null +++ b/data/presets/presets/shop/agrarian.json @@ -0,0 +1,27 @@ +{ + "icon": "shop", + "fields": [ + "name", + "brand", + "agrarian", + "address", + "building_area", + "opening_hours" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "agricultural inputs", + "agricultural machines", + "seeds", + "pesticides", + "fertilizer", + "agricultural tools" + ], + "tags": { + "shop": "agrarian" + }, + "name": "Agriculture Shop" +} diff --git a/data/taginfo.json b/data/taginfo.json index 026d2a96fb..a0249a9bf4 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2591,6 +2591,10 @@ "key": "shop", "value": "vacant" }, + { + "key": "shop", + "value": "agrarian" + }, { "key": "shop", "value": "alcohol" diff --git a/dist/locales/en.json b/dist/locales/en.json index 1536a17808..0399d56736 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1219,6 +1219,9 @@ "aeroway": { "label": "Type" }, + "agrarian": { + "label": "Products" + }, "amenity": { "label": "Type" }, @@ -5052,6 +5055,10 @@ "name": "Vacant Shop", "terms": "" }, + "shop/agrarian": { + "name": "Agriculture Shop", + "terms": "agricultural inputs,agricultural machines,seeds,pesticides,fertilizer,agricultural tools" + }, "shop/alcohol": { "name": "Liquor Store", "terms": "alcohol,beer,booze,wine" From 59426e870518746b64f609d7e463029e9765ca7e Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Mon, 6 Nov 2017 16:43:51 -0200 Subject: [PATCH 2/2] remove brand field from shop=agrarian preset --- data/presets/presets.json | 2 +- data/presets/presets/shop/agrarian.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 7052f35ca1..6feb29ee5e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -13523,7 +13523,7 @@ "icon": "shop", "fields": [ "name", - "brand", + "operator", "agrarian", "address", "building_area", diff --git a/data/presets/presets/shop/agrarian.json b/data/presets/presets/shop/agrarian.json index 080de0705b..8696682aa6 100644 --- a/data/presets/presets/shop/agrarian.json +++ b/data/presets/presets/shop/agrarian.json @@ -2,7 +2,7 @@ "icon": "shop", "fields": [ "name", - "brand", + "operator", "agrarian", "address", "building_area",