Changeset 9150 in josm


Ignore:
Timestamp:
2015-12-25T20:18:21+01:00 (8 years ago)
Author:
Don-vip
Message:

see #12201 - use new presets icons created by zermes

Location:
trunk
Files:
13 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r9148 r9150  
    17161716        </item> <!-- Sally Port -->
    17171717    </group> <!-- Barriers -->
    1718     <group name="Passageways" icon="presets/tunnel.png">
    1719         <item name="Tunnel" icon="presets/tunnel.png" type="way" preset_name_label="true">
     1718    <group name="Passageways" icon="styles/standard/transport/passage/tunnel.svg">
     1719        <item name="Tunnel" icon="styles/standard/transport/passage/tunnel.svg" type="way" preset_name_label="true">
    17201720            <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
    17211721                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:tunnel"
    … …  
    17441744            </optional>
    17451745        </item> <!-- Tunnel -->
    1746         <item name="Building Passage" icon="presets/tunnel.png" type="way" preset_name_label="true">
     1746        <item name="Building Passage" icon="styles/standard/transport/passage/tunnel_building_passage.svg" type="way" preset_name_label="true">
    17471747            <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
    17481748                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
    … …  
    17631763            </optional>
    17641764        </item> <!-- Building Passage -->
    1765         <item name="Arcade" type="way" preset_name_label="true">
     1765        <item name="Arcade" icon="styles/standard/transport/passage/arcade.svg" type="way" preset_name_label="true">
    17661766            <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
    17671767                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:covered"
    … …  
    17821782            </optional>
    17831783        </item> <!-- Arcade -->
    1784         <item name="Colonnade" type="way" preset_name_label="true">
     1784        <item name="Colonnade" icon="styles/standard/transport/passage/colonnade.svg" type="way" preset_name_label="true">
    17851785            <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
    17861786                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
    … …  
    17991799            </optional>
    18001800        </item> <!-- Colonnade -->
    1801         <item name="Avalanche Protector" type="way" preset_name_label="true">
     1801        <item name="Avalanche Protector" icon="styles/standard/transport/passage/tunnel_avalanche_protector.svg" type="way" preset_name_label="true">
    18021802            <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
    18031803                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
    … …  
    18211821    </group> <!-- Passageways -->
    18221822  </group> <!-- Highways -->
    1823   <group name="Water" name_context="main group" icon="presets/waterway.png">
    1824     <group name="Water" name_context="sub group" icon="presets/waterway.png">
    1825         <item name="Drain" icon="presets/waterway.png" type="way" preset_name_label="true">
     1823  <group name="Water" name_context="main group" icon="styles/standard/nautical/waterway_river.svg">
     1824    <group name="Water" name_context="sub group" icon="styles/standard/nautical/waterway_river.svg">
     1825        <item name="Drain" icon="styles/standard/nautical/waterway_drain.svg" type="way" preset_name_label="true">
    18261826            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain"
    18271827                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=drain"
    … …  
    18381838            </optional>
    18391839        </item> <!-- Drain -->
    1840         <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
     1840        <item name="Ditch" icon="styles/standard/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
    18411841            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
    18421842                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=ditch"
    … …  
    18521852            </optional>
    18531853        </item> <!-- Ditch -->
    1854         <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
     1854        <item name="Stream" icon="styles/standard/nautical/waterway_stream.svg" type="way" preset_name_label="true">
    18551855            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
    18561856                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=stream"
    … …  
    18711871            <reference ref="water_access" />
    18721872        </item> <!-- Stream -->
    1873         <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
     1873        <item name="River" icon="styles/standard/nautical/waterway_river.svg" type="way" preset_name_label="true">
    18741874            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
    18751875                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=river"
    … …  
    18891889            <reference ref="water_access" />
    18901890        </item> <!-- River -->
    1891         <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
     1891        <item name="Canal" icon="styles/standard/nautical/waterway_canal.svg" type="way" preset_name_label="true">
    18921892            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
    18931893                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=canal"
    … …  
    19591959            <reference ref="name_wikipedia" />
    19601960        </item> <!-- Dam -->
    1961         <item name="Groyne" icon="presets/groyne.png" type="way,closedway" preset_name_label="true">
     1961        <item name="Groyne" icon="styles/standard/nautical/groyne.svg" type="way,closedway" preset_name_label="true">
    19621962            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
    19631963                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=groyne"
    … …  
    19671967            <key key="man_made" value="groyne" />
    19681968        </item> <!-- Groyne -->
    1969         <item name="Breakwater" icon="presets/breakwater.png" type="way,closedway" preset_name_label="true">
     1969        <item name="Breakwater" icon="styles/standard/nautical/breakwater.svg" type="way,closedway" preset_name_label="true">
    19701970            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
    19711971                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=breakwater"
    … …  
    19801980        </item> <!-- Breakwater -->
    19811981        <separator/>
    1982         <item name="Culvert" icon="presets/tunnel.png" type="way" preset_name_label="true">
     1982        <item name="Culvert" icon="styles/standard/transport/passage/tunnel_culvert.svg" type="way" preset_name_label="true">
    19831983            <link href="http://wiki.openstreetmap.org/wiki/Tag:tunnel=culvert"
    19841984                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tunnel=culvert"
    … …  
    20532053            <reference ref="water_access" />
    20542054        </item> <!-- Water -->
    2055         <item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">
     2055        <item name="Coastline" icon="styles/standard/nautical/coast_line.svg" type="way,closedway,relation" preset_name_label="true">
    20562056            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
    20572057                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=coastline"
    … …  
    20672067            <text key="name" text="Name" />
    20682068        </item> <!-- Coastline -->
    2069         <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation" preset_name_label="true">
     2069        <item name="Riverbank" icon="styles/standard/nautical/waterway_riverbank.svg" type="closedway,relation" preset_name_label="true">
    20702070            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
    20712071                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=riverbank"
    … …  
    20862086        </item> <!-- Riverbank -->
    20872087        <separator/>
    2088         <item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
     2088        <item name="Wetland" icon="styles/standard/misc/landuse/wetland.svg" type="closedway,relation" preset_name_label="true">
    20892089            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
    20902090                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wetland"
    … …  
    21042104            <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
    21052105        </item> <!-- Wetland -->
    2106         <item name="Mud" icon="presets/mud.png" type="closedway,relation" preset_name_label="true">
     2106        <item name="Mud" icon="styles/standard/misc/landuse/mud.svg" type="closedway,relation" preset_name_label="true">
    21072107            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
    21082108                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=mud"
    … …  
    21152115            <text key="name" text="Name" />
    21162116        </item> <!-- Mud -->
    2117         <item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true">
     2117        <item name="Beach" icon="styles/standard/nautical/beach.svg" type="closedway,relation" preset_name_label="true">
    21182118            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
    21192119                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=beach"
    … …  
    21352135            </optional>
    21362136        </item> <!-- Beach -->
    2137         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
     2137        <item name="Bay" icon="styles/standard/nautical/bay.svg" type="node,closedway,relation" preset_name_label="true">
    21382138            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bay"
    21392139                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=bay"
    … …  
    21482148            <text key="name" text="Name" />
    21492149        </item> <!-- Bay -->
    2150         <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation" preset_name_label="true">
     2150        <item name="Cliff" icon="styles/standard/misc/cliff.svg" type="node,way,closedway,relation" preset_name_label="true">
    21512151            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
    21522152                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cliff"
    … …  
    22302230            <reference ref="link_contact_address_payment" />
    22312231        </item> <!-- Marine Fuel -->
    2232         <item name="Pier" icon="presets/pier.png" type="node,way,closedway" preset_name_label="true">
     2232        <item name="Pier" icon="styles/standard/nautical/pier.svg" type="node,way,closedway" preset_name_label="true">
    22332233            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
    22342234                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pier"
    … …  
    57445744            <check key="disused" text="Disused" />
    57455745        </item> <!-- Adit -->
    5746         <item name="Embankment" icon="presets/cliff.png" type="way" preset_name_label="true">
     5746        <item name="Embankment" icon="styles/standard/misc/cliff.svg" type="way" preset_name_label="true">
    57475747            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=embankment"
    57485748                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=embankment"
    … …  
    59805980        </item> <!-- Surveillance Camera -->
    59815981    </group> <!-- Man Made -->
    5982     <group name="Bridges" icon="presets/bridge.png">
    5983         <item name="Bridge" icon="presets/bridge.png" type="way,relation" preset_name_label="true">
     5982    <group name="Bridges" icon="styles/standard/transport/bridge/bridge.svg">
     5983        <item name="Bridge" icon="styles/standard/transport/bridge/bridge.svg" type="way,relation" preset_name_label="true">
    59845984            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
    59855985                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:bridge"
    … …  
    59995999            <reference ref="optional_bridge" />
    60006000        </item> <!-- Bridge -->
    6001         <item name="Movable Bridge" icon="presets/bridge_movable.png" type="way,relation" preset_name_label="true">
     6001        <item name="Movable Bridge" icon="styles/standard/transport/bridge/bridge_movable.svg" type="way,relation" preset_name_label="true">
    60026002            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:movable"
    60036003                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge:movable"
    … …  
    60086008            <reference ref="optional_bridge" />
    60096009        </item> <!-- Movable Bridge -->
    6010         <item name="Bridge Support" icon="styles/standard/transport/bridge/support.svg" type="node,closedway" preset_name_label="true">
     6010        <item name="Bridge Support" icon="styles/standard/transport/bridge/bridge_support.svg" type="node,closedway" preset_name_label="true">
    60116011            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:support" />
    60126012            <space />
    60136013            <combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier" match="key" />
    60146014        </item> <!-- Bridge Support -->
    6015         <item name="Bridge outline" icon="presets/bridge.png" type="closedway" preset_name_label="true">
     6015        <item name="Bridge outline" icon="styles/standard/transport/bridge/bridge_outline.svg" type="closedway" preset_name_label="true">
    60166016            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bridge"
    60176017                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=bridge"
    … …  
    76237623    </item> <!-- Payment Methods -->
    76247624  </group> <!-- Shops -->
    7625   <group name="Offices" icon="icons/office_blue.png">
     7625  <group name="Offices" icon="styles/standard/office/private_company.svg">
    76267626    <item name="Accountant" icon="styles/standard/office/accountant.svg" name_context="office" type="node,closedway" preset_name_label="true">
    76277627        <link href="http://wiki.openstreetmap.org/wiki/Tag:office=accountant"
    … …  
    93389338        </item> <!-- Destination Sign -->
    93399339        <separator/>
    9340         <item name="Waterway" icon="presets/river.png" type="relation" preset_name_label="true">
     9340        <item name="Waterway" icon="styles/standard/nautical/waterway_river.svg" type="relation" preset_name_label="true">
    93419341            <link href="http://wiki.openstreetmap.org/wiki/Relation:waterway"
    93429342                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:waterway"

  • trunk/styles/standard/elemstyles.mapcss

    r9148 r9150  
    802802}
    803803node[highway=ford], node[ford?] {
    804     icon-image: "misc/ford.svg";
     804    icon-image: "nautical/ford.svg";
    805805    set icon_z17;
    806806    text: auto;
    … …  
    13001300}
    13011301node[bridge:support] {
    1302     icon-image: "transport/bridge/support.svg";
     1302    icon-image: "transport/bridge/bridge_support.svg";
    13031303    set icon_z17;
    13041304    text: auto;
    … …  
    13781378}
    13791379node[man_made=pier] {
    1380     icon-image: "nautical/pier.png";
     1380    icon-image: "nautical/pier.svg";
    13811381    set icon_z17;
    13821382    text: auto;
    … …  
    41324132}
    41334133node[natural=cliff] {
    4134     icon-image: "misc/cliff.png";
     4134    icon-image: "misc/cliff.svg";
    41354135    set icon_z17;
    41364136    text: auto;
    … …  
    42124212}
    42134213node[natural=bay] {
    4214     icon-image: "misc/bay.png";
     4214    icon-image: "nautical/bay.svg";
    42154215    set icon_z17;
    42164216    text: auto;
Note: See TracChangeset for help on using the changeset viewer.