From bfe2836443a3efb800cb7d37f2ef1992f946491c Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 12 May 2016 17:05:21 -0400
Subject: [PATCH] Use maki prison icon for gate-like barriers

---
 data/presets/presets.json                      | 11 ++++++-----
 data/presets/presets/barrier/cattle_grid.json  |  2 +-
 data/presets/presets/barrier/city_wall.json    |  3 ++-
 data/presets/presets/barrier/ditch.json        |  2 +-
 data/presets/presets/barrier/fence.json        |  2 +-
 data/presets/presets/barrier/gate.json         |  2 +-
 data/presets/presets/barrier/kissing_gate.json |  2 +-
 data/presets/presets/barrier/wall.json         |  2 +-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index ef3d6338e..3ae60dd66 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2333,7 +2333,7 @@
         "name": "Bollard"
     },
     "barrier/cattle_grid": {
-        "icon": "roadblock",
+        "icon": "prison",
         "geometry": [
             "vertex"
         ],
@@ -2343,6 +2343,7 @@
         "name": "Cattle Grid"
     },
     "barrier/city_wall": {
+        "icon": "prison",
         "geometry": [
             "line",
             "area"
@@ -2387,7 +2388,7 @@
         "searchable": false
     },
     "barrier/fence": {
-        "icon": "roadblock",
+        "icon": "prison",
         "geometry": [
             "line"
         ],
@@ -2397,7 +2398,7 @@
         "name": "Fence"
     },
     "barrier/gate": {
-        "icon": "roadblock",
+        "icon": "prison",
         "fields": [
             "access"
         ],
@@ -2422,7 +2423,7 @@
         "name": "Hedge"
     },
     "barrier/kissing_gate": {
-        "icon": "roadblock",
+        "icon": "prison",
         "fields": [
             "access"
         ],
@@ -2486,7 +2487,7 @@
         "name": "Toll Booth"
     },
     "barrier/wall": {
-        "icon": "roadblock",
+        "icon": "prison",
         "geometry": [
             "line",
             "area"
diff --git a/data/presets/presets/barrier/cattle_grid.json b/data/presets/presets/barrier/cattle_grid.json
index 0781d4964..6e7c8cde7 100644
--- a/data/presets/presets/barrier/cattle_grid.json
+++ b/data/presets/presets/barrier/cattle_grid.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roadblock",
+    "icon": "prison",
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/barrier/city_wall.json b/data/presets/presets/barrier/city_wall.json
index ce0807e44..512be00fd 100644
--- a/data/presets/presets/barrier/city_wall.json
+++ b/data/presets/presets/barrier/city_wall.json
@@ -1,4 +1,5 @@
 {
+    "icon": "prison",
     "geometry": [
         "line",
         "area"
@@ -7,4 +8,4 @@
         "barrier": "city_wall"
     },
     "name": "City Wall"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/ditch.json b/data/presets/presets/barrier/ditch.json
index 5aa681ef6..347387837 100644
--- a/data/presets/presets/barrier/ditch.json
+++ b/data/presets/presets/barrier/ditch.json
@@ -7,4 +7,4 @@
         "barrier": "ditch"
     },
     "name": "Ditch"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/barrier/fence.json b/data/presets/presets/barrier/fence.json
index d73447bf9..169cfd46f 100644
--- a/data/presets/presets/barrier/fence.json
+++ b/data/presets/presets/barrier/fence.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roadblock",
+    "icon": "prison",
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/barrier/gate.json b/data/presets/presets/barrier/gate.json
index e3d1b7c69..7ba3d2b85 100644
--- a/data/presets/presets/barrier/gate.json
+++ b/data/presets/presets/barrier/gate.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roadblock",
+    "icon": "prison",
     "fields": [
         "access"
     ],
diff --git a/data/presets/presets/barrier/kissing_gate.json b/data/presets/presets/barrier/kissing_gate.json
index fb7a4525f..181ad18d7 100644
--- a/data/presets/presets/barrier/kissing_gate.json
+++ b/data/presets/presets/barrier/kissing_gate.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roadblock",
+    "icon": "prison",
     "fields": [
         "access"
     ],
diff --git a/data/presets/presets/barrier/wall.json b/data/presets/presets/barrier/wall.json
index 5f43bf19a..f102102d9 100644
--- a/data/presets/presets/barrier/wall.json
+++ b/data/presets/presets/barrier/wall.json
@@ -1,5 +1,5 @@
 {
-    "icon": "roadblock",
+    "icon": "prison",
     "geometry": [
         "line",
         "area"