From 5db95d8a89d30a073378d1dfc48afa6f87f23b36 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 13 Mar 2020 14:57:40 -0400
Subject: [PATCH] Fix source filtering for 'custom' and 'none'

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

diff --git a/modules/renderer/background.js b/modules/renderer/background.js
index 90b53692e..9413a3079 100644
--- a/modules/renderer/background.js
+++ b/modules/renderer/background.js
@@ -284,8 +284,9 @@ export function rendererBackground(context) {
     const currSource = baseLayer.source();
 
     return _imageryIndex.backgrounds.filter(source => {
+      if (source.isGlobal) return true;                          // always include imagery with worldwide coverage
       if (includeCurrent && currSource === source) return true;  // optionally include the current imagery
-      if (zoom && zoom < 6) return source.isGlobal;              // optionally exclude local imagery at low zooms
+      if (zoom && zoom < 6) return false;                        // optionally exclude local imagery at low zooms
       return visible[source.id];                                 // include imagery visible in given extent
     });
   };
diff --git a/modules/renderer/background_source.js b/modules/renderer/background_source.js
index aa93a6f18..e760588e4 100644
--- a/modules/renderer/background_source.js
+++ b/modules/renderer/background_source.js
@@ -490,7 +490,7 @@ rendererBackgroundSource.Esri = function(data) {
 
 
 rendererBackgroundSource.None = function() {
-    var source = rendererBackgroundSource({ id: 'none', template: '' });
+    var source = rendererBackgroundSource({ id: 'none', template: '', isGlobal: true });
 
 
     source.name = function() {
@@ -513,7 +513,7 @@ rendererBackgroundSource.None = function() {
 
 
 rendererBackgroundSource.Custom = function(template) {
-    var source = rendererBackgroundSource({ id: 'custom', template: template });
+    var source = rendererBackgroundSource({ id: 'custom', template: template, isGlobal: true });
 
 
     source.name = function() {