Changeset 11346 in josm for trunk

Timestamp:

2016-11-29T19:19:33+01:00 (7 years ago)

Author:

Klumbumbus

Message:

• fix #14034 - add shop=dairy to presets and mappaint style, icon from ​https://wiki.openstreetmap.org/wiki/File:Shop_dairy-32x32.svg, resized, PD licensed
• add warning for amenity=vending_machine + shop combination

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/combinations.mapcss (modified) (1 diff)
• images/presets/shop/groceries/dairy.svg (added)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -7334 +7334 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Seafood -->
+        <item name="Dairy" icon="presets/shop/groceries/dairy.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dairy"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dairy"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=dairy" />
+            <space />
+            <key key="shop" value="dairy" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Dairy -->
         <item name="Deli (Fine Food)" icon="presets/shop/groceries/deli.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"

trunk/data/validator/combinations.mapcss

@@ -205 +205 @@
 }
 
-/* {0.tag} together with {1.key}, see #10837 */
+/* {0.tag} together with {1.key}, see #10837, #14034 */
+*[amenity=vending_machine][shop],
 *[noname?][name] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");

trunk/styles/standard/elemstyles.mapcss

@@ -1883 +1883 @@
 area[shop=pawnbroker],
 area[shop=seafood],
+area[shop=dairy],
 area[shop=shoes],
 area[shop=sports],
@@ -2130 +2131 @@
     set icon_z17;
 }
+node[shop=dairy] {
+    icon-image: "presets/shop/groceries/dairy.svg";
+    set icon_z17;
+}
 node[shop=shoes] {
     icon-image: "presets/shop/shoes.svg";