Changeset 10707 in josm for trunk


Ignore:
Timestamp:
2016-08-02T18:57:37+02:00 (4 years ago)
Author:
Klumbumbus
Message:

see #13217 - fix some icons; see #13204 - add reef mappaint style and icon (https://openclipart.org/detail/172292/corals, modified, PD, CC0)

Location:
trunk
Files:
1 added
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r10706 r10707  
    53505350            <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
    53515351        </item> <!-- Bench -->
    5352         <item name="Shelter" icon="presets/accommodation/shelter.png" type="node,closedway" preset_name_label="true">
     5352        <item name="Shelter" icon="presets/accommodation/shelter.svg" type="node,closedway" preset_name_label="true">
    53535353            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
    53545354                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shelter"
     
    53685368                <list_entry value="picnic_shelter" icon="presets/accommodation/shelter_picnic_brown.png" />
    53695369                <list_entry value="public_transport" icon="presets/accommodation/shelter_public_transport_brown.png" />
    5370                 <list_entry value="weather_shelter" icon="presets/accommodation/shelter.png" />
    5371                 <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.png" />
     5370                <list_entry value="weather_shelter" icon="presets/accommodation/shelter.svg" />
     5371                <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.svg" />
    53725372            </combo>
    53735373        </item> <!-- Shelter -->
     
    60036003            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
    60046004        </item> <!-- Motorsport -->
    6005         <item name="Kart Racing" icon="presets/sports/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
     6005        <item name="Kart Racing" icon="presets/sport/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
    60066006            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting"
    60076007                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=karting" />
     
    63756375            <text key="name" text="Name" />
    63766376        </item> <!-- Wastewater Treatment Plant -->
    6377         <item name="Watermill" icon="presets/landmark/watermill.png" type="node,closedway" preset_name_label="true">
     6377        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway" preset_name_label="true">
    63786378            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
    63796379                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=watermill"
     
    73567356            <reference ref="link_contact_address_payment" />
    73577357        </item> <!-- Greengrocer -->
    7358         <item name="Farm Stand" icon="presets/shop/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
     7358        <item name="Farm Stand" icon="presets/shop/groceries/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
    73597359            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
    73607360                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
     
    90169016            <text key="name" text="Name" />
    90179017            <combo key="reef" text="Type" values="coral,oyster,rock,sand" />
    9018         </item> <!-- Islet -->
     9018        </item> <!-- Reef -->
    90199019    </group> <!-- Geography -->
    90209020    <group name="Nature" icon="presets/landmark/trees.svg">
  • trunk/styles/standard/elemstyles.mapcss

    r10706 r10707  
    443443node[barrier=border_control] {
    444444    icon-image: "presets/barrier/douane.png";
     445    icon-width: 16;
    445446    set icon_z17;
    446447}
     
    14651466}
    14661467node[man_made=watermill] {
    1467     icon-image: "presets/landmark/watermill.png";
     1468    icon-image: "presets/landmark/watermill.svg";
    14681469    set icon_z17;
    14691470}
     
    19431944node[shop=doityourself] {
    19441945    icon-image: "presets/shop/diy_store.svg";
    1945     icon-width: 16;
    1946     icon-height: 16;
    19471946    set icon_z17;
    19481947}
     
    22662265}
    22672266node[shop=farm] {
    2268     icon-image: "presets/shop/apple.png";
     2267    icon-image: "presets/shop/groceries/apple.png";
    22692268    set icon_z17;
    22702269}
     
    23462345node[amenity=pub] {
    23472346    icon-image: "presets/food/pub.png";
    2348     icon-width: 15;
    2349     icon-height: 19;
     2347    icon-height: 16;
    23502348    set icon_z17;
    23512349}
     
    23532351    icon-image: "presets/food/biergarten.png";
    23542352    icon-width: 16;
    2355     icon-height: 16;
    23562353    set icon_z17;
    23572354}
     
    26392636}
    26402637node[amenity=grave_yard] {
    2641     icon-image: "presets/misc/landuse/graveyard.svg";
     2638    icon-image: "presets/landuse/graveyard.svg";
    26422639    set icon_z17;
    26432640}
     
    28382835}
    28392836node[amenity=shelter] {
    2840     icon-image: "presets/accommodation/shelter.png";
     2837    icon-image: "presets/accommodation/shelter.svg";
    28412838    set icon_z17;
    28422839}
     
    37773774node[sport=rugby_union] {
    37783775    icon-image: "presets/sport/football.svg";
    3779     icon-width: 20;
    3780     icon-height: 20;
    37813776    set icon_z17;
    37823777}
     
    37983793node[sport=basketball] {
    37993794    icon-image: "presets/sport/basketball.svg";
    3800     icon-width: 16;
    3801     icon-height: 16;
    38023795    set icon_z17;
    38033796}
     
    41644157node[natural=bay] {
    41654158    icon-image: "presets/nautical/bay.svg";
     4159    set icon_z17;
     4160}
     4161area[natural=reef] {
     4162    fill-color: reef#80c9ff;
     4163}
     4164node[natural=reef] {
     4165    icon-image: "presets/misc/no_icon.svg";
    41664166    set icon_z17;
    41674167}
Note: See TracChangeset for help on using the changeset viewer.