Merge pull request #5356 from hchho/master

Add `design` field and improve search terms for `power=tower` preset

data/presets.yaml

@@ -431,6 +431,9 @@ en:
       description:
         # description=*
         label: Description
+      design:
+        # design=*
+        label: Design
       devices:
         # devices=*
         label: Devices
@@ -4983,6 +4986,7 @@ en:
       power/tower:
         # power=tower
         name: High-Voltage Tower
+        # 'terms: power'
         terms: '<translate with synonyms or related terms for ''High-Voltage Tower'', separated by commas>'
       power/transformer:
         # power=transformer

data/presets/fields.json

@@ -74,6 +74,7 @@
     "denomination": {"key": "denomination", "type": "combo", "label": "Denomination"},
     "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"},
     "description": {"key": "description", "type": "textarea", "label": "Description", "universal": true},
+    "design": {"key": "design", "type": "combo", "label": "Design"},
     "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."},
     "diaper": {"key": "diaper", "type": "combo", "label": "Diaper Changing Available", "options": ["yes", "no", "room", "1", "2", "3", "4", "5"]},
     "direction_cardinal": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"N": "North", "E": "East", "S": "South", "W": "West", "NE": "Northeast", "SE": "Southeast", "SW": "Southwest", "NW": "Northwest", "NNE": "North-northeast", "ENE": "East-northeast", "ESE": "East-southeast", "SSE": "South-southeast", "SSW": "South-southwest", "WSW": "West-southwest", "WNW": "West-northwest", "NNW": "North-northwest"}}},

data/presets/fields/design.json

@@ -0,0 +1,5 @@
+{
+    "key": "design",
+    "type": "combo",
+    "label": "Design"
+}

data/presets/presets.json

@@ -685,7 +685,7 @@
     "power/pole": {"fields": ["ref"], "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", "area"], "tags": {"power": "switch"}, "name": "Power Switch"},
-    "power/tower": {"fields": ["ref"], "geometry": ["vertex"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
+    "power/tower": {"fields": ["design", "ref"], "geometry": ["vertex"], "terms": ["power"], "tags": {"power": "tower"}, "name": "High-Voltage Tower"},
     "power/transformer": {"icon": "temaki-power", "fields": ["transformer", "operator", "location", "rating", "devices", "phases", "frequency", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration", "ref"], "geometry": ["point", "vertex", "area"], "tags": {"power": "transformer"}, "name": "Transformer"},
     "public_transport/linear_platform_aerialway": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter"], "geometry": ["line"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stop / Platform"},
     "public_transport/linear_platform_bus": {"icon": "iD-highway-footway", "fields": ["name", "ref_platform", "network", "operator", "surface", "lit", "bench", "shelter", "passenger_information_display"], "geometry": ["line"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "removeTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop / Platform"},

data/presets/presets/power/tower.json

@@ -1,10 +1,14 @@
 {
     "fields": [
+        "design",
         "ref"
     ],
     "geometry": [
         "vertex"
     ],
+    "terms": [
+        "power"
+    ],
     "tags": {
         "power": "tower"
     },

data/taginfo.json

@@ -6635,6 +6635,7 @@
     {"key": "denomination", "description": "Denomination"},
     {"key": "denotation", "description": "Denotation"},
     {"key": "description", "description": "Description"},
+    {"key": "design", "description": "Design"},
     {"key": "devices", "description": "Devices"},
     {"key": "diaper", "description": "Diaper Changing Available"},
     {"key": "direction", "value": "N", "description": "Direction"},

dist/locales/en.json

@@ -1836,6 +1836,9 @@
                 "description": {
                     "label": "Description"
                 },
+                "design": {
+                    "label": "Design"
+                },
                 "devices": {
                     "label": "Devices",
                     "placeholder": "1, 2, 3..."
@@ -5798,7 +5801,7 @@
                 },
                 "power/tower": {
                     "name": "High-Voltage Tower",
-                    "terms": ""
+                    "terms": "power"
                 },
                 "power/transformer": {
                     "name": "Transformer",