From 0ba5691dd2c4075ed35bd3ce5884dd92f0e4b985 Mon Sep 17 00:00:00 2001
From: Adamant36 <amendenhall@live.com>
Date: Thu, 30 Aug 2018 12:31:57 -0700
Subject: [PATCH] Add special icon for shop=trade closes #3291 (#3361)

---
 amenity-points.mss     | 10 ++++++++++
 project.mml            |  8 ++++----
 symbols/shop/trade.svg | 31 +++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 symbols/shop/trade.svg

diff --git a/amenity-points.mss b/amenity-points.mss
index 47a82f9c0c..73fe73a13d 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1140,6 +1140,14 @@
     [shop = 'ticket'][zoom >= 18] {
       marker-file: url('symbols/shop/ticket.svg');
     }
+   
+    [shop = 'trade'][zoom >= 18] {
+      marker-file: url('symbols/shop/trade.svg');
+    } 
+      
+    [shop = 'wholesale'][zoom >= 18] {
+      marker-file: url('symbols/shop/trade.svg');
+    } 
     
     [shop = 'tyres'][zoom >= 18] {
       marker-file: url('symbols/shop/tyres.svg');
@@ -2551,10 +2559,12 @@
   [feature = 'shop_tobacco'],
   [feature = 'shop_tea'],
   [feature = 'shop_ticket'],
+  [feature = 'shop_trade'],
   [feature = 'shop_tyres'],
   [feature = 'shop_variety_store'],
   [feature = 'shop_video'],
   [feature = 'shop_video_games'],
+  [feature = 'shop_wholesale'],
   [feature = 'shop_wine'],
   [feature = 'shop_other'] {
     [way_pixels > 3000][zoom >= 17],
diff --git a/project.mml b/project.mml
index d86c914220..34dae0c3b5 100644
--- a/project.mml
+++ b/project.mml
@@ -1529,7 +1529,7 @@ Layer:
                                'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
                                'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate',
                                'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 
-                               'interior_decoration', 'video', 'paint', 'massage') THEN shop
+                               'interior_decoration', 'video', 'paint', 'massage', 'trade', 'wholesale') THEN shop
                                ELSE 'other' END AS shop,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
@@ -1667,7 +1667,7 @@ Layer:
                                'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
                                'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate',
                                'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 
-                               'interior_decoration', 'video', 'paint', 'massage') THEN shop
+                               'interior_decoration', 'video', 'paint', 'massage', 'trade', 'wholesale') THEN shop
                                ELSE 'other' END AS shop,
             NULL AS way_pixels
           FROM planet_osm_point
@@ -2072,7 +2072,7 @@ Layer:
                                             'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages',
                                             'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea',
                                             'coffee', 'tyres', 'pastry', 'chocolate', 'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 
-                                            'charity', 'second_hand', 'interior_decoration', 'video', 'paint', 'massage') THEN shop
+                                            'charity', 'second_hand', 'interior_decoration', 'video', 'paint', 'massage', 'trade', 'wholesale') THEN shop
                               WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
               'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END,
               'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',
@@ -2241,7 +2241,7 @@ Layer:
                                                 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics',
                                                 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres',
                                                 'pastry', 'chocolate', 'music', 'medical_supply','dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 
-                                                'interior_decoration', 'video', 'paint', 'massage') THEN shop
+                                                'interior_decoration', 'video', 'paint', 'massage', 'trade', 'wholesale') THEN shop
                                   WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
                   'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END,
                   'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',
diff --git a/symbols/shop/trade.svg b/symbols/shop/trade.svg
new file mode 100644
index 0000000000..beaa8ced4e
--- /dev/null
+++ b/symbols/shop/trade.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <defs
+     id="defs3053" />
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="rect826"
+     d="m 3,0 v 4 h 7 V 0 H 7 V 2 H 6 V 0 Z M 0,5 v 5 H 5 V 5 H 3 V 7 H 2 V 5 Z m 6,0 v 5 h 8 V 5 Z m -6,6 c 0,1 0,2 0,3 h 2 v -2 h 4 v 2 h 2 v -2 h 4 v 2 h 2 c 0,-1 0,-2 0,-3 z"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.36643195;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" />
+</svg>