From f3b25551366b7698dce485e6a1f51369815d5e18 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 19 May 2020 14:36:07 -0400 Subject: [PATCH] Add amenity=give_box preset and deprecate amenity=givebox (close #7574) --- data/deprecated.json | 4 ++ data/presets.yaml | 5 +++ data/presets/presets.json | 1 + data/presets/presets/amenity/give_box.json | 44 ++++++++++++++++++++++ data/taginfo.json | 2 + dist/locales/en.json | 4 ++ svg/fontawesome/fas-box-open.svg | 1 + 7 files changed, 61 insertions(+) create mode 100644 data/presets/presets/amenity/give_box.json create mode 100644 svg/fontawesome/fas-box-open.svg diff --git a/data/deprecated.json b/data/deprecated.json index 775044c11..5c8b09985 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -95,6 +95,10 @@ "old": {"amenity": "garages"}, "replace": {"landuse": "garages"} }, + { + "old": {"amenity": "givebox"}, + "replace": {"amenity": "give_box"} + }, { "old": {"amenity": "gym"}, "replace": {"leisure": "fitness_centre"} diff --git a/data/presets.yaml b/data/presets.yaml index 27544ccb2..d159a1f99 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3324,6 +3324,11 @@ en: name: Gambling Hall # 'terms: betting,bingo,blackjack,casino,craps,gamble,gambling,keno,lottery,pachinko,poker,roulette,slot machines,slots' terms: '' + amenity/give_box: + # amenity=give_box + name: Free Box + # 'terms: donations,free box,free table,freebox,give box,give shelf,givebox,library,share shelf' + terms: '' amenity/grave_yard: # amenity=grave_yard name: Graveyard diff --git a/data/presets/presets.json b/data/presets/presets.json index a358b87ea..01ecd86a8 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -126,6 +126,7 @@ "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "fountain", "drinking_water", "height", "lit"], "moreFields": ["covered", "indoor", "level", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "terms": ["basin", "water"], "name": "Fountain"}, "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["brand", "building", "email", "fax", "gnis/feature_id", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"}, "amenity/gambling": {"icon": "fas-coins", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "geometry": ["point", "area"], "terms": ["betting", "bingo", "blackjack", "casino", "craps", "gamble", "gambling", "keno", "lottery", "pachinko", "poker", "roulette", "slot machines", "slots"], "tags": {"amenity": "gambling"}, "name": "Gambling Hall"}, + "amenity/give_box": {"icon": "fas-box-open", "fields": ["name", "operator", "opening_hours", "opening_hours/covid19", "access_simple", "website"], "moreFields": ["address", "brand", "capacity", "covered", "email", "indoor", "level", "lit", "location", "phone", "ref", "wheelchair"], "geometry": ["point", "area"], "terms": ["donations", "free box", "free table", "freebox", "give box", "give shelf", "givebox", "library", "share shelf"], "tags": {"amenity": "give_box"}, "name": "Free Box"}, "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "terms": ["burial ground", "cemetary", "cemetery", "churchyard", "columbarium", "grave yard", "graveyard", "mausoleum", "tomb"], "name": "Graveyard"}, "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"}, "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"}, diff --git a/data/presets/presets/amenity/give_box.json b/data/presets/presets/amenity/give_box.json new file mode 100644 index 000000000..e28e3b81e --- /dev/null +++ b/data/presets/presets/amenity/give_box.json @@ -0,0 +1,44 @@ +{ + "icon": "fas-box-open", + "fields": [ + "name", + "operator", + "opening_hours", + "opening_hours/covid19", + "access_simple", + "website" + ], + "moreFields": [ + "address", + "brand", + "capacity", + "covered", + "email", + "indoor", + "level", + "lit", + "location", + "phone", + "ref", + "wheelchair" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "donations", + "free box", + "free table", + "freebox", + "give box", + "give shelf", + "givebox", + "library", + "share shelf" + ], + "tags": { + "amenity": "give_box" + }, + "name": "Free Box" +} diff --git a/data/taginfo.json b/data/taginfo.json index c11d95687..c0c325449 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -129,6 +129,7 @@ {"key": "amenity", "value": "fountain", "description": "🄿 Fountain", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/fountain.svg"}, {"key": "amenity", "value": "fuel", "description": "🄿 Gas Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fuel-15.svg"}, {"key": "amenity", "value": "gambling", "description": "🄿 Gambling Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-coins.svg"}, + {"key": "amenity", "value": "give_box", "description": "🄿 Free Box", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-box-open.svg"}, {"key": "amenity", "value": "grave_yard", "description": "🄿 Graveyard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"}, {"key": "amenity", "value": "grit_bin", "description": "🄿 Grit Bin", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-box.svg"}, {"key": "amenity", "value": "hospital", "description": "🄿 Hospital Grounds", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"}, @@ -2004,6 +2005,7 @@ {"key": "amenity", "value": "firepit", "description": "🄳 ➜ leisure=firepit"}, {"key": "amenity", "value": "garage", "description": "🄳 ➜ landuse=garages"}, {"key": "amenity", "value": "garages", "description": "🄳 ➜ landuse=garages"}, + {"key": "amenity", "value": "givebox", "description": "🄳 ➜ amenity=give_box"}, {"key": "amenity", "value": "gym", "description": "🄳 ➜ leisure=fitness_centre"}, {"key": "amenity", "value": "hotel", "description": "🄳 ➜ tourism=hotel"}, {"key": "amenity", "value": "kiosk", "description": "🄳 ➜ shop=kiosk"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 06ab7bf57..79475cdbd 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5495,6 +5495,10 @@ "name": "Gambling Hall", "terms": "betting,bingo,blackjack,casino,craps,gamble,gambling,keno,lottery,pachinko,poker,roulette,slot machines,slots" }, + "amenity/give_box": { + "name": "Free Box", + "terms": "donations,free box,free table,freebox,give box,give shelf,givebox,library,share shelf" + }, "amenity/grave_yard": { "name": "Graveyard", "terms": "burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb" diff --git a/svg/fontawesome/fas-box-open.svg b/svg/fontawesome/fas-box-open.svg new file mode 100644 index 000000000..73fe87e91 --- /dev/null +++ b/svg/fontawesome/fas-box-open.svg @@ -0,0 +1 @@ + \ No newline at end of file