From 857bc3f7cd810e67a306e69266c4c10723c65a06 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 18 Mar 2020 20:16:30 -0700 Subject: [PATCH] Add unsearchable power=cable preset --- data/presets.yaml | 3 +++ data/presets/presets.json | 3 ++- data/presets/presets/power/_cable.json | 19 +++++++++++++++++++ .../presets/power/cable/underground.json | 7 ------- data/taginfo.json | 1 + dist/locales/en.json | 3 +++ 6 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 data/presets/presets/power/_cable.json diff --git a/data/presets.yaml b/data/presets.yaml index 432a49897..c9a55bc55 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7031,6 +7031,9 @@ en: power: # power=* name: Power Feature + power/cable: + # power=cable + name: Power Cable power/cable/underground: # 'power=cable, location=underground' name: Underground Power Cable diff --git a/data/presets/presets.json b/data/presets/presets.json index 18da310c1..a06136102 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -931,7 +931,8 @@ "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "name": "Zip Wire"}, "point": {"fields": ["name"], "geometry": ["vertex", "point"], "tags": {}, "terms": ["node", "other", "vertex", "vertices"], "name": "Point", "matchScore": 0.1}, "polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"polling_station": "*"}, "matchScore": 0.75, "name": "Temporary Polling Place"}, - "power/cable/underground": {"icon": "temaki-cable", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"}, + "power/cable": {"icon": "temaki-cable", "fields": ["name", "ref", "operator", "voltage", "location", "layer"], "geometry": ["line"], "tags": {"power": "cable"}, "searchable": false, "name": "Power Cable"}, + "power/cable/underground": {"icon": "temaki-cable", "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"}, "power/generator": {"icon": "temaki-power", "fields": ["ref", "operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity"], "moreFields": ["colour", "height", "level", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"}, "power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["ref", "operator", "generator/output/electricity"], "moreFields": ["{power/generator}"], "geometry": ["area", "point", "vertex"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "*"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "terms": ["photovoltaic module", "PV module", "sunlight"], "name": "Solar Panel"}, "power/generator/source/hydro": {"icon": "temaki-power", "fields": ["ref", "operator", "generator/method", "generator/type", "generator/output/electricity"], "moreFields": ["{power/generator}"], "geometry": ["point", "vertex", "area"], "tags": {"power": "generator", "generator:source": "hydro"}, "addTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "reference": {"key": "generator:source", "value": "hydro"}, "terms": ["dam", "generator", "francis turbine", "hydroelectricity", "kaplan turbine", "pelton turbine"], "name": "Water Turbine"}, diff --git a/data/presets/presets/power/_cable.json b/data/presets/presets/power/_cable.json new file mode 100644 index 000000000..57266248d --- /dev/null +++ b/data/presets/presets/power/_cable.json @@ -0,0 +1,19 @@ +{ + "icon": "temaki-cable", + "fields": [ + "name", + "ref", + "operator", + "voltage", + "location", + "layer" + ], + "geometry": [ + "line" + ], + "tags": { + "power": "cable" + }, + "searchable": false, + "name": "Power Cable" +} diff --git a/data/presets/presets/power/cable/underground.json b/data/presets/presets/power/cable/underground.json index 58418c2b9..047f30cef 100644 --- a/data/presets/presets/power/cable/underground.json +++ b/data/presets/presets/power/cable/underground.json @@ -1,12 +1,5 @@ { "icon": "temaki-cable", - "fields": [ - "name", - "operator", - "voltage", - "ref", - "layer" - ], "geometry": [ "line" ], diff --git a/data/taginfo.json b/data/taginfo.json index 658cfa473..78cab5334 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -908,6 +908,7 @@ {"key": "playground", "value": "swing", "description": "🄿 Swing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "playground", "value": "zipwire", "description": "🄿 Zip Wire", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"}, {"key": "polling_station", "description": "🄿 Temporary Polling Place, 🄵 Polling Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vote-yea.svg"}, + {"key": "power", "value": "cable", "description": "🄿 Power Cable (unsearchable)", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/cable.svg"}, {"key": "power", "value": "generator", "description": "🄿 Power Generator", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.svg"}, {"key": "generator:method", "value": "photovoltaic", "description": "🄿 Solar Panel", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-solar-panel.svg"}, {"key": "generator:source", "value": "hydro", "description": "🄿 Water Turbine", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.svg"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index b7d55ab42..1068e5044 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8592,6 +8592,9 @@ "name": "Temporary Polling Place", "terms": "ballot box,ballot drop,democracy,elections,polling place,vote,voting booth,voting machine" }, + "power/cable": { + "name": "Power Cable" + }, "power/cable/underground": { "name": "Underground Power Cable", "terms": ""