Changeset 16758 in josm


Ignore:
Timestamp:
2020-07-13T16:08:36+02:00 (3 months ago)
Author:
Klumbumbus
Message:
  • fix #19515 - Add man_made=antenna (icon derived from internal communication icon, PD and CC0 licensed)
  • see #10759 - Add communication:*=yes check boxes to antenna, mast, tower and communication_tower, remove poi_access from mast
  • see #19517 - Fine tune club preset
Location:
trunk/resources
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r16757 r16758  
    542542            <reference ref="POI_access" />
    543543        </optional>
     544    </chunk>
     545    <chunk id="communication">
     546        <space />
     547        <label text="Communication type:" />
     548        <checkgroup columns="3">
     549            <check key="communication:mobile_phone" text="Mobile phone" />
     550            <check key="communication:television" text="Television" />
     551            <check key="communication:radio" text="Radio" />
     552            <check key="communication:microwave" text="Microwave" />
     553            <check key="communication:gsm-r" text="GSM-R" />
     554        </checkgroup>
    544555    </chunk>
    545556    <!-- Link chunks -->
     
    35683579            <space />
    35693580            <combo key="club" text="Type" values="amateur_radio,art,astronomy,automobile,board_games,card_games,charity,cinema,computer,cooking,culture,dog,doityourself,environment_protection,ethnic,fan,filmmaking,fishing,freemasonry,game,gardening,history,hunting,linux,motorcycle,music,nature,nudism,photography,politics,scout,smoke,social,sport,student,surf_life_saving,theatre,tourism,veterans,yachting,youth_movement" values_searchable="true" values_context="club" match="key!" />
    3570             <reference ref="name_operator_oh_wheelchair" />
    3571             <optional text="For sport:">
     3581            <optional>
     3582                <reference ref="name_operator_oh_wheelchair" />
     3583                <space />
     3584                <label text="In case of sport:" />
    35723585                <reference ref="sport" />
    35733586            </optional>
     
    51965209            <reference ref="link_contact_address" />
    51975210        </item> <!-- Non-public police facility -->
     5211        <item name="Antenna" icon="presets/tower/antenna.svg" type="node,closedway" preset_name_label="true">
     5212            <link wiki="Tag:man_made=antenna" />
     5213            <space />
     5214            <key key="man_made" value="antenna" />
     5215            <optional>
     5216                <reference ref="name_ref_operator" />
     5217                <text key="height" text="Height (meters)" length="7" />
     5218                <text key="ele" text="Elevation (meters)" length="10" />
     5219                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     5220                <reference ref="communication" />
     5221            </optional>
     5222            <preset_link preset_name="Mast" text="Similar but different tags:" />
     5223            <preset_link preset_name="Tower" text="Similar but different tags:" />
     5224            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
     5225            <preset_link preset_name="Telescope" text="Similar but different tags:" />
     5226        </item> <!-- Antenna -->
    51985227        <item name="Mast" icon="presets/tower/mast.svg" type="node,closedway" preset_name_label="true">
    51995228            <link wiki="Tag:man_made=mast" />
     
    52135242                <text key="ele" text="Elevation (meters)" length="10" />
    52145243                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
    5215                 <reference ref="POI_access" />
    5216             </optional>
     5244                <reference ref="communication" />
     5245            </optional>
     5246            <preset_link preset_name="Antenna" text="Similar but different tags:" />
    52175247            <preset_link preset_name="Tower" text="Similar but different tags:" />
    52185248            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
     
    52405270                <text key="ele" text="Elevation (meters)" length="10" />
    52415271                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     5272                <reference ref="communication" />
     5273                <space />
    52425274                <reference ref="POI_access" />
    52435275                <reference ref="oh" />
     
    52455277                <space />
    52465278            </optional>
     5279            <preset_link preset_name="Antenna" text="Similar but different tags:" />
    52475280            <preset_link preset_name="Mast" text="Similar but different tags:" />
    52485281            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
     
    52625295                <text key="ele" text="Elevation (meters)" length="10" />
    52635296                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     5297                <reference ref="communication" />
     5298                <space />
    52645299                <reference ref="POI_access" />
    52655300                <reference ref="oh" />
    52665301                <reference ref="fee_interval" />
    52675302            </optional>
     5303            <preset_link preset_name="Antenna" text="Similar but different tags:" />
    52685304            <preset_link preset_name="Mast" text="Similar but different tags:" />
    52695305            <preset_link preset_name="Tower" text="Similar but different tags:" />
     
    52895325                <reference ref="POI_access" />
    52905326            </optional>
     5327            <preset_link preset_name="Antenna" text="Similar but different tags:" />
    52915328            <preset_link preset_name="Mast" text="Similar but different tags:" />
    52925329            <preset_link preset_name="Tower" text="Similar but different tags:" />
  • trunk/resources/styles/standard/elemstyles.mapcss

    r16755 r16758  
    16091609area[man_made=water_tower],
    16101610area[man_made=telescope],
     1611area[man_made=antenna],
    16111612area[man_made=mast],
    16121613area[man_made=tower],
     
    16241625node[man_made=telescope][telescope:type=optical] {
    16251626    icon-image: "presets/tower/telescope_dome.svg";
     1627    set icon_z17;
     1628}
     1629node[man_made=antenna] {
     1630    icon-image: "presets/tower/antenna.svg";
    16261631    set icon_z17;
    16271632}
Note: See TracChangeset for help on using the changeset viewer.