From 97ec27285612f7f3f05f1b3472c12f9a29b40429 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Thu, 27 Mar 2014 23:29:42 -0400
Subject: [PATCH 1/2] Add preset for shop=funeral_directors

---
 data/presets.yaml                             |  3 +++
 data/presets/presets.json                     | 23 +++++++++++++++++++
 .../presets/shop/funeral_directors.json       | 23 +++++++++++++++++++
 dist/locales/en.json                          |  4 ++++
 4 files changed, 53 insertions(+)
 create mode 100644 data/presets/presets/shop/funeral_directors.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 328d2eefe..bb0b6fed0 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1577,6 +1577,9 @@ en:
       shop/florist: 
         name: Florist
         terms: "<translate with synonyms or related terms for 'Florist', separated by commas>"
+      shop/funeral_directors: 
+        name: Funeral Home
+        terms: "<translate with synonyms or related terms for 'Funeral Home', separated by commas>"
       shop/furniture: 
         name: Furniture Store
         terms: "<translate with synonyms or related terms for 'Furniture Store', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 64351f3e3..a5e2e1893 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6849,6 +6849,29 @@
         },
         "name": "Florist"
     },
+    "shop/funeral_directors": {
+        "icon": "cemetery",
+        "fields": [
+            "address",
+            "building_area",
+            "religion"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "shop": "funeral_directors"
+        },
+        "terms": [
+            "undertaker",
+            "funeral parlour",
+            "funeral parlor",
+            "memorial home"
+        ],
+        "name": "Funeral Home"
+    },
     "shop/furniture": {
         "icon": "shop",
         "fields": [
diff --git a/data/presets/presets/shop/funeral_directors.json b/data/presets/presets/shop/funeral_directors.json
new file mode 100644
index 000000000..cd9aff4f6
--- /dev/null
+++ b/data/presets/presets/shop/funeral_directors.json
@@ -0,0 +1,23 @@
+{
+    "icon": "cemetery",
+    "fields": [
+        "address",
+        "building_area",
+        "religion"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "shop": "funeral_directors"
+    },
+    "terms": [
+        "undertaker",
+        "funeral parlour",
+        "funeral parlor",
+        "memorial home"
+    ],
+    "name": "Funeral Home"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 42a1e1b3d..70f5e963a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2536,6 +2536,10 @@
                 "name": "Florist",
                 "terms": ""
             },
+            "shop/funeral_directors": {
+                "name": "Funeral Home",
+                "terms": "undertaker,funeral parlour,funeral parlor,memorial home"
+            },
             "shop/furniture": {
                 "name": "Furniture Store",
                 "terms": ""

From 2d85e047ccbe484343603e3ddd99444dbc535fd7 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Fri, 28 Mar 2014 10:07:19 -0400
Subject: [PATCH 2/2] Add denomination=* field for cemetary, graveyard, funeral
 home.

---
 data/presets/presets.json                        | 9 ++++++---
 data/presets/presets/amenity/grave_yard.json     | 5 +++--
 data/presets/presets/landuse/cemetery.json       | 5 +++--
 data/presets/presets/shop/funeral_directors.json | 3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index a5e2e1893..b18898d7f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -836,7 +836,8 @@
     "amenity/grave_yard": {
         "icon": "cemetery",
         "fields": [
-            "religion"
+            "religion",
+            "denomination"
         ],
         "geometry": [
             "point",
@@ -4419,7 +4420,8 @@
     "landuse/cemetery": {
         "icon": "cemetery",
         "fields": [
-            "religion"
+            "religion",
+            "denomination"
         ],
         "geometry": [
             "point",
@@ -6854,7 +6856,8 @@
         "fields": [
             "address",
             "building_area",
-            "religion"
+            "religion",
+            "denomination"
         ],
         "geometry": [
             "point",
diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json
index d6adbc112..e71015c50 100644
--- a/data/presets/presets/amenity/grave_yard.json
+++ b/data/presets/presets/amenity/grave_yard.json
@@ -1,7 +1,8 @@
 {
     "icon": "cemetery",
     "fields": [
-        "religion"
+        "religion",
+        "denomination"
     ],
     "geometry": [
         "point",
@@ -12,4 +13,4 @@
         "amenity": "grave_yard"
     },
     "name": "Graveyard"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json
index 728dec672..f41808f27 100644
--- a/data/presets/presets/landuse/cemetery.json
+++ b/data/presets/presets/landuse/cemetery.json
@@ -1,7 +1,8 @@
 {
     "icon": "cemetery",
     "fields": [
-        "religion"
+        "religion",
+        "denomination"
     ],
     "geometry": [
         "point",
@@ -13,4 +14,4 @@
     },
     "terms": [],
     "name": "Cemetery"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop/funeral_directors.json b/data/presets/presets/shop/funeral_directors.json
index cd9aff4f6..fd0421752 100644
--- a/data/presets/presets/shop/funeral_directors.json
+++ b/data/presets/presets/shop/funeral_directors.json
@@ -3,7 +3,8 @@
     "fields": [
         "address",
         "building_area",
-        "religion"
+        "religion",
+        "denomination"
     ],
     "geometry": [
         "point",