diff --git a/data/deprecated.json b/data/deprecated.json index bcec93ab3..7a170c0f0 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -627,10 +627,18 @@ "old": {"leisure": "beach"}, "replace": {"natural": "beach"} }, + { + "old": {"leisure": "bingo"}, + "replace": {"amenity": "gambling", "gambling": "bingo"} + }, { "old": {"leisure": "club"}, "replace": {"club": "*"} }, + { + "old": {"leisure": "gambling"}, + "replace": {"amenity": "gambling"} + }, { "old": {"leisure": "golf_pin"}, "replace": {"golf": "pin"} @@ -643,14 +651,14 @@ "old": {"leisure": "ice_rink", "sport": "skating"}, "replace": {"leisure": "ice_rink", "sport": "ice_skating"} }, - { - "old": {"leisure": "video_arcade"}, - "replace": {"leisure": "amusement_arcade"} - }, { "old": {"leisure": "recreation_ground"}, "replace": {"landuse": "recreation_ground"} }, + { + "old": {"leisure": "video_arcade"}, + "replace": {"leisure": "amusement_arcade"} + }, { "old": {"Level": "*"}, "replace": {"level": "$1"} diff --git a/data/presets.yaml b/data/presets.yaml index e7ca88ef9..c970eaf2e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3195,6 +3195,11 @@ en: name: Gas Station # 'terms: petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel' terms: '' + amenity/gambling: + # amenity=gambling + name: Gambling Hall + # 'terms: betting,bingo,blackjack,casino,craps,gamble,gambling,keno,lottery,pachinko,poker,roulette,slot machines,slots' + terms: '' amenity/grave_yard: # amenity=grave_yard name: Graveyard @@ -7458,7 +7463,7 @@ en: shop/bookmaker: # shop=bookmaker name: Bookmaker - # 'terms: betting,bookie' + # 'terms: betting,bookie,gamble,gambling,turf accountant' terms: '' shop/books: # shop=books @@ -7841,6 +7846,7 @@ en: shop/lottery: # shop=lottery name: Lottery Shop + # 'terms: lotto tickets,gamble,gambling,scratch-offs' terms: '' shop/mall: # shop=mall diff --git a/data/presets/presets.json b/data/presets/presets.json index 253ff09b1..61220deff 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -128,6 +128,7 @@ "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["capacity", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "outdoor_seating", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"}, "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", "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/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"}, @@ -1039,7 +1040,7 @@ "shop/beverages": {"icon": "temaki-bottles", "geometry": ["point", "area"], "tags": {"shop": "beverages"}, "terms": ["drinks"], "name": "Beverage Store"}, "shop/bicycle": {"icon": "maki-bicycle", "fields": ["{shop}", "service/bicycle"], "geometry": ["point", "area"], "terms": ["bike", "repair", "tricycle", "unicycle"], "tags": {"shop": "bicycle"}, "name": "Bicycle Shop"}, "shop/boat": {"icon": "temaki-boat", "geometry": ["point", "area"], "terms": ["fishing boat", "jetski", "motorboat", "rowboat", "sailboat", "vessel", "watercraft"], "tags": {"shop": "boat"}, "name": "Boat Store"}, - "shop/bookmaker": {"icon": "temaki-money_hand", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"}, + "shop/bookmaker": {"icon": "temaki-money_hand", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "bookmaker"}, "terms": ["betting", "bookie", "gamble", "gambling", "turf accountant"], "name": "Bookmaker"}, "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/brewing_supplies": {"icon": "temaki-storage_fermenter", "geometry": ["point", "area"], "terms": ["brew shop", "homebrew supply store"], "tags": {"shop": "brewing_supplies"}, "name": "Brewing Supply Store"}, "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"}, @@ -1117,7 +1118,7 @@ "shop/leather": {"icon": "temaki-handbag", "geometry": ["point", "area"], "tags": {"shop": "leather"}, "name": "Leather Store"}, "shop/lighting": {"icon": "temaki-desk_lamp", "geometry": ["point", "area"], "terms": ["fluorescent lighting", "lamps", "LEDs", "light fixtures", "lightbulbs"], "tags": {"shop": "lighting"}, "name": "Lighting Store"}, "shop/locksmith": {"icon": "fas-key", "geometry": ["point", "area"], "terms": ["key", "lockpick"], "tags": {"shop": "locksmith"}, "name": "Locksmith"}, - "shop/lottery": {"icon": "fas-ticket-alt", "geometry": ["point", "area"], "tags": {"shop": "lottery"}, "name": "Lottery Shop"}, + "shop/lottery": {"icon": "fas-ticket-alt", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "lottery"}, "terms": ["lotto tickets", "gamble", "gambling", "scratch-offs"], "name": "Lottery Shop"}, "shop/mall": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["shopping"], "tags": {"shop": "mall"}, "name": "Mall"}, "shop/massage": {"icon": "temaki-spa", "geometry": ["point", "area"], "tags": {"shop": "massage"}, "name": "Massage Shop"}, "shop/medical_supply": {"icon": "fas-crutch", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"}, diff --git a/data/presets/presets/amenity/gambling.json b/data/presets/presets/amenity/gambling.json new file mode 100644 index 000000000..936c3fd12 --- /dev/null +++ b/data/presets/presets/amenity/gambling.json @@ -0,0 +1,33 @@ +{ + "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" +} diff --git a/data/presets/presets/shop/bookmaker.json b/data/presets/presets/shop/bookmaker.json index 3a7ef107a..7b0541399 100644 --- a/data/presets/presets/shop/bookmaker.json +++ b/data/presets/presets/shop/bookmaker.json @@ -8,12 +8,15 @@ "point", "area" ], - "terms": [ - "betting", - "bookie" - ], "tags": { "shop": "bookmaker" }, + "terms": [ + "betting", + "bookie", + "gamble", + "gambling", + "turf accountant" + ], "name": "Bookmaker" } diff --git a/data/presets/presets/shop/lottery.json b/data/presets/presets/shop/lottery.json index a2bb41daf..5adf17021 100644 --- a/data/presets/presets/shop/lottery.json +++ b/data/presets/presets/shop/lottery.json @@ -1,5 +1,9 @@ { "icon": "fas-ticket-alt", + "moreFields": [ + "{shop}", + "min_age" + ], "geometry": [ "point", "area" @@ -7,5 +11,11 @@ "tags": { "shop": "lottery" }, + "terms": [ + "lotto tickets", + "gamble", + "gambling", + "scratch-offs" + ], "name": "Lottery Shop" } diff --git a/data/taginfo.json b/data/taginfo.json index 6bc8e4320..a090d1610 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -130,6 +130,7 @@ {"key": "amenity", "value": "food_court", "description": "🄿 Food Court", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"}, {"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@master/svg/fontawesome/fas-coins.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@master/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"}, @@ -2066,10 +2067,12 @@ {"key": "landuse", "value": "port", "description": "🄳 ➜ landuse=industrial + industrial=port"}, {"key": "landuse", "value": "wood", "description": "🄳 ➜ natural=wood"}, {"key": "leisure", "value": "beach", "description": "🄳 ➜ natural=beach"}, + {"key": "leisure", "value": "bingo", "description": "🄳 ➜ amenity=gambling + gambling=bingo"}, {"key": "leisure", "value": "club", "description": "🄳 ➜ club=*"}, + {"key": "leisure", "value": "gambling", "description": "🄳 ➜ amenity=gambling"}, {"key": "leisure", "value": "golf_pin", "description": "🄳 ➜ golf=pin"}, - {"key": "leisure", "value": "video_arcade", "description": "🄳 ➜ leisure=amusement_arcade"}, {"key": "leisure", "value": "recreation_ground", "description": "🄳 ➜ landuse=recreation_ground"}, + {"key": "leisure", "value": "video_arcade", "description": "🄳 ➜ leisure=amusement_arcade"}, {"key": "Level", "description": "🄳 ➜ level=*"}, {"key": "LEVEL", "description": "🄳 ➜ level=*"}, {"key": "levels", "description": "🄳 ➜ building:levels=*"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 11cb605ea..f1d4438b9 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5345,6 +5345,10 @@ "name": "Gas Station", "terms": "petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel" }, + "amenity/gambling": { + "name": "Gambling Hall", + "terms": "betting,bingo,blackjack,casino,craps,gamble,gambling,keno,lottery,pachinko,poker,roulette,slot machines,slots" + }, "amenity/grave_yard": { "name": "Graveyard", "terms": "burial ground,cemetary,cemetery,churchyard,columbarium,grave yard,graveyard,mausoleum,tomb" @@ -8942,7 +8946,7 @@ }, "shop/bookmaker": { "name": "Bookmaker", - "terms": "betting,bookie" + "terms": "betting,bookie,gamble,gambling,turf accountant" }, "shop/books": { "name": "Book Store", @@ -9254,7 +9258,7 @@ }, "shop/lottery": { "name": "Lottery Shop", - "terms": "" + "terms": "lotto tickets,gamble,gambling,scratch-offs" }, "shop/mall": { "name": "Mall", diff --git a/svg/fontawesome/fas-coins.svg b/svg/fontawesome/fas-coins.svg new file mode 100644 index 000000000..c446c7773 --- /dev/null +++ b/svg/fontawesome/fas-coins.svg @@ -0,0 +1 @@ + \ No newline at end of file