From 3571182f2d0cb5244869fa21494d43a731dfb157 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 18 Sep 2019 11:38:20 -0400 Subject: [PATCH] Revert "Add preset for `amenity=stripclub` (close #6867)" This reverts commit 55392f5eae5a5e1b510dede116fd2bce3b377bcd. --- data/presets.yaml | 4 --- data/presets/presets.json | 1 - data/presets/presets/amenity/stripclub.json | 30 --------------------- data/taginfo.json | 1 - dist/locales/en.json | 4 --- 5 files changed, 40 deletions(-) delete mode 100644 data/presets/presets/amenity/stripclub.json diff --git a/data/presets.yaml b/data/presets.yaml index 84f3da72bd..41e345ff54 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3464,10 +3464,6 @@ en: name: Nursing Home # 'terms: elderly,living,nursing,old,senior,assisted living' terms: '' - amenity/stripclub: - # amenity=stripclub - name: Strip Club - terms: '' amenity/studio: # amenity=studio name: Studio diff --git a/data/presets/presets.json b/data/presets/presets.json index fb0f84283b..adc0a86c54 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -219,7 +219,6 @@ "amenity/social_facility/group_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["old", "senior", "living", "care home", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "group_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "group_home"}, "name": "Elderly Group Home"}, "amenity/social_facility/homeless_shelter": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": ["houseless", "unhoused", "displaced"], "tags": {"amenity": "social_facility", "social_facility": "shelter", "social_facility:for": "homeless"}, "reference": {"key": "social_facility", "value": "shelter"}, "name": "Homeless Shelter"}, "amenity/social_facility/nursing_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["elderly", "living", "nursing", "old", "senior", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "nursing_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home"}, - "amenity/stripclub": {"icon": "maki-commercial", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "stripclub"}, "name": "Strip Club"}, "amenity/studio": {"icon": "fas-microphone", "fields": ["name", "studio", "address", "building_area"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"}, "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity", "address"], "moreFields": ["access_simple", "brand", "opening_hours", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"}, "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "level", "lit", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"}, diff --git a/data/presets/presets/amenity/stripclub.json b/data/presets/presets/amenity/stripclub.json deleted file mode 100644 index f3463a531d..0000000000 --- a/data/presets/presets/amenity/stripclub.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "icon": "maki-commercial", - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "min_age", - "smoking" - ], - "moreFields": [ - "air_conditioning", - "email", - "fax", - "level", - "payment_multi", - "phone", - "website", - "wheelchair" - ], - "geometry": [ - "point", - "area" - ], - "tags": { - "amenity": "stripclub" - }, - "name": "Strip Club" -} diff --git a/data/taginfo.json b/data/taginfo.json index f46ca02483..d4c4f5e4b8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -216,7 +216,6 @@ {"key": "social_facility", "value": "food_bank", "description": "🄿 Food Bank", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/social_facility.svg"}, {"key": "social_facility:for", "value": "senior", "description": "🄿 Elderly Group Home, 🄿 Nursing Home", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wheelchair-15.svg"}, {"key": "social_facility:for", "value": "homeless", "description": "🄿 Homeless Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/social_facility.svg"}, - {"key": "amenity", "value": "stripclub", "description": "🄿 Strip Club", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/commercial-15.svg"}, {"key": "amenity", "value": "studio", "description": "🄿 Studio", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-microphone.svg"}, {"key": "amenity", "value": "taxi", "description": "🄿 Taxi Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-taxi.svg"}, {"key": "amenity", "value": "telephone", "description": "🄿 Telephone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/telephone-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 62fcb68bf2..b9f25ed3d1 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5729,10 +5729,6 @@ "name": "Nursing Home", "terms": "elderly,living,nursing,old,senior,assisted living" }, - "amenity/stripclub": { - "name": "Strip Club", - "terms": "" - }, "amenity/studio": { "name": "Studio", "terms": "recording,radio,television"