From 27ac33e817cb8a39d205f24519670e3b9f02345c Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 6 Jan 2020 13:06:12 -0500 Subject: [PATCH] Add Type field to Museum preset Add Art Museum and History Museum presets Deprecate some museum_type tags --- data/deprecated.json | 16 +++++++++++ data/presets.yaml | 13 +++++++++ data/presets/fields.json | 1 + data/presets/fields/museum.json | 5 ++++ data/presets/presets.json | 4 ++- data/presets/presets/tourism/museum.json | 1 + data/presets/presets/tourism/museum/art.json | 27 +++++++++++++++++++ .../presets/tourism/museum/history.json | 25 +++++++++++++++++ data/taginfo.json | 7 +++++ dist/locales/en.json | 11 ++++++++ 10 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 data/presets/fields/museum.json create mode 100644 data/presets/presets/tourism/museum/art.json create mode 100644 data/presets/presets/tourism/museum/history.json diff --git a/data/deprecated.json b/data/deprecated.json index 697e87424..637788125 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -747,6 +747,22 @@ "old": {"mining_resource": "*"}, "replace": {"resource": "$1"} }, + { + "old": {"museum_type": "art"}, + "replace": {"museum": "art"} + }, + { + "old": {"museum_type": "history"}, + "replace": {"museum": "history"} + }, + { + "old": {"museum_type": "private"}, + "replace": {"operator:type": "private"} + }, + { + "old": {"museum_type": "public"}, + "replace": {"operator:type": "public"} + }, { "old": {"natural": "marsh"}, "replace": {"natural": "wetland", "wetland": "marsh"} diff --git a/data/presets.yaml b/data/presets.yaml index 428a28e7d..add50b309 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1420,6 +1420,9 @@ en: # mtb/scale/uphill field placeholder placeholder: '0, 1, 2, 3...' terms: '[translate with synonyms or related terms for ''Mountain Biking Uphill Difficulty'', separated by commas]' + museum: + # museum=* + label: Type name: # name=* label: Name @@ -8287,6 +8290,16 @@ 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 + # 'terms: artifacts,dioramas,exhibits,exhibitions,foundation,hall,institution' + terms: '' tourism/picnic_site: # tourism=picnic_site name: Picnic Site diff --git a/data/presets/fields.json b/data/presets/fields.json index eaa0ec09f..a622da50c 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -259,6 +259,7 @@ "mtb/scale": {"key": "mtb:scale", "type": "combo", "label": "Mountain Biking Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Solid gravel/packed earth, no obstacles, wide curves", "1": "1: Some loose surface, small obstacles, wide curves", "2": "2: Much loose surface, large obstacles, easy hairpins", "3": "3: Slippery surface, large obstacles, tight hairpins", "4": "4: Loose surface or boulders, dangerous hairpins", "5": "5: Maximum difficulty, boulder fields, landslides", "6": "6: Not rideable except by the very best mountain bikers"}}}, "mtb/scale/imba": {"key": "mtb:scale:imba", "type": "combo", "label": "IMBA Trail Difficulty", "placeholder": "Easy, Medium, Difficult...", "strings": {"options": {"0": "Easiest (white circle)", "1": "Easy (green circle)", "2": "Medium (blue square)", "3": "Difficult (black diamond)", "4": "Extremely Difficult (double black diamond)"}}}, "mtb/scale/uphill": {"key": "mtb:scale:uphill", "type": "combo", "label": "Mountain Biking Uphill Difficulty", "placeholder": "0, 1, 2, 3...", "strings": {"options": {"0": "0: Avg. incline <10%, gravel/packed earth, no obstacles", "1": "1: Avg. incline <15%, gravel/packed earth, few small objects", "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots", "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches", "4": "4: Avg. incline <30%, poor condition, big rocks/branches", "5": "5: Very steep, bike generally needs to be pushed or carried"}}}, + "museum": {"key": "museum", "type": "combo", "label": "Type"}, "name": {"key": "name", "type": "localized", "label": "Name", "universal": true, "placeholder": "Common name (if any)", "terms": ["label", "title"]}, "natural": {"key": "natural", "type": "typeCombo", "label": "Natural"}, "network_bicycle": {"key": "network", "type": "combo", "label": "Network Class", "placeholder": "Local, Regional, National, International", "strings": {"options": {"lcn": "Local", "rcn": "Regional", "ncn": "National", "icn": "International"}}}, diff --git a/data/presets/fields/museum.json b/data/presets/fields/museum.json new file mode 100644 index 000000000..defc585de --- /dev/null +++ b/data/presets/fields/museum.json @@ -0,0 +1,5 @@ +{ + "key": "museum", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 7e1bca524..8a85c5046 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1213,7 +1213,9 @@ "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"}, "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", "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": {"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"}, "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2}, diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json index eaf8f7ed3..5262e99a4 100644 --- a/data/presets/presets/tourism/museum.json +++ b/data/presets/presets/tourism/museum.json @@ -4,6 +4,7 @@ "name", "operator", "operator/type", + "museum", "address", "building_area", "opening_hours" diff --git a/data/presets/presets/tourism/museum/art.json b/data/presets/presets/tourism/museum/art.json new file mode 100644 index 000000000..50c14d55e --- /dev/null +++ b/data/presets/presets/tourism/museum/art.json @@ -0,0 +1,27 @@ +{ + "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/presets/presets/tourism/museum/history.json b/data/presets/presets/tourism/museum/history.json new file mode 100644 index 000000000..812963296 --- /dev/null +++ b/data/presets/presets/tourism/museum/history.json @@ -0,0 +1,25 @@ +{ + "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" +} diff --git a/data/taginfo.json b/data/taginfo.json index 7823e6588..6a39d3a5a 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1156,6 +1156,8 @@ {"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"}, {"key": "tourism", "value": "trail_riding_station", "description": "🄿 Trail Riding Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"}, @@ -1609,6 +1611,7 @@ {"key": "mtb:scale:uphill", "value": "3", "description": "🄵 Mountain Biking Uphill Difficulty"}, {"key": "mtb:scale:uphill", "value": "4", "description": "🄵 Mountain Biking Uphill Difficulty"}, {"key": "mtb:scale:uphill", "value": "5", "description": "🄵 Mountain Biking Uphill Difficulty"}, + {"key": "museum", "description": "🄵 Type"}, {"key": "name", "description": "🄵 Name"}, {"key": "network", "value": "lcn", "description": "🄵 Network Class"}, {"key": "network", "value": "rcn", "description": "🄵 Network Class"}, @@ -2088,6 +2091,10 @@ {"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"}, {"key": "natural", "value": "marsh", "description": "🄳 ➜ natural=wetland + wetland=marsh"}, {"key": "natural", "value": "waterfall", "description": "🄳 ➜ waterway=waterfall"}, {"key": "NOTE", "description": "🄳 ➜ note=*"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 6474fb5a6..579053029 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3792,6 +3792,9 @@ "5": "5: Very steep, bike generally needs to be pushed or carried" } }, + "museum": { + "label": "Type" + }, "name": { "label": "Name", "terms": "label,title", @@ -9628,6 +9631,14 @@ "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" + }, "tourism/picnic_site": { "name": "Picnic Site", "terms": "camp"