Changes between Version 27 and Version 28 of Presets/MastAndTower


Ignore:
Timestamp:
2020-07-07T01:27:54+02:00 (4 years ago)
Author:
skyper
Comment:

use internal icons

Legend:

Unmodified
Added
Removed
Modified

  • Presets/MastAndTower

    v27 v28  
    1 = [[Image(Tower_freestanding.svg,48,margin-right=20,inline,middle)]] Mast and Tower
     1= [[JOSMImage(presets/tower/tower,48,margin-right=20,inline,middle)]] Mast and Tower
    22
    33**A complete tagging preset for all kind of masts and towers.**
    … …  
    8989        <combo key="tower:construction" text="Construction" values_sort="false" values_searchable="true">
    9090            <list_entry value="lattice" display_value="lattice" icon="Tower_lattice.svg" />
    91             <list_entry value="freestanding" display_value="freestanding" icon="Tower_freestanding.svg" />
     91            <list_entry value="freestanding" display_value="freestanding" icon="presets/tower/tower.svg" />
    9292            <list_entry value="dome" display_value="Dome" icon="Tower_dome.svg" />
    9393            <list_entry value="dish" display_value="Dish" icon="Tower_dish.svg" />
    … …  
    9898        <combo key="tower:construction" text="Construction" values_sort="false" values_searchable="true">
    9999            <list_entry value="lattice" display_value="lattice" icon="Tower_lattice_communication.svg" />
    100             <list_entry value="freestanding" display_value="freestanding" icon="Tower_cantilever_communication.svg" />
     100            <list_entry value="freestanding" display_value="freestanding" icon="presets/tower/communication.svg" />
    101101            <list_entry value="dome" display_value="Dome" icon="Tower_dome.svg" />
    102102            <list_entry value="dish" display_value="Dish" icon="Tower_dish.svg" />
    … …  
    106106    <chunk id="tw_con_mt">
    107107        <combo key="tower:construction" text="Construction" values_sort="false" values_searchable="true">
    108             <list_entry value="guyed_lattice" display_value="guyed lattice" icon="Mast_general.svg" />
    109             <list_entry value="guyed_tube" display_value="guyed tube" icon="Mast_general.svg" />
    110             <list_entry value="freestanding" display_value="freestanding" icon="Tower_freestanding.svg" />
     108            <list_entry value="guyed_lattice" display_value="guyed lattice" icon="presets/tower/mast.svg" />
     109            <list_entry value="guyed_tube" display_value="guyed tube" icon="presets/tower/mast.svg" />
     110            <list_entry value="freestanding" display_value="freestanding" icon="presets/tower/tower.svg" />
    111111            <list_entry value="lattice" display_value="lattice" icon="Tower_lattice.svg" />
    112112        </combo>
    … …  
    133133
    134134    <!-- groups -->
    135     <group name="Mast and Tower" icon="Tower_freestanding.svg">
    136         <group name="Mast" icon="Mast_general.svg">
    137 
    138             <item name="General preset Mast" icon="Mast_general.svg" type="node" preset_name_label="true">
     135    <group name="Mast and Tower" icon="presets/tower/tower.svg">
     136        <group name="Mast" icon="presets/tower/mast.svg">
     137
     138            <item name="General preset Mast" icon="presets/tower/mast.svg" type="node" preset_name_label="true">
    139139                <link wiki="Tag:man_made=mast" />
    140140                <space />
    … …  
    145145                <key key="man_made" value="mast" />
    146146                <multiselect key="tower:type" text="Tower type" values_searchable="true" values_sort="false" rows="7">
    147                     <list_entry value="communication" display_value="Communication" icon="Mast_communications.svg" />
    148                     <list_entry value="lighting" display_value="Lighting" icon="Mast_lighting.svg" />
     147                    <list_entry value="communication" display_value="Communication" icon="presets/tower/mast_communication.svg" />
     148                    <list_entry value="lighting" display_value="Lighting" icon="presets/tower/mast_lighting.svg" />
    149149                    <list_entry value="monitoring" display_value="Monitoring" icon="High-contrast-utilities-system-monitor.svg"
    150150                            icon_size="16" />
    151                     <list_entry value="observation" display_value="Observation" icon="Tower_observation.svg" />
     151                    <list_entry value="observation" display_value="Observation" icon="presets/tower/observation.svg" />
    152152                    <list_entry value="radar" display_value="Radar" icon="Tower_dish.svg" icon_size="16" />
    153153                    <list_entry value="siren" display_value="Siren" icon="presets/emergency/siren.svg" />
    … …  
    161161            <separator />
    162162
    163             <item name="Communication mast" icon="Mast_communications.svg" type="node" preset_name_label="true">
     163            <item name="Communication mast" icon="presets/tower/mast_communication.svg" type="node" preset_name_label="true">
    164164                <link wiki="Tag:tower:type=communication" />
    165165                <space />
    … …  
    173173            </item>
    174174
    175             <item name="Lighting mast" icon="Mast_lighting.svg" type="node" preset_name_label="true">
     175            <item name="Lighting mast" icon="presets/tower/mast_lighting.svg" type="node" preset_name_label="true">
    176176                <link wiki="Tag:tower:type=lighting" />
    177177                <space />
    … …  
    222222   
    223223        </group>
    224         <group name="Tower" icon="Tower_freestanding.svg">
    225 
    226             <item name="General preset Tower" icon="Tower_freestanding.svg" type="node,closedway,multipolygon" preset_name_label="true">
     224        <group name="Tower" icon="presets/tower/tower.svg">
     225
     226            <item name="General preset Tower" icon="presets/tower/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
    227227                <link wiki="Tag:man_made=tower" />
    228228                <space />
    … …  
    235235                <key key="man_made" value="tower" />
    236236                <multiselect key="tower:type" text="Type of tower" values_searchable="true" values_sort="false" rows="11">
    237                     <list_entry value="bell_tower" display_value="Bell tower" icon="Tower_bell_tower.svg" />
    238                     <list_entry value="communication" display_value="Small communication tower" icon="Tower_cantilever_communication.svg" />
    239                     <list_entry value="cooling" display_value="Cooling" icon="Tower_cooling.svg" />
    240                     <list_entry value="defensive" display_value="Defensive tower" icon="Tower_defensive.svg" />
    241                     <list_entry value="lighting" display_value="Lighting tower" icon="Tower_lighting.svg" />
     237                    <list_entry value="bell_tower" display_value="Bell tower" icon="presets/tower/bell_tower.svg" />
     238                    <list_entry value="communication" display_value="Small communication tower" icon="presets/tower/communication.svg" />
     239                    <list_entry value="cooling" display_value="Cooling" icon="presets/tower/cooling.svg" />
     240                    <list_entry value="defensive" display_value="Defensive tower" icon="presets/tower/defensive.svg" />
     241                    <list_entry value="lighting" display_value="Lighting tower" icon="presets/tower/lighting.svg" />
    242242                    <list_entry value="minaret" display_value="Minaret" icon="Mosque.svg" icon_size="16" />
    243                     <list_entry value="monitoring" display_value="Monitoring tower" icon="High-contrast-utilities-system-monitor.svg"
    244                             icon_size="16" />
    245                     <list_entry value="observation" display_value="Observation tower" icon="Tower_observation.svg" />
     243                    <list_entry value="monitoring" display_value="Monitoring tower" icon="High-contrast-utilities-system-monitor.svg" icon_size="16" />
     244                    <list_entry value="observation" display_value="Observation tower" icon="presets/tower/observation.svg" />
    246245                    <list_entry value="radar" display_value="Radar tower" icon="Tower_dish.svg" icon_size="16" />
    247                     <list_entry value="watchtower" display_value="Watch tower" icon="Tower_observation.svg" />
     246                    <list_entry value="watchtower" display_value="Watch tower" icon="presets/tower/observation.svg" />
    248247                </multiselect>
    249248                <reference ref="tw_con_tw" />
    … …  
    253252            <separator />
    254253
    255             <item name="Big communication tower" icon="Communication_tower-14.svg" type="node,closedway,multipolygon" preset_name_label="true">
     254            <item name="Big communication tower" icon="presets/tower/communications_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
    256255                <link wiki="Tag:man_made=communications_tower" />
    257256                <space />
    … …  
    262261                <key key="man_made" value="communications_tower" />
    263262                <multiselect key="tower:type" text="Type of tower" values_searchable="true" values_sort="false" default="communication" rows="3">
    264                     <list_entry value="communication" display_value="Communication tower" icon="Tower_cantilever_communication.svg" />
    265                     <list_entry value="observation" display_value="Observation tower" icon="Tower_observation.svg" />
     263                    <list_entry value="communication" display_value="Communication tower" icon="presets/tower/communication.svg" />
     264                    <list_entry value="observation" display_value="Observation tower" icon="presets/tower/observation.svg" />
    266265                </multiselect>
    267266                <reference ref="tw_con_tw_com" />
    … …  
    272271            </item>
    273272
    274             <item name="Small communication tower" icon="Tower_cantilever_communication.svg" type="node,closedway,multipolygon" preset_name_label="true">
     273            <item name="Small communication tower" icon="presets/tower/communication.svg" type="node,closedway,multipolygon" preset_name_label="true">
    275274                <link wiki="Tag:tower:type=communication" />
    276275                <space />
    … …  
    296295            </item>
    297296
    298             <item name="Lighting tower" icon="Tower_lighting.svg" type="node,closedway,multipolygon" preset_name_label="true">
     297            <item name="Lighting tower" icon="presets/tower/lighting.svg" type="node,closedway,multipolygon" preset_name_label="true">
    299298                <link wiki="Tag:tower:type=lighting" />
    300299                <space />
    … …  
    305304            </item>
    306305
    307             <item name="Cooling tower" icon="Tower_cooling.svg" type="node,closedway,multipolygon" preset_name_label="true">
     306            <item name="Cooling tower" icon="presets/tower/cooling.svg" type="node,closedway,multipolygon" preset_name_label="true">
    308307                <link wiki="Tag:tower:type=cooling" />
    309308                <space />
    … …  
    337336            </item>
    338337
    339             <item name="Observation tower" icon="Tower_observation.svg" type="node,closedway,multipolygon" preset_name_label="true">
     338            <item name="Observation tower" icon="presets/tower/observation.svg" type="node,closedway,multipolygon" preset_name_label="true">
    340339                <link wiki="Tag:tower:type=observation" />
    341340                <space />
    … …  
    346345            </item>
    347346
    348             <item name="Watch tower" icon="Tower_observation.svg" type="node,closedway,multipolygon" preset_name_label="true">
     347            <item name="Watch tower" icon="presets/tower/observation.svg" type="node,closedway,multipolygon" preset_name_label="true">
    349348                <link wiki="Tag:tower:type=watchtower" />
    350349                <space />
    … …  
    354353            </item>
    355354
    356             <item name="Defensive tower" icon="Tower_defensive.svg" type="node,closedway,multipolygon" preset_name_label="true">
     355            <item name="Defensive tower" icon="presets/tower/defensive.svg" type="node,closedway,multipolygon" preset_name_label="true">
    357356                <link wiki="Tag:tower:type=defensive" />
    358357                <space />
    … …  
    362361            </item>
    363362
    364             <item name="Bell tower" icon="Tower_bell_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
     363            <item name="Bell tower" icon="presets/tower/bell_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
    365364                <link wiki="Tag:tower:type=bell_tower" />
    366365                <space />