Changeset 15075 in josm


Ignore:
Timestamp:
2019-05-15T22:01:53+02:00 (5 months ago)
Author:
Klumbumbus
Message:

fix #17707

  • remove branch=* from all power related presets
  • remove voltage=* and frequency=* from power=plant presets
  • add a warning about voltage=* and frequency=* on power=plant
  • add plant:source to power=plant presets
Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15074 r15075  
    326326        <reference ref="frequency" />
    327327    </chunk>
    328     <chunk id="ref_operator_branch">
     328    <chunk id="ref_operator">
    329329        <text key="ref" text="Reference" />
    330330        <text key="operator" text="Operator" />
    331         <text key="branch" text="Branch operator" />
    332331    </chunk>
    333332    <chunk id="cables">
     
    344343        <reference ref="power_loc" />
    345344        <reference ref="voltage_frequency" />
    346         <reference ref="ref_operator_branch" />
     345        <reference ref="ref_operator" />
    347346    </chunk>
    348347    <chunk id="power_line_extra">
     
    355354        <key key="power" value="generator" />
    356355        <reference ref="name_ref_operator" />
    357         <text key="branch" text="Branch operator" />
    358356        <text key="start_date" text="Start date" />
    359357    </chunk>
     
    377375        <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
    378376        <check key="location:transition" text="Location transition" disable_off="true" />
    379         <reference ref="ref_operator_branch" />
     377        <reference ref="ref_operator" />
    380378    </chunk>
    381379    <chunk id="rating_phases">
     
    49174915            <key key="power" value="plant" />
    49184916            <reference ref="name_ref_operator" />
    4919             <text key="branch" text="Branch operator" />
    49204917            <text key="start_date" text="Start date" />
    49214918            <optional text="Output forms of energy (optional):">
     
    49294926                <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    49304927                <space />
    4931                 <reference ref="voltage_frequency" />
     4928                <combo key="plant:source" text="Plant source" values="biofuel,biogas,biomass,coal,gas,oil,diesel,gasoline,nuclear,solar,waste,hydro,tidal,wave,osmotic,geothermal,wind" />
    49324929            </optional>
    49334930        </item> <!-- Power Plant -->
     
    51115108            <reference ref="power_loc" />
    51125109            <reference ref="transformer_voltage_frequency" />
    5113             <reference ref="ref_operator_branch" />
     5110            <reference ref="ref_operator" />
    51145111            <reference ref="optional_transformer_rating_phases_devices_windings" />
    51155112        </item> <!-- Power Transformer -->
     
    51495146                <reference ref="voltage" />
    51505147                <reference ref="cables" />
    5151                 <reference ref="ref_operator_branch" />
     5148                <reference ref="ref_operator" />
    51525149            </optional>
    51535150        </item> <!-- Power Switch -->
     
    51595156            <combo key="converter" text="Type of converter" values="lcc,vsc,back-to-back" match="key" values_context="power" />
    51605157            <reference ref="voltage_frequency" />
    5161             <reference ref="ref_operator_branch" />
     5158            <reference ref="ref_operator" />
    51625159            <optional>
    51635160                <combo key="poles" text="Amount of poles" values="monopole,bipole" />
     
    51715168            <combo key="compensator" text="Type of compensator" values="shunt_reactor,shunt_capacitor,static_var,statcom,synchronous_condenser,filter,series_reactor,series_capacitor" match="key" values_context="power" />
    51725169            <reference ref="voltage_frequency" />
    5173             <reference ref="ref_operator_branch" />
     5170            <reference ref="ref_operator" />
    51745171            <optional>
    51755172                <combo key="rating" text="Power rating (kvar/Mvar)" values="500 kvar,1 Mvar,5 Mvar" />
     
    51835180            <key key="street_cabinet" value="power" />
    51845181            <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110" /> <!-- Recheck values -->
    5185             <reference ref="ref_operator_branch" />
     5182            <reference ref="ref_operator" />
    51865183        </item> <!-- Power Street Cabinet -->
    51875184        <separator/>
     
    51915188            <key key="building" value="transformer_tower" />
    51925189            <text key="height" text="Height (meters)" />
    5193             <reference ref="ref_operator_branch" />
     5190            <reference ref="ref_operator" />
    51945191            <preset_link preset_name="Power Substation" />
    51955192        </item> <!-- Transformer Tower -->
     
    52115208            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
    52125209            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
    5213             <reference ref="ref_operator_branch" />
     5210            <reference ref="ref_operator" />
    52145211            <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
    52155212        </item> <!-- Power Portal -->
     
    52225219            <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
    52235220            <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
    5224             <reference ref="ref_operator_branch" />
     5221            <reference ref="ref_operator" />
    52255222            <optional>
    52265223                <combo key="tower:type" text="Tower type" values="suspension,anchor,termination,branch,transposing,crossing,transition" text_context="power" values_context="power" />
     
    52775274            <space />
    52785275            <key key="power" value="insulator" />
    5279             <reference ref="ref_operator_branch" />
     5276            <reference ref="ref_operator" />
    52805277        </item> <!-- Insulator -->
    52815278        <item name="Power Line" icon="presets/power/line.svg" type="way" preset_name_label="true">
     
    52845281            <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue!" />
    52855282            <reference ref="voltage_frequency" />
    5286             <reference ref="ref_operator_branch" />
     5283            <reference ref="ref_operator" />
    52875284            <optional>
    52885285                <reference ref="cables_circuits" />
     
    52975294            <key key="power" value="cable" />
    52985295            <reference ref="voltage_frequency" />
    5299             <reference ref="ref_operator_branch" />
     5296            <reference ref="ref_operator" />
    53005297            <optional>
    53015298                <reference ref="cables_circuits" />
  • trunk/data/validator/combinations.mapcss

    r15004 r15075  
    223223}
    224224
    225 /* {0.tag} together with {1.key}, see #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
     225/* {0.tag} together with {1.key}, see #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
     226*[power=plant][voltage],
     227*[power=plant][frequency],
    226228*[internet_access=no][internet_access:fee],
    227229node[power=transformer][voltage],
Note: See TracChangeset for help on using the changeset viewer.