From 4063148242a4d40da2ceb148bda730366d516577 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Thu, 22 Aug 2019 12:00:26 -0500 Subject: [PATCH] User tower icon instead of pole icon for `power=line` preset --- data/presets/presets.json | 2 +- data/presets/presets/power/line.json | 2 +- data/taginfo.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 35c5f4fec..578a8538e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -890,7 +890,7 @@ "power/generator/source/hydro": {"icon": "temaki-power", "fields": ["operator", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["height", "manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["dam", "generator", "francis turbine", "hydroelectricity", "kaplan turbine", "pelton turbine"], "tags": {"power": "generator", "generator:source": "hydro"}, "addTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "reference": {"key": "generator:source", "value": "hydro"}, "name": "Water Turbine"}, "power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"}, "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/type", "generator/output/electricity", "height", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"}, - "power/line": {"icon": "iD-power-line", "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/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"}, diff --git a/data/presets/presets/power/line.json b/data/presets/presets/power/line.json index f3c3301a8..82fb01aa7 100644 --- a/data/presets/presets/power/line.json +++ b/data/presets/presets/power/line.json @@ -1,5 +1,5 @@ { - "icon": "iD-power-line", + "icon": "temaki-power_tower", "fields": [ "name", "operator", diff --git a/data/taginfo.json b/data/taginfo.json index 58ab7bb70..e7eacffd7 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -858,7 +858,7 @@ {"key": "generator:source", "value": "hydro", "description": "🄿 Water Turbine", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power.svg"}, {"key": "generator:method", "value": "fission", "description": "🄿 Nuclear Reactor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/radiation.svg"}, {"key": "generator:method", "value": "wind_turbine", "description": "🄿 Wind Turbine", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wind_turbine.svg"}, - {"key": "power", "value": "line", "description": "🄿 Power Line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/power-line.svg"}, + {"key": "power", "value": "line", "description": "🄿 Power Line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power_tower.svg"}, {"key": "power", "value": "minor_line", "description": "🄿 Minor Power Line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/power-line.svg"}, {"key": "power", "value": "plant", "description": "🄿 Power Station Grounds", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"}, {"key": "power", "value": "pole", "description": "🄿 Power Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"},