diff --git a/data/deprecated.json b/data/deprecated.json index efad8f89b..09347972b 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -897,6 +897,14 @@ "old": {"tower:type": "power"}, "replace": {"power": "tower"} }, + { + "old": {"tower:type": "anchor"}, + "replace": {"line_attachment": "anchor"} + }, + { + "old": {"tower:type": "suspension"}, + "replace": {"line_attachment": "suspension"} + }, { "old": {"type": "broad_leaved"}, "replace": {"leaf_type": "broadleaved"} diff --git a/data/presets.yaml b/data/presets.yaml index 62c32e721..12ae65d12 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1150,6 +1150,10 @@ en: liaison: # liaison=* label: Type + line_attachment: + # line_attachment=* + label: Line Attachment + terms: '[translate with synonyms or related terms for ''Line Attachment'', separated by commas]' lit: # lit=* label: Lit diff --git a/data/presets/fields.json b/data/presets/fields.json index 15f52f2b4..559af0b8a 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -208,6 +208,7 @@ "level": {"key": "level", "type": "combo", "label": "Level", "universal": true, "terms": ["building floor", "deck", "storey", "story"]}, "levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."}, "liaison": {"key": "liaison", "type": "combo", "label": "Type"}, + "line_attachment": {"key": "line_attachment", "type": "combo", "label": "Line Attachment"}, "lit": {"key": "lit", "type": "check", "label": "Lit", "terms": ["lamp", "lighting"]}, "location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}}, "location": {"key": "location", "type": "combo", "label": "Location"}, diff --git a/data/presets/fields/line_attachment.json b/data/presets/fields/line_attachment.json new file mode 100644 index 000000000..b45ad11a5 --- /dev/null +++ b/data/presets/fields/line_attachment.json @@ -0,0 +1,5 @@ +{ + "key": "line_attachment", + "type": "combo", + "label": "Line Attachment" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 0aa5e85e2..fa8003766 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -891,10 +891,10 @@ "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/pole": {"fields": ["ref", "material", "operator", "manufacturer"], "moreFields": ["line_attachment"], "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"}, "matchScore": 1.05, "name": "High-Voltage Tower"}, + "power/tower": {"fields": ["design", "ref", "material", "operator", "manufacturer"], "moreFields": ["line_attachment"], "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.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/power/pole.json b/data/presets/presets/power/pole.json index 4c0ef6dce..9bb50752a 100644 --- a/data/presets/presets/power/pole.json +++ b/data/presets/presets/power/pole.json @@ -5,6 +5,9 @@ "operator", "manufacturer" ], + "moreFields": [ + "line_attachment" + ], "geometry": [ "point", "vertex" diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json index f49b9a5dd..5684ffd8b 100644 --- a/data/presets/presets/power/tower.json +++ b/data/presets/presets/power/tower.json @@ -6,6 +6,9 @@ "operator", "manufacturer" ], + "moreFields": [ + "line_attachment" + ], "geometry": [ "point", "vertex" diff --git a/data/taginfo.json b/data/taginfo.json index 7f6b04be3..a518153df 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1478,6 +1478,7 @@ {"key": "length", "description": "🄵 Length (Meters)"}, {"key": "level", "description": "🄵 Level"}, {"key": "liaison", "description": "🄵 Type"}, + {"key": "line_attachment", "description": "🄵 Line Attachment"}, {"key": "lit", "description": "🄵 Lit"}, {"key": "location", "value": "outdoor", "description": "🄵 Location"}, {"key": "location", "value": "indoor", "description": "🄵 Location"}, @@ -2018,6 +2019,8 @@ {"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": "tower:type", "value": "anchor", "description": "🄳 ➜ line_attachment=anchor"}, + {"key": "tower:type", "value": "suspension", "description": "🄳 ➜ line_attachment=suspension"}, {"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 113788810..de5fe3c08 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3551,6 +3551,10 @@ "label": "Type", "terms": "" }, + "line_attachment": { + "label": "Line Attachment", + "terms": "" + }, "lit": { "label": "Lit", "terms": "lamp,lighting"