From 67e2f6d264bd07eea5fbfc6d9aac9d1424e87238 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 6 Jan 2020 16:02:00 -0500 Subject: [PATCH] Remove Art Museum preset due to unclear distinction with Art Gallery --- data/deprecated.json | 4 --- data/presets.yaml | 5 ---- data/presets/presets.json | 1 - data/presets/presets/tourism/museum/art.json | 27 -------------------- data/taginfo.json | 2 -- dist/locales/en.json | 4 --- 6 files changed, 43 deletions(-) delete mode 100644 data/presets/presets/tourism/museum/art.json diff --git a/data/deprecated.json b/data/deprecated.json index f774c0d5c..6b81d5ae8 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -767,10 +767,6 @@ "old": {"mining_resource": "*"}, "replace": {"resource": "$1"} }, - { - "old": {"museum_type": "art"}, - "replace": {"museum": "art"} - }, { "old": {"museum_type": "history"}, "replace": {"museum": "history"} diff --git a/data/presets.yaml b/data/presets.yaml index 637c115a3..52d1a2ac6 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -8293,11 +8293,6 @@ en: name: Museum # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*' terms: '' - tourism/museum/art: - # 'tourism=museum, museum=art' - name: Art Museum - # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*' - terms: '' tourism/museum/history: # 'tourism=museum, museum=history' name: History Museum diff --git a/data/presets/presets.json b/data/presets/presets.json index 4e6720e08..d600c36bc 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1214,7 +1214,6 @@ "tourism/information/terminal": {"icon": "maki-information", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"}, "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "terms": ["lodging", "motor hotel", "overnight accommodations"], "name": "Motel"}, "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "museum", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"}, - "tourism/museum/art": {"icon": "temaki-museum", "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum", "museum": "art"}, "reference": {"key": "museum", "value": "art"}, "name": "Art Museum"}, "tourism/museum/history": {"icon": "temaki-museum", "geometry": ["point", "area"], "terms": ["artifacts", "dioramas", "exhibits", "exhibitions", "foundation", "hall", "institution"], "tags": {"tourism": "museum", "museum": "history"}, "reference": {"key": "museum", "value": "history"}, "name": "History Museum"}, "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"}, "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"}, diff --git a/data/presets/presets/tourism/museum/art.json b/data/presets/presets/tourism/museum/art.json deleted file mode 100644 index 50c14d55e..000000000 --- a/data/presets/presets/tourism/museum/art.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "icon": "temaki-museum", - "geometry": [ - "point", - "area" - ], - "terms": [ - "art*", - "exhibit*", - "gallery", - "foundation", - "hall", - "institution", - "paint*", - "photo*", - "sculpt*" - ], - "tags": { - "tourism": "museum", - "museum": "art" - }, - "reference": { - "key": "museum", - "value": "art" - }, - "name": "Art Museum" -} diff --git a/data/taginfo.json b/data/taginfo.json index 7c490f0b4..260d08888 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1156,7 +1156,6 @@ {"key": "information", "value": "terminal", "description": "🄿 Information Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"}, {"key": "tourism", "value": "motel", "description": "🄿 Motel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"}, {"key": "tourism", "value": "museum", "description": "🄿 Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"}, - {"key": "museum", "value": "art", "description": "🄿 Art Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"}, {"key": "museum", "value": "history", "description": "🄿 History Museum", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/museum.svg"}, {"key": "tourism", "value": "picnic_site", "description": "🄿 Picnic Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/picnic-site-15.svg"}, {"key": "tourism", "value": "theme_park", "description": "🄿 Theme Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"}, @@ -2097,7 +2096,6 @@ {"key": "men", "description": "🄳 ➜ male=*"}, {"key": "minage", "description": "🄳 ➜ min_age=*"}, {"key": "mining_resource", "description": "🄳 ➜ resource=*"}, - {"key": "museum_type", "value": "art", "description": "🄳 ➜ museum=art"}, {"key": "museum_type", "value": "history", "description": "🄳 ➜ museum=history"}, {"key": "museum_type", "value": "private", "description": "🄳 ➜ operator:type=private"}, {"key": "museum_type", "value": "public", "description": "🄳 ➜ operator:type=public"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index a7d43a7d4..270eccc5f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -9634,10 +9634,6 @@ "name": "Museum", "terms": "art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*" }, - "tourism/museum/art": { - "name": "Art Museum", - "terms": "art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*" - }, "tourism/museum/history": { "name": "History Museum", "terms": "artifacts,dioramas,exhibits,exhibitions,foundation,hall,institution"