From ec98a06d5815c461c5d379ff81e79cf7feb21d67 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 3 Jan 2020 11:46:20 -0500 Subject: [PATCH] Add `gambling` field to gambling-related presets (re: #7198) --- data/deprecated.json | 12 ++++++++++++ data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/gambling.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/amenity/casino.json | 1 + data/taginfo.json | 2 ++ dist/locales/en.json | 3 +++ 8 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/gambling.json diff --git a/data/deprecated.json b/data/deprecated.json index f2cca1e97..d8568d72f 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -460,6 +460,18 @@ "old": {"footway": "separate"}, "replace": {"sidewalk": "separate"} }, + { + "old": {"amenity": "gambling", "gambling": "casino"}, + "replace": {"amenity": "casino"} + }, + { + "old": {"leisure": "amusement_arcade", "gambling": "*"}, + "replace": {"leisure": "adult_gaming_centre", "gambling": "$1"} + }, + { + "old": {"gambling": "slot_machine"}, + "replace": {"gambling": "slot_machines"} + }, { "old": {"generator:source": "photovoltaic"}, "replace": {"generator:source": "solar", "generator:method": "photovoltaic"} diff --git a/data/presets.yaml b/data/presets.yaml index e70298466..93b78aff2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -897,6 +897,9 @@ en: fuel_multi: # 'fuel:=*' label: Fuel Types + gambling: + # gambling=* + label: Games gauge: # gauge=* label: Gauge diff --git a/data/presets/fields.json b/data/presets/fields.json index 4ef672a05..0f8f3a3a9 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -161,6 +161,7 @@ "from": {"key": "from", "type": "text", "label": "From"}, "fuel_multi": {"key": "fuel:", "type": "multiCombo", "label": "Fuel Types"}, "fuel": {"key": "fuel", "type": "combo", "label": "Fuel"}, + "gambling": {"key": "gambling", "type": "semiCombo", "label": "Games"}, "gauge": {"key": "gauge", "type": "combo", "label": "Gauge"}, "gender": {"type": "radio", "keys": ["male", "female", "unisex"], "label": "Gender", "placeholder": "Unknown", "strings": {"options": {"male": "Male", "female": "Female", "unisex": "Unisex"}}, "terms": ["access", "female", "male", "unisex"]}, "generator/method": {"key": "generator:method", "type": "combo", "label": "Method"}, diff --git a/data/presets/fields/gambling.json b/data/presets/fields/gambling.json new file mode 100644 index 000000000..ebe999d13 --- /dev/null +++ b/data/presets/fields/gambling.json @@ -0,0 +1,5 @@ +{ + "key": "gambling", + "type": "semiCombo", + "label": "Games" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index b2949b0a9..289ec7834 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -89,7 +89,7 @@ "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"}, "amenity/car_sharing": {"icon": "temaki-sign_and_car", "fields": ["name", "operator", "operator/type", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["brand", "email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing Station"}, "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"}, - "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"}, + "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "gambling", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"}, "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["brand", "covered", "level", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"}, "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "level", "max_age", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"}, "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "email", "fax", "gnis/feature_id", "level", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"}, diff --git a/data/presets/presets/amenity/casino.json b/data/presets/presets/amenity/casino.json index 15461bbdb..22bac255d 100644 --- a/data/presets/presets/amenity/casino.json +++ b/data/presets/presets/amenity/casino.json @@ -6,6 +6,7 @@ "address", "building_area", "opening_hours", + "gambling", "smoking" ], "moreFields": [ diff --git a/data/taginfo.json b/data/taginfo.json index 6091588ee..ef9769556 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1489,6 +1489,7 @@ {"key": "from", "description": "🄵 From"}, {"key": "fuel:", "description": "🄵 Fuel Types"}, {"key": "fuel", "description": "🄵 Fuel"}, + {"key": "gambling", "description": "🄵 Games"}, {"key": "gauge", "description": "🄵 Gauge"}, {"key": "male", "description": "🄵 Gender"}, {"key": "female", "description": "🄵 Gender"}, @@ -2026,6 +2027,7 @@ {"key": "footway", "value": "none", "description": "🄳 ➜ sidewalk=no"}, {"key": "footway", "value": "right", "description": "🄳 ➜ sidewalk=right"}, {"key": "footway", "value": "separate", "description": "🄳 ➜ sidewalk=separate"}, + {"key": "gambling", "value": "slot_machine", "description": "🄳 ➜ gambling=slot_machines"}, {"key": "generator:source", "value": "photovoltaic", "description": "🄳 ➜ generator:source=solar + generator:method=photovoltaic"}, {"key": "golf", "value": "faiway", "description": "🄳 ➜ golf=fairway + landuse=grass"}, {"key": "golf", "value": "putting_green", "description": "🄳 ➜ golf=green + landuse=grass"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index f57840062..b33926cdd 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3343,6 +3343,9 @@ "fuel": { "label": "Fuel" }, + "gambling": { + "label": "Games" + }, "gauge": { "label": "Gauge" },