diff --git a/data/deprecated.json b/data/deprecated.json index 67f71a4f3..6e6a5bdef 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -857,6 +857,10 @@ "old": {"tourism": "bed_and_breakfast"}, "replace": {"tourism": "guest_house", "guest_house": "bed_and_breakfast"} }, + { + "old": {"tower:type": "power"}, + "replace": {"power": "tower"} + }, { "old": {"type": "broad_leaved"}, "replace": {"leaf_type": "broadleaved"} diff --git a/data/presets.yaml b/data/presets.yaml index fb5d67aa0..10bddc44b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -6293,6 +6293,7 @@ en: power/line: # power=line name: Power Line + # 'terms: electric power transmission line,high voltage line,high tension line' terms: '' power/minor_line: # power=minor_line diff --git a/data/presets/presets.json b/data/presets/presets.json index 18bc3bbfd..7d7badd57 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -879,13 +879,13 @@ "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"], "tags": {"power": "line"}, "name": "Power Line"}, + "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/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": {"fields": ["ref", "material", "operator", "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": {"fields": ["design", "ref", "material", "operator", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"}, + "power/tower": {"fields": ["design", "ref", "material", "operator", "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", "area"], "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.2}, "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.2}, diff --git a/data/presets/presets/power/line.json b/data/presets/presets/power/line.json index bb86c4694..f3c3301a8 100644 --- a/data/presets/presets/power/line.json +++ b/data/presets/presets/power/line.json @@ -10,6 +10,11 @@ "geometry": [ "line" ], + "terms": [ + "electric power transmission line", + "high voltage line", + "high tension line" + ], "tags": { "power": "line" }, diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json index cd74e6904..f49b9a5dd 100644 --- a/data/presets/presets/power/tower.json +++ b/data/presets/presets/power/tower.json @@ -16,5 +16,6 @@ "tags": { "power": "tower" }, + "matchScore": 1.05, "name": "High-Voltage Tower" } diff --git a/data/taginfo.json b/data/taginfo.json index 540b54155..15c810299 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1971,6 +1971,7 @@ {"key": "toilets:disposal", "value": "longdrop", "description": "🄳 ➜ toilets:disposal=pitlatrine"}, {"key": "toilets:disposal", "value": "pit_latrine", "description": "🄳 ➜ toilets:disposal=pitlatrine"}, {"key": "tourism", "value": "bed_and_breakfast", "description": "🄳 ➜ tourism=guest_house + guest_house=bed_and_breakfast"}, + {"key": "tower:type", "value": "power", "description": "🄳 ➜ power=tower"}, {"key": "type", "value": "broad_leaved", "description": "🄳 ➜ leaf_type=broadleaved"}, {"key": "type", "value": "conifer", "description": "🄳 ➜ leaf_type=needleleaved"}, {"key": "type", "value": "deciduous", "description": "🄳 ➜ leaf_cycle=deciduous"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index de112f5e3..f281124da 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -7874,7 +7874,7 @@ }, "power/line": { "name": "Power Line", - "terms": "" + "terms": "electric power transmission line,high voltage line,high tension line" }, "power/minor_line": { "name": "Minor Power Line",