From a6f840197a640de140a686a1493a953df25cc4fe Mon Sep 17 00:00:00 2001 From: Jordane Pelloux-Prayer Date: Mon, 5 Feb 2018 20:33:00 +0100 Subject: [PATCH 1/3] add wholesale shop preset (#4754) --- data/presets.yaml | 8 ++++++++ data/presets/fields.json | 5 +++++ data/presets/fields/wholesale.json | 5 +++++ data/presets/presets.json | 24 ++++++++++++++++++++++++ data/presets/presets/shop/wholesale.json | 24 ++++++++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 7 +++++++ 7 files changed, 77 insertions(+) create mode 100644 data/presets/fields/wholesale.json create mode 100644 data/presets/presets/shop/wholesale.json diff --git a/data/presets.yaml b/data/presets.yaml index 449211ed3..2cdf00feb 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1620,6 +1620,9 @@ en: wheelchair: # wheelchair=* label: Wheelchair Access + wholesale: + # wholesale=* + label: wholesale width: # width=* label: Width (Meters) @@ -5373,6 +5376,11 @@ en: name: Weapon Shop # 'terms: ammo,gun,knife,knives' terms: '' + shop/wholesale: + # shop=wholesale + name: Wholesale shop/store + # 'terms: warehouse club,cash and carry' + terms: '' shop/window_blind: # shop=window_blind name: Window Blind Store diff --git a/data/presets/fields.json b/data/presets/fields.json index 19c1a8569..9572dd677 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -2202,6 +2202,11 @@ "universal": true, "label": "Wheelchair Access" }, + "wholesale": { + "key": "wholesale", + "type": "typeCombo", + "label": "wholesale" + }, "width": { "key": "width", "type": "number", diff --git a/data/presets/fields/wholesale.json b/data/presets/fields/wholesale.json new file mode 100644 index 000000000..9612b71db --- /dev/null +++ b/data/presets/fields/wholesale.json @@ -0,0 +1,5 @@ +{ + "key": "wholesale", + "type": "typeCombo", + "label": "wholesale" +} \ No newline at end of file diff --git a/data/presets/presets.json b/data/presets/presets.json index d8b7fbd56..4e63db8e9 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -18220,6 +18220,30 @@ }, "name": "Weapon Shop" }, + "shop/wholesale": { + "icon": "shop", + "fields": [ + "name", + "operator", + "wholesale", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "warehouse club", + "cash and carry" + ], + "tags": { + "shop": "wholesale" + }, + "name": "Wholesale shop/store" + }, "shop/window_blind": { "icon": "shop", "fields": [ diff --git a/data/presets/presets/shop/wholesale.json b/data/presets/presets/shop/wholesale.json new file mode 100644 index 000000000..e5067f766 --- /dev/null +++ b/data/presets/presets/shop/wholesale.json @@ -0,0 +1,24 @@ +{ + "icon": "shop", + "fields": [ + "name", + "operator", + "wholesale", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "warehouse club", + "cash and carry" + ], + "tags": { + "shop": "wholesale" + }, + "name": "Wholesale shop/store" +} \ No newline at end of file diff --git a/data/taginfo.json b/data/taginfo.json index bcaa8359b..1bc93bb8e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -3307,6 +3307,10 @@ "key": "shop", "value": "weapons" }, + { + "key": "shop", + "value": "wholesale" + }, { "key": "shop", "value": "window_blind" diff --git a/dist/locales/en.json b/dist/locales/en.json index 1a159203f..914daf66c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2642,6 +2642,9 @@ "wheelchair": { "label": "Wheelchair Access" }, + "wholesale": { + "label": "wholesale" + }, "width": { "label": "Width (Meters)" }, @@ -5998,6 +6001,10 @@ "name": "Weapon Shop", "terms": "ammo,gun,knife,knives" }, + "shop/wholesale": { + "name": "Wholesale shop/store", + "terms": "warehouse club,cash and carry" + }, "shop/window_blind": { "name": "Window Blind Store", "terms": "" From fb71294d8e8dbecc61798581a567f06935ac8606 Mon Sep 17 00:00:00 2001 From: Jordane Pelloux-Prayer Date: Mon, 5 Feb 2018 20:34:32 +0100 Subject: [PATCH 2/3] add health food shop preset (#4754) --- data/presets.yaml | 5 +++++ data/presets/presets.json | 25 ++++++++++++++++++++++ data/presets/presets/shop/health_food.json | 25 ++++++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 63 insertions(+) create mode 100644 data/presets/presets/shop/health_food.json diff --git a/data/presets.yaml b/data/presets.yaml index 2cdf00feb..a747d8f94 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5117,6 +5117,11 @@ en: # shop=hardware name: Hardware Store terms: '' + shop/health_food: + # 'shop=health_food ' + name: Health food shop + # 'terms: wholefood,vitamins,vegetarian,vegan' + terms: '' shop/hearing_aids: # shop=hearing_aids name: Hearing Aids Store diff --git a/data/presets/presets.json b/data/presets/presets.json index 4e63db8e9..30eae7c21 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -17006,6 +17006,31 @@ }, "name": "Hardware Store" }, + "shop/health_food": { + "icon": "shop", + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "wholefood", + "vitamins", + "vegetarian", + "vegan" + ], + "tags": { + "shop": "health_food " + }, + "name": "Health food shop" + }, "shop/hearing_aids": { "icon": "shop", "fields": [ diff --git a/data/presets/presets/shop/health_food.json b/data/presets/presets/shop/health_food.json new file mode 100644 index 000000000..80be91b21 --- /dev/null +++ b/data/presets/presets/shop/health_food.json @@ -0,0 +1,25 @@ +{ + "icon": "shop", + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "wholefood", + "vitamins", + "vegetarian", + "vegan" + ], + "tags": { + "shop": "health_food " + }, + "name": "Health food shop" +} \ No newline at end of file diff --git a/data/taginfo.json b/data/taginfo.json index 1bc93bb8e..952cd9461 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -3071,6 +3071,10 @@ "key": "shop", "value": "hardware" }, + { + "key": "shop", + "value": "health_food " + }, { "key": "shop", "value": "hearing_aids" diff --git a/dist/locales/en.json b/dist/locales/en.json index 914daf66c..f6f0a110f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5765,6 +5765,10 @@ "name": "Hardware Store", "terms": "" }, + "shop/health_food": { + "name": "Health food shop", + "terms": "wholefood,vitamins,vegetarian,vegan" + }, "shop/hearing_aids": { "name": "Hearing Aids Store", "terms": "" From fef30e02ddf07382d3674ea8d51041248a99811b Mon Sep 17 00:00:00 2001 From: Jordane Pelloux-Prayer Date: Mon, 5 Feb 2018 20:48:23 +0100 Subject: [PATCH 3/3] fix the names of new presets --- data/presets/presets/shop/health_food.json | 2 +- data/presets/presets/shop/wholesale.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/presets/shop/health_food.json b/data/presets/presets/shop/health_food.json index 80be91b21..a80333678 100644 --- a/data/presets/presets/shop/health_food.json +++ b/data/presets/presets/shop/health_food.json @@ -21,5 +21,5 @@ "tags": { "shop": "health_food " }, - "name": "Health food shop" + "name": "Health Food Shop" } \ No newline at end of file diff --git a/data/presets/presets/shop/wholesale.json b/data/presets/presets/shop/wholesale.json index e5067f766..289f242fd 100644 --- a/data/presets/presets/shop/wholesale.json +++ b/data/presets/presets/shop/wholesale.json @@ -20,5 +20,5 @@ "tags": { "shop": "wholesale" }, - "name": "Wholesale shop/store" + "name": "Wholesale Shop" } \ No newline at end of file