From 512ee67374e1598caa17cae674cb92a319b0dfd6 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 2 Nov 2017 14:53:32 -0400 Subject: [PATCH] Add power=switch preset (closes #4441) --- data/presets.yaml | 32 ++++++++++++++++++++++---- data/presets/fields.json | 32 ++++++++++++++++++++++---- data/presets/fields/cables.json | 6 +++++ data/presets/fields/devices.json | 2 +- data/presets/fields/phases.json | 2 +- data/presets/fields/switch.json | 13 +++++++++++ data/presets/fields/transformer.json | 2 +- data/presets/fields/voltage.json | 5 ++++ data/presets/fields/windings.json | 2 +- data/presets/presets.json | 20 ++++++++++++++++ data/presets/presets/power/switch.json | 20 ++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 28 ++++++++++++++++++---- 13 files changed, 152 insertions(+), 16 deletions(-) create mode 100644 data/presets/fields/cables.json create mode 100644 data/presets/fields/switch.json create mode 100644 data/presets/fields/voltage.json create mode 100644 data/presets/presets/power/switch.json diff --git a/data/presets.yaml b/data/presets.yaml index fbb7bb03f..4e855290e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -261,6 +261,11 @@ en: bunker_type: # bunker_type=* label: Type + cables: + # cables=* + label: Cables + # cables field placeholder + placeholder: '1, 2, 3...' camera/direction: # 'camera:direction=*' label: Direction (Degrees Clockwise) @@ -452,7 +457,7 @@ en: label: Description devices: # devices=* - label: Number of Devices + label: Devices # devices field placeholder placeholder: '1, 2, 3...' diaper: @@ -990,7 +995,7 @@ en: label: Payment Types phases: # phases=* - label: Number of Phases + label: Phases # phases field placeholder placeholder: '1, 2, 3...' phone: @@ -1372,6 +1377,18 @@ en: surveillance/zone: # 'surveillance:zone=*' label: Surveillance Zone + switch: + # switch=* + label: Type + options: + # switch=circuit_breaker + circuit_breaker: Circuit Breaker + # switch=disconnector + disconnector: Disconnector + # switch=earthing + earthing: Earthing + # switch=mechanical + mechanical: Mechanical tactile_paving: # tactile_paving=* label: Tactile Paving @@ -1464,7 +1481,7 @@ en: placeholder: 'Excellent, Good, Bad...' transformer: # transformer=* - label: Type of Transformer + label: Type options: # transformer=auto auto: Autotransformer @@ -1523,6 +1540,9 @@ en: shield: Shield # 'volcano:type=stratovolcano' stratovolcano: Stratovolcano + voltage: + # voltage=* + label: Voltage voltage/primary: # 'voltage:primary=*' label: Primary Voltage @@ -1563,7 +1583,7 @@ en: label: Wikipedia windings: # windings=* - label: Number of Windings + label: Windings # windings field placeholder placeholder: '1, 2, 3...' windings/configuration: @@ -4351,6 +4371,10 @@ en: # power=substation name: Substation terms: '' + power/switch: + # power=switch + name: Power Switch + terms: '' power/tower: # power=tower name: High-Voltage Tower diff --git a/data/presets/fields.json b/data/presets/fields.json index 53191bea8..0b957ac05 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -349,6 +349,12 @@ "type": "combo", "label": "Type" }, + "cables": { + "key": "cables", + "type": "number", + "label": "Cables", + "placeholder": "1, 2, 3..." + }, "camera/direction": { "key": "camera:direction", "type": "number", @@ -597,7 +603,7 @@ "devices": { "key": "devices", "type": "number", - "label": "Number of Devices", + "label": "Devices", "placeholder": "1, 2, 3..." }, "diaper": { @@ -1335,7 +1341,7 @@ "phases": { "key": "phases", "type": "number", - "label": "Number of Phases", + "label": "Phases", "placeholder": "1, 2, 3..." }, "phone": { @@ -1882,6 +1888,19 @@ "type": "combo", "label": "Surveillance Zone" }, + "switch": { + "key": "switch", + "type": "combo", + "label": "Type", + "strings": { + "options": { + "mechanical": "Mechanical", + "circuit_breaker": "Circuit Breaker", + "disconnector": "Disconnector", + "earthing": "Earthing" + } + } + }, "tactile_paving": { "key": "tactile_paving", "type": "check", @@ -1996,7 +2015,7 @@ "transformer": { "key": "transformer", "type": "combo", - "label": "Type of Transformer", + "label": "Type", "strings": { "options": { "distribution": "Distribution", @@ -2062,6 +2081,11 @@ } } }, + "voltage": { + "key": "voltage", + "type": "combo", + "label": "Voltage" + }, "voltage/primary": { "key": "voltage:primary", "type": "combo", @@ -2141,7 +2165,7 @@ "windings": { "key": "windings", "type": "number", - "label": "Number of Windings", + "label": "Windings", "placeholder": "1, 2, 3..." }, "windings/configuration": { diff --git a/data/presets/fields/cables.json b/data/presets/fields/cables.json new file mode 100644 index 000000000..f6b18eb8a --- /dev/null +++ b/data/presets/fields/cables.json @@ -0,0 +1,6 @@ +{ + "key": "cables", + "type": "number", + "label": "Cables", + "placeholder": "1, 2, 3..." +} diff --git a/data/presets/fields/devices.json b/data/presets/fields/devices.json index d2f35f22e..55d36db74 100644 --- a/data/presets/fields/devices.json +++ b/data/presets/fields/devices.json @@ -1,6 +1,6 @@ { "key": "devices", "type": "number", - "label": "Number of Devices", + "label": "Devices", "placeholder": "1, 2, 3..." } diff --git a/data/presets/fields/phases.json b/data/presets/fields/phases.json index 5b32604d5..5fa9aac95 100644 --- a/data/presets/fields/phases.json +++ b/data/presets/fields/phases.json @@ -1,6 +1,6 @@ { "key": "phases", "type": "number", - "label": "Number of Phases", + "label": "Phases", "placeholder": "1, 2, 3..." } diff --git a/data/presets/fields/switch.json b/data/presets/fields/switch.json new file mode 100644 index 000000000..c17d9b75c --- /dev/null +++ b/data/presets/fields/switch.json @@ -0,0 +1,13 @@ +{ + "key": "switch", + "type": "combo", + "label": "Type", + "strings": { + "options": { + "mechanical": "Mechanical", + "circuit_breaker": "Circuit Breaker", + "disconnector": "Disconnector", + "earthing": "Earthing" + } + } +} diff --git a/data/presets/fields/transformer.json b/data/presets/fields/transformer.json index e811eb2a2..0c3720ed6 100644 --- a/data/presets/fields/transformer.json +++ b/data/presets/fields/transformer.json @@ -1,7 +1,7 @@ { "key": "transformer", "type": "combo", - "label": "Type of Transformer", + "label": "Type", "strings": { "options": { "distribution": "Distribution", diff --git a/data/presets/fields/voltage.json b/data/presets/fields/voltage.json new file mode 100644 index 000000000..d297c9371 --- /dev/null +++ b/data/presets/fields/voltage.json @@ -0,0 +1,5 @@ +{ + "key": "voltage", + "type": "combo", + "label": "Voltage" +} diff --git a/data/presets/fields/windings.json b/data/presets/fields/windings.json index 2c123b0a7..106e67857 100644 --- a/data/presets/fields/windings.json +++ b/data/presets/fields/windings.json @@ -1,6 +1,6 @@ { "key": "windings", "type": "number", - "label": "Number of Windings", + "label": "Windings", "placeholder": "1, 2, 3..." } diff --git a/data/presets/presets.json b/data/presets/presets.json index 827891199..791011c30 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -12886,6 +12886,26 @@ }, "name": "Substation" }, + "power/switch": { + "icon": "poi-power", + "fields": [ + "switch", + "location", + "cables", + "voltage", + "operator", + "ref" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "power": "switch" + }, + "name": "Power Switch" + }, "power/tower": { "geometry": [ "vertex" diff --git a/data/presets/presets/power/switch.json b/data/presets/presets/power/switch.json new file mode 100644 index 000000000..138cfee1e --- /dev/null +++ b/data/presets/presets/power/switch.json @@ -0,0 +1,20 @@ +{ + "icon": "poi-power", + "fields": [ + "switch", + "location", + "cables", + "voltage", + "operator", + "ref" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "power": "switch" + }, + "name": "Power Switch" +} diff --git a/data/taginfo.json b/data/taginfo.json index 8555c538e..1935f3690 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2464,6 +2464,10 @@ "key": "power", "value": "substation" }, + { + "key": "power", + "value": "switch" + }, { "key": "power", "value": "tower" diff --git a/dist/locales/en.json b/dist/locales/en.json index cac44a343..49cda42a7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1309,6 +1309,10 @@ "bunker_type": { "label": "Type" }, + "cables": { + "label": "Cables", + "placeholder": "1, 2, 3..." + }, "camera/direction": { "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270" @@ -1475,7 +1479,7 @@ "label": "Description" }, "devices": { - "label": "Number of Devices", + "label": "Devices", "placeholder": "1, 2, 3..." }, "diaper": { @@ -1924,7 +1928,7 @@ "label": "Payment Types" }, "phases": { - "label": "Number of Phases", + "label": "Phases", "placeholder": "1, 2, 3..." }, "phone": { @@ -2246,6 +2250,15 @@ "surveillance/zone": { "label": "Surveillance Zone" }, + "switch": { + "label": "Type", + "options": { + "mechanical": "Mechanical", + "circuit_breaker": "Circuit Breaker", + "disconnector": "Disconnector", + "earthing": "Earthing" + } + }, "tactile_paving": { "label": "Tactile Paving" }, @@ -2319,7 +2332,7 @@ } }, "transformer": { - "label": "Type of Transformer", + "label": "Type", "options": { "distribution": "Distribution", "generator": "Generator", @@ -2365,6 +2378,9 @@ "scoria": "Scoria" } }, + "voltage": { + "label": "Voltage" + }, "voltage/primary": { "label": "Primary Voltage" }, @@ -2403,7 +2419,7 @@ "label": "Wikipedia" }, "windings": { - "label": "Number of Windings", + "label": "Windings", "placeholder": "1, 2, 3..." }, "windings/configuration": { @@ -4904,6 +4920,10 @@ "name": "Substation", "terms": "" }, + "power/switch": { + "name": "Power Switch", + "terms": "" + }, "power/tower": { "name": "High-Voltage Tower", "terms": ""