Changeset 10897 in josm for trunk

Timestamp:

2016-08-25T21:55:44+02:00 (8 years ago)

Author:

Klumbumbus

Message:

fix #10566 - add shop=pastry to preset and mappaint style, icon from ​https://openclipart.org/detail/217049/slice-of-cake (modified, CC0 and PD licensed); rename Candy Store to Confectionery

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• images/presets/shop/groceries/pastry.svg (added)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -7302 +7302 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Deli (Fine Food) -->
-        <item name="Candy Store" icon="presets/shop/groceries/confectionery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Pastry" icon="presets/shop/groceries/pastry.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pastry" />
+            <space />
+            <key key="shop" value="pastry" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Pastry -->
+        <item name="Confectionery" icon="presets/shop/groceries/confectionery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=confectionery"
@@ -7316 +7323 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Candy Store -->
+        </item> <!-- Confectionery -->
         <item name="Tea" icon="presets/shop/groceries/tea.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea"

trunk/styles/standard/elemstyles.mapcss

@@ -1849 +1849 @@
 area[shop=computer],
 area[shop=confectionery],
+area[shop=pastry],
 area[shop=copyshop],
 area[shop=curtain],
@@ -2000 +2001 @@
     set icon_z17;
 }
+node[shop=pastry] {
+    icon-image: "presets/shop/groceries/pastry.svg";
+    set icon_z17;
+}
 node[shop=copyshop] {
     icon-image: "presets/shop/copyshop.svg";