Changes between Version 19 and Version 20 of Presets/MastAndTower


Ignore:
Timestamp:
2020-04-03T02:53:12+02:00 (6 years ago)
Author:
skyper
Comment:

preset_name_label instead of label to show icons (missing in docu); special preset links on top

Legend:

Unmodified
Added
Removed
Modified

  • Presets/MastAndTower

    v19 v20  
    139139        <group name="Mast" icon="Mast_general.svg">
    140140
    141             <item name="General preset Mast" icon="Mast_general.svg" type="node">
     141            <item name="General preset Mast" icon="Mast_general.svg" type="node" preset_name_label="true">
    142142                <link wiki="Tag:man_made=mast" />
     143                <space />
    143144                <label text="Adding a general mast. Please use distinct presets if possible." />
    144145                <space />
    … …  
    162163            <separator />
    163164
    164             <item name="Communication mast" icon="Mast_communications.svg" type="node">
     165            <item name="Communication mast" icon="Mast_communications.svg" type="node" preset_name_label="true">
    165166                <link wiki="Tag:tower:type=communication" />
    166                 <label text="Adding a communication mast"/>
    167167                <space />
    168168                <key key="man_made" value="mast" />
    … …  
    175175            </item>
    176176
    177             <item name="Lighting mast" icon="Mast_lighting.svg" type="node">
     177            <item name="Lighting mast" icon="Mast_lighting.svg" type="node" preset_name_label="true">
    178178                <link wiki="Tag:tower:type=lighting" />
    179                 <label text="Adding a lighting mast" />
    180179                <space />
    181180                <key key="man_made" value="mast" />
    … …  
    187186            </item>
    188187
    189             <item name="Monitoring mast" icon="High-contrast-utilities-system-monitor.svg" type="node">
     188            <item name="Monitoring mast" icon="High-contrast-utilities-system-monitor.svg" type="node" preset_name_label="true">
    190189                <link wiki="Tag:tower:type=monitoring" />
    191                 <label text="Adding a monitoring mast" />
    192190                <space />
    193191                <key key="man_made" value="mast" />
    194192                <key key="tower:type" value="monitoring" />
    195193                <reference ref="tw_con_mt" />
    196                 <optional>
    197                     <reference ref="name_ref_extra_contact" />
    198                 </optional>
    199194                <preset_link preset_name="Monitoring Station" />
    200             </item>
    201 
    202             <item name="Radar mast" icon="Tower_dish.svg" type="node">
     195                <optional>
     196                    <reference ref="name_ref_extra_contact" />
     197                </optional>
     198            </item>
     199
     200            <item name="Radar mast" icon="Tower_dish.svg" type="node" preset_name_label="true">
    203201                <link wiki="Tag:tower:type=radar" />
    204                 <label text="Adding a radar mast" />
    205202                <space />
    206203                <key key="man_made" value="mast" />
    … …  
    212209            </item>
    213210
    214             <item name="Siren mast" icon="presets/emergency/siren.svg" type="node">
     211            <item name="Siren mast" icon="presets/emergency/siren.svg" type="node" preset_name_label="true">
    215212                <link wiki="Tag:tower:type=siren" />
    216                 <label text="Adding a siren mast" />
    217213                <space />
    218214                <key key="man_made" value="mast" />
    219215                <key key="tower:type" value="siren" />
    220216                <reference ref="tw_con_mt" />
    221                 <optional>
    222                     <reference ref="name_ref_extra_contact" />
    223                 </optional>
    224217                <preset_link preset_name="Siren" />
     218                <optional>
     219                    <reference ref="name_ref_extra_contact" />
     220                </optional>
    225221            </item>
    226222   
    227223        </group>
    228 
    229224        <group name="Tower" icon="Tower_freestanding.svg">
    230             <item name="General preset Tower" icon="Tower_freestanding.svg" type="node,closedway,multipolygon">
     225
     226            <item name="General preset Tower" icon="Tower_freestanding.svg" type="node,closedway,multipolygon" preset_name_label="true">
    231227                <link wiki="Tag:man_made=tower" />
    232                 <label text="Adding a general tower. Please use distinct presets if possible." />
     228                <space />
     229                <label text=" Adding a general tower. Please use distinct presets if possible." />
    233230                <space />
    234231                <key key="man_made" value="tower" />
    … …  
    256253            <separator />
    257254
    258             <item name="Big communication tower" icon="Communication_tower-14.svg" type="node,closedway,multipolygon">
     255            <item name="Big communication tower" icon="Communication_tower-14.svg" type="node,closedway,multipolygon" preset_name_label="true">
    259256                <link wiki="Tag:man_made=communications_tower" />
    260                 <label text="Adding a big communication tower, usually 100 meters or higher." />
    261                 <space />
    262                 <label text=" Use Communication tower preset for smaller ones !" />
     257                <space />
     258                <label text=" Adding a big communication tower, usually 100 meters or higher." />
     259                <space />
     260                <label text="  Use Communication tower preset for smaller ones !" />
    263261                <preset_link preset_name="Communication tower" />
    264262                <space />
    … …  
    275273            </item>
    276274
    277             <item name="Small communication tower" icon="Tower_cantilever_communication.svg" type="node,closedway,multipolygon">
     275            <item name="Small communication tower" icon="Tower_cantilever_communication.svg" type="node,closedway,multipolygon" preset_name_label="true">
    278276                <link wiki="Tag:tower:type=communication" />
    279                 <label text="Adding a communication tower" />
    280277                <space />
    281278                <label text=" See Big communication tower preset for big communication towers !" />
    282279                <preset_link preset_name="Big communication tower" />
    283                 <label text=" Consider using Communication mast preset for smaller constructions !" />
     280                <label text=" Use Communication mast preset for smaller constructions !" />
    284281                <preset_link preset_name="Communication mast" />
     282                <space />
    285283                <key key="man_made" value="tower" />
    286284                <key key="tower:type" value="communication" />
    … …  
    292290            </item>
    293291
    294             <item name="Radar tower" icon="Tower_dish.svg" type="node,closedway,multipolygon">
     292            <item name="Radar tower" icon="Tower_dish.svg" type="node,closedway,multipolygon" preset_name_label="true">
    295293                <link wiki="Tag:tower:type=radar" />
    296                 <label text="Adding a radar tower" />
    297294                <space />
    298295                <key key="man_made" value="tower" />
    … …  
    302299            </item>
    303300
    304             <item name="Lighting tower" icon="Tower_lighting.svg" type="node,closedway,multipolygon">
     301            <item name="Lighting tower" icon="Tower_lighting.svg" type="node,closedway,multipolygon" preset_name_label="true">
    305302                <link wiki="Tag:tower:type=lighting" />
    306                 <label text="Adding a lighting tower" />
    307303                <space />
    308304                <key key="man_made" value="tower" />
    … …  
    312308            </item>
    313309
    314             <item name="Cooling tower" icon="Tower_cooling.svg" type="node,closedway,multipolygon">
     310            <item name="Cooling tower" icon="Tower_cooling.svg" type="node,closedway,multipolygon" preset_name_label="true">
    315311                <link wiki="Tag:tower:type=cooling" />
    316                 <label text="Adding a cooling tower" />
    317312                <space />
    318313                <key key="man_made" value="tower" />
    … …  
    323318            </item>
    324319
    325             <item name="Water tower" icon="presets/landmark/water_tower.svg" type="node,closedway,multipolygon">
     320            <item name="Water tower" icon="presets/landmark/water_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
    326321                <link wiki="Tag:man_made=water_tower" />
    327                 <label text="Adding a water tower" />
    328322                <space />
    329323                <key key="man_made" value="water_tower" />
    … …  
    335329            </item>
    336330
    337             <item name="Monitoring tower" icon="High-contrast-utilities-system-monitor.svg" type="node,closedway,multipolygon">
     331            <item name="Monitoring tower" icon="High-contrast-utilities-system-monitor.svg" type="node,closedway,multipolygon" preset_name_label="true">
    338332                <link wiki="Tag:tower:type=monitoring" />
    339                 <label text="Adding a monitoring tower" />
    340333                <space />
    341334                <key key="man_made" value="tower" />
    … …  
    346339            </item>
    347340
    348             <item name="Observation tower" icon="Tower_observation.svg" type="node,closedway,multipolygon">
     341            <item name="Observation tower" icon="Tower_observation.svg" type="node,closedway,multipolygon" preset_name_label="true">
    349342                <link wiki="Tag:tower:type=observation" />
    350                 <label text="Adding a observation tower" />
    351343                <space />
    352344                <key key="man_made" value="tower" />
    … …  
    356348            </item>
    357349
    358             <item name="Watch tower" icon="Tower_observation.svg" type="node,closedway,multipolygon">
     350            <item name="Watch tower" icon="Tower_observation.svg" type="node,closedway,multipolygon" preset_name_label="true">
    359351                <link wiki="Tag:tower:type=watchtower" />
    360                 <label text="Adding a watch tower" />
    361352                <space />
    362353                <key key="man_made" value="tower" />
    … …  
    365356            </item>
    366357
    367             <item name="Defensive tower" icon="Tower_defensive.svg" type="node,closedway,multipolygon">
     358            <item name="Defensive tower" icon="Tower_defensive.svg" type="node,closedway,multipolygon" preset_name_label="true">
    368359                <link wiki="Tag:tower:type=defensive" />
    369                 <label text="Adding a defensive tower" />
    370360                <space />
    371361                <key key="man_made" value="tower" />
    … …  
    374364            </item>
    375365
    376             <item name="Bell tower" icon="Tower_bell_tower.svg" type="node,closedway,multipolygon">
     366            <item name="Bell tower" icon="Tower_bell_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
    377367                <link wiki="Tag:tower:type=bell_tower" />
    378                 <label text="Adding a bell tower" />
    379368                <space />
    380369                <key key="man_made" value="tower" />
    … …  
    387376            </item>
    388377
    389             <item name="Minaret" icon="Mosque.svg" type="node,closedway,multipolygon">
     378            <item name="Minaret" icon="Mosque.svg" type="node,closedway,multipolygon" preset_name_label="true">
    390379                <link wiki="Tag:tower:type=minaret" />
    391                 <label text="Adding a minaret"/>
    392380                <space />
    393381                <key key="man_made" value="tower" />