From ca2c6b10980b8da1c573cf5c99cebd0d25dd5144 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 30 Jun 2019 01:42:43 -0400
Subject: [PATCH] Allow for some tags (`takeaway`) to be kept thru a NSI
 upgrade (closes #6530, closes #6581)

---
 modules/validations/outdated_tags.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/validations/outdated_tags.js b/modules/validations/outdated_tags.js
index a8a01e0c8..aed803451 100644
--- a/modules/validations/outdated_tags.js
+++ b/modules/validations/outdated_tags.js
@@ -102,8 +102,16 @@ export function validationOutdatedTags(context) {
                 var brand = brands.brands[match.kvnd];
                 if (brand && brand.tags['brand:wikidata']) {
                     subtype = 'noncanonical_brand';
-                    nsiKeys.forEach(function(remove) { delete newTags[remove]; });
-                    Object.assign(newTags, brand.tags);
+
+                    var keepTags = ['takeaway'].reduce(function(acc, k) {
+                        if (newTags[k]) {
+                            acc[k] = newTags[k];
+                        }
+                        return acc;
+                    }, {});
+
+                    nsiKeys.forEach(function(k) { delete newTags[k]; });
+                    Object.assign(newTags, brand.tags, keepTags);
                     break;
                 }
             }