From 9d55cfb70f0fe05e0a8be87c52fee4035ce316bc Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 1 Feb 2018 11:36:20 -0500
Subject: [PATCH] Treat both EsriWorldImagery layers the same (support vintage,
 etc)

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

diff --git a/modules/renderer/background.js b/modules/renderer/background.js
index 89eabc335..2cfc25d09 100644
--- a/modules/renderer/background.js
+++ b/modules/renderer/background.js
@@ -356,7 +356,7 @@ export function rendererBackground(context) {
         _backgroundSources = dataImagery.map(function(source) {
             if (source.type === 'bing') {
                 return rendererBackgroundSource.Bing(source, dispatch);
-            } else if (source.id === 'EsriWorldImagery') {
+            } else if (/^EsriWorldImagery/.test(source.id)) {
                 return rendererBackgroundSource.Esri(source);
             } else {
                 return rendererBackgroundSource(source);
diff --git a/modules/renderer/tile_layer.js b/modules/renderer/tile_layer.js
index b0fb42aa3..475147e43 100644
--- a/modules/renderer/tile_layer.js
+++ b/modules/renderer/tile_layer.js
@@ -257,7 +257,7 @@ export function rendererTileLayer(context) {
                 .selectAll('.tile-label-debug-vintage')
                 .each(function(d) {
                     var span = d3_select(this);
-                    var center = context._projection.invert(tileCenter(d));
+                    var center = context.projection.invert(tileCenter(d));
                     _source.getMetadata(center, d, function(err, result) {
                         span.text((result && result.vintage && result.vintage.range) ||
                             t('info_panels.background.vintage') + ': ' + t('info_panels.background.unknown')