From 8de00a159a999c67c6e4333d6734b652eb6ff528 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 31 Jan 2023 12:50:57 +0100 Subject: [PATCH] =?UTF-8?q?use=20R=C3=B6ntgen=20icon=20for=20more=20preset?= =?UTF-8?q?s=20and=20field-values?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit presets: * Diving Platform * City Limit Sign * Turning Loop fields values: * `design` field of Power Poles and Power Towers/Portals * `leaf_type` * `traffic_calming` * `volcano:type` and `volcano:status` * `tower:construction` --- data/fields/design_power_pole.json | 18 +++++++++++++++ data/fields/design_power_tower.json | 27 +++++++++++++++++++++++ data/fields/leaf_type.json | 4 ++++ data/fields/leaf_type_singular.json | 1 + data/fields/tower/construction.json | 8 ++++++- data/fields/traffic_calming.json | 10 +++++++++ data/fields/volcano/status.json | 5 +++++ data/fields/volcano/type.json | 5 +++++ data/presets/highway/turning_circle.json | 2 +- data/presets/highway/turning_loop.json | 2 +- data/presets/man_made/tower/diving.json | 2 +- data/presets/power/pole.json | 1 + data/presets/power/portal.json | 2 +- data/presets/power/tower.json | 9 ++++---- data/presets/traffic_sign/city_limit.json | 2 +- interim/source_strings.yaml | 7 ++++-- 16 files changed, 93 insertions(+), 12 deletions(-) create mode 100644 data/fields/design_power_pole.json create mode 100644 data/fields/design_power_tower.json diff --git a/data/fields/design_power_pole.json b/data/fields/design_power_pole.json new file mode 100644 index 00000000..33f2e538 --- /dev/null +++ b/data/fields/design_power_pole.json @@ -0,0 +1,18 @@ +{ + "key": "design", + "type": "combo", + "label": "{design}", + "icons": { + "one-level": "roentgen-power_pole_1_level", + "two-level": "roentgen-power_pole_2_level", + "three-level": "roentgen-power_pole_3_level", + "four-level": "roentgen-power_pole_4_level", + "asymmetric": "roentgen-power_pole_asymmetric", + "triangle": "roentgen-power_pole_triangle", + "flag": "roentgen-power_pole_flag", + "delta": "roentgen-power_pole_delta", + "armless": "roentgen-power_pole_armless", + "armless_asymmetric": "roentgen-power_pole_asymmetric_armless", + "armless_triangle": "roentgen-power_pole_triangle_armless" + } +} diff --git a/data/fields/design_power_tower.json b/data/fields/design_power_tower.json new file mode 100644 index 00000000..64dceff5 --- /dev/null +++ b/data/fields/design_power_tower.json @@ -0,0 +1,27 @@ +{ + "key": "design", + "type": "combo", + "label": "{design}", + "icons": { + "one-level": "roentgen-power_tower_1_level", + "two-level": "roentgen-power_tower_2_level", + "three-level": "roentgen-power_tower_3_level", + "four-level": "roentgen-power_tower_4_level", + "asymmetric": "roentgen-power_tower_asymmetric", + "triangle": "roentgen-power_tower_triangle", + "flag": "roentgen-power_tower_flag", + "delta": "roentgen-power_tower_delta", + "delta_two-level": "roentgen-power_tower_delta_2_level", + "delta_tree-level": "roentgen-power_tower_delta_3_level", + "donau": "roentgen-power_tower_donau", + "barrel": "roentgen-power_tower_barrel", + "x-frame": "roentgen-power_tower_x_frame", + "y-frame": "roentgen-power_tower_y_frame", + "h-frame": "roentgen-power_tower_h_frame", + "h-frame_two-level": "roentgen-power_tower_h_frame_2_level", + "guyed_h-frame": "roentgen-power_tower_guyed_h_frame", + "portal": "roentgen-power_tower_portal", + "portal_two-level": "roentgen-power_tower_portal_2_level", + "portal_three-level": "roentgen-power_tower_portal_3_level" + } +} diff --git a/data/fields/leaf_type.json b/data/fields/leaf_type.json index 1c784c5c..c9932c78 100644 --- a/data/fields/leaf_type.json +++ b/data/fields/leaf_type.json @@ -10,6 +10,10 @@ "leafless": "Leafless" } }, + "icons": { + "broadleaved": "roentgen-tree", + "needleleaved": "roentgen-needleleaved_tree" + }, "autoSuggestions": false, "customValues": false } diff --git a/data/fields/leaf_type_singular.json b/data/fields/leaf_type_singular.json index 2b2cb1e3..b43434e0 100644 --- a/data/fields/leaf_type_singular.json +++ b/data/fields/leaf_type_singular.json @@ -3,6 +3,7 @@ "type": "combo", "label": "Leaf Type", "stringsCrossReference": "{leaf_type}", + "iconsCrossReference": "{leaf_type}", "options": [ "broadleaved", "needleleaved", diff --git a/data/fields/tower/construction.json b/data/fields/tower/construction.json index d6723507..3c36b99b 100644 --- a/data/fields/tower/construction.json +++ b/data/fields/tower/construction.json @@ -2,5 +2,11 @@ "key": "tower:construction", "type": "combo", "label": "Construction", - "placeholder": "Guyed, Lattice, Concealed, ..." + "placeholder": "Guyed, Lattice, Concealed, ...", + "icons": { + "freestanding": "roentgen-tube", + "guyed_lattice": "roentgen-lattice_guyed", + "guyed_tube": "roentgen-tube_guyed", + "lattice": "roentgen-lattice" + } } diff --git a/data/fields/traffic_calming.json b/data/fields/traffic_calming.json index 7c279b45..317d96b3 100644 --- a/data/fields/traffic_calming.json +++ b/data/fields/traffic_calming.json @@ -23,5 +23,15 @@ "rumble_strip": "Rumble Strip", "table": "Speed Table" } + }, + "icons": { + "bump": "roentgen-bump", + "cushion": "roentgen-traffic_cushion", + "dip": "roentgen-dip", + "double_dip": "roentgen-double_dip", + "hump": "roentgen-hump", + "mini_bumps": "roentgen-mini_bumps", + "rumble_strip": "roentgen-rumble_strip", + "table": "roentgen-traffic_table" } } diff --git a/data/fields/volcano/status.json b/data/fields/volcano/status.json index c6d0e632..6998492c 100644 --- a/data/fields/volcano/status.json +++ b/data/fields/volcano/status.json @@ -9,6 +9,11 @@ "extinct": "Extinct" } }, + "icons": { + "active": "roentgen-stratovolcano___lava", + "dormant": "roentgen-stratovolcano___smoke", + "extinct": "roentgen-stratovolcano" + }, "autoSuggestions": false, "customValues": false } diff --git a/data/fields/volcano/type.json b/data/fields/volcano/type.json index f2e74be4..879721f6 100644 --- a/data/fields/volcano/type.json +++ b/data/fields/volcano/type.json @@ -9,6 +9,11 @@ "scoria": "Scoria" } }, + "icons": { + "stratovolcano": "roentgen-stratovolcano___smoke_2", + "shield": "roentgen-shield_volcano___smoke_2", + "scoria": "roentgen-volcanic_cone___smoke_2" + }, "autoSuggestions": false, "customValues": false } diff --git a/data/presets/highway/turning_circle.json b/data/presets/highway/turning_circle.json index b2b4d608..4b32661e 100644 --- a/data/presets/highway/turning_circle.json +++ b/data/presets/highway/turning_circle.json @@ -1,5 +1,5 @@ { - "icon": "maki-circle-stroked", + "icon": "maki-circle", "geometry": [ "vertex" ], diff --git a/data/presets/highway/turning_loop.json b/data/presets/highway/turning_loop.json index 6b1a23f9..abb40899 100644 --- a/data/presets/highway/turning_loop.json +++ b/data/presets/highway/turning_loop.json @@ -1,5 +1,5 @@ { - "icon": "maki-circle", + "icon": "roentgen-turning_loop", "geometry": [ "vertex" ], diff --git a/data/presets/man_made/tower/diving.json b/data/presets/man_made/tower/diving.json index c9d7ad90..21c4cebf 100644 --- a/data/presets/man_made/tower/diving.json +++ b/data/presets/man_made/tower/diving.json @@ -1,5 +1,5 @@ { - "icon": "temaki-diving", + "icon": "roentgen-diving_1_platforms", "geometry": [ "point", "area" diff --git a/data/presets/power/pole.json b/data/presets/power/pole.json index bfd422c3..01b4f26e 100644 --- a/data/presets/power/pole.json +++ b/data/presets/power/pole.json @@ -3,6 +3,7 @@ "fields": [ "ref", "operator", + "design_power_pole", "height", "material", "line_attachment" diff --git a/data/presets/power/portal.json b/data/presets/power/portal.json index 723a2b43..36b82010 100644 --- a/data/presets/power/portal.json +++ b/data/presets/power/portal.json @@ -8,7 +8,7 @@ ], "moreFields": [ "colour", - "design", + "design_power_tower", "height", "line_management", "manufacturer" diff --git a/data/presets/power/tower.json b/data/presets/power/tower.json index 2bdb0a7d..2ac3c152 100644 --- a/data/presets/power/tower.json +++ b/data/presets/power/tower.json @@ -3,11 +3,11 @@ "fields": [ "ref", "operator", - "design", + "structure_power", + "design_power_tower", "height", "material", - "line_attachment", - "structure_power" + "line_attachment" ], "moreFields": [ "line_management", @@ -18,7 +18,8 @@ "vertex" ], "terms": [ - "power" + "power", + "power tower" ], "tags": { "power": "tower" diff --git a/data/presets/traffic_sign/city_limit.json b/data/presets/traffic_sign/city_limit.json index 1175311b..dd438a9d 100644 --- a/data/presets/traffic_sign/city_limit.json +++ b/data/presets/traffic_sign/city_limit.json @@ -1,5 +1,5 @@ { - "icon": "maki-square-stroked", + "icon": "roentgen-city_limit_sign", "fields": [ "{traffic_sign}", "name" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index b8095a30..e482e89c 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1484,7 +1484,10 @@ en: design: # design=* label: Design - terms: '[translate with synonyms or related terms for ''Design'', separated by commas]' + design_power_pole: + # design=* + design_power_tower: + # design=* destination: # destination=* label: Destinations @@ -10534,7 +10537,7 @@ en: power/tower: # power=tower | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: High-Voltage Tower - # 'terms: power' + # 'terms: power,power tower' terms: power/transformer: # power=transformer | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).