diff --git a/data/presets.yaml b/data/presets.yaml index f03a740d7..1282a7f6a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -7059,9 +7059,6 @@ en: # power=pole name: Power Pole terms: '' - power/sub_station: - # power=sub_station - name: Substation power/substation: # power=substation name: Substation diff --git a/data/presets/presets.json b/data/presets/presets.json index 2109df46e..b67c6998f 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -928,7 +928,6 @@ "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/sub_station": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["area", "point"], "tags": {"power": "sub_station"}, "reference": {"key": "power", "value": "substation"}, "name": "Substation", "searchable": false}, "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/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"}, diff --git a/data/presets/presets/power/_sub_station.json b/data/presets/presets/power/_sub_station.json deleted file mode 100644 index bc123470f..000000000 --- a/data/presets/presets/power/_sub_station.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "icon": "temaki-power", - "fields": [ - "substation", - "operator", - "building", - "ref" - ], - "geometry": [ - "area", - "point" - ], - "tags": { - "power": "sub_station" - }, - "reference": { - "key": "power", - "value": "substation" - }, - "name": "Substation", - "searchable": false -} diff --git a/data/taginfo.json b/data/taginfo.json index d8c49a308..80297763e 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -902,7 +902,6 @@ {"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": "sub_station", "description": "🄿 Substation (unsearchable), 🄳 ➜ power=substation", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/power.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"}, @@ -2142,6 +2141,7 @@ {"key": "postcode", "description": "🄳 ➜ addr:postcode=*"}, {"key": "power", "value": "busbar", "description": "🄳 ➜ power=line + line=busbar"}, {"key": "power", "value": "marker", "description": "🄳 ➜ marker=* + utility=power"}, + {"key": "power", "value": "sub_station", "description": "🄳 ➜ power=substation"}, {"key": "power", "value": "underground_cable", "description": "🄳 ➜ power=cable + location=underground"}, {"key": "power_source", "description": "🄳 ➜ generator:source=*"}, {"key": "power_rating", "description": "🄳 ➜ generator:output=*"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 44d7c1b66..d5439cceb 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -8524,9 +8524,6 @@ "name": "Temporary Polling Place", "terms": "ballot box,ballot drop,democracy,elections,polling place,vote,voting booth,voting machine" }, - "power/sub_station": { - "name": "Substation" - }, "power/cable/underground": { "name": "Underground Power Cable", "terms": ""