From 80bbb44f1578eb088066ff96dadd8cfb0e422c77 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 24 Feb 2016 09:38:02 -0500
Subject: [PATCH] Disambiguate art store, art gallery, etc.

---
 data/presets.yaml                         | 14 ++++--
 data/presets/presets.json                 | 58 ++++++++++++++++++++---
 data/presets/presets/shop/art.json        | 10 +++-
 data/presets/presets/shop/craft.json      |  7 ++-
 data/presets/presets/shop/frame.json      |  6 +++
 data/presets/presets/tourism/gallery.json | 25 ++++++++++
 data/presets/presets/tourism/museum.json  | 10 ++--
 data/taginfo.json                         |  4 ++
 dist/locales/en.json                      | 14 ++++--
 9 files changed, 128 insertions(+), 20 deletions(-)
 create mode 100644 data/presets/presets/tourism/gallery.json

diff --git a/data/presets.yaml b/data/presets.yaml
index b1f95df01..633037a70 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3119,8 +3119,9 @@ en:
         terms: "<translate with synonyms or related terms for 'Antiques Shop', separated by commas>"
       shop/art:
         # shop=art
-        name: Art Gallery
-        terms: "<translate with synonyms or related terms for 'Art Gallery', separated by commas>"
+        name: Art Store
+        # 'terms: art*,exhibit*,gallery'
+        terms: "<translate with synonyms or related terms for 'Art Store', separated by commas>"
       shop/baby_goods:
         # shop=baby_goods
         name: Baby Goods Store
@@ -3236,6 +3237,7 @@ en:
       shop/craft:
         # shop=craft
         name: Arts and Crafts Store
+        # 'terms: art*,paint*,frame'
         terms: "<translate with synonyms or related terms for 'Arts and Crafts Store', separated by commas>"
       shop/curtain:
         # shop=curtain
@@ -3300,6 +3302,7 @@ en:
       shop/frame:
         # shop=frame
         name: Framing Shop
+        # 'terms: art*,paint*,photo*,frame'
         terms: "<translate with synonyms or related terms for 'Framing Shop', separated by commas>"
       shop/funeral_directors:
         # shop=funeral_directors
@@ -3609,6 +3612,11 @@ en:
         # tourism=chalet
         name: Chalet
         terms: "<translate with synonyms or related terms for 'Chalet', separated by commas>"
+      tourism/gallery:
+        # tourism=gallery
+        name: Art Gallery
+        # 'terms: art*,exhibit*,paint*,photo*,sculpt*'
+        terms: "<translate with synonyms or related terms for 'Art Gallery', separated by commas>"
       tourism/guest_house:
         # tourism=guest_house
         name: Guest House
@@ -3633,7 +3641,7 @@ en:
       tourism/museum:
         # tourism=museum
         name: Museum
-        # 'terms: exhibition,foundation,gallery,hall,institution'
+        # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*'
         terms: "<translate with synonyms or related terms for 'Museum', separated by commas>"
       tourism/picnic_site:
         # tourism=picnic_site
diff --git a/data/presets/presets.json b/data/presets/presets.json
index a0cb5f829..6fe02944d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7832,8 +7832,9 @@
         "name": "Antiques Shop"
     },
     "shop/art": {
-        "icon": "art-gallery",
+        "icon": "shop",
         "fields": [
+            "artwork_type",
             "operator",
             "address",
             "building_area",
@@ -7843,10 +7844,15 @@
             "point",
             "area"
         ],
+        "terms": [
+            "art*",
+            "exhibit*",
+            "gallery"
+        ],
         "tags": {
             "shop": "art"
         },
-        "name": "Art Gallery"
+        "name": "Art Store"
     },
     "shop/baby_goods": {
         "icon": "shop",
@@ -8320,7 +8326,7 @@
         "name": "Cosmetics Store"
     },
     "shop/craft": {
-        "icon": "art-gallery",
+        "icon": "shop",
         "fields": [
             "operator",
             "address",
@@ -8334,6 +8340,11 @@
         "tags": {
             "shop": "craft"
         },
+        "terms": [
+            "art*",
+            "paint*",
+            "frame"
+        ],
         "name": "Arts and Crafts Store"
     },
     "shop/curtain": {
@@ -8607,6 +8618,12 @@
         "tags": {
             "shop": "frame"
         },
+        "terms": [
+            "art*",
+            "paint*",
+            "photo*",
+            "frame"
+        ],
         "name": "Framing Shop"
     },
     "shop/funeral_directors": {
@@ -9924,6 +9941,31 @@
         },
         "name": "Chalet"
     },
+    "tourism/gallery": {
+        "icon": "art-gallery",
+        "fields": [
+            "artwork_type",
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "art*",
+            "exhibit*",
+            "paint*",
+            "photo*",
+            "sculpt*"
+        ],
+        "tags": {
+            "tourism": "gallery"
+        },
+        "name": "Art Gallery"
+    },
     "tourism/guest_house": {
         "icon": "lodging",
         "fields": [
@@ -10026,11 +10068,15 @@
             "area"
         ],
         "terms": [
-            "exhibition",
-            "foundation",
+            "art*",
+            "exhibit*",
             "gallery",
+            "foundation",
             "hall",
-            "institution"
+            "institution",
+            "paint*",
+            "photo*",
+            "sculpt*"
         ],
         "tags": {
             "tourism": "museum"
diff --git a/data/presets/presets/shop/art.json b/data/presets/presets/shop/art.json
index 2d95b5c30..cc3c7a3b2 100644
--- a/data/presets/presets/shop/art.json
+++ b/data/presets/presets/shop/art.json
@@ -1,6 +1,7 @@
 {
-    "icon": "art-gallery",
+    "icon": "shop",
     "fields": [
+        "artwork_type",
         "operator",
         "address",
         "building_area",
@@ -10,8 +11,13 @@
         "point",
         "area"
     ],
+    "terms": [
+        "art*",
+        "exhibit*",
+        "gallery"
+    ],
     "tags": {
         "shop": "art"
     },
-    "name": "Art Shop"
+    "name": "Art Store"
 }
diff --git a/data/presets/presets/shop/craft.json b/data/presets/presets/shop/craft.json
index 2f39e46a8..7f33c4f62 100644
--- a/data/presets/presets/shop/craft.json
+++ b/data/presets/presets/shop/craft.json
@@ -1,5 +1,5 @@
 {
-    "icon": "art-gallery",
+    "icon": "shop",
     "fields": [
         "operator",
         "address",
@@ -13,5 +13,10 @@
     "tags": {
         "shop": "craft"
     },
+    "terms": [
+        "art*",
+        "paint*",
+        "frame"
+    ],
     "name": "Arts and Crafts Store"
 }
diff --git a/data/presets/presets/shop/frame.json b/data/presets/presets/shop/frame.json
index 1415959d0..c1856298b 100644
--- a/data/presets/presets/shop/frame.json
+++ b/data/presets/presets/shop/frame.json
@@ -13,5 +13,11 @@
     "tags": {
         "shop": "frame"
     },
+    "terms": [
+        "art*",
+        "paint*",
+        "photo*",
+        "frame"
+    ],
     "name": "Framing Shop"
 }
diff --git a/data/presets/presets/tourism/gallery.json b/data/presets/presets/tourism/gallery.json
new file mode 100644
index 000000000..e0d375b6c
--- /dev/null
+++ b/data/presets/presets/tourism/gallery.json
@@ -0,0 +1,25 @@
+{
+    "icon": "art-gallery",
+    "fields": [
+        "artwork_type",
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "art*",
+        "exhibit*",
+        "paint*",
+        "photo*",
+        "sculpt*"
+    ],
+    "tags": {
+        "tourism": "gallery"
+    },
+    "name": "Art Gallery"
+}
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
index ebebd2167..92a17fc79 100644
--- a/data/presets/presets/tourism/museum.json
+++ b/data/presets/presets/tourism/museum.json
@@ -11,11 +11,15 @@
         "area"
     ],
     "terms": [
-        "exhibition",
-        "foundation",
+        "art*",
+        "exhibit*",
         "gallery",
+        "foundation",
         "hall",
-        "institution"
+        "institution",
+        "paint*",
+        "photo*",
+        "sculpt*"
     ],
     "tags": {
         "tourism": "museum"
diff --git a/data/taginfo.json b/data/taginfo.json
index 8f4d238d7..45090e079 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2290,6 +2290,10 @@
             "key": "tourism",
             "value": "chalet"
         },
+        {
+            "key": "tourism",
+            "value": "gallery"
+        },
         {
             "key": "tourism",
             "value": "guest_house"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9a9a5f758..b9d4e6a23 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3398,8 +3398,8 @@
                 "terms": ""
             },
             "shop/art": {
-                "name": "Art Gallery",
-                "terms": ""
+                "name": "Art Store",
+                "terms": "art*,exhibit*,gallery"
             },
             "shop/baby_goods": {
                 "name": "Baby Goods Store",
@@ -3507,7 +3507,7 @@
             },
             "shop/craft": {
                 "name": "Arts and Crafts Store",
-                "terms": ""
+                "terms": "art*,paint*,frame"
             },
             "shop/curtain": {
                 "name": "Curtain Store",
@@ -3563,7 +3563,7 @@
             },
             "shop/frame": {
                 "name": "Framing Shop",
-                "terms": ""
+                "terms": "art*,paint*,photo*,frame"
             },
             "shop/funeral_directors": {
                 "name": "Funeral Home",
@@ -3849,6 +3849,10 @@
                 "name": "Chalet",
                 "terms": ""
             },
+            "tourism/gallery": {
+                "name": "Art Gallery",
+                "terms": "art*,exhibit*,paint*,photo*,sculpt*"
+            },
             "tourism/guest_house": {
                 "name": "Guest House",
                 "terms": "B&B,Bed and Breakfast"
@@ -3871,7 +3875,7 @@
             },
             "tourism/museum": {
                 "name": "Museum",
-                "terms": "exhibition,foundation,gallery,hall,institution"
+                "terms": "art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*"
             },
             "tourism/picnic_site": {
                 "name": "Picnic Site",