From 25a4174c77c5434e386614f9160bb52b0fc66a98 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 25 Nov 2019 16:52:24 -0500
Subject: [PATCH] Update icon for barrier=block preset

---
 data/presets/presets.json               | 2 +-
 data/presets/presets/barrier/block.json | 2 +-
 data/taginfo.json                       | 2 +-
 svg/fontawesome/fas-cube.svg            | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 svg/fontawesome/fas-cube.svg

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 83d003862..7da5c1420 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -293,7 +293,7 @@
     "attraction/water_slide": {"icon": "fas-swimmer", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["line", "area"], "terms": ["theme park", "aquatic park", "water park", "flumes", "water chutes", "hydroslides"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"},
     "barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "moreFields": ["level"], "name": "Barrier", "matchScore": 0.4},
     "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false},
-    "barrier/block": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"},
+    "barrier/block": {"icon": "fas-cube", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"},
     "barrier/bollard_line": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "material", "colour"], "geometry": ["line"], "tags": {"barrier": "bollard"}, "name": "Bollard Row"},
     "barrier/bollard": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "width", "material", "colour"], "geometry": ["point", "vertex"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
     "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
diff --git a/data/presets/presets/barrier/block.json b/data/presets/presets/barrier/block.json
index 873df8953..76f2d87a7 100644
--- a/data/presets/presets/barrier/block.json
+++ b/data/presets/presets/barrier/block.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-roadblock",
+    "icon": "fas-cube",
     "fields": [
         "access",
         "material"
diff --git a/data/taginfo.json b/data/taginfo.json
index 795cc2043..da2f76aa9 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -290,7 +290,7 @@
     {"key": "attraction", "value": "water_slide", "description": "🄿 Water Slide", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
     {"key": "barrier", "description": "🄿 Barrier, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "entrance", "description": "🄿 Entrance (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
-    {"key": "barrier", "value": "block", "description": "🄿 Block", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
+    {"key": "barrier", "value": "block", "description": "🄿 Block", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cube.svg"},
     {"key": "barrier", "value": "bollard", "description": "🄿 Bollard Row, 🄿 Bollard", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
     {"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
diff --git a/svg/fontawesome/fas-cube.svg b/svg/fontawesome/fas-cube.svg
new file mode 100644
index 000000000..cb3500838
--- /dev/null
+++ b/svg/fontawesome/fas-cube.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="cube" class="svg-inline--fa fa-cube fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"></path></svg>
\ No newline at end of file