From ebf46550166428d44c106812a31a7f44058053e4 Mon Sep 17 00:00:00 2001
From: Lukas Sommer <sommerluk@gmail.com>
Date: Sat, 6 Jan 2018 10:33:55 +0000
Subject: [PATCH] toll booth symbol

---
 amenity-points.mss     |  7 +++++++
 project.mml            | 26 +++++++++++++++++++++++---
 symbols/toll_booth.svg | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100755 symbols/toll_booth.svg

diff --git a/amenity-points.mss b/amenity-points.mss
index d0fce6f5c2..e46d7e50b7 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1070,6 +1070,13 @@
     }
   }
 
+  [feature = 'barrier_toll_booth'][zoom >= 16] {
+    marker-file: url('symbols/toll_booth.svg');
+    marker-placement: interior;
+    marker-clip: false;
+    marker-fill: @transportation-icon;
+  }
+
   [feature = 'railway_level_crossing'][zoom >= 14]::railway,
   [feature = 'railway_crossing'][zoom >= 15]::railway{
     point-file: url('symbols/level_crossing.svg');
diff --git a/project.mml b/project.mml
index 552e875116..5617370abb 100644
--- a/project.mml
+++ b/project.mml
@@ -2318,7 +2318,7 @@ Layer:
               'amenity_' || CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'bench', 'waste_basket') THEN amenity ELSE NULL END,
               'historic_' || CASE WHEN historic IN ('wayside_cross') THEN historic ELSE NULL END,
               'man_made_' || CASE WHEN man_made IN ('cross') THEN man_made ELSE NULL END,
-              'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block') THEN barrier ELSE NULL END
+              'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'toll_booth') THEN barrier ELSE NULL END
             )  AS feature,
             access,
             CASE WHEN amenity='waste_basket' THEN 2 ELSE 1 END AS prio
@@ -2328,11 +2328,31 @@ Layer:
              OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'bench', 'waste_basket')
              OR historic IN ('wayside_cross')
              OR man_made IN ('cross')
-             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block')
+             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'toll_booth')
           ORDER BY prio
           ) AS amenity_low_priority
     properties:
       minzoom: 14
+  - id: amenity-low-priority-line
+    class: amenity-low-priority
+    geometry: linestring
+    <<: *extents
+    Datasource:
+      <<: *osm2pgsql
+      table: |-
+        (SELECT
+            way,
+            COALESCE(
+              'amenity_' || CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking') THEN amenity ELSE NULL END,
+              'barrier_' || CASE WHEN barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block') THEN barrier ELSE NULL END
+            )  AS feature,
+            access
+          FROM planet_osm_line p
+          WHERE amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking')
+             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'toll_booth')
+          ) AS amenity_low_priority_line
+    properties:
+      minzoom: 14
   - id: amenity-low-priority-poly
     class: amenity-low-priority
     geometry: polygon
@@ -2349,7 +2369,7 @@ Layer:
             access
           FROM planet_osm_polygon p
           WHERE amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking')
-             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block')
+             OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'toll_booth')
           ) AS amenity_low_priority_poly
     properties:
       minzoom: 14
diff --git a/symbols/toll_booth.svg b/symbols/toll_booth.svg
new file mode 100755
index 0000000000..7742b1048d
--- /dev/null
+++ b/symbols/toll_booth.svg
@@ -0,0 +1,32 @@
+<?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"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <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="path4136"
+       d="M 7.1679688 4.5117188 L 0 6 L 0 14.009766 L 6 14.009766 L 6 11.5 A 1 1 0 0 0 6.9960938 10.560547 L 13.722656 7.1972656 L 13.277344 6.3027344 L 6.5527344 9.6660156 A 1 1 0 0 0 6 9.5 L 6 6.7695312 L 7.6035156 5.3789062 L 7.1679688 4.5117188 z M 1 7 L 5 7 L 5 10 L 1 10 L 1 7 z "
+        />
+
+</svg>