Changeset 9550 in josm

Timestamp:

2016-01-20T22:01:44+01:00 (9 years ago)

Author:

Klumbumbus

Message:

fix #12372 - add shop=cosmetics and shop=perfumery to preset and mappaint style (icons by zermes), move old icons to nodist folder; see also [o32009]

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• images_nodist/presets/beauty.svg (added)
• styles/standard/elemstyles.mapcss (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -7435 +7435 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Chemist -->
+        <item name="Cosmetics" icon="styles/standard/shop/cosmetics.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=cosmetics" />
+            <space />
+            <key key="shop" value="cosmetics" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Cosmetics -->
+        <item name="Perfumery" icon="styles/standard/shop/perfumery.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=perfumery" />
+            <space />
+            <key key="shop" value="perfumery" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Perfumery -->
+        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beauty"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=beauty"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
+            <space />
+            <key key="shop" value="beauty" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Beauty -->
         <item name="Tobacco" icon="styles/standard/shop/tobacco.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tobacco" />
@@ -7455 +7482 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hairdresser/Barber -->
-        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beauty"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=beauty"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
-            <space />
-            <key key="shop" value="beauty" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Beauty -->
         <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo"

trunk/styles/standard/elemstyles.mapcss

@@ -1958 +1958 @@
 area[shop=bed],
 area[shop=beauty],
+area[shop=cosmetics],
+area[shop=perfumery],
 area[shop=tea],
 area[shop=coffee],
@@ -2326 +2328 @@
 node[shop=beauty] {
     icon-image: "shop/beauty.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=cosmetics] {
+    icon-image: "shop/cosmetics.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=perfumery] {
+    icon-image: "shop/perfumery.svg";
     set icon_z17;
     text: auto;