From 8b9fc25e87779105ee8fc629debb3600300eafcd Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 28 Jul 2016 22:11:25 -0400 Subject: [PATCH] Add preset for shop=charity --- data/presets.yaml | 5 + data/presets/fields/second_hand.json | 3 +- data/presets/presets.json | 149 ++++++++++++++++++++- data/presets/presets/shop/charity.json | 23 ++++ data/presets/presets/shop/second_hand.json | 3 +- data/taginfo.json | 4 + dist/locales/en.json | 6 +- 7 files changed, 187 insertions(+), 6 deletions(-) create mode 100644 data/presets/presets/shop/charity.json diff --git a/data/presets.yaml b/data/presets.yaml index c22df001a..68576ae76 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3265,6 +3265,11 @@ en: name: Carpet Store # 'terms: rug' terms: '' + shop/charity: + # shop=charity + name: Charity Store + # 'terms: thrift,op shop,nonprofit' + terms: '' shop/cheese: # shop=cheese name: Cheese Store diff --git a/data/presets/fields/second_hand.json b/data/presets/fields/second_hand.json index 4949fe2f7..84fb4a57e 100644 --- a/data/presets/fields/second_hand.json +++ b/data/presets/fields/second_hand.json @@ -1,4 +1,3 @@ - { "key": "second_hand", "type": "combo", @@ -11,4 +10,4 @@ "only": "Only" } } -} \ No newline at end of file +} diff --git a/data/presets/presets.json b/data/presets/presets.json index b3e6a44c1..e9ae8c5eb 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -8421,6 +8421,29 @@ }, "name": "Carpet Store" }, + "shop/charity": { + "icon": "shop", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours", + "second_hand" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "thrift", + "op shop", + "nonprofit" + ], + "tags": { + "shop": "charity" + }, + "name": "Charity Store" + }, "shop/cheese": { "icon": "shop", "fields": [ @@ -9687,7 +9710,8 @@ "operator", "address", "building_area", - "opening_hours" + "opening_hours", + "second_hand" ], "geometry": [ "point", @@ -84482,6 +84506,126 @@ ], "suggestion": true }, + "shop/charity/British Heart Foundation": { + "tags": { + "name": "British Heart Foundation", + "shop": "charity" + }, + "name": "British Heart Foundation", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "operator", + "address", + "building_area", + "opening_hours", + "second_hand" + ], + "suggestion": true + }, + "shop/charity/Cancer Research UK": { + "tags": { + "name": "Cancer Research UK", + "shop": "charity" + }, + "name": "Cancer Research UK", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "operator", + "address", + "building_area", + "opening_hours", + "second_hand" + ], + "suggestion": true + }, + "shop/charity/Oxfam": { + "tags": { + "name": "Oxfam", + "shop": "charity" + }, + "name": "Oxfam", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "operator", + "address", + "building_area", + "opening_hours", + "second_hand" + ], + "suggestion": true + }, + "shop/charity/Scope": { + "tags": { + "name": "Scope", + "shop": "charity" + }, + "name": "Scope", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "operator", + "address", + "building_area", + "opening_hours", + "second_hand" + ], + "suggestion": true + }, + "shop/charity/Age UK": { + "tags": { + "name": "Age UK", + "shop": "charity" + }, + "name": "Age UK", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "operator", + "address", + "building_area", + "opening_hours", + "second_hand" + ], + "suggestion": true + }, + "shop/charity/Sue Ryder": { + "tags": { + "name": "Sue Ryder", + "shop": "charity" + }, + "name": "Sue Ryder", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "operator", + "address", + "building_area", + "opening_hours", + "second_hand" + ], + "suggestion": true + }, "shop/florist/Monceau Fleurs": { "tags": { "name": "Monceau Fleurs", @@ -86189,7 +86333,8 @@ "operator", "address", "building_area", - "opening_hours" + "opening_hours", + "second_hand" ], "suggestion": true }, diff --git a/data/presets/presets/shop/charity.json b/data/presets/presets/shop/charity.json new file mode 100644 index 000000000..d21c90e18 --- /dev/null +++ b/data/presets/presets/shop/charity.json @@ -0,0 +1,23 @@ +{ + "icon": "shop", + "fields": [ + "operator", + "address", + "building_area", + "opening_hours", + "second_hand" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "thrift", + "op shop", + "nonprofit" + ], + "tags": { + "shop": "charity" + }, + "name": "Charity Store" +} diff --git a/data/presets/presets/shop/second_hand.json b/data/presets/presets/shop/second_hand.json index 356d11c1b..3ef57239c 100644 --- a/data/presets/presets/shop/second_hand.json +++ b/data/presets/presets/shop/second_hand.json @@ -4,7 +4,8 @@ "operator", "address", "building_area", - "opening_hours" + "opening_hours", + "second_hand" ], "geometry": [ "point", diff --git a/data/taginfo.json b/data/taginfo.json index 501fecdb2..9442eb8f3 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1951,6 +1951,10 @@ "key": "shop", "value": "carpet" }, + { + "key": "shop", + "value": "charity" + }, { "key": "shop", "value": "cheese" diff --git a/dist/locales/en.json b/dist/locales/en.json index 7f6613ea0..f799b7bb3 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2857,7 +2857,7 @@ }, "leisure/miniature_golf": { "name": "Miniature Golf", - "terms": "crazy,mini,putt" + "terms": "crazy golf,mini golf,putt-putt" }, "leisure/nature_reserve": { "name": "Nature Reserve", @@ -3527,6 +3527,10 @@ "name": "Carpet Store", "terms": "rug" }, + "shop/charity": { + "name": "Charity Store", + "terms": "thrift,op shop,nonprofit" + }, "shop/cheese": { "name": "Cheese Store", "terms": ""