Changeset 10707 in josm

Timestamp:

2016-08-02T18:57:37+02:00 (8 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:

• data/defaultpresets.xml (modified) (6 diffs)
• images/presets/landmark/reef.svg (added)
• images/presets/misc/information/map.svg (moved) (moved from trunk/images/presets/misc/information/map3.svg )
• images/presets/shop/marketplace.png (moved) (moved from trunk/images/presets/sport/marketplace.png )
• styles/standard/elemstyles.mapcss (modified) (11 diffs)

trunk/data/defaultpresets.xml

@@ -5350 +5350 @@
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
         </item> <!-- Bench -->
-        <item name="Shelter" icon="presets/accommodation/shelter.png" type="node,closedway" preset_name_label="true">
+        <item name="Shelter" icon="presets/accommodation/shelter.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shelter"
@@ -5368 +5368 @@
                 <list_entry value="picnic_shelter" icon="presets/accommodation/shelter_picnic_brown.png" />
                 <list_entry value="public_transport" icon="presets/accommodation/shelter_public_transport_brown.png" />
-                <list_entry value="weather_shelter" icon="presets/accommodation/shelter.png" />
-                <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.png" />
+                <list_entry value="weather_shelter" icon="presets/accommodation/shelter.svg" />
+                <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.svg" />
             </combo>
         </item> <!-- Shelter -->
@@ -6003 +6003 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Motorsport -->
-        <item name="Kart Racing" icon="presets/sports/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Kart Racing" icon="presets/sport/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=karting" />
@@ -6375 +6375 @@
             <text key="name" text="Name" />
         </item> <!-- Wastewater Treatment Plant -->
-        <item name="Watermill" icon="presets/landmark/watermill.png" type="node,closedway" preset_name_label="true">
+        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=watermill"
@@ -7356 +7356 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Greengrocer -->
-        <item name="Farm Stand" icon="presets/shop/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Farm Stand" icon="presets/shop/groceries/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
@@ -9016 +9016 @@
             <text key="name" text="Name" />
             <combo key="reef" text="Type" values="coral,oyster,rock,sand" />
-        </item> <!-- Islet -->
+        </item> <!-- Reef -->
     </group> <!-- Geography -->
     <group name="Nature" icon="presets/landmark/trees.svg">

trunk/styles/standard/elemstyles.mapcss

@@ -443 +443 @@
 node[barrier=border_control] {
     icon-image: "presets/barrier/douane.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -1465 +1466 @@
 }
 node[man_made=watermill] {
-    icon-image: "presets/landmark/watermill.png";
+    icon-image: "presets/landmark/watermill.svg";
     set icon_z17;
 }
@@ -1943 +1944 @@
 node[shop=doityourself] {
     icon-image: "presets/shop/diy_store.svg";
-    icon-width: 16;
-    icon-height: 16;
     set icon_z17;
 }
@@ -2266 +2265 @@
 }
 node[shop=farm] {
-    icon-image: "presets/shop/apple.png";
+    icon-image: "presets/shop/groceries/apple.png";
     set icon_z17;
 }
@@ -2346 +2345 @@
 node[amenity=pub] {
     icon-image: "presets/food/pub.png";
-    icon-width: 15;
-    icon-height: 19;
+    icon-height: 16;
     set icon_z17;
 }
@@ -2353 +2351 @@
     icon-image: "presets/food/biergarten.png";
     icon-width: 16;
-    icon-height: 16;
     set icon_z17;
 }
@@ -2639 +2636 @@
 }
 node[amenity=grave_yard] {
-    icon-image: "presets/misc/landuse/graveyard.svg";
+    icon-image: "presets/landuse/graveyard.svg";
     set icon_z17;
 }
@@ -2838 +2835 @@
 }
 node[amenity=shelter] {
-    icon-image: "presets/accommodation/shelter.png";
+    icon-image: "presets/accommodation/shelter.svg";
     set icon_z17;
 }
@@ -3777 +3774 @@
 node[sport=rugby_union] {
     icon-image: "presets/sport/football.svg";
-    icon-width: 20;
-    icon-height: 20;
     set icon_z17;
 }
@@ -3798 +3793 @@
 node[sport=basketball] {
     icon-image: "presets/sport/basketball.svg";
-    icon-width: 16;
-    icon-height: 16;
     set icon_z17;
 }
@@ -4164 +4157 @@
 node[natural=bay] {
     icon-image: "presets/nautical/bay.svg";
+    set icon_z17;
+}
+area[natural=reef] {
+    fill-color: reef#80c9ff;
+}
+node[natural=reef] {
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }