Changeset 17355 in josm


Ignore:
Timestamp:
2020-11-25T00:09:36+01:00 (6 months ago)
Author:
Don-vip
Message:

presets refactoring

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r17311 r17355  
    12631263            <key key="highway" value="services" />
    12641264            <optional>
    1265                 <text key="name" text="Name" />
    1266                 <text key="operator" text="Operator" />
     1265                <reference ref="name_operator" />
    12671266                <check key="toilets" text="Toilets" />
    12681267            </optional>
     
    20122011            <combo key="location" text="Location" values="overground,underground" values_context="pipeline" />
    20132012            <optional>
    2014                 <text key="name" text="Name" />
    2015                 <text key="operator" text="Operator" />
     2013                <reference ref="name_operator" />
    20162014                <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
    20172015                <text key="pressure" text="Pressure (bar)" />
     
    23612359            <key key="railway" value="switch" />
    23622360            <combo key="railway:switch" text="Type" values="abt,default,double_slip,single_slip,three_way,wye" />
    2363             <text key="ref" text="Reference" />
    2364             <text key="operator" text="Operator" />
     2361            <reference ref="ref_operator" />
    23652362        </item> <!-- Railway Switch -->
    23662363        <item name="Railway crossing" icon="presets/transport/railway/railway_crossing.svg" type="node" preset_name_label="true">
    23672364            <link wiki="Tag:railway=railway_crossing" />
    23682365            <key key="railway" value="railway_crossing" />
    2369             <text key="ref" text="Reference" />
    2370             <text key="operator" text="Operator" />
     2366            <reference ref="ref_operator" />
    23712367        </item> <!-- Railway crossing -->
    23722368        <item name="Railway Signal" icon="presets/transport/railway/signal.svg" type="node" preset_name_label="true">
    23732369            <link wiki="Tag:railway=signal" />
    23742370            <key key="railway" value="signal" />
    2375             <text key="ref" text="Reference" />
    2376             <text key="operator" text="Operator" />
     2371            <reference ref="ref_operator" />
    23772372        </item> <!-- Railway Signal -->
    23782373        <item name="Railway milestone" icon="presets/transport/railway/milestone.svg" type="node" preset_name_label="true">
     
    25612556            <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Eni,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Socar,Statoil,Sunoco,Tamoil,Texaco,Total,Independent" values_searchable="true" />
    25622557            <optional>
    2563                 <text key="name" text="Name" />
    2564                 <text key="operator" text="Operator" />
     2558                <reference ref="name_operator" />
    25652559                <reference ref="oh_wheelchair" />
    25662560                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
     
    43364330            <space />
    43374331            <key key="emergency" value="fire_extinguisher" />
    4338             <text key="ref" text="Reference" />
    4339             <text key="operator" text="Operator" />
     4332            <reference ref="ref_operator" />
    43404333            <check key="indoor" text="Indoor" />
    43414334        </item> <!-- Fire Extinguisher -->
     
    43444337            <space />
    43454338            <key key="emergency" value="fire_hose" />
    4346             <text key="ref" text="Reference" />
    4347             <text key="operator" text="Operator" />
     4339            <reference ref="ref_operator" />
    43484340        </item> <!-- Fire Hose -->
    43494341        <item name="Fire Hydrant" icon="presets/service/fire_hydrant.svg" type="node" preset_name_label="true">
     
    44274419            <link wiki="Tag:emergency=phone" />
    44284420            <key key="emergency" value="phone" />
    4429             <text key="ref" text="Reference" />
    4430             <text key="operator" text="Operator" />
     4421            <reference ref="ref_operator" />
    44314422        </item> <!-- Emergency Phone -->
    44324423        <item name="Siren" icon="presets/emergency/siren.svg" type="node" preset_name_label="true">
    44334424            <link wiki="Tag:emergency=siren" />
    44344425            <key key="emergency" value="siren" />
    4435             <text key="ref" text="Reference" />
    4436             <text key="operator" text="Operator" />
     4426            <reference ref="ref_operator" />
    44374427            <space />
    44384428            <combo key="siren:type" text="Type" values="pneumatic,electronic,mechanical" />
     
    54125402            <space />
    54135403            <combo key="police" text="Type" values="barracks,car_pound,checkpoint,detention,naval_base,offices,range,storage,training_area,yes" values_context="police" match="keyvalue!" values_searchable="true" />
    5414             <optional>
    5415                 <text key="name" text="Name" />
    5416                 <text key="operator" text="Operator" />
    5417             </optional>
     5404            <reference ref="optional_name_operator" />
    54185405            <reference ref="link_contact_address" />
    54195406        </item> <!-- Non-public police facility -->
     
    56395626            <text key="operator" text="Operator" />
    56405627            <optional>
    5641                 <text key="name" text="Name" />
    5642                 <text key="ref" text="Reference" />
     5628                <reference ref="name_ref" />
    56435629            </optional>
    56445630            <space />
     
    62176203                <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    62186204                <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    6219                 <text key="ref" text="Reference" />
    6220                 <text key="operator" text="Operator" />
     6205                <reference ref="ref_operator" />
    62216206            </optional>
    62226207        </item> <!-- Terminal -->
     
    62896274            <key key="power" value="catenary_mast" />
    62906275            <optional>
    6291                 <text key="ref" text="Reference" />
    6292                 <text key="operator" text="Operator" />
     6276                <reference ref="ref_operator" />
    62936277            </optional>
    62946278        </item> <!-- Catenary mast -->
Note: See TracChangeset for help on using the changeset viewer.