Changes between Version 33 and Version 34 of Presets/MastAndTower


Ignore:
Timestamp:
2021-10-06T18:02:46+02:00 (5 years ago)
Author:
skyper
Comment:

Readd default and lowered number of rows as #21404 is fixed and #19013 almost; removed some empty space

Legend:

Unmodified
Added
Removed
Modified

  • Presets/MastAndTower

    v33 v34  
    2525== Notes
    2626* 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 and #20843.
    27 * I had to remove the default value `tower:type=communication` for big communication towers, cause of #21404.
    28 * The `<multiselect />` need to be one row bigger than values to get rid of the scrollbar, see #19013.
    2927
    3028==  Help needed
    … …  
    8886
    8987    <chunk id="tw_con_tw">
    90         <combo key="tower:construction" text="Construction" values_sort="false" values_searchable="true">
     88        <combo key="tower:construction" text="Tower construction" values_sort="false" values_searchable="true">
    9189            <list_entry value="lattice" display_value="lattice" icon="tower_lattice.svg" />
    9290            <list_entry value="freestanding" display_value="freestanding" icon="presets/tower/tower.svg" />
    … …  
    9795
    9896    <chunk id="tw_con_tw_com">
    99         <combo key="tower:construction" text="Construction" values_sort="false" values_searchable="true">
     97        <combo key="tower:construction" text="Tower construction" values_sort="false" values_searchable="true">
    10098            <list_entry value="lattice" display_value="lattice" icon="tower_lattice_communication.svg" />
    10199            <list_entry value="freestanding" display_value="freestanding" icon="presets/tower/communication.svg" />
    … …  
    106104
    107105    <chunk id="tw_con_mt">
    108         <combo key="tower:construction" text="Construction" values_sort="false" values_searchable="true">
     106        <combo key="tower:construction" text="Mast construction" values_sort="false" values_searchable="true">
    109107            <list_entry value="guyed_lattice" display_value="guyed lattice" icon="presets/tower/mast.svg" />
    110108            <list_entry value="guyed_tube" display_value="guyed tube" icon="presets/tower/mast.svg" />
    … …  
    115113
    116114    <chunk id="tech">
    117         <multiselect key="technology" text="Technology" values="LTE;UMTS;GSM 900;GSM 1800" values_sort="false" rows="5"/>
    118         <label text="Transmitting:" />
     115        <multiselect key="technology" text="Technology" values="LTE;UMTS;GSM 900;GSM 1800" values_sort="false" rows="4" />
     116        <label text="Transmitting: " />
    119117        <checkgroup columns="3">
    120118            <check key="communication:mobile_phone" text="Mobile phone" />
    … …  
    166164                <reference ref="link_com_mast" />
    167165                <reference ref="link_telescope" />
    168             <space />
    169166            <optional>
    170167                <reference ref="name_ref_tech_extra" />
    … …  
    178175                <link wiki="Tag:man_made=mast" />
    179176                <space />
    180                 <label text="Adding a general mast. Please use distinct presets if possible." />
    181                 <space />
     177                <label text="Adding a general mast. Please use distinct presets if possible: " />
    182178                <reference ref="link_tower" />
    183179                <reference ref="link_antenna" />
    … …  
    185181                <space />
    186182                <key key="man_made" value="mast" />
    187                 <multiselect key="tower:type" text="Tower type" values_searchable="true" values_sort="false" rows="7">
     183                <multiselect key="tower:type" text="Tower type" values_searchable="true" values_sort="false" rows="6">
    188184                    <list_entry value="communication" display_value="Communication" icon="presets/tower/mast_communication.svg" />
    189185                    <list_entry value="lighting" display_value="Lighting" icon="presets/tower/mast_lighting.svg" />
    … …  
    206202                <key key="tower:type" value="communication" />
    207203                <space />
    208                 <preset_link preset_name="Small communication tower" text="For bigger constructions, use:" />
     204                <preset_link preset_name="Small communication tower" text="For bigger constructions, use: " />
    209205                <reference ref="link_antenna" />
    210206                <reference ref="link_telescope" />
    … …  
    275271                <link wiki="Tag:man_made=tower" />
    276272                <space />
    277                 <label text=" Adding a general tower. Please use distinct presets if possible." />
    278                 <space />
     273                <label text="Adding a general tower. Please use distinct presets if possible: " />
    279274                <preset_link preset_name="Big communication tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
    280275                <preset_link preset_name="Water tower" text="Similar but different tags:" text_context="man_made=mast/tower/communications_tower" />
    … …  
    284279                <space />
    285280                <key key="man_made" value="tower" />
    286                 <multiselect key="tower:type" text="Type of tower" values_searchable="true" values_sort="false" rows="11">
     281                <multiselect key="tower:type" text="Type of tower" values_searchable="true" values_sort="false" rows="10">
    287282                    <list_entry value="bell_tower" display_value="Bell tower" icon="presets/tower/bell_tower.svg" />
    288283                    <list_entry value="communication" display_value="Small communication tower" icon="presets/tower/communication.svg" />
    … …  
    305300                <link wiki="Tag:man_made=communications_tower" />
    306301                <space />
    307                 <label text=" Adding a big communication tower, usually 100 meters or higher." />
    308                 <space />
    309                 <preset_link preset_name="Small communication tower" text="For smaller constructions, use:" />
     302                <label text="Adding a big communication tower, usually 100 meters or higher: " />
     303                <preset_link preset_name="Small communication tower" text="For smaller constructions, use: " />
    310304                <space />
    311305                <key key="man_made" value="communications_tower" />
    312                 <multiselect key="tower:type" text="Type of tower" values_searchable="true" values_sort="false" rows="3">
     306                <multiselect key="tower:type" text="Type of tower" default="communication" values_searchable="true" values_sort="false" rows="2">
    313307                    <list_entry value="communication" display_value="Communication tower" icon="presets/tower/communication.svg" />
    314308                    <list_entry value="observation" display_value="Observation tower" icon="presets/tower/observation.svg" />
    … …  
    324318                <link wiki="Tag:tower:type=communication" />
    325319                <space />
    326                 <preset_link preset_name="Big communication tower" text="For big communication towers, see:" />
    327                 <preset_link preset_name="Communication mast" text="For smaller constructions, use:" />
     320                <preset_link preset_name="Big communication tower" text="For big communication towers, see: " />
     321                <preset_link preset_name="Communication mast" text="For smaller constructions, use: " />
    328322                <space />
    329323                <key key="man_made" value="tower" />
    … …  
    359353                <link wiki="Tag:tower:type=cooling" />
    360354                <space />
    361                 <preset_link preset_name="Chimney" text="Similar but different tag:" text_context="man_made=chimney;man_made=tower,tower:type=cooling" />
     355                <preset_link preset_name="Chimney" text="Similar but different tag: " text_context="man_made=chimney;man_made=tower,tower:type=cooling" />
    362356                <space />
    363357                <key key="man_made" value="tower" />