From 792a4e85943adb8b5a5ed6871cb545725357933e Mon Sep 17 00:00:00 2001
From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com>
Date: Mon, 26 Oct 2020 14:52:58 -0400
Subject: [PATCH] Fix background tile issues caused by the cache not properly
 updating upon load/error with D3 v6

---
 modules/renderer/tile_layer.js | 4 ++--
 modules/services/mapillary.js  | 8 ++++++--
 modules/services/streetside.js | 8 ++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/renderer/tile_layer.js b/modules/renderer/tile_layer.js
index 163125e38..be2d5a951 100644
--- a/modules/renderer/tile_layer.js
+++ b/modules/renderer/tile_layer.js
@@ -121,7 +121,7 @@ export function rendererTileLayer(context) {
             });
         }
 
-        function load(d) {
+        function load(d3_event, d) {
             _cache[d[3]] = true;
             d3_select(this)
                 .on('error', null)
@@ -130,7 +130,7 @@ export function rendererTileLayer(context) {
             render(selection);
         }
 
-        function error(d) {
+        function error(d3_event, d) {
             _cache[d[3]] = false;
             d3_select(this)
                 .on('error', null)
diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js
index 60e969f5a..c140dacf9 100644
--- a/modules/services/mapillary.js
+++ b/modules/services/mapillary.js
@@ -431,7 +431,9 @@ export default {
                 .attr('crossorigin', 'anonymous')
                 .attr('href', context.asset(viewercss))
                 .on('load.serviceMapillary', loaded)
-                .on('error.serviceMapillary', reject);
+                .on('error.serviceMapillary', function() {
+                    reject();
+                });
 
             // load mapillary-viewerjs
             head.selectAll('#ideditor-mapillary-viewerjs')
@@ -442,7 +444,9 @@ export default {
                 .attr('crossorigin', 'anonymous')
                 .attr('src', context.asset(viewerjs))
                 .on('load.serviceMapillary', loaded)
-                .on('error.serviceMapillary', reject);
+                .on('error.serviceMapillary', function() {
+                    reject();
+                });
         })
         .catch(function() {
             _loadViewerPromise = null;
diff --git a/modules/services/streetside.js b/modules/services/streetside.js
index 094062fb1..89345bcc6 100644
--- a/modules/services/streetside.js
+++ b/modules/services/streetside.js
@@ -585,7 +585,9 @@ export default {
         .attr('crossorigin', 'anonymous')
         .attr('href', context.asset(pannellumViewerCSS))
         .on('load.serviceStreetside', loaded)
-        .on('error.serviceStreetside', reject);
+        .on('error.serviceStreetside', function() {
+            reject();
+        });
 
       // load streetside pannellum viewer js
       head.selectAll('#ideditor-streetside-viewerjs')
@@ -596,7 +598,9 @@ export default {
         .attr('crossorigin', 'anonymous')
         .attr('src', context.asset(pannellumViewerJS))
         .on('load.serviceStreetside', loaded)
-        .on('error.serviceStreetside', reject);
+        .on('error.serviceStreetside', function() {
+            reject();
+        });
       })
       .catch(function() {
         _loadViewerPromise = null;