Changeset 16714 in josm for trunk/resources

Timestamp:

2020-06-25T19:57:23+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #18265 - Add shop=lighting, shop=security, shop=wholesale and shop=trade (icons from ​https://publicdomainvectors.org/en/free-clipart/Yellow-lamp-shade/61718.html, ​https://publicdomainvectors.org/en/free-clipart/Alarm-system/75822.html, ​https://wiki.openstreetmap.org/wiki/File:Trade-14.svg and ​https://openclipart.org/detail/312240/forklift, all except wholesale modified, all PD and CC0 licensed), thanks to francians, deprecate shop=lamps

Location:

trunk/resources

Files:

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

trunk/resources/data/defaultpresets.xml

@@ -6259 +6259 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Computer -->
+        </item> <!-- Electronics -->
         <item name="Mobile Phone" icon="presets/shop/mobile_phone.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=mobile_phone" />
@@ -6422 +6422 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Interior Decoration -->
+        <item name="Lighting" icon="presets/shop/lighting.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=lighting" />
+            <space />
+            <key key="shop" value="lighting" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Lighting -->
         <item name="Antiques" icon="presets/shop/antique.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=antiques" />
@@ -6642 +6649 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Gas -->
+        <item name="Wholesale" icon="presets/shop/wholesale.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=wholesale" />
+            <space />
+            <key key="shop" value="wholesale" />
+            <text key="name" text="Name" />
+            <combo key="wholesale" text="Type" values="clothes,electro,florist,food,general,paper,pharmacy,sanitary,seafood,supermarket" values_context="wholesale" />
+            <text key="operator" text="Operator" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Wholesale -->
+        <item name="Trade" icon="presets/shop/trade.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=trade" />
+            <space />
+            <key key="shop" value="trade" />
+            <text key="name" text="Name" />
+            <combo key="trade" text="Type" values="agricultural_supplies,building_supplies,catering_supplies,plumbing,tiles,timber,windows,wood" values_context="trade" />
+            <text key="operator" text="Operator" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Trade -->
         <separator/>
         <item name="Travel Agency" icon="presets/shop/travel_agency.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -6754 +6781 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Photo -->
+        <item name="Security" icon="presets/shop/security.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=security" />
+            <space />
+            <key key="shop" value="security" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Security -->
         <item name="Weapons" icon="presets/shop/weapons.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=weapons" />

trunk/resources/data/validator/deprecated.mapcss

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

trunk/resources/styles/standard/elemstyles.mapcss

@@ -2143 +2143 @@
 area[shop=tattoo],
 area[shop=art],
+area[shop=lighting],
+area[shop=security],
+area[shop=wholesale],
+area[shop=trade],
 area[shop=bag] {
     fill-color: shop#00005f;
@@ -2533 +2537 @@
 node[shop=art] {
     icon-image: "presets/shop/art.svg";
+    set icon_z17;
+}
+node[shop=lighting] {
+    icon-image: "presets/shop/lighting.svg";
+    set icon_z17;
+}
+node[shop=security] {
+    icon-image: "presets/shop/security.svg";
+    set icon_z17;
+}
+node[shop=wholesale] {
+    icon-image: "presets/shop/wholesale.svg";
+    set icon_z17;
+}
+node[shop=trade] {
+    icon-image: "presets/shop/trade.svg";
     set icon_z17;
 }