Changes between Version 31 and Version 32 of Presets/MastAndTower


Ignore:
Timestamp:
2020-07-16T17:03:09+02:00 (4 years ago)
Author:
skyper
Comment:

add antenna and frequency plus more preset_links

Legend:

Unmodified
Added
Removed
Modified

  • Presets/MastAndTower

    v31 v32  
    1010* [osmwiki:Tag:man_made=communications_tower man_made=communications_tower]
    1111* [osmwiki:Tag:man_made=water_tower man_made=water_tower]
     12* [osmwiki:Tag:man_made=antenna man_made=antenna]
    1213
    1314=== Secondary tags
    … …  
    1516* [osmwiki:Key:tower:type tower:type=*]
    1617* [osmwiki:Key:technology technology=*]
     18* [osmwiki:Key:frequency frequency=*]
    1719* [osmwiki:Key:communication:radio communication:radio=*], [osmwiki:Key:communication:bos communication:bos=*] and [osmwiki:Key:communication:gsm-r communication:gsm-r=*], [osmwiki:Key:communication:microwave communication:microwave=*], [osmwiki:Key:communication:mobile_phone communication:mobile_phone=*], [osmwiki:Key:communication:television communication:television=*]
    1820* [osmwiki:Tag:historic=tower historic=tower]
    … …  
    2224
    2325== Notes
    24 * I'd love to use `editable="false"` on combos but #6157 prevents it.
     26* I'd love to use `editable="false"` on `<combo />` but #6157 prevents it.
    2527* The two general presets should be excluded from preset links from [wikitr:/Help/Dialog/TagsMembership Tags/Memberships panel] if [osmwiki:Key:tower:type tower:type=*] is present but this is not implemented, see #19012.
    26 * The multiselect need to be one row bigger than values to get rid of the scrollbar, see #19013.
     28* The `<multiselect />` need to be one row bigger than values to get rid of the scrollbar, see #19013.
    2729
    2830==  Help needed
    … …  
    5153        <text key="height" text="Height (in meters)" length="7" />
    5254        <text key="ele" text="Elevation at the bottom (in meters)" />
    53         <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood"
    54                 values_searchable="true" />     
    55         <combo key="access" text="Access" values="yes,private,permissive,customers,no" values_sort="false" />
     55        <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" values_searchable="true" />       
     56        <combo key="access" text="General access" values="yes,private,permissive,customers,no" values_sort="false" />
    5657    </chunk>
    5758
    … …  
    127128    </chunk>
    128129
     130    <chunk id="frequency">
     131        <text key="frequency" text="Frequency" />
     132    </chunk>
     133
    129134    <chunk id="name_ref_tech_extra">
    130135        <reference ref="tech" />
     136        <reference ref="frequency" />
    131137        <reference ref="name_ref_extra"/>
     138    </chunk>
     139
     140    <chunk id="link_mast">
     141        <preset_link preset_name="General preset Mast" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     142    </chunk>
     143
     144    <chunk id="link_tower">
     145        <preset_link preset_name="General preset Tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     146    </chunk>
     147
     148    <chunk id="link_com_mast">
     149        <preset_link preset_name="Communication mast" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     150    </chunk>
     151
     152    <chunk id="link_antenna">
     153        <preset_link preset_name="Antenna " text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     154    </chunk>
     155
     156    <chunk id="link_telescope">
     157        <preset_link preset_name="Telescope" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
    132158    </chunk>
    133159
    134160    <!-- groups -->
    135161    <group name="Mast and Tower" icon="presets/tower/tower.svg">
    136         <group name="Mast" icon="presets/tower/mast.svg">
     162
     163        <item name="Antenna " icon="presets/tower/antenna.svg" type="node" preset_name_label="true">
     164            <link wiki="Tag:man_made=antenna" />
     165            <key key="man_made" value="antenna" />
     166            <space />
     167                <reference ref="link_com_mast" />
     168                <reference ref="link_telescope" />
     169            <space />
     170            <optional>
     171                <reference ref="name_ref_tech_extra" />
     172                <reference ref="addr_contact" />
     173            </optional>
     174        </item>
     175
     176        <group name="Mast" icon="presets/tower/mast.svg">
    137177
    138178            <item name="General preset Mast" icon="presets/tower/mast.svg" type="node" preset_name_label="true">
    … …  
    141181                <label text="Adding a general mast. Please use distinct presets if possible." />
    142182                <space />
    143                 <preset_link preset_name="General preset Tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
    144                 <preset_link preset_name="Telescope" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     183                <reference ref="link_tower" />
     184                <reference ref="link_antenna" />
     185                <reference ref="link_telescope" />
    145186                <space />
    146187                <key key="man_made" value="mast" />
    … …  
    164205            <item name="Communication mast" icon="presets/tower/mast_communication.svg" type="node" preset_name_label="true">
    165206                <link wiki="Tag:tower:type=communication" />
    166                 <space />
    167207                <key key="man_made" value="mast" />
    168208                <key key="tower:type" value="communication" />
     209                <space />
     210                <preset_link preset_name="Small communication tower" text="For bigger constructions, use:" />
     211                <reference ref="link_antenna" />
     212                <reference ref="link_telescope" />
     213                <space />
    169214                <reference ref="tw_con_mt" />
    170215                <optional>
    … …  
    201246                <link wiki="Tag:tower:type=radar" />
    202247                <space />
    203                 <preset_link preset_name="Telescope" text="Similar but different tag:" text_context="man_made=mast/tower/communications_tower" />
     248                <reference ref="link_com_mast" />
     249                <reference ref="link_antenna" />
     250                <reference ref="link_telescope" />
    204251                <space />
    205252                <key key="man_made" value="mast" />
    … …  
    232279                <label text=" Adding a general tower. Please use distinct presets if possible." />
    233280                <space />
    234                 <preset_link preset_name="Big communication tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     281                <preset_link preset_name="Big communication tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
    235282                <preset_link preset_name="Water tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
    236                 <preset_link preset_name="General preset Mast" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
    237                 <preset_link preset_name="Telescope" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
     283                <reference ref="link_mast" />
     284                <reference ref="link_antenna" />
     285                <reference ref="link_telescope" />
    238286                <space />
    239287                <key key="man_made" value="tower" />
    … …  
    293341                <link wiki="Tag:tower:type=radar" />
    294342                <space />
    295                 <preset_link preset_name="Telescope" text="Similar but different tag:" text_context="man_made=mast/tower/communications_tower" />
     343                <reference ref="link_telescope" />
    296344                <space />
    297345                <key key="man_made" value="tower" />