Skip to content

Update power presets following transformer tagging extension #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tyrasd merged 3 commits into from
Jul 11, 2022
Merged

Update power presets following transformer tagging extension #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbfd3a0
Update power presets following transformer tagging extension
flacombe May 1, 2022
ef1e8b1
Apply change requests from Tyrasd
flacombe May 27, 2022
493db9e
Minor changes to transformers definitions
flacombe May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions data/deprecated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,18 @@
"old": {"townhall:village": "yes"},
"replace": {"amenity": "townhall", "townhall:type": "village"}
},
{
"old": {"transformer": "auto"},
"replace": {"transformer": "yes", "windings:auto": "yes"}
},
{
"old": {"transformer": "minor_distribution"},
"replace": {"transformer": "distribution"}
},
{
"old": {"transformer": "traction"},
"replace": {"transformer": "main"}
},
{
"old": {"tunnel": "1"},
"replace": {"tunnel": "yes"}
Expand Down Expand Up @@ -1743,6 +1755,22 @@
"old": {"volcano": "extinct"},
"replace": {"volcano:status": "extinct"}
},
{
"old": {"voltage-high": "*", "transformer":"generator"},
"replace": {"voltage:secondary":"$1", "transformer":"generator"}
},
{
"old": {"voltage-low": "*", "transformer":"generator"},
"replace": {"voltage:primary":"$1", "transformer":"generator"}
},
Comment thread
flacombe marked this conversation as resolved.
{
"old": {"voltage-high": "*"},
"replace": {"voltage:primary":"$1"}
},
{
"old": {"voltage-low": "*"},
"replace": {"voltage:secondary":"$1"}
},
{
"old": {"wall_type": "noise_barrier"},
"replace": {"wall": "noise_barrier"}
Expand Down
15 changes: 7 additions & 8 deletions data/fields/transformer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
"label": "Type",
"strings": {
"options": {
"distribution": "Distribution",
"generator": "Generator",
"converter": "Converter",
"traction": "Traction",
"auto": "Autotransformer",
"phase_angle_regulator": "Phase Angle Regulator",
"auxiliary": "Auxiliary",
"yes": "Unknown"
"main": "Forwards power",
"distribution": "Feeds final consumers, installed outside substations",
"generator": "Steps-up voltage in power plants",
"converter": "Feeds power converters",
"phase_angle_regulator": "Regulates phase angle",
"auxiliary": "Feeds internal systems in substations",
Comment on lines +7 to +12
Copy link
Copy Markdown
Contributor

@1ec5 1ec5 Jul 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Were the previous strings incorrect? The new strings can end up being so lengthy in translation that they ideally would be displayed as tooltips, though I’m unsure if schema-builder supports localizable combo option tooltips yet. For now, perhaps each option could start with the short name, like “Distribution: Feeds final consumers, installed outside substations”.

Copy link
Copy Markdown
Member

@tyrasd tyrasd Jul 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They were probably not incorrect, but I thought that having an almost 1:1 copy of the raw tag value isn't a big help for mappers (otherwise this field could have been a regular combo field), that's why I asked for more descriptive labels.

👍 for adding the tag values as part of the labels, I've tweaked it in a33d777 – does that look better?

"yes": "Unknown role"
}
},
"autoSuggestions": false,
Expand Down
12 changes: 12 additions & 0 deletions data/fields/windings/auto.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"key": "windings:auto",
"type": "check",
"label": "Autotransformer",
"strings": {
"options": {
"undefined": "Assumed to be No",
"yes": "Yes",
"no": "No"
}
}
}
6 changes: 5 additions & 1 deletion data/preset_categories/utility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"power/line",
"power/minor_line",
"man_made/pipeline",
"power/cable/underground"
"power/cable",
"power/generator",
"power/plant",
"power/switch",
"power/transformer"
]
}
6 changes: 2 additions & 4 deletions data/presets/_power.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
"power": "*"
},
"fields": [
"power"
],
"moreFields": [
"material"
"power",
"operator"
],
"searchable": false,
"name": "Power Feature"
Expand Down
3 changes: 2 additions & 1 deletion data/presets/power/transformer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"voltage/secondary",
"voltage/tertiary",
"windings",
"windings/configuration"
"windings/configuration",
"windings/auto"
],
"geometry": [
"point",
Expand Down
24 changes: 20 additions & 4 deletions interim/source_strings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3187,20 +3187,20 @@ en:
# transformer=*
label: Type
options:
# transformer=auto
auto: Autotransformer
# transformer=auxiliary
auxiliary: Auxiliary
# transformer=compensator
compensator: Compensation feed
# transformer=converter
converter: Converter
# transformer=distribution
distribution: Distribution
# transformer=generator
generator: Generator
# transformer=main
main: Main
# transformer=phase_angle_regulator
phase_angle_regulator: Phase Angle Regulator
# transformer=traction
traction: Traction
# transformer=yes
'yes': Unknown
trees:
Expand Down Expand Up @@ -3438,6 +3438,17 @@ en:
# windings field placeholder
placeholder: 1, 2, 3...
terms: '[translate with synonyms or related terms for ''Windings'', separated by commas]'
windings/auto:
# windings:auto=*
label: Auto-transformer
options:
# windings:auto=no
'no': 'No'
# windings:auto=undefined
undefined: Assumed to be No
# windings:auto=yes
'yes': 'Yes'
terms: '[translate with synonyms or related terms for ''Auto-transformer'', separated by commas]'
windings/configuration:
# windings:configuration=*
label: Windings Configuration
Expand Down Expand Up @@ -7217,6 +7228,11 @@ en:
name: Television Broadcast Mast
# 'terms: antenna,broadcast tower,communication mast,communication tower,guyed tower,television mast,television tower,transmission mast,transmission tower,tv mast,tv tower'
terms: <translate with synonyms or related terms for 'Television Broadcast Mast', separated by commas>
man_made/mast/lighting:
# man_made=mast + tower:type=lighting | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Lighting Mast
# 'terms: flood light,lighting,stadium lights,stadium lighting,headlight'
terms: <translate with synonyms or related terms for 'Lighting Mast', separated by commas>
man_made/mineshaft:
# man_made=mineshaft | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
name: Mineshaft
Expand Down
⚡