Changeset 7950 in josm for trunk

Timestamp:

2015-01-10T00:41:25+01:00 (10 years ago)

Author:

Klumbumbus

Message:

see #10835 - icon unification and geometry consistency for some shop tags. add own icon for shop=alcohol

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (6 diffs)
• styles/standard/elemstyles.mapcss (modified) (5 diffs)

trunk/data/defaultpresets.xml

@@ -5896 +5896 @@
             <reference ref="link_contact" />
         </item> <!-- Bakery -->
-        <item name="Butcher" icon="presets/cow.png" type="node,closedway" preset_name_label="true">
+        <item name="Butcher" icon="styles/standard/shop/groceries/butcher.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=butcher"
@@ -6019 +6019 @@
         </item> <!-- Fair Trade -->
         <separator/>
-        <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
+        <item name="Alcohol" icon="styles/standard/shop/alcohol.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=alcohol"
@@ -6090 +6090 @@
             <reference ref="link_contact" />
         </item> <!-- Shoes -->
-        <item name="Outdoor" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
+        <item name="Outdoor" icon="styles/standard/shop/outdoor.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
@@ -6101 +6101 @@
             <reference ref="link_contact" />
         </item> <!-- Outdoor -->
-        <item name="Sports" icon="presets/rowing.png" type="node,closedway" preset_name_label="true">
+        <item name="Sports" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=sports"
@@ -6403 +6403 @@
             <reference ref="name_operator_oh" />
         </item> <!-- Copy Shop -->
-        <item name="Book Store" icon="presets/book.png" type="node,closedway" preset_name_label="true">
+        <item name="Book Store" icon="styles/standard/shop/library.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=books"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=books"
@@ -6697 +6697 @@
     </group> <!-- Other -->
         <separator/>
-    <item name="Vending Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
+    <item name="Vending Machine" icon="styles/standard/transport/ticket-machine.png" type="node" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"

trunk/styles/standard/elemstyles.mapcss

@@ -1710 +1710 @@
 }
 node[shop=outdoor] {
-    icon-image: "shop/sports/outdoor.png";
+    icon-image: "shop/outdoor.png";
     set icon_z17;
     text: auto;
@@ -1719 +1719 @@
     text: auto;
 }
-node[shop=alcohol],
 node[shop=beverages] {
     icon-image: "shop/beverages.png";
@@ -1725 +1724 @@
     text: auto;
 }
+node[shop=alcohol] {
+    icon-image: "shop/alcohol.png";
+    set icon_z17;
+    text: auto;
+}
 node[shop=books] {
-    icon-image: "shop/rental/library.png";
+    icon-image: "shop/library.png";
     set icon_z17;
     text: auto;
@@ -1937 +1941 @@
 }
 node[shop=travel_agency] {
-    icon-image: "place/island.png";
+    icon-image: "presets/travel.png";
+    icon-width: 16;
     set icon_z17;
     text: auto;
@@ -2532 +2537 @@
 area[amenity=bank],
 area[amenity=bureau_de_change],
-area[amenity=atm],
 area[amenity=bbq] {
     fill-color: amenity_light#f7efb7;