From 2e43c6010764120a28442eaba21a77090e624601 Mon Sep 17 00:00:00 2001
From: Adamant36 <amendenhall@live.com>
Date: Wed, 22 Aug 2018 03:44:20 -0700
Subject: [PATCH] Add icon for shop=bookmaker closes #3186 (#3345)

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

diff --git a/amenity-points.mss b/amenity-points.mss
index 1da3376523..47a82f9c0c 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -880,6 +880,10 @@
       marker-file: url('symbols/shop/beverages.svg');
     }
 
+    [shop = 'bookmaker'][zoom >= 18] {
+      marker-file: url('symbols/shop/bookmaker.svg');
+    }
+    
     [shop = 'books'][zoom >= 18] {
       marker-file: url('symbols/library.svg');
     }
@@ -2480,6 +2484,7 @@
   [feature = 'shop_beauty'],
   [feature = 'shop_bed'],
   [feature = 'shop_beverages'],
+  [feature = 'shop_bookmaker'],
   [feature = 'shop_books'],
   [feature = 'shop_charity'],
   [feature = 'shop_clothes'],
diff --git a/project.mml b/project.mml
index a9cdf8d45f..d86c914220 100644
--- a/project.mml
+++ b/project.mml
@@ -1520,7 +1520,7 @@ Layer:
             tags->'tower:type' as "tower:type",
             tags->'castle_type' as castle_type,
             tags->'information' as information,
-            CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'books', 'butcher', 'clothes', 'computer',
+            CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer',
                                'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist',
                                'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
                                'photo', 'photo_studio', 'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk',
@@ -1658,7 +1658,7 @@ Layer:
             tags->'tower:type' as "tower:type",
             tags->'castle_type' as castle_type,
             tags->'information' as information,
-            CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'books', 'butcher', 'clothes', 'computer',
+            CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer',
                                'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist',
                                'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
                                'photo', 'photo_studio', 'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk',
@@ -2064,7 +2064,7 @@ Layer:
                                                   'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school',
                                                   'casino', 'boat_rental') THEN amenity ELSE NULL END,
               'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
-              'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
+              'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
                                             'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre',
                                             'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio',
                                             'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle',
@@ -2233,7 +2233,7 @@ Layer:
                                                       'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq',
                                                       'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END,
                   'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END,
-                  'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion',
+                  'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion',
                                                 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser',
                                                 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio', 'photography',
                                                 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle', 'musical_instrument',
diff --git a/symbols/shop/bookmaker.svg b/symbols/shop/bookmaker.svg
new file mode 100644
index 0000000000..50096499c6
--- /dev/null
+++ b/symbols/shop/bookmaker.svg
@@ -0,0 +1,74 @@
+<?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="svg8"
+   version="1.1"
+   viewBox="0 0 3.7041666 3.7041668"
+   height="14"
+   width="14">
+  <defs
+     id="defs2">
+    <clipPath
+       id="clipPath3825"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         y="-8.4830503"
+         x="15.779661"
+         height="12.51695"
+         width="4.2711868"
+         id="rect3827"
+         style="fill:#000080" />
+    </clipPath>
+    <clipPath
+       id="clipPath3825-7"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         y="-8.4830503"
+         x="15.779661"
+         height="12.51695"
+         width="4.2711868"
+         id="rect3827-6"
+         style="fill:#000080" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     transform="translate(0,-293.29582)"
+     id="layer1">
+    <path
+       id="path3773-3"
+       transform="matrix(0.26458334,0,0,0.26458334,0,293.29582)"
+       d="M 0 0 L 0 1 L 0 2 L 0 3 L 0.01953125 3 C 0.59023991 2.9997732 0.99999456 3.4475843 1 4 C 0.99996761 4.5524157 0.57070865 5.0001512 0 5 L 0 6 L 0 7 L 0 8 L 2 8 L 2 7 L 1 7 L 1 5.7167969 C 1.5935203 5.3688024 1.9999063 4.7338217 2 4 C 1.9998919 3.2660659 1.5936655 2.6311502 1 2.2832031 L 1 1 L 13 1 L 13 2.2832031 C 12.406321 2.6311502 12.000068 3.2660659 12 4 C 12.000084 4.7435902 12.402432 5.3858535 13 5.7304688 L 13 7 L 12 7 L 12 8 L 14 8 L 14 7 L 14 5 L 13.96875 5 C 13.398004 5.000189 13.000043 4.5524157 13 4 C 12.999994 3.4475843 13.380425 2.999811 13.951172 3 C 13.958731 3.0006047 13.96875 3.0019531 13.96875 3.0019531 L 13.96875 3 L 14 3 L 14 1 L 14 0 L 0 0 z "
+       style="stroke-width:1.73347199" />
+    <rect
+       width="3.7041667"
+       height="3.7041667"
+       x="-6.0000005e-008"
+       y="293.29581"
+       id="canvas"
+       style="visibility:hidden;fill:none;stroke:none;stroke-width:0.26458335" />
+    <g
+       transform="matrix(0.14233895,0,0,0.19402759,-59.959397,203.10239)"
+       id="layer1-1">
+      <path
+         id="path3211"
+         d="m 434.25556,468.93938 c -2.18895,0 -3.96669,1.60363 -3.96669,3.57819 0,1.40647 0.90033,2.62364 2.21047,3.20714 0.39427,0.17559 -0.036,0.63016 -0.32549,0.33555 -0.72705,-0.73985 -1.78736,-1.20671 -2.96876,-1.20671 -2.18894,0 -3.96669,1.60363 -3.96669,3.57819 0,1.97456 1.77776,3.57496 3.96669,3.57496 2.17217,0 3.9438,-1.57608 3.96669,-3.52979 0.004,-0.34658 0.59375,-0.38248 0.59375,0.0839 0,0.73442 -0.78271,4.6349 -1.20181,5.37858 0.45745,-0.10405 1.21982,-0.19037 1.69184,-0.19037 0.47201,0 1.23439,0.0863 1.69183,0.19037 -0.41909,-0.74368 -1.20181,-4.64416 -1.20181,-5.37858 0,-0.46637 0.58969,-0.43047 0.59375,-0.0839 0.0229,1.95371 1.79453,3.52979 3.96669,3.52979 2.18894,0 3.96669,-1.6004 3.96669,-3.57496 0,-1.97456 -1.77775,-3.57819 -3.96669,-3.57819 -1.18139,0 -2.24171,0.46686 -2.96876,1.20671 -0.2895,0.29461 -0.71975,-0.15996 -0.32549,-0.33555 1.31014,-0.5835 2.21047,-1.80067 2.21047,-3.20714 0,-1.97456 -1.77774,-3.57819 -3.96668,-3.57819 z"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14454354;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:3.9994173;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>