From 77985d65f898987f4343936626f0040193916a30 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 23 Aug 2013 12:48:28 -0700 Subject: [PATCH] Exclude Locator Overlay from imagery_used --- js/id/renderer/background.js | 5 ++++- js/id/renderer/background_source.js | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/js/id/renderer/background.js b/js/id/renderer/background.js index 6ab8502ce..84aaa2b43 100644 --- a/js/id/renderer/background.js +++ b/js/id/renderer/background.js @@ -52,7 +52,10 @@ iD.Background = function(context) { } overlayLayers.forEach(function (d) { - imageryUsed.push(d.source().sourcetag || d.source().name); + var source = d.source(); + if (!source.isLocatorOverlay()) { + imageryUsed.push(source.sourcetag || source.name); + } }); if (background.showsGpxLayer()) { diff --git a/js/id/renderer/background_source.js b/js/id/renderer/background_source.js index b42b729b1..440172a4b 100644 --- a/js/id/renderer/background_source.js +++ b/js/id/renderer/background_source.js @@ -51,7 +51,11 @@ iD.BackgroundSource = function(data) { source.validZoom = function(z) { return source.scaleExtent[0] <= z && - (source.name !== 'Locator Overlay' || source.scaleExtent[1] > z); + (!source.isLocatorOverlay() || source.scaleExtent[1] > z); + }; + + source.isLocatorOverlay = function() { + return source.name === 'Locator Overlay'; }; source.copyrightNotices = function() {};