From 5eda112bfae00a693200c3faa413c2f0d22ef98d Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 25 Jan 2019 08:15:55 -0500
Subject: [PATCH] Move Hours field from moreFields to fields of shop presets
 Add Currency Types field to moreFields of shop presets

---
 data/presets/presets.json      | 2 +-
 data/presets/presets/shop.json | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index cc60510e8..ae31ea8fe 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -837,7 +837,7 @@
     "seamark/buoy_lateral/green": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
     "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
     "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"},
-    "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "payment_multi"], "moreFields": ["opening_hours", "brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
+    "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["brand", "currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
     "shop/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false},
     "shop/furnace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["oven", "stove"], "tags": {"shop": "furnace"}, "name": "Furnace Store", "searchable": false},
     "shop/vacant": {"icon": "maki-shop", "fields": ["name", "address", "building_area"], "geometry": ["point", "area"], "tags": {"shop": "vacant"}, "name": "Vacant Shop", "searchable": false},
diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
index c1e7ba240..0e5850906 100644
--- a/data/presets/presets/shop.json
+++ b/data/presets/presets/shop.json
@@ -6,11 +6,12 @@
         "operator",
         "address",
         "building_area",
+        "opening_hours",
         "payment_multi"
     ],
     "moreFields": [
-        "opening_hours",
         "brand",
+        "currency_multi",
         "website",
         "phone",
         "email",