Changeset 16706 in josm


Ignore:
Timestamp:
2020-06-22T20:01:53+02:00 (2 weeks ago)
Author:
Klumbumbus
Message:

see #10759, see #17818, see #16898 - Add Presets for man_made=mast and man_made=communications_tower, rework preset for man_made=tower, based on patch by skyper, (all icons from https://wiki.openstreetmap.org/, from Geozeisig, all PD and CC0 licensed)

Location:
trunk/resources
Files:
13 added
2 edited

Legend:

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

    r16702 r16706  
    50205020            <reference ref="link_contact_address" />
    50215021        </item> <!-- Non-public police facility -->
    5022         <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5022        <item name="Mast" icon="presets/tower/mast.svg" type="node,closedway" preset_name_label="true">
     5023            <link wiki="Tag:man_made=mast" />
     5024            <space />
     5025            <key key="man_made" value="mast" />
     5026            <combo key="tower:type" text="Type" values_context="mast/tower" values_searchable="true">
     5027                <list_entry value="communication" icon="presets/tower/mast_communication.svg" />
     5028                <list_entry value="lighting" icon="presets/tower/mast_lighting.svg" />
     5029                <list_entry value="monitoring" />
     5030                <list_entry value="radar" />
     5031                <list_entry value="siren" />
     5032            </combo>
     5033            <optional>
     5034                <combo key="tower:construction" text="Type of construction" values="freestanding,guyed_lattice,guyed_tube,lattice" values_searchable="true" />
     5035                <reference ref="name_ref_operator" />
     5036                <text key="height" text="Height (meters)" length="7" />
     5037                <text key="ele" text="Elevation (meters)" lenght="10" />
     5038                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     5039                <reference ref="POI_access" />
     5040            </optional>
     5041            <preset_link preset_name="Tower" text="Similar but different tags:" />
     5042            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
     5043        </item> <!-- Mast -->
     5044        <item name="Tower" icon="presets/tower/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
    50235045            <link wiki="Tag:man_made=tower" />
    50245046            <space />
    50255047            <key key="man_made" value="tower" />
    5026             <text key="name" text="Name" />
    5027             <combo key="tower:type" text="Tower type" values="bell_tower,communication,cooling,defensive,observation,radar,watchtower" values_searchable="true" />
    5028             <optional>
     5048            <combo key="tower:type" text="Type" values_context="mast/tower" values_searchable="true">
     5049                <list_entry value="bell_tower" icon="presets/tower/bell_tower.svg" />
     5050                <list_entry value="communication" icon="presets/tower/communication.svg" />
     5051                <list_entry value="cooling" icon="presets/tower/cooling.svg" />
     5052                <list_entry value="defensive" icon="presets/tower/defensive.svg" />
     5053                <list_entry value="lighting" icon="presets/tower/lighting.svg" />
     5054                <list_entry value="minaret" />
     5055                <list_entry value="observation" icon="presets/tower/observation.svg" />
     5056                <list_entry value="radar" />
     5057                <list_entry value="watchtower" icon="presets/tower/observation.svg" />
     5058            </combo>
     5059            <optional>
     5060                <combo key="tower:construction" text="Type of construction" values="dish,dome,freestanding,lattice" values_searchable="true" />
     5061                <reference ref="name_ref_operator" />
    50295062                <text key="height" text="Height (meters)" length="7" />
    5030                 <text key="operator" text="Operator" />
    5031             </optional>
     5063                <text key="ele" text="Elevation (meters)" lenght="10" />
     5064                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     5065                <reference ref="POI_access" />
     5066                <reference ref="oh" />
     5067                <reference ref="fee_interval" />
     5068                <space />
     5069            </optional>
     5070            <preset_link preset_name="Mast" text="Similar but different tags:" />
     5071            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
     5072            <reference ref="link_contact_address" />
    50325073        </item> <!-- Tower -->
     5074        <item name="Big Communication Tower" icon="presets/tower/communications_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5075            <link wiki="Tag:man_made=communications_tower" />
     5076            <space />
     5077            <label text="Big communication tower, usually higher than 100 meters." />
     5078            <key key="man_made" value="communications_tower" />
     5079            <optional>
     5080                <combo key="tower:type" text="Type" values="communication,observation" default="communication" values_context="mast/tower" />
     5081                <combo key="tower:construction" text="Type of construction" values="dish,dome,freestanding,lattice" values_searchable="true" />
     5082                <reference ref="name_ref_operator" />
     5083                <text key="height" text="Height (meters)" length="7" />
     5084                <text key="ele" text="Elevation (meters)" lenght="10" />
     5085                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
     5086                <reference ref="POI_access" />
     5087                <reference ref="oh" />
     5088                <reference ref="fee_interval" />
     5089            </optional>
     5090            <preset_link preset_name="Mast" text="Similar but different tags:" />
     5091            <preset_link preset_name="Tower" text="Similar but different tags:" />
     5092            <reference ref="link_contact_address" />
     5093        </item> <!-- Big Communication Tower -->
    50335094        <item name="Flagpole" icon="presets/misc/flag.svg" type="node" preset_name_label="true">
    50345095            <link wiki="Tag:man_made=flagpole" />
     
    51835244        </item> <!-- Manhole -->
    51845245        <separator/>
    5185         <item name="Water Tower" icon="presets/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
     5246        <item name="Water Tower" icon="presets/tower/water_tower.svg" type="node,closedway" preset_name_label="true">
    51865247            <link wiki="Tag:man_made=water_tower" />
    51875248            <space />
  • trunk/resources/styles/standard/elemstyles.mapcss

    r16500 r16706  
    15401540}
    15411541area[man_made=reservoir_covered],
    1542 area[man_made=tower],
    15431542area[man_made=wastewater_plant],
    15441543area[man_made=watermill],
    1545 area[man_made=water_tower],
    15461544area[man_made=water_well],
    15471545area[man_made=windmill],
     
    15621560    set icon_z17;
    15631561}
    1564 node[man_made=tower] {
    1565     icon-image: "presets/landmark/tower.svg";
    1566     set icon_z17;
    1567 }
    15681562node[man_made=wastewater_plant] {
    15691563    icon-image: "presets/landmark/wastewater_plant.svg";
     
    15721566node[man_made=watermill] {
    15731567    icon-image: "presets/landmark/watermill.svg";
    1574     set icon_z17;
    1575 }
    1576 node[man_made=water_tower] {
    1577     icon-image: "presets/landmark/water_tower.svg";
    15781568    set icon_z17;
    15791569}
     
    16031593node[man_made=cutline] {
    16041594    icon-image: "presets/misc/deprecated.svg";
     1595    set icon_z17;
     1596}
     1597
     1598area[man_made=water_tower],
     1599area[man_made=mast],
     1600area[man_made=tower],
     1601area[man_made=communications_tower] {
     1602    fill-color: manmade#d8d8d8;
     1603}
     1604node[man_made=water_tower] {
     1605    icon-image: "presets/tower/water_tower.svg";
     1606    set icon_z17;
     1607}
     1608node[man_made=mast] {
     1609    icon-image: "presets/tower/mast.svg";
     1610    set icon_z17;
     1611}
     1612node[man_made=mast][tower:type=communication] {
     1613    icon-image: "presets/tower/mast_communication.svg";
     1614    set icon_z17;
     1615}
     1616node[man_made=mast][tower:type=lighting] {
     1617    icon-image: "presets/tower/mast_lighting.svg";
     1618    set icon_z17;
     1619}
     1620node[man_made=tower] {
     1621    icon-image: "presets/tower/tower.svg";
     1622    set icon_z17;
     1623}
     1624node[man_made=tower][tower:type=bell_tower] {
     1625    icon-image: "presets/tower/bell_tower.svg";
     1626    set icon_z17;
     1627}
     1628node[man_made=tower][tower:type=communication] {
     1629    icon-image: "presets/tower/communication.svg";
     1630    set icon_z17;
     1631}
     1632node[man_made=tower][tower:type=cooling] {
     1633    icon-image: "presets/tower/cooling.svg";
     1634    set icon_z17;
     1635}
     1636node[man_made=tower][tower:type=defensive] {
     1637    icon-image: "presets/tower/defensive.svg";
     1638    set icon_z17;
     1639}
     1640node[man_made=tower][tower:type=lighting] {
     1641    icon-image: "presets/tower/lighting.svg";
     1642    set icon_z17;
     1643}
     1644node[man_made=tower][tower:type=observation] {
     1645    icon-image: "presets/tower/observation.svg";
     1646    set icon_z17;
     1647}
     1648node[man_made=tower][tower:type=watchtower] {
     1649    icon-image: "presets/tower/observation.svg";
     1650    set icon_z17;
     1651}
     1652node[man_made=communications_tower] {
     1653    icon-image: "presets/tower/communications_tower.svg";
    16051654    set icon_z17;
    16061655}
Note: See TracChangeset for help on using the changeset viewer.