From d279c234ddb896c088f69639e2423b1f7c427863 Mon Sep 17 00:00:00 2001
From: Martin Raifer <martin@raifer.tech>
Date: Mon, 10 Jan 2022 17:53:21 +0100
Subject: [PATCH] specify values for "embassy" tag (#343)

* embassy=embassy to embassy=yes

embassy=embassy is an unwanted tagging fueled by iD presets showing top taginfo suggestions

there was confused philosophical discussion about deprecations on tagging mailing list - but of all involved noone considered embassy=embassy as a good idea

see https://lists.openstreetmap.org/pipermail/tagging/2022-January/063459.html

* specify values for "embassy" tag (closes #340)

Co-authored-by: Mateusz Konieczny <matkoniecz@gmail.com>
---
 data/deprecated.json        |  4 ++++
 data/fields/embassy.json    | 15 ++++++++++++++-
 interim/source_strings.yaml | 17 +++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/data/deprecated.json b/data/deprecated.json
index 983c121d..d0b3a71c 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -578,6 +578,10 @@
     "old": {"embankment": "true"},
     "replace": {"embankment": "yes"}
   },
+  {
+    "old": {"embassy": "embassy"},
+    "replace": {"embassy": "yes"}
+  },
   {
     "old": {"entrance": "emergency_exit"},
     "replace": {"entrance": "emergency"}
diff --git a/data/fields/embassy.json b/data/fields/embassy.json
index 3fa14fa9..0807132d 100644
--- a/data/fields/embassy.json
+++ b/data/fields/embassy.json
@@ -1,5 +1,18 @@
 {
     "key": "embassy",
+    "label": "Type",
     "type": "combo",
-    "label": "Type"
+    "autoSuggestions": false,
+    "strings": {
+        "options": {
+            "yes": "Embassy",
+            "residence": "Official Residence of an Ambassador",
+            "high_commission": "High Commission",
+            "mission": "Diplomatic Mission",
+            "branch_embassy": "Branch of an Embassy",
+            "nunciature": "Diplomatic Mission of the Holy See",
+            "delegation": "Delegation",
+            "interests_section": "Interests Section"
+        }
+    }
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 9007822e..b376d06f 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -1064,6 +1064,23 @@ en:
       embassy:
         # embassy=*
         label: Type
+        options:
+          # embassy=branch_embassy
+          branch_embassy: Branch of an Embassy
+          # embassy=delegation
+          delegation: Delegation
+          # embassy=high_commission
+          high_commission: High Commission
+          # embassy=interests_section
+          interests_section: Interests Section
+          # embassy=mission
+          mission: Diplomatic Mission
+          # embassy=nunciature
+          nunciature: Diplomatic Mission of the Holy See
+          # embassy=residence
+          residence: Official Residence of an Ambassador
+          # embassy=yes
+          'yes': Embassy
       emergency:
         # emergency=*
         label: Emergency