From 8b49247b9cfca36e79907def861d55fc0c7739a0 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 13 Sep 2019 11:11:30 -0400 Subject: [PATCH] Add man_made=utility_pole preset (re: #6848) Add `height` field to `power=pole` and `power=tower` presets --- data/presets.yaml | 4 ++++ data/presets/presets.json | 5 +++-- .../presets/man_made/utility_pole.json | 21 +++++++++++++++++++ data/presets/presets/power/pole.json | 1 + data/presets/presets/power/tower.json | 1 + data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 7 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 data/presets/presets/man_made/utility_pole.json diff --git a/data/presets.yaml b/data/presets.yaml index 3edd719e1..587d735f0 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -5880,6 +5880,10 @@ en: name: Tunnel # 'terms: bore,dig,shaft,underground passage,underpass' terms: '' + man_made/utility_pole: + # man_made=utility_pole + name: Utility Pole + terms: '' man_made/wastewater_plant: # man_made=wastewater_plant name: Wastewater Plant diff --git a/data/presets/presets.json b/data/presets/presets.json index faf10bbe7..8e97cd289 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -745,6 +745,7 @@ "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"}, "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel"}, + "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"}, "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax"], "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", "height"], "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"}, @@ -897,10 +898,10 @@ "power/line": {"icon": "temaki-power_tower", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "terms": ["electric power transmission line", "high voltage line", "high tension line"], "tags": {"power": "line"}, "name": "Power Line"}, "power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"}, "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"}, - "power/pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"}, + "power/pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"}, "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"}, "power/switch": {"icon": "temaki-power", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"}, - "power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"}, + "power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"}, "power/transformer": {"icon": "temaki-power", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex"], "tags": {"power": "transformer"}, "name": "Transformer"}, "public_transport/platform_point": {"icon": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "lit", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6}, "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6}, diff --git a/data/presets/presets/man_made/utility_pole.json b/data/presets/presets/man_made/utility_pole.json new file mode 100644 index 000000000..9f859bead --- /dev/null +++ b/data/presets/presets/man_made/utility_pole.json @@ -0,0 +1,21 @@ +{ + "icon": "temaki-utility_pole", + "fields": [ + "ref", + "operator", + "height", + "material" + ], + "moreFields": [ + "colour", + "manufacturer" + ], + "geometry": [ + "point", + "vertex" + ], + "tags": { + "man_made": "utility_pole" + }, + "name": "Utility Pole" +} diff --git a/data/presets/presets/power/pole.json b/data/presets/presets/power/pole.json index 1f38d0ca7..ea3272a85 100644 --- a/data/presets/presets/power/pole.json +++ b/data/presets/presets/power/pole.json @@ -3,6 +3,7 @@ "fields": [ "ref", "operator", + "height", "material", "line_attachment" ], diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json index 32084f4cb..63f34acbc 100644 --- a/data/presets/presets/power/tower.json +++ b/data/presets/presets/power/tower.json @@ -4,6 +4,7 @@ "ref", "operator", "design", + "height", "material", "line_attachment" ], diff --git a/data/taginfo.json b/data/taginfo.json index 5623a913e..65326c0b9 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -722,6 +722,7 @@ {"key": "tower:type", "value": "minaret", "description": "🄿 Minaret", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"}, {"key": "tower:type", "value": "observation", "description": "🄿 Observation Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"}, {"key": "man_made", "value": "tunnel", "description": "🄿 Tunnel", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/the-noun-project/2009642.svg"}, + {"key": "man_made", "value": "utility_pole", "description": "🄿 Utility Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"}, {"key": "man_made", "value": "wastewater_plant", "description": "🄿 Wastewater Plant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, {"key": "man_made", "value": "water_well", "description": "🄿 Water Well", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 1a34d61ab..35bb9b214 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7809,6 +7809,10 @@ "name": "Tunnel", "terms": "bore,dig,shaft,underground passage,underpass" }, + "man_made/utility_pole": { + "name": "Utility Pole", + "terms": "" + }, "man_made/wastewater_plant": { "name": "Wastewater Plant", "terms": "sewage*,water treatment plant,reclamation plant"