From 3cf0589c99b755b6d4eadfd0b2119936af704704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ko=C4=87?= <daniel@xn--ko-wla.pl>
Date: Mon, 26 Jun 2017 21:51:59 +0200
Subject: [PATCH] Adding shop=tyres rendering

---
 amenity-points.mss     |  5 +++++
 project.mml            |  8 ++++----
 symbols/shop/tyres.svg | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 symbols/shop/tyres.svg

diff --git a/amenity-points.mss b/amenity-points.mss
index 85798a9b52..da1ff4c206 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -825,6 +825,10 @@
       marker-file: url('symbols/shop/tea.svg');
     }
 
+    [shop = 'tyres'][zoom >= 18] {
+      marker-file: url('symbols/shop/tyres.svg');
+    }
+
     [shop = 'variety_store'][zoom >= 18] {
       marker-file: url('symbols/shop/variety_store.svg');
     }
@@ -1856,6 +1860,7 @@
   [feature = 'shop_stationery'],
   [feature = 'shop_tobacco'],
   [feature = 'shop_tea'],
+  [feature = 'shop_tyres'],
   [feature = 'shop_variety_store'],
   [feature = 'shop_wine'],
   [feature = 'shop_other']{
diff --git a/project.mml b/project.mml
index 023fcabcc5..3d159ee211 100644
--- a/project.mml
+++ b/project.mml
@@ -1644,7 +1644,7 @@ Layer:
                                'mobile_phone', 'motorcycle', 'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 
                                'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 
                                'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 
-                               'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee') THEN shop
+                               'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres') THEN shop
                                ELSE 'other' END AS shop,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
@@ -1725,7 +1725,7 @@ Layer:
                                'mobile_phone', 'motorcycle', 'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 
                                'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 
                                'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 
-                               'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee') THEN shop
+                               'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres') THEN shop
                                ELSE 'other' END AS shop,
             NULL AS way_pixels
           FROM planet_osm_point
@@ -2082,7 +2082,7 @@ Layer:
                                             'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 
                                             'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 
                                             'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 
-                                            'coffee') THEN shop 
+                                            'coffee', 'tyres') THEN shop 
                               WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
               'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track', 
                                                   'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 
@@ -2209,7 +2209,7 @@ Layer:
                                                 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle', 'musical_instrument', 
                                                 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 
                                                 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 
-                                                'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee') THEN shop 
+                                                'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres') THEN shop 
                                   WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
                   'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',  
                                                       'pitch','playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina',  
diff --git a/symbols/shop/tyres.svg b/symbols/shop/tyres.svg
new file mode 100644
index 0000000000..0713b83eeb
--- /dev/null
+++ b/symbols/shop/tyres.svg
@@ -0,0 +1,37 @@
+<?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"
+   height="14"
+   width="14"
+   version="1.1">
+  <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>
+  <defs
+     id="defs6" />
+  <rect
+     style="visibility:hidden;fill:none;stroke:none"
+     id="canvas"
+     y="-0.87500006"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="tyres"
+     d="M 4.5156251,0.18749994 C 2.5890609,0.42887414 1,2.9381313 1,6.5624999 1,10.186872 2.5755505,12.906773 4.5156251,12.984371 L 8.0312501,13.125 C 6.8950094,13.125 5.9458678,12.289913 5.3029783,11.099852 4.6600893,9.9097959 4.28125,8.3172049 4.28125,6.5624999 4.28125,4.807795 4.6600893,3.2152056 5.3029783,2.0251463 5.9458677,0.83508754 6.8950094,0 8.0312501,0 H 7.1523439 C 6.271218,0 5.3652343,0.0810544 4.5156251,0.18749994 Z M 8.0312501,0 C 9.1674905,0 10.11663,0.83508754 10.75952,2.0251463 11.241687,2.9176909 11.574926,4.0367958 11.711669,5.2807619 11.400808,2.3811809 10.089457,0.22784294 8.5091555,0.02197263 L 8.500037,3.2258002e-8 H 8.2656252 Z m 0,13.125 h 0.2343751 0.234375 l 0.00549,-0.01646 C 10.346461,12.873515 11.776797,10.021636 11.781248,6.5771506 11.779069,8.3259338 11.400576,9.9131899 10.759519,11.099854 10.11663,12.289913 9.1674905,13.125 8.0312501,13.125 Z m 0,-12.24975586 C 7.3400774,0.87524414 6.6358462,1.41221 6.0811769,2.4389646 5.5265072,3.4657198 5.163818,4.9344608 5.163818,6.5624999 c 0,1.6280393 0.3626892,3.098612 0.9173589,4.1253661 0.5546693,1.026754 1.2589005,1.561892 1.9500732,1.561892 0.6911721,0 1.3954021,-0.535138 1.9500756,-1.561892 C 10.535994,9.6611119 10.89868,8.1905392 10.89868,6.5624999 10.89868,4.9344608 10.535994,3.4657198 9.9813257,2.4389646 9.4266522,1.41221 8.7224222,0.87524414 8.0312501,0.87524414 Z M 8.2509764,3.2812499 c 0.3118906,0 0.5974527,0.1412053 0.8148197,0.3387451 0.2173665,0.1975397 0.3842035,0.4531537 0.5218505,0.7489014 0.2752898,0.5914957 0.4284654,1.3537602 0.4284654,2.1936035 0,0.8398434 -0.1531756,1.6021079 -0.4284654,2.1936035 -0.137647,0.2957474 -0.304484,0.5513605 -0.5218505,0.7489005 -0.217367,0.197541 -0.5029291,0.338746 -0.8148197,0.338746 -0.3118904,0 -0.5956214,-0.141205 -0.8129878,-0.338746 C 7.2206216,9.3074639 7.0537838,9.0518508 6.9161379,8.7561034 6.6408453,8.1646078 6.4876709,7.4023433 6.4876709,6.5624999 c 0,-0.8398433 0.1531744,-1.6021079 0.428467,-2.1936035 C 7.0537838,4.0731487 7.2206216,3.8175347 7.4379886,3.619995 7.655355,3.4224552 7.939086,3.2812499 8.2509764,3.2812499 Z M 7.6881468,4.1564941 c -0.053591,0 -0.1167411,0.019601 -0.2160643,0.1098631 C 7.3727596,4.3566214 7.255345,4.5162379 7.1534792,4.7351073 6.9497477,5.1728465 6.8074097,5.8317837 6.8074097,6.5624999 c 0,0.7307162 0.142338,1.3914841 0.3460695,1.8292235 0.1018658,0.21887 0.2192805,0.3784864 0.3186033,0.4687502 0.099323,0.090264 0.1624731,0.108032 0.2160643,0.108032 0.053591,0 0.1185729,-0.017768 0.2178956,-0.108032 C 8.0053656,8.7702101 8.1227804,8.6105933 8.2246461,8.3917234 8.4283777,7.953984 8.5707157,7.2932161 8.5707157,6.5624999 8.5707157,5.8317837 8.4283777,5.1728465 8.2246461,4.7351073 8.1227804,4.5162378 8.0053656,4.356621 7.9060424,4.2663572 7.8067198,4.1760943 7.7417391,4.1564941 7.6881468,4.1564941 Z m 4.0235222,1.1260987 c 0.04545,0.4141041 0.06956,0.8418554 0.06956,1.2799071 -6.76e-4,-0.4298602 -0.02398,-0.8585552 -0.06956,-1.2799071 z"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.62499857;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>