Adds Communication, Mobile Phone, Television, and Radio Mast presets

Adds Communication Tower preset
Corrects the paths of the Observation Tower and Surveillance Camera presets

data/presets.yaml

@@ -4710,16 +4710,31 @@ en:
         name: Mast
         # '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'
         terms: '<translate with synonyms or related terms for ''Mast'', separated by commas>'
+      man_made/mast/communication:
+        # 'man_made=mast, tower:type=communication'
+        name: Communication Mast
+        # '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'
+        terms: '<translate with synonyms or related terms for ''Communication Mast'', separated by commas>'
+      man_made/mast/communication/mobile_phone:
+        # 'man_made=mast, tower:type=communication, communication:mobile_phone=yes'
+        name: Mobile Phone Mast
+        # 'terms: antenna,cell mast,cell phone mast,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,television tower,transmission mast,transmission tower'
+        terms: '<translate with synonyms or related terms for ''Mobile Phone Mast'', separated by commas>'
+      man_made/mast/communication/radio:
+        # 'man_made=mast, tower:type=communication, communication:radio=yes'
+        name: Radio Broadcast Mast
+        # 'terms: antenna,broadcast tower,communication mast,communication tower,guyed tower,radio mast,radio tower,transmission mast,transmission tower'
+        terms: '<translate with synonyms or related terms for ''Radio Broadcast Mast'', separated by commas>'
+      man_made/mast/communication/television:
+        # 'man_made=mast, tower:type=communication, communication:television=yes'
+        name: Television Broadcast Mast
+        # 'terms: antenna,broadcast tower,communication mast,communication tower,guyed tower,television tower,transmission mast,transmission tower,tv tower'
+        terms: '<translate with synonyms or related terms for ''Television Broadcast Mast'', separated by commas>'
       man_made/monitoring_station:
         # man_made=monitoring_station
         name: Monitoring Station
         # 'terms: weather,earthquake,seismology,air,gps'
         terms: '<translate with synonyms or related terms for ''Monitoring Station'', separated by commas>'
-      man_made/observation:
-        # 'man_made=tower, tower:type=observation'
-        name: Observation Tower
-        # 'terms: lookout tower,fire tower'
-        terms: '<translate with synonyms or related terms for ''Observation Tower'', separated by commas>'
       man_made/observatory:
         # man_made=observatory
         name: Observatory
@@ -4759,7 +4774,7 @@ en:
         name: Surveillance
         # 'terms: anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam'
         terms: '<translate with synonyms or related terms for ''Surveillance'', separated by commas>'
-      man_made/surveillance_camera:
+      man_made/surveillance/camera:
         # 'man_made=surveillance, surveillance:type=camera'
         name: Surveillance Camera
         # 'terms: anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam'
@@ -4773,6 +4788,16 @@ en:
         # man_made=tower
         name: Tower
         terms: '<translate with synonyms or related terms for ''Tower'', separated by commas>'
+      man_made/tower/communication:
+        # 'man_made=tower, tower:type=communication'
+        name: Communication Tower
+        # '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'
+        terms: '<translate with synonyms or related terms for ''Communication Tower'', separated by commas>'
+      man_made/tower/observation:
+        # 'man_made=tower, tower:type=observation'
+        name: Observation Tower
+        # 'terms: lookout tower,fire tower'
+        terms: '<translate with synonyms or related terms for ''Observation Tower'', separated by commas>'
       man_made/wastewater_plant:
         # man_made=wastewater_plant
         name: Wastewater Plant

data/presets/presets.json

@@ -594,8 +594,11 @@
     "man_made/groyne": {"geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
     "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["building_area"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "name": "Lighthouse"},
     "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "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"}, "name": "Mast"},
+    "man_made/mast/communication": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height", "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", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "television 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", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "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", "fields": ["tower/type", "tower/construction", "height", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:television": "yes"}, "reference": {"key": "communication:television", "value": "yes"}, "name": "Television Broadcast Mast"},
     "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
-    "man_made/observation": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "name": "Observation Tower"},
     "man_made/observatory": {"geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
     "man_made/pier": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "access"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "name": "Pier"},
@@ -603,10 +606,12 @@
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
     "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
-    "man_made/surveillance_camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
     "man_made/surveillance": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"},
+    "man_made/surveillance/camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
     "man_made/survey_point": {"icon": "maki-monument", "fields": ["ref"], "geometry": ["point", "vertex"], "terms": ["trig point", "triangulation pillar", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"},
     "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
+    "man_made/tower/communication": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "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/observation": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"},
     "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
     "man_made/water_tower": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
     "man_made/water_well": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "name": "Water Well"},

data/presets/presets/man_made/mast/communication.json

@@ -0,0 +1,37 @@
+{
+    "icon": "maki-communications-tower",
+    "fields": [
+        "tower/type",
+        "tower/construction",
+        "height",
+        "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"
+}

data/presets/presets/man_made/mast/communication/mobile_phone.json

@@ -0,0 +1,36 @@
+{
+    "icon": "maki-communications-tower",
+    "fields": [
+        "tower/type",
+        "tower/construction",
+        "height",
+        "communication_multi"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "antenna",
+        "cell mast",
+        "cell phone mast",
+        "cell phone tower",
+        "cell tower",
+        "communication mast",
+        "communication tower",
+        "guyed tower",
+        "mobile phone tower",
+        "television 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"
+}

data/presets/presets/man_made/mast/communication/radio.json

@@ -0,0 +1,33 @@
+{
+    "icon": "maki-communications-tower",
+    "fields": [
+        "tower/type",
+        "tower/construction",
+        "height",
+        "communication_multi"
+    ],
+    "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"
+}

data/presets/presets/man_made/mast/communication/television.json

@@ -0,0 +1,33 @@
+{
+    "icon": "maki-communications-tower",
+    "fields": [
+        "tower/type",
+        "tower/construction",
+        "height",
+        "communication_multi"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "antenna",
+        "broadcast tower",
+        "communication mast",
+        "communication tower",
+        "guyed tower",
+        "television tower",
+        "transmission mast",
+        "transmission tower",
+        "tv tower"
+    ],
+    "tags": {
+        "man_made": "mast",
+        "tower:type": "communication",
+        "communication:television": "yes"
+    },
+    "reference": {
+        "key": "communication:television",
+        "value": "yes"
+    },
+    "name": "Television Broadcast Mast"
+}

data/presets/presets/man_made/tower/communication.json

@@ -0,0 +1,38 @@
+{
+    "icon": "temaki-tower",
+    "fields": [
+        "tower/type",
+        "tower/construction",
+        "height",
+        "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"
+}

data/presets/presets/man_made/tower/observation.json

@@ -1,5 +1,10 @@
 {
     "icon": "temaki-tower",
+    "fields": [
+        "tower/type",
+        "tower/construction",
+        "height"
+    ],
     "geometry": [
         "point",
         "area"
@@ -12,5 +17,9 @@
         "man_made": "tower",
         "tower:type": "observation"
     },
+    "reference": {
+        "key": "tower:type",
+        "value": "observation"
+    },
     "name": "Observation Tower"
 }

data/taginfo.json

@@ -3977,6 +3977,34 @@
       "object_types": ["node"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"
     },
+    {
+      "key": "tower:type",
+      "value": "communication",
+      "description": "Communication Mast, Communication Tower",
+      "object_types": ["node"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"
+    },
+    {
+      "key": "communication:mobile_phone",
+      "value": "yes",
+      "description": "Mobile Phone Mast",
+      "object_types": ["node"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"
+    },
+    {
+      "key": "communication:radio",
+      "value": "yes",
+      "description": "Radio Broadcast Mast",
+      "object_types": ["node"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"
+    },
+    {
+      "key": "communication:television",
+      "value": "yes",
+      "description": "Television Broadcast Mast",
+      "object_types": ["node"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/communications-tower-15.svg?sanitize=true"
+    },
     {
       "key": "man_made",
       "value": "monitoring_station",
@@ -3984,13 +4012,6 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/antenna.svg?sanitize=true"
     },
-    {
-      "key": "tower:type",
-      "value": "observation",
-      "description": "Observation Tower",
-      "object_types": ["node", "area"],
-      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"
-    },
     {
       "key": "man_made",
       "value": "observatory",
@@ -4040,16 +4061,16 @@
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"
     },
     {
-      "key": "surveillance:type",
-      "value": "camera",
-      "description": "Surveillance Camera, Surveillance Type",
+      "key": "man_made",
+      "value": "surveillance",
+      "description": "Surveillance",
       "object_types": ["node"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"
     },
     {
-      "key": "man_made",
-      "value": "surveillance",
-      "description": "Surveillance",
+      "key": "surveillance:type",
+      "value": "camera",
+      "description": "Surveillance Camera, Surveillance Type",
       "object_types": ["node"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/attraction-15.svg?sanitize=true"
     },
@@ -4067,6 +4088,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"
     },
+    {
+      "key": "tower:type",
+      "value": "observation",
+      "description": "Observation Tower",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tower.svg?sanitize=true"
+    },
     {
       "key": "man_made",
       "value": "wastewater_plant",

dist/locales/en.json

@@ -5552,14 +5552,26 @@
                     "name": "Mast",
                     "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"
                 },
+                "man_made/mast/communication": {
+                    "name": "Communication Mast",
+                    "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"
+                },
+                "man_made/mast/communication/mobile_phone": {
+                    "name": "Mobile Phone Mast",
+                    "terms": "antenna,cell mast,cell phone mast,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,television tower,transmission mast,transmission tower"
+                },
+                "man_made/mast/communication/radio": {
+                    "name": "Radio Broadcast Mast",
+                    "terms": "antenna,broadcast tower,communication mast,communication tower,guyed tower,radio mast,radio tower,transmission mast,transmission tower"
+                },
+                "man_made/mast/communication/television": {
+                    "name": "Television Broadcast Mast",
+                    "terms": "antenna,broadcast tower,communication mast,communication tower,guyed tower,television tower,transmission mast,transmission tower,tv tower"
+                },
                 "man_made/monitoring_station": {
                     "name": "Monitoring Station",
                     "terms": "weather,earthquake,seismology,air,gps"
                 },
-                "man_made/observation": {
-                    "name": "Observation Tower",
-                    "terms": "lookout tower,fire tower"
-                },
                 "man_made/observatory": {
                     "name": "Observatory",
                     "terms": "astronomical,meteorological"
@@ -5588,14 +5600,14 @@
                     "name": "Storage Tank",
                     "terms": "water,oil,gas,petrol"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "Surveillance Camera",
-                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
-                },
                 "man_made/surveillance": {
                     "name": "Surveillance",
                     "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
                 },
+                "man_made/surveillance/camera": {
+                    "name": "Surveillance Camera",
+                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
+                },
                 "man_made/survey_point": {
                     "name": "Survey Point",
                     "terms": "trig point,triangulation pillar,trigonometrical station"
@@ -5604,6 +5616,14 @@
                     "name": "Tower",
                     "terms": ""
                 },
+                "man_made/tower/communication": {
+                    "name": "Communication Tower",
+                    "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"
+                },
+                "man_made/tower/observation": {
+                    "name": "Observation Tower",
+                    "terms": "lookout tower,fire tower"
+                },
                 "man_made/wastewater_plant": {
                     "name": "Wastewater Plant",
                     "terms": "sewage*,water treatment plant,reclamation plant"