From b072c9abe59131f70f3beff8ab66672f02429cb7 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bhousel@gmail.com>
Date: Wed, 7 Jul 2021 12:41:57 -0400
Subject: [PATCH] Switch "gb" to use "Q3336843" (UK countries excl. BOTS) (re:
 https://github.com/ideditor/country-coder/issues/35)

---
 resources/europe/united_kingdom/uk-irc.json          |  2 +-
 resources/europe/united_kingdom/uk-localchapter.json | 10 +---------
 resources/europe/united_kingdom/uk-mailinglist.json  |  2 +-
 resources/europe/united_kingdom/uk-twitter.json      |  2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/resources/europe/united_kingdom/uk-irc.json b/resources/europe/united_kingdom/uk-irc.json
index 3775717f4..bde5be362 100644
--- a/resources/europe/united_kingdom/uk-irc.json
+++ b/resources/europe/united_kingdom/uk-irc.json
@@ -2,7 +2,7 @@
   "id": "gb-irc",
   "type": "irc",
   "account": "osm-gb",
-  "locationSet": {"include": ["gb"]},
+  "locationSet": {"include": ["Q3336843"]},
   "languageCodes": ["cy", "en"],
   "order": 2,
   "strings": {
diff --git a/resources/europe/united_kingdom/uk-localchapter.json b/resources/europe/united_kingdom/uk-localchapter.json
index 4ad7b1a48..f2b230cf1 100644
--- a/resources/europe/united_kingdom/uk-localchapter.json
+++ b/resources/europe/united_kingdom/uk-localchapter.json
@@ -2,15 +2,7 @@
   "id": "uk-localchapter",
   "type": "osm-lc",
   "locationSet": {
-    "include": [
-      "GB-ENG",
-      "GB-NIR",
-      "GB-SCT",
-      "GB-WLS",
-      "JE",
-      "GG",
-      "IM"
-    ]
+    "include": ["Q3336843", "Q185086"]
   },
   "languageCodes": ["en"],
   "order": 3,
diff --git a/resources/europe/united_kingdom/uk-mailinglist.json b/resources/europe/united_kingdom/uk-mailinglist.json
index e404add00..e5d099aca 100644
--- a/resources/europe/united_kingdom/uk-mailinglist.json
+++ b/resources/europe/united_kingdom/uk-mailinglist.json
@@ -2,7 +2,7 @@
   "id": "gb-mailinglist",
   "type": "mailinglist",
   "account": "talk-gb",
-  "locationSet": {"include": ["gb"]},
+  "locationSet": {"include": ["Q3336843"]},
   "languageCodes": ["en"],
   "order": 4,
   "strings": {
diff --git a/resources/europe/united_kingdom/uk-twitter.json b/resources/europe/united_kingdom/uk-twitter.json
index 0eb7d0fd6..49b623be2 100644
--- a/resources/europe/united_kingdom/uk-twitter.json
+++ b/resources/europe/united_kingdom/uk-twitter.json
@@ -2,7 +2,7 @@
   "id": "uk-twitter",
   "type": "twitter",
   "account": "osmuk",
-  "locationSet": {"include": ["gb"]},
+  "locationSet": {"include": ["Q3336843"]},
   "languageCodes": ["en"],
   "order": 2,
   "strings": {"community": "OpenStreetMap UK"},