Changeset 14874 in josm

Timestamp:

2019-03-10T18:31:00+01:00 (6 years ago)

Author:

Klumbumbus

Message:

• fix #17429 - add shop=massage (icon ​https://wiki.openstreetmap.org/wiki/File:Massage-14.svg, first version, CC0 and PD licensed)
• warn about shop=shopping_centre

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• images/presets/shop/massage.svg (added)
• styles/standard/elemstyles.mapcss (modified) (4 diffs)

trunk/data/defaultpresets.xml

@@ -5871 +5871 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hairdresser/Barber -->
+        <item name="Massage" icon="presets/shop/massage.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=massage" />
+            <space />
+            <key key="shop" value="massage" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Massage -->
         <item name="Tattoo" icon="presets/shop/tattoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=tattoo" />

trunk/data/validator/deprecated.mapcss

@@ -1397 +1397 @@
   group: tr("deprecated tagging");
 }
+
+*[shop=shopping_centre] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "shop=mall";
+  fixAdd: "shop=mall";
+  group: tr("deprecated tagging");
+}

trunk/styles/standard/elemstyles.mapcss

@@ -1941 +1941 @@
 area[shop=kitchen],
 area[shop=mall],
+area[shop=massage],
 area[shop=mobile_phone],
 area[shop=motorcycle],
@@ -1964 +1965 @@
 area[shop=bookmaker],
 area[shop=lottery],
-area[shop=shopping_centre],
 area[shop=pet],
 area[shop=photo],
@@ -2168 +2168 @@
     set icon_z17;
 }
+node[shop=massage] {
+    icon-image: "presets/shop/massage.svg";
+    set icon_z17;
+}
 node[shop=mobile_phone] {
     icon-image: "presets/shop/mobile_phone.svg";
@@ -2258 +2262 @@
 node[shop=lottery] {
     icon-image: "presets/shop/lottery.svg";
-    set icon_z17;
-}
-/* duplicate of shopping_centre? */
-node[shop=shopping_centre] {
-    icon-image: "presets/shop/mall.svg";
     set icon_z17;
 }