From 3f79a100afdd4d0ef99200fc1cc4dbe3564b9637 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 17 Jul 2016 00:18:54 -0400
Subject: [PATCH] Prefer `government=register_office`, deprecate
 `amenity=register_office` (closes #3245)

---
 data/presets.yaml                             |  5 ++++
 data/presets/presets.json                     | 28 ++++++++++++++++++-
 .../presets/amenity/register_office.json      |  3 +-
 .../office/government/register_office.json    | 25 +++++++++++++++++
 data/taginfo.json                             |  4 +++
 dist/locales/en.json                          |  4 +++
 6 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 data/presets/presets/office/government/register_office.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 3d330c6c9..13a1d78d3 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2897,6 +2897,11 @@ en:
         # office=government
         name: Government Office
         terms: '<translate with synonyms or related terms for ''Government Office'', separated by commas>'
+      office/government/register_office:
+        # 'office=government, government=register_office'
+        name: Register Office
+        # 'terms: clerk,marriage,death,birth,certificate'
+        terms: '<translate with synonyms or related terms for ''Register Office'', separated by commas>'
       office/insurance:
         # office=insurance
         name: Insurance Office
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6884a5abc..0bbfdb725 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1640,7 +1640,8 @@
         "tags": {
             "amenity": "register_office"
         },
-        "name": "Register Office"
+        "name": "Register Office",
+        "searchable": false
     },
     "amenity/restaurant": {
         "icon": "restaurant",
@@ -7064,6 +7065,31 @@
         "terms": [],
         "name": "Government Office"
     },
+    "office/government/register_office": {
+        "icon": "town-hall",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours",
+            "operator"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "clerk",
+            "marriage",
+            "death",
+            "birth",
+            "certificate"
+        ],
+        "tags": {
+            "office": "government",
+            "government": "register_office"
+        },
+        "name": "Register Office"
+    },
     "office/insurance": {
         "icon": "commercial",
         "fields": [
diff --git a/data/presets/presets/amenity/register_office.json b/data/presets/presets/amenity/register_office.json
index 5719531e2..0efdd7c0c 100644
--- a/data/presets/presets/amenity/register_office.json
+++ b/data/presets/presets/amenity/register_office.json
@@ -15,5 +15,6 @@
     "tags": {
         "amenity": "register_office"
     },
-    "name": "Register Office"
+    "name": "Register Office",
+    "searchable": false
 }
diff --git a/data/presets/presets/office/government/register_office.json b/data/presets/presets/office/government/register_office.json
new file mode 100644
index 000000000..4f8dae677
--- /dev/null
+++ b/data/presets/presets/office/government/register_office.json
@@ -0,0 +1,25 @@
+{
+    "icon": "town-hall",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours",
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "clerk",
+        "marriage",
+        "death",
+        "birth",
+        "certificate"
+    ],
+    "tags": {
+        "office": "government",
+        "government": "register_office"
+    },
+    "name": "Register Office"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index b1e7b6756..422e1d1cd 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1648,6 +1648,10 @@
             "key": "office",
             "value": "government"
         },
+        {
+            "key": "government",
+            "value": "register_office"
+        },
         {
             "key": "office",
             "value": "insurance"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 87c9679da..728d557dc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3188,6 +3188,10 @@
                 "name": "Government Office",
                 "terms": ""
             },
+            "office/government/register_office": {
+                "name": "Register Office",
+                "terms": "clerk,marriage,death,birth,certificate"
+            },
             "office/insurance": {
                 "name": "Insurance Office",
                 "terms": ""