From b29cc88f3646a7940707d6e4dbe48575ff353cde Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 5 Dec 2017 11:36:46 -0500
Subject: [PATCH] Add Retail Building to buildings, switch Commercial icon to
 suitcase (closes #4590)

---
 data/presets/categories.json                  |  1 +
 data/presets/categories/building.json         |  1 +
 data/presets/presets.json                     | 44 +++++++++----------
 data/presets/presets/building/commercial.json |  2 +-
 data/presets/presets/landuse/commercial.json  |  2 +-
 data/presets/presets/landuse/retail.json      |  2 +-
 6 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/data/presets/categories.json b/data/presets/categories.json
index 0cae387957..074b44b0c4 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -21,6 +21,7 @@
                 "building",
                 "building/house",
                 "building/apartments",
+                "building/retail",
                 "building/commercial",
                 "building/industrial",
                 "building/residential"
diff --git a/data/presets/categories/building.json b/data/presets/categories/building.json
index 2c178a21c5..d94ce516b8 100644
--- a/data/presets/categories/building.json
+++ b/data/presets/categories/building.json
@@ -6,6 +6,7 @@
         "building",
         "building/house",
         "building/apartments",
+        "building/retail",
         "building/commercial",
         "building/industrial",
         "building/residential"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index dd899b2b4c..283bef41d8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4247,7 +4247,7 @@
             "name": "College Building"
         },
         "building/commercial": {
-            "icon": "commercial",
+            "icon": "suitcase",
             "fields": [
                 "name",
                 "address",
@@ -8054,7 +8054,7 @@
             "name": "Churchyard"
         },
         "landuse/commercial": {
-            "icon": "commercial",
+            "icon": "suitcase",
             "fields": [
                 "name"
             ],
@@ -8846,7 +8846,7 @@
             "name": "Residential Area"
         },
         "landuse/retail": {
-            "icon": "shop",
+            "icon": "commercial",
             "geometry": [
                 "area"
             ],
@@ -17857,7 +17857,7 @@
             "name": "Artwork"
         },
         "tourism/attraction": {
-            "icon": "monument",
+            "icon": "star",
             "fields": [
                 "name",
                 "operator",
@@ -90893,7 +90893,7 @@
                 "tourism": "attraction"
             },
             "name": "Arch",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -90912,7 +90912,7 @@
                 "tourism": "attraction"
             },
             "name": "Kursächsische Postmeilensäule",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -90931,7 +90931,7 @@
                 "tourism": "attraction"
             },
             "name": "Lavoir",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -90950,7 +90950,7 @@
                 "tourism": "attraction"
             },
             "name": "Maibaum",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -90969,7 +90969,7 @@
                 "tourism": "attraction"
             },
             "name": "Moab trail",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -90988,7 +90988,7 @@
                 "tourism": "attraction"
             },
             "name": "Moai",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91007,7 +91007,7 @@
                 "tourism": "attraction"
             },
             "name": "OWŚ",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91026,7 +91026,7 @@
                 "tourism": "attraction"
             },
             "name": "Sommerrodelbahn",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91045,7 +91045,7 @@
                 "tourism": "attraction"
             },
             "name": "path continues",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91064,7 +91064,7 @@
                 "tourism": "attraction"
             },
             "name": "path contiunes",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91083,7 +91083,7 @@
                 "tourism": "attraction"
             },
             "name": "white blaze",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91102,7 +91102,7 @@
                 "tourism": "attraction"
             },
             "name": "Кладбище еврейское",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91121,7 +91121,7 @@
                 "tourism": "attraction"
             },
             "name": "Колесо обозрения",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91140,7 +91140,7 @@
                 "tourism": "attraction"
             },
             "name": "Приусадебный парк",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91159,7 +91159,7 @@
                 "tourism": "attraction"
             },
             "name": "Усадьба",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91178,7 +91178,7 @@
                 "tourism": "attraction"
             },
             "name": "Хозяйственный двор",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91197,7 +91197,7 @@
                 "tourism": "attraction"
             },
             "name": "Часовня",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
@@ -91216,7 +91216,7 @@
                 "tourism": "attraction"
             },
             "name": "дольмен",
-            "icon": "monument",
+            "icon": "star",
             "geometry": [
                 "point",
                 "vertex",
diff --git a/data/presets/presets/building/commercial.json b/data/presets/presets/building/commercial.json
index 2c548315a8..2b115101b5 100644
--- a/data/presets/presets/building/commercial.json
+++ b/data/presets/presets/building/commercial.json
@@ -1,5 +1,5 @@
 {
-    "icon": "commercial",
+    "icon": "suitcase",
     "fields": [
         "name",
         "address",
diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json
index ab4d5ee56a..0f4ca186ef 100644
--- a/data/presets/presets/landuse/commercial.json
+++ b/data/presets/presets/landuse/commercial.json
@@ -1,5 +1,5 @@
 {
-    "icon": "commercial",
+    "icon": "suitcase",
     "fields": [
         "name"
     ],
diff --git a/data/presets/presets/landuse/retail.json b/data/presets/presets/landuse/retail.json
index 8af7e2fc5e..fa3c22b9f6 100644
--- a/data/presets/presets/landuse/retail.json
+++ b/data/presets/presets/landuse/retail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "commercial",
     "geometry": [
         "area"
     ],