Changes between Version 24 and Version 25 of Presets/MastAndTower


Ignore:
Timestamp:
2020-04-13T15:10:35+02:00 (6 years ago)
Author:
skyper
Comment:

rework preset_links, see #19022

Legend:

Unmodified
Added
Removed
Modified

  • Presets/MastAndTower

    v24 v25  
    4747
    4848    <!-- chunks -->
    49     <chunk id="name_ref">
    50         <space />
    51         <text key="name" text="Name" />
    52         <text key="ref" text="Reference" />
    53     </chunk>
    54 
    5549    <chunk id="extra">
    5650        <text key="operator" text="Operator" />
    … …  
    6862   
    6963    <chunk id="name_ref_extra">
    70         <reference ref="name_ref" />
     64        <text key="name" text="Name" />
     65        <text key="ref" text="Reference" />
    7166        <reference ref="extra" />
    7267    </chunk>
    7368
    7469    <chunk id="name_ref_extra_contact">
    75         <reference ref="name_ref" />
    76         <reference ref="extra" />
     70        <reference ref="name_ref_extra" />
    7771        <reference ref="addr_contact" />
    7872    </chunk>
    … …  
    147141                <label text="Adding a general mast. Please use distinct presets if possible." />
    148142                <space />
     143                <preset_link preset_name="General preset Tower" text="Similar but different tag:" text_context="man_made=mast/tower/communications_tower" />
     144                <space />
    149145                <key key="man_made" value="mast" />
    150146                <multiselect key="tower:type" text="Tower type" values_searchable="true" values_sort="false" rows="7">
    … …  
    157153                    <list_entry value="siren" display_value="Siren" icon="presets/emergency/siren.svg" />
    158154                </multiselect>
    159                 <preset_link preset_name="General preset Tower" />
    160155                <reference ref="tw_con_mt" />
    161156                <optional>
    … …  
    195190                <key key="tower:type" value="monitoring" />
    196191                <reference ref="tw_con_mt" />
     192                <optional>
     193                    <reference ref="name_ref_extra" />
     194                </optional>
    197195                <preset_link preset_name="Monitoring Station" />
    198                 <optional>
    199                     <reference ref="name_ref_extra_contact" />
    200                 </optional>
     196                <reference ref="addr_contact" />
    201197            </item>
    202198
    … …  
    218214                <key key="tower:type" value="siren" />
    219215                <reference ref="tw_con_mt" />
     216                <optional>
     217                    <reference ref="name_ref_extra" />
     218                </optional>
    220219                <preset_link preset_name="Siren" />
    221                 <optional>
    222                     <reference ref="name_ref_extra_contact" />
    223                 </optional>
     220                <reference ref="addr_contact" />
    224221            </item>
    225222   
    … …  
    231228                <space />
    232229                <label text=" Adding a general tower. Please use distinct presets if possible." />
     230                <space />
     231                <preset_link preset_name="Big communication tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     232                <preset_link preset_name="Water tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     233                <preset_link preset_name="General preset Mast" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
    233234                <space />
    234235                <key key="man_made" value="tower" />
    … …  
    247248                </multiselect>
    248249                <reference ref="tw_con_tw" />
    249                 <preset_link preset_name="Big communication tower" />
    250                 <preset_link preset_name="Water tower" />
    251                 <preset_link preset_name="General preset Mast" />
    252250                <reference ref="detail_tw" />
    253251            </item>
    … …  
    260258                <label text=" Adding a big communication tower, usually 100 meters or higher." />
    261259                <space />
    262                 <label text="  Use Small communication tower preset for smaller ones !" />
    263                 <preset_link preset_name="Small communication tower" />
     260                <preset_link preset_name="Small communication tower" text="For smaller constructions, use:" />
    264261                <space />
    265262                <key key="man_made" value="communications_tower" />
    … …  
    278275                <link wiki="Tag:tower:type=communication" />
    279276                <space />
    280                 <label text=" See Big communication tower preset for big communication towers !" />
    281                 <preset_link preset_name="Big communication tower" />
    282                 <label text=" Use Communication mast preset for smaller constructions !" />
    283                 <preset_link preset_name="Communication mast" />
     277                <preset_link preset_name="Big communication tower" text="For big communication towers, see:" />
     278                <preset_link preset_name="Communication mast" text="For smaller constructions, use:" />
    284279                <space />
    285280                <key key="man_made" value="tower" />
    … …  
    313308                <link wiki="Tag:tower:type=cooling" />
    314309                <space />
     310                <preset_link preset_name="Chimney" text="Similar but different tag:" text_context="man_made=chimney;man_made=tower,tower:type=cooling" />
     311                <space />
    315312                <key key="man_made" value="tower" />
    316313                <key key="tower:type" value="cooling" />
    317314                <reference ref="tw_con_tw" />
    318                 <preset_link preset_name="Chimney" />
    319315                <reference ref="detail_tw" />
    320316            </item>
    … …  
    390386</presets>
    391387}}}
     388
    392389^* Icons in [attachment:MastTower_icons.zip​ MastTower_icons.zip] and [attachment:Tower_dish.svg Tower_dish.svg] are PD from [osmwiki: wiki.openstreetmap.org]. Other icons from [https://commons.wikimedia.org commons.wikimedia.org] with different licenses.