From 5be94b133cec63855198e55db761644fb4e935af Mon Sep 17 00:00:00 2001
From: Arthur Eigenbrot <aeigenbrot@nso.edu>
Date: Wed, 24 Oct 2018 09:19:49 -0600
Subject: [PATCH 1/4] Added wiki info for Halfords Autocentre

car_repair|Halfords had (slightly) more matches, but "Halfords" is an affiliated
store that does NOT offer car repair, so I fell back on the offical name of this
brand, "Halfords Autocentre".
---
 config/canonical.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/canonical.json b/config/canonical.json
index 1c1212e95de..37a6ed5fdd6 100644
--- a/config/canonical.json
+++ b/config/canonical.json
@@ -16799,14 +16799,14 @@
       "shop": "car_repair"
     }
   },
-  "shop/car_repair|Halfords": {
-    "count": 56,
-    "match": [
-      "shop/car_repair|Halfords Autocentre"
-    ],
+  "shop/car_repair|Halfords Autocentre": {
+    "count": 51,
+    "match": ["shop/car_repair|Halfords"],
     "tags": {
-      "brand": "Halfords",
-      "name": "Halfords",
+      "brand": "Halfords Auocentre",
+      "brand:wikidata": "Q5641894",
+      "brand:wikipedia": "en:Halfords Autocentre",
+      "name": "Halfords Autocentre",
       "shop": "car_repair"
     }
   },
@@ -32696,4 +32696,4 @@
       "tourism": "motel"
     }
   }
-}
\ No newline at end of file
+}

From fa70163f7baeef7279c2f44eff4f368c1bd97562 Mon Sep 17 00:00:00 2001
From: Arthur Eigenbrot <aeigenbrot@nso.edu>
Date: Wed, 24 Oct 2018 09:34:03 -0600
Subject: [PATCH 2/4] Merged duplicate Halfords to car_parts|Halfords

This is a related, but separate, brand from Halfords Autocentre.

Not sure that choice of car_parts over bicycle was correct; this store seems to
sell everything!
---
 config/canonical.json | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/config/canonical.json b/config/canonical.json
index 37a6ed5fdd6..1590cc6aeab 100644
--- a/config/canonical.json
+++ b/config/canonical.json
@@ -16095,14 +16095,6 @@
       "shop": "bicycle"
     }
   },
-  "shop/bicycle|Halfords": {
-    "count": 164,
-    "tags": {
-      "brand": "Halfords",
-      "name": "Halfords",
-      "shop": "bicycle"
-    }
-  },
   "shop/bicycle|サイクルベースあさひ": {
     "count": 105,
     "countryCodes": ["jp"],
@@ -16561,8 +16553,14 @@
   },
   "shop/car_parts|Halfords": {
     "count": 114,
+    "match": ["shop/bicycle|Halfords"],
+    "nomatch": [
+      "shop/car_repair|Halfords Autocentre"
+    ],
     "tags": {
       "brand": "Halfords",
+      "brand:wikidata": "Q3398786",
+      "brand:wikipedia": "en:Halfords",
       "name": "Halfords",
       "shop": "car_parts"
     }
@@ -16802,6 +16800,7 @@
   "shop/car_repair|Halfords Autocentre": {
     "count": 51,
     "match": ["shop/car_repair|Halfords"],
+    "nomatch": ["shop/car_parts|Halfords"],
     "tags": {
       "brand": "Halfords Auocentre",
       "brand:wikidata": "Q5641894",
@@ -32696,4 +32695,4 @@
       "tourism": "motel"
     }
   }
-}
+}
\ No newline at end of file

From 843f0c78f3e82afbb675f01b7d0a5f48db021f93 Mon Sep 17 00:00:00 2001
From: Arthur Eigenbrot <aeigenbrot@nso.edu>
Date: Thu, 25 Oct 2018 11:30:09 -0600
Subject: [PATCH 3/4] Added `service:bicycle:retai` to Halfords

---
 config/canonical.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/canonical.json b/config/canonical.json
index 1590cc6aeab..aecb687b02b 100644
--- a/config/canonical.json
+++ b/config/canonical.json
@@ -16562,6 +16562,7 @@
       "brand:wikidata": "Q3398786",
       "brand:wikipedia": "en:Halfords",
       "name": "Halfords",
+      "service:bicycle:retail": true,
       "shop": "car_parts"
     }
   },

From 2b2d0b1681be669c3898340cd4230d2a7d558ced Mon Sep 17 00:00:00 2001
From: Arthur Eigenbrot <aeigenbrot@nso.edu>
Date: Thu, 25 Oct 2018 13:46:44 -0600
Subject: [PATCH 4/4] Change from `true` -> `"yes"`

---
 config/canonical.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/canonical.json b/config/canonical.json
index aecb687b02b..8232e2cf383 100644
--- a/config/canonical.json
+++ b/config/canonical.json
@@ -16562,7 +16562,7 @@
       "brand:wikidata": "Q3398786",
       "brand:wikipedia": "en:Halfords",
       "name": "Halfords",
-      "service:bicycle:retail": true,
+      "service:bicycle:retail": "yes",
       "shop": "car_parts"
     }
   },