Skip to content

Commit de6fce4

Browse files
authored
Update power presets following transformer tagging extension (#447)
1 parent 57c0a7e commit de6fce4

File tree

7 files changed

+71
-18
lines changed

7 files changed

+71
-18
lines changed

data/deprecated.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,6 +1655,18 @@
16551655
"old": {"townhall:village": "yes"},
16561656
"replace": {"amenity": "townhall", "townhall:type": "village"}
16571657
},
1658+
{
1659+
"old": {"transformer": "auto"},
1660+
"replace": {"transformer": "yes", "windings:auto": "yes"}
1661+
},
1662+
{
1663+
"old": {"transformer": "minor_distribution"},
1664+
"replace": {"transformer": "distribution"}
1665+
},
1666+
{
1667+
"old": {"transformer": "traction"},
1668+
"replace": {"transformer": "main"}
1669+
},
16581670
{
16591671
"old": {"tunnel": "1"},
16601672
"replace": {"tunnel": "yes"}
@@ -1747,6 +1759,22 @@
17471759
"old": {"volcano": "extinct"},
17481760
"replace": {"volcano:status": "extinct"}
17491761
},
1762+
{
1763+
"old": {"voltage-high": "*", "transformer":"generator"},
1764+
"replace": {"voltage:secondary":"$1", "transformer":"generator"}
1765+
},
1766+
{
1767+
"old": {"voltage-low": "*", "transformer":"generator"},
1768+
"replace": {"voltage:primary":"$1", "transformer":"generator"}
1769+
},
1770+
{
1771+
"old": {"voltage-high": "*"},
1772+
"replace": {"voltage:primary":"$1"}
1773+
},
1774+
{
1775+
"old": {"voltage-low": "*"},
1776+
"replace": {"voltage:secondary":"$1"}
1777+
},
17501778
{
17511779
"old": {"wall_type": "noise_barrier"},
17521780
"replace": {"wall": "noise_barrier"}

data/fields/transformer.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
"label": "Type",
55
"strings": {
66
"options": {
7-
"distribution": "Distribution",
8-
"generator": "Generator",
9-
"converter": "Converter",
10-
"traction": "Traction",
11-
"auto": "Autotransformer",
12-
"phase_angle_regulator": "Phase Angle Regulator",
13-
"auxiliary": "Auxiliary",
14-
"yes": "Unknown"
7+
"main": "Forwards power",
8+
"distribution": "Feeds final consumers, installed outside substations",
9+
"generator": "Steps-up voltage in power plants",
10+
"converter": "Feeds power converters",
11+
"phase_angle_regulator": "Regulates phase angle",
12+
"auxiliary": "Feeds internal systems in substations",
13+
"yes": "Unknown role"
1514
}
1615
},
1716
"autoSuggestions": false,

data/fields/windings/auto.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"key": "windings:auto",
3+
"type": "check",
4+
"label": "Autotransformer",
5+
"strings": {
6+
"options": {
7+
"undefined": "Assumed to be No",
8+
"yes": "Yes",
9+
"no": "No"
10+
}
11+
}
12+
}

data/preset_categories/utility.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
"power/line",
66
"power/minor_line",
77
"man_made/pipeline",
8-
"power/cable/underground"
8+
"power/cable",
9+
"power/generator",
10+
"power/plant",
11+
"power/switch",
12+
"power/transformer"
913
]
1014
}

data/presets/_power.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
"power": "*"
1111
},
1212
"fields": [
13-
"power"
14-
],
15-
"moreFields": [
16-
"material"
13+
"power",
14+
"operator"
1715
],
1816
"searchable": false,
1917
"name": "Power Feature"

data/presets/power/transformer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"voltage/secondary",
1717
"voltage/tertiary",
1818
"windings",
19-
"windings/configuration"
19+
"windings/configuration",
20+
"windings/auto"
2021
],
2122
"geometry": [
2223
"point",

interim/source_strings.yaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3339,20 +3339,20 @@ en:
33393339
# transformer=*
33403340
label: Type
33413341
options:
3342-
# transformer=auto
3343-
auto: Autotransformer
33443342
# transformer=auxiliary
33453343
auxiliary: Auxiliary
3344+
# transformer=compensator
3345+
compensator: Compensation feed
33463346
# transformer=converter
33473347
converter: Converter
33483348
# transformer=distribution
33493349
distribution: Distribution
33503350
# transformer=generator
33513351
generator: Generator
3352+
# transformer=main
3353+
main: Main
33523354
# transformer=phase_angle_regulator
33533355
phase_angle_regulator: Phase Angle Regulator
3354-
# transformer=traction
3355-
traction: Traction
33563356
# transformer=yes
33573357
'yes': Unknown
33583358
trees:
@@ -3590,6 +3590,17 @@ en:
35903590
# windings field placeholder
35913591
placeholder: 1, 2, 3...
35923592
terms: '[translate with synonyms or related terms for ''Windings'', separated by commas]'
3593+
windings/auto:
3594+
# windings:auto=*
3595+
label: Auto-transformer
3596+
options:
3597+
# windings:auto=no
3598+
'no': 'No'
3599+
# windings:auto=undefined
3600+
undefined: Assumed to be No
3601+
# windings:auto=yes
3602+
'yes': 'Yes'
3603+
terms: '[translate with synonyms or related terms for ''Auto-transformer'', separated by commas]'
35933604
windings/configuration:
35943605
# windings:configuration=*
35953606
label: Windings Configuration

0 commit comments

Comments
 (0)