From 761b790dbbb721e02018dd9c3949b77bfaf721f6 Mon Sep 17 00:00:00 2001
From: Jamie <james2432@gmail.com>
Date: Sat, 17 Mar 2018 16:33:52 -0400
Subject: [PATCH] Adding shop=diary

Related #3087
---
 amenity-points.mss     |  5 +++++
 project.mml            |  8 ++++----
 symbols/shop/dairy.svg | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 symbols/shop/dairy.svg

diff --git a/amenity-points.mss b/amenity-points.mss
index 1642646695..3f0d2c8a3b 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -852,6 +852,10 @@
       marker-fill: @amenity-brown;
     }
 
+    [shop = 'dairy'][zoom >= 18] {
+      marker-file: url('symbols/shop/dairy.svg');
+    }
+
     [shop = 'bicycle'][zoom >= 18] {
       marker-file: url('symbols/shop/bicycle.svg');
     }
@@ -2101,6 +2105,7 @@
   [feature = 'shop_car_repair'],
   [feature = 'shop_car_parts'],
   [feature = 'shop_cosmetics'],
+  [feature = 'shop_dairy'],
   [feature = 'shop_bicycle'],
   [feature = 'shop_farm'],
   [feature = 'shop_fishmonger'],
diff --git a/project.mml b/project.mml
index 7536c7fcd8..84db42b3b4 100644
--- a/project.mml
+++ b/project.mml
@@ -1479,7 +1479,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', 'tyres', 'pastry', 'chocolate') THEN shop
+                               'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate', 'dairy') THEN shop
                                ELSE 'other' END AS shop,
             way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
           FROM planet_osm_polygon
@@ -1593,7 +1593,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', 'tyres', 'pastry', 'chocolate') THEN shop
+                               'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate', 'dairy') THEN shop
                                ELSE 'other' END AS shop,
             NULL AS way_pixels
           FROM planet_osm_point
@@ -1985,7 +1985,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', 'tyres', 'pastry', 'chocolate') THEN shop
+                                            'coffee', 'tyres', 'pastry', 'chocolate', 'dairy') 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',
@@ -2128,7 +2128,7 @@ Layer:
                                                 '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', 'tyres', 
-                                                'pastry', 'chocolate') THEN shop
+                                                'pastry', 'chocolate', 'dairy') 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/dairy.svg b/symbols/shop/dairy.svg
new file mode 100644
index 0000000000..c57d94ae63
--- /dev/null
+++ b/symbols/shop/dairy.svg
@@ -0,0 +1,36 @@
+<?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"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   id="shop_dairy"
+   version="1.1">
+  <metadata
+     id="metadata115">
+    <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="defs113" />
+  <g
+     id="g12"
+     transform="matrix(0.16211304,0,0,0.16203704,-2.3341676,-1.101852)">
+    <path
+       id="path4"
+       transform="matrix(6.1685352,0,0,6.1714285,14.398395,6.8000008)"
+       d="M 1.296875,0 C 1.1185507,0 0.97265625,0.14597801 0.97265625,0.32421875 V 2.6484375 L 0.03320312,4.7871094 C 0.01699212,4.8357204 0,4.8674044 0,4.9160156 V 13.675781 C 0,13.854022 0.14589435,14 0.32421875,14 H 14 V 8.2441406 H 7.5039062 c 9.973e-4,-1.1089434 0.00195,-2.2182945 0.00195,-3.328125 0,-0.048611 -0.015039,-0.096499 -0.03125,-0.1289062 L 6.5332031,2.6484375 V 0.32421875 C 6.5332031,0.14597801 6.3873087,0 6.2089844,0 Z M 1.6210938,0.6640625 H 5.8847656 V 2.5664062 H 1.6210938 Z M 1.5722656,2.890625 h 4.3457032 l 0.015625,0.033203 c -0.3011572,0.6819043 -0.6144176,1.379414 -0.875,1.9589844 V 8.2441406 H 3.4316406 V 13.339844 H 0.65625 C 0.64061686,10.582371 0.648437,7.7724441 0.648437,4.9960938 Z m 4.5390625,0.4375 0.7304688,1.6679688 V 8.2441406 H 5.3808594 V 4.9550781 c 6.682e-4,-0.00142 0.00129,-0.00447 0.00195,-0.00586 z M 5.3085938,9.0800781 C 5.8344157,9.080702 6.2602203,9.507381 6.2597656,10.033203 6.2602203,10.559025 5.8344157,10.985704 5.3085938,10.986328 4.782009,10.986783 4.3550136,10.559788 4.3554688,10.033203 4.3550137,9.5066182 4.782009,9.0796229 5.3085938,9.0800781 Z m 6.4179682,0.4082031 c 0.71825,3.653e-4 1.300416,0.5825308 1.300782,1.3007808 -3.65e-4,0.718251 -0.582531,1.300417 -1.300782,1.300782 -0.719013,7.13e-4 -1.302369,-0.581769 -1.302734,-1.300782 3.66e-4,-0.719013 0.583722,-1.3014935 1.302734,-1.3007808 z M 8.0976562,11.021484 c 0.608407,-7.4e-5 1.1016368,0.493156 1.1015626,1.101563 7.36e-5,0.608407 -0.493156,1.101636 -1.1015626,1.101562 -0.6084065,7.4e-5 -1.101636,-0.493155 -1.1015624,-1.101562 -7.42e-5,-0.608407 0.4931555,-1.101637 1.1015624,-1.101563 z"
+       style="stroke-width:0.16207504" />
+  </g>
+</svg>