Changeset 12934 in josm


Ignore:
Timestamp:
2017-10-07T15:06:59+02:00 (2 weeks ago)
Author:
Don-vip
Message:

see #15365 - improve power=switch preset

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r12915 r12934  
    286286        <text key="branch" text="Branch operator" />
    287287    </chunk>
    288     <chunk id="cable_circuit">
     288    <chunk id="cables">
    289289        <combo key="cables" text="Amount of Cables" values="1,2,3,4,6,9,12" />
     290    </chunk>
     291    <chunk id="cables_circuits">
     292        <reference ref="cables" />
    290293        <combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
    291294    </chunk>
    292295    <chunk id="power_loc">
    293         <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
     296        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop,kiosk" values_context="power" />
    294297    </chunk>
    295298    <chunk id="power_extra">
     
    299302    </chunk>
    300303    <chunk id="power_line_extra">
    301         <reference ref="cable_circuit" />
     304        <reference ref="cables_circuits" />
    302305        <reference ref="voltage_frequency" />
    303306    </chunk>
     
    76077610            <space />
    76087611            <key key="power" value="switch" />
     7612            <combo key="switch" text="Type of switch" values="mechanical,circuit_breaker,disconnector,earthing" match="key" values_context="power" />
     7613            <reference ref="power_loc" />
     7614            <optional>
     7615                <reference ref="voltage" />
     7616                <reference ref="cables" />
     7617                <reference ref="ref_operator_branch" />
     7618            </optional>
    76097619        </item> <!-- Power Switch -->
    76107620        <separator/>
     
    77627772            <reference ref="ref_operator_branch" />
    77637773            <optional>
    7764                 <reference ref="cable_circuit" />
     7774                <reference ref="cables_circuits" />
    77657775                <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
    77667776                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     
    77787788            <reference ref="ref_operator_branch" />
    77797789            <optional>
    7780                 <reference ref="cable_circuit" />
     7790                <reference ref="cables_circuits" />
    77817791                <combo key="location" text="Location" values="underground,underwater,overground" values_context="power cable" />
    77827792                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     
    1055810568            <space />
    1055910569            <key key="landuse" value="vineyard" />
    10560             <combo key="crop" text="Crop" values="grape" default="grape" values_context="crop" />
     10570            <key key="crop" value="grape" match="keyvalue" />
    1056110571            <reference ref="optional_name" />
    1056210572        </item> <!-- Vineyard -->
Note: See TracChangeset for help on using the changeset viewer.