Changeset 13814 in josm


Ignore:
Timestamp:
2018-05-22T00:02:17+02:00 (4 weeks ago)
Author:
Don-vip
Message:

fix #15367 - Power transformer extension

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r13793 r13814  
    274274    <chunk id="leaf_without_mixed">
    275275        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
    276             <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
     276        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
    277277            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
    278278            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
     
    294294    <chunk id="voltage_frequency">
    295295        <reference ref="voltage" />
     296        <reference ref="frequency" />
     297    </chunk>
     298    <chunk id="transformer_voltage_frequency">
     299        <combo key="voltage:primary" text="Primary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" />
     300        <combo key="voltage:secondary" text="Secondary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" />
     301        <combo key="voltage:tertiary" text="Tertiary voltage in Volts (V)" values="765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000" />
    296302        <reference ref="frequency" />
    297303    </chunk>
     
    358364        <reference ref="ref_operator_branch" />
    359365    </chunk>
     366    <chunk id="rating_phases">
     367        <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
     368        <combo key="phases" text="Phases" values="1,3" length="1" />
     369    </chunk>
    360370    <chunk id="optional_rating_phases">
    361371        <optional>
    362             <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
    363             <combo key="phases" text="Phases" values="1,3" length="1" />
     372            <reference ref="rating_phases" />
     373        </optional>
     374    </chunk>
     375    <chunk id="optional_transformer_rating_phases_devices_windings">
     376        <optional>
     377            <reference ref="rating_phases" />
     378            <combo key="devices" text="Number of devices" values="1,2,3,4" />
     379            <combo key="windings" text="Number of windings" values="1,2,3,4" />
     380            <combo key="windings:configuration" text="Windings configuration" values="star,delta,open-delta,zigzag,open,scott,leblanc" values_context="power" />
    364381        </optional>
    365382    </chunk>
     
    77327749            <space />
    77337750            <key key="power" value="transformer" />
    7734             <combo key="transformer" text="Type of transformer" values="distribution,generator,converter,traction,auto,phase_angle_regulator,yes" match="key" values_context="power" />
    7735             <reference ref="power_extra" />
    7736             <reference ref="optional_rating_phases" />
     7751            <combo key="transformer" text="Type of transformer" values="distribution,generator,converter,traction,auto,phase_angle_regulator,auxiliary,yes" match="key" values_context="power" />
     7752            <reference ref="power_loc" />
     7753            <reference ref="transformer_voltage_frequency" />
     7754            <reference ref="ref_operator_branch" />
     7755            <reference ref="optional_transformer_rating_phases_devices_windings" />
    77377756        </item> <!-- Power Transformer -->
    77387757        <item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway" preset_name_label="true">
     
    79227941            <label text="Transformer Attributes:" />
    79237942            <key key="transformer" value="distribution" match="key!" />
    7924             <reference ref="voltage_frequency" />
    7925             <reference ref="optional_rating_phases" />
     7943            <reference ref="transformer_voltage_frequency" />
     7944            <reference ref="optional_transformer_rating_phases_devices_windings" />
    79267945        </item> <!-- Pole with Transformer -->
    79277946        <item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
  • trunk/data/validator/combinations.mapcss

    r13787 r13814  
    137137way[highway=track              ][!tracktype],
    138138way[power=cable                ][!location],
    139 node[power=transformer         ][!voltage],
     139node[power=transformer         ][!voltage:primary],
     140node[power=transformer         ][!voltage:secondary],
     141node[transformer=distribution  ][!voltage:primary][power=pole],
     142node[transformer=distribution  ][!voltage:secondary][power=pole],
    140143way[power=line                 ][!voltage],
    141144way[power=minor_line           ][!voltage],
     
    204207
    205208/* {0.tag} together with {1.key}, see #10837, #14034, #9389, #11977, #13156 */
     209node[power=transformer][voltage],
     210node[transformer=distribution][voltage][power=pole],
    206211*[amenity=vending_machine][shop],
    207212*[noname?][name],
Note: See TracChangeset for help on using the changeset viewer.