From 2a4841f51721df173b2532094b9b2e28c02bfd94 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 4 Nov 2019 13:16:34 -0500 Subject: [PATCH] Update several communications mast and tower icons (closes #6985) --- data/presets/presets.json | 12 ++++++------ data/presets/presets/man_made/mast.json | 2 +- .../presets/presets/man_made/mast/communication.json | 2 +- .../man_made/mast/communication/mobile_phone.json | 2 +- .../presets/man_made/mast/communication/radio.json | 2 +- .../man_made/mast/communication/television.json | 2 +- .../presets/man_made/tower/communication.json | 2 +- data/taginfo.json | 10 +++++----- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 00376aead..6eeb3fc9d 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -736,11 +736,11 @@ "man_made/manhole/sewer": {"icon": "temaki-waste_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "sewer"}, "addTags": {"man_made": "manhole", "manhole": "sewer"}, "terms": ["cover", "drain", "hole", "sewer", "sewage", "utility"], "name": "Sewer Utility Manhole"}, "man_made/manhole/telecom": {"icon": "temaki-cable_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["bt", "cable", "cover", "phone", "hole", "telecom", "telephone", "utility"], "name": "Telecom Utility Manhole"}, "man_made/manhole/water": {"icon": "temaki-waste_manhole", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "water"}, "addTags": {"man_made": "manhole", "manhole": "water"}, "terms": ["cover", "drinking", "hole", "utility", "water"], "name": "Water Utility Manhole"}, - "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["communication_multi", "manufacturer", "material"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"}, - "man_made/mast/communication": {"icon": "maki-communications-tower", "fields": ["{man_made/mast}", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Mast"}, - "man_made/mast/communication/mobile_phone": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"}, - "man_made/mast/communication/radio": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "radio mast", "radio tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:radio": "yes"}, "reference": {"key": "communication:radio", "value": "yes"}, "name": "Radio Broadcast Mast"}, - "man_made/mast/communication/television": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "television mast", "television tower", "transmission mast", "transmission tower", "tv mast", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:television": "yes"}, "reference": {"key": "communication:television", "value": "yes"}, "name": "Television Broadcast Mast"}, + "man_made/mast": {"icon": "temaki-mast", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["communication_multi", "manufacturer", "material"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"}, + "man_made/mast/communication": {"icon": "temaki-mast_communication", "fields": ["{man_made/mast}", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Mast"}, + "man_made/mast/communication/mobile_phone": {"icon": "temaki-mast_communication", "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"}, + "man_made/mast/communication/radio": {"icon": "temaki-mast_communication", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "radio mast", "radio tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:radio": "yes"}, "reference": {"key": "communication:radio", "value": "yes"}, "name": "Radio Broadcast Mast"}, + "man_made/mast/communication/television": {"icon": "temaki-mast_communication", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "television mast", "television tower", "transmission mast", "transmission tower", "tv mast", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:television": "yes"}, "reference": {"key": "communication:television", "value": "yes"}, "name": "Television Broadcast Mast"}, "man_made/mineshaft": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource"], "terms": ["cave", "mine shaft", "tunnel", "underground", "vertical mine entrance"], "tags": {"man_made": "mineshaft"}, "name": "Mineshaft"}, "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator", "manufacturer"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"}, "man_made/obelisk": {"icon": "maki-monument", "fields": ["name", "inscription", "height", "material", "colour"], "geometry": ["point", "vertex", "area"], "tags": {"man_made": "obelisk"}, "name": "Obelisk"}, @@ -762,7 +762,7 @@ "man_made/torii": {"icon": "temaki-shinto", "fields": ["height", "material", "colour", "lit"], "moreFields": ["name", "operator", "ref"], "geometry": ["point", "vertex", "line"], "terms": ["Japanese gate", "Shinto shrine"], "tags": {"man_made": "torii"}, "name": "Torii"}, "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"}, "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"}, - "man_made/tower/communication": {"icon": "temaki-tower", "fields": ["{man_made/tower}", "communication_multi"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"}, + "man_made/tower/communication": {"icon": "temaki-tower_communication", "fields": ["{man_made/tower}", "communication_multi"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"}, "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Defensive Tower", "Castle Tower"], "name": "Fortified Tower"}, "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"}, "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"}, diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json index 98dce19ef..804fd7c7b 100644 --- a/data/presets/presets/man_made/mast.json +++ b/data/presets/presets/man_made/mast.json @@ -1,5 +1,5 @@ { - "icon": "maki-communications-tower", + "icon": "temaki-mast", "fields": [ "tower/type", "tower/construction", diff --git a/data/presets/presets/man_made/mast/communication.json b/data/presets/presets/man_made/mast/communication.json index 069b38b34..a59290f66 100644 --- a/data/presets/presets/man_made/mast/communication.json +++ b/data/presets/presets/man_made/mast/communication.json @@ -1,5 +1,5 @@ { - "icon": "maki-communications-tower", + "icon": "temaki-mast_communication", "fields": [ "{man_made/mast}", "communication_multi" diff --git a/data/presets/presets/man_made/mast/communication/mobile_phone.json b/data/presets/presets/man_made/mast/communication/mobile_phone.json index a51a5ccbe..91d0adf46 100644 --- a/data/presets/presets/man_made/mast/communication/mobile_phone.json +++ b/data/presets/presets/man_made/mast/communication/mobile_phone.json @@ -1,5 +1,5 @@ { - "icon": "maki-communications-tower", + "icon": "temaki-mast_communication", "geometry": [ "point" ], diff --git a/data/presets/presets/man_made/mast/communication/radio.json b/data/presets/presets/man_made/mast/communication/radio.json index e1f99b75b..e214c5bc4 100644 --- a/data/presets/presets/man_made/mast/communication/radio.json +++ b/data/presets/presets/man_made/mast/communication/radio.json @@ -1,5 +1,5 @@ { - "icon": "maki-communications-tower", + "icon": "temaki-mast_communication", "geometry": [ "point" ], diff --git a/data/presets/presets/man_made/mast/communication/television.json b/data/presets/presets/man_made/mast/communication/television.json index defc67e99..0762b4df0 100644 --- a/data/presets/presets/man_made/mast/communication/television.json +++ b/data/presets/presets/man_made/mast/communication/television.json @@ -1,5 +1,5 @@ { - "icon": "maki-communications-tower", + "icon": "temaki-mast_communication", "geometry": [ "point" ], diff --git a/data/presets/presets/man_made/tower/communication.json b/data/presets/presets/man_made/tower/communication.json index 18f9c3042..7bb2880bb 100644 --- a/data/presets/presets/man_made/tower/communication.json +++ b/data/presets/presets/man_made/tower/communication.json @@ -1,5 +1,5 @@ { - "icon": "temaki-tower", + "icon": "temaki-tower_communication", "fields": [ "{man_made/tower}", "communication_multi" diff --git a/data/taginfo.json b/data/taginfo.json index 7690b3688..69ae07d46 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -713,11 +713,11 @@ {"key": "manhole", "value": "sewer", "description": "🄿 Sewer Utility Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste_manhole.svg"}, {"key": "manhole", "value": "telecom", "description": "🄿 Telecom Utility Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/cable_manhole.svg"}, {"key": "manhole", "value": "water", "description": "🄿 Water Utility Manhole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/waste_manhole.svg"}, - {"key": "man_made", "value": "mast", "description": "🄿 Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, - {"key": "tower:type", "value": "communication", "description": "🄿 Communication Mast, 🄿 Communication Tower", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, - {"key": "communication:mobile_phone", "value": "yes", "description": "🄿 Mobile Phone Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, - {"key": "communication:radio", "value": "yes", "description": "🄿 Radio Broadcast Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, - {"key": "communication:television", "value": "yes", "description": "🄿 Television Broadcast Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"}, + {"key": "man_made", "value": "mast", "description": "🄿 Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/mast.svg"}, + {"key": "tower:type", "value": "communication", "description": "🄿 Communication Mast, 🄿 Communication Tower", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/mast_communication.svg"}, + {"key": "communication:mobile_phone", "value": "yes", "description": "🄿 Mobile Phone Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/mast_communication.svg"}, + {"key": "communication:radio", "value": "yes", "description": "🄿 Radio Broadcast Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/mast_communication.svg"}, + {"key": "communication:television", "value": "yes", "description": "🄿 Television Broadcast Mast", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/mast_communication.svg"}, {"key": "man_made", "value": "mineshaft", "description": "🄿 Mineshaft", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-15.svg"}, {"key": "man_made", "value": "monitoring_station", "description": "🄿 Monitoring Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/antenna.svg"}, {"key": "man_made", "value": "obelisk", "description": "🄿 Obelisk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/monument-15.svg"},