From 577e0c6503f8ba6cfe40fe4328da0b9ab2c37516 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 11 Dec 2018 16:37:52 -0500
Subject: [PATCH] Don't add "None" to `imagery_used` tag when other imagery was
 used (closes #5565)

---
 modules/renderer/background.js        | 7 ++++++-
 modules/renderer/background_source.js | 2 +-
 modules/ui/commit.js                  | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/renderer/background.js b/modules/renderer/background.js
index ea41e0264..513606384 100644
--- a/modules/renderer/background.js
+++ b/modules/renderer/background.js
@@ -164,7 +164,12 @@ export function rendererBackground(context) {
             window.location.replace('#' + utilQsString(q, true));
         }
 
-        var imageryUsed = [b.imageryUsed()];
+        var imageryUsed = [];
+
+        var current = b.imageryUsed();
+        if (current) {
+            imageryUsed.push(current);
+        }
 
         _overlayLayers
             .filter(function (d) { return !d.source().isLocatorOverlay() && !d.source().isHidden(); })
diff --git a/modules/renderer/background_source.js b/modules/renderer/background_source.js
index f3e2d5014..771fd7bec 100644
--- a/modules/renderer/background_source.js
+++ b/modules/renderer/background_source.js
@@ -467,7 +467,7 @@ rendererBackgroundSource.None = function() {
 
 
     source.imageryUsed = function() {
-        return 'None';
+        return null;
     };
 
 
diff --git a/modules/ui/commit.js b/modules/ui/commit.js
index 8cf633cdf..4da3acbd9 100644
--- a/modules/ui/commit.js
+++ b/modules/ui/commit.js
@@ -92,7 +92,9 @@ export function uiCommit(context) {
         }
 
         tags = _clone(_changeset.tags);
-        tags.imagery_used = context.history().imageryUsed().join(';').substr(0, 255);
+
+        var imageryUsed = context.history().imageryUsed().join(';').substr(0, 255);
+        tags.imagery_used = imageryUsed || 'None';
         _changeset = _changeset.update({ tags: tags });
 
         var header = selection.selectAll('.header')