From cdd624b41bd206638cd823a8df94eca3d3596d55 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 2 May 2019 20:01:18 -0700 Subject: [PATCH] Add preset for shop=cannabis (close #6301) --- data/presets.yaml | 5 +++++ data/presets/presets.json | 1 + data/presets/presets/shop/cannabis.json | 18 ++++++++++++++++++ data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ svg/fontawesome/fas-cannabis.svg | 1 + 6 files changed, 30 insertions(+) create mode 100644 data/presets/presets/shop/cannabis.json create mode 100644 svg/fontawesome/fas-cannabis.svg diff --git a/data/presets.yaml b/data/presets.yaml index ac37fe4ca..cc5139975 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6515,6 +6515,11 @@ en: name: Candle Shop # 'terms: wax' terms: '' + shop/cannabis: + # shop=cannabis + name: Cannabis Shop + # 'terms: 420,marijuana,pot,reefer,weed' + terms: '' shop/car: # shop=car name: Car Dealership diff --git a/data/presets/presets.json b/data/presets/presets.json index 09a0b499b..e30d5a549 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -941,6 +941,7 @@ "shop/books": {"icon": "fas-book", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"}, "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"}, "shop/candles": {"icon": "fas-burn", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"}, + "shop/cannabis": {"icon": "fas-cannabis", "geometry": ["point", "area"], "terms": ["420", "marijuana", "pot", "reefer", "weed"], "tags": {"shop": "cannabis"}, "name": "Cannabis Shop"}, "shop/car_parts": {"icon": "fas-car-battery", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"}, "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"}, "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car"}, "name": "Car Dealership"}, diff --git a/data/presets/presets/shop/cannabis.json b/data/presets/presets/shop/cannabis.json new file mode 100644 index 000000000..4d7cbbf9b --- /dev/null +++ b/data/presets/presets/shop/cannabis.json @@ -0,0 +1,18 @@ +{ + "icon": "fas-cannabis", + "geometry": [ + "point", + "area" + ], + "terms": [ + "420", + "marijuana", + "pot", + "reefer", + "weed" + ], + "tags": { + "shop": "cannabis" + }, + "name": "Cannabis Shop" +} diff --git a/data/taginfo.json b/data/taginfo.json index 1e5293f90..069317ef5 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -879,6 +879,7 @@ {"key": "shop", "value": "books", "description": "🄿 Book Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-book.svg?sanitize=true"}, {"key": "shop", "value": "butcher", "description": "🄿 Butcher", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-bacon.svg?sanitize=true"}, {"key": "shop", "value": "candles", "description": "🄿 Candle Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-burn.svg?sanitize=true"}, + {"key": "shop", "value": "cannabis", "description": "🄿 Cannabis Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-cannabis.svg?sanitize=true"}, {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-car-battery.svg?sanitize=true"}, {"key": "shop", "value": "car_repair", "description": "🄿 Car Repair Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-repair-15.svg?sanitize=true"}, {"key": "shop", "value": "car", "description": "🄿 Car Dealership", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 209c96547..a66c7c6f1 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8015,6 +8015,10 @@ "name": "Candle Shop", "terms": "wax" }, + "shop/cannabis": { + "name": "Cannabis Shop", + "terms": "420,marijuana,pot,reefer,weed" + }, "shop/car_parts": { "name": "Car Parts Store", "terms": "automobile,automotive" diff --git a/svg/fontawesome/fas-cannabis.svg b/svg/fontawesome/fas-cannabis.svg new file mode 100644 index 000000000..36da71138 --- /dev/null +++ b/svg/fontawesome/fas-cannabis.svg @@ -0,0 +1 @@ + \ No newline at end of file