From 298f069c7e046a8b6c735e9fe5e71226a36e107d Mon Sep 17 00:00:00 2001
From: Aiosa <horakj7@gmail.com>
Date: Tue, 9 Aug 2022 10:40:57 +0100
Subject: [PATCH 1/2] Change missing cacheKey in Tilesource constructor to
 warning. Provide default implementation of getTileHashKey for tileSource if
 the tileSource does not inherit from OpenSeadragon.TileSource

---
 src/tile.js   | 2 +-
 src/viewer.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/tile.js b/src/tile.js
index b41aa9e9..45f2823b 100644
--- a/src/tile.js
+++ b/src/tile.js
@@ -129,7 +129,7 @@ $.Tile = function(level, x, y, bounds, exists, url, context2D, loadWithAjax, aja
     this.ajaxHeaders = ajaxHeaders;
 
     if (cacheKey === undefined) {
-        $.console.error("Tile constructor needs 'cacheKey' variable: creation tile cache" +
+        $.console.warn("Tile constructor needs 'cacheKey' variable: creation tile cache" +
             " in Tile class is deprecated. TileSource.prototype.getTileHashKey will be used.");
         cacheKey = $.TileSource.prototype.getTileHashKey(level, x, y, url, ajaxHeaders, postData);
     }
diff --git a/src/viewer.js b/src/viewer.js
index df553e4c..007f1bf1 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -1398,6 +1398,11 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
             options.ajaxHeaders = $.extend({}, this.ajaxHeaders, options.ajaxHeaders);
         }
 
+        if (!$.isFunction(options.tileSource.getTileHashKey)) {
+            //silently add custom implementation
+            options.tileSource.getTileHashKey = $.TileSource.prototype.getTileHashKey;
+        }
+
         var myQueueItem = {
             options: options
         };

From 61c77a344078c54d3a213f9a8dab9dfe7a79d951 Mon Sep 17 00:00:00 2001
From: Aiosa <horakj7@gmail.com>
Date: Sun, 21 Aug 2022 10:09:36 +0200
Subject: [PATCH 2/2] Fix hash tile generation by checking the validity of URL
 input parameter and fallback to level, x, y variables.

---
 src/tilesource.js | 11 +++++++----
 src/viewer.js     |  5 -----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/tilesource.js b/src/tilesource.js
index cba91511..2c99db29 100644
--- a/src/tilesource.js
+++ b/src/tilesource.js
@@ -688,11 +688,14 @@ $.TileSource.prototype = {
      * @param {*} postData data the tile was fetched with (type depends on getTilePostData(..) return type)
      */
     getTileHashKey: function(level, x, y, url, ajaxHeaders, postData) {
-        if (ajaxHeaders) {
-            return url + "+" + JSON.stringify(ajaxHeaders);
-        } else {
-            return url;
+        function withHeaders(hash) {
+            return ajaxHeaders ? hash + "+" + JSON.stringify(ajaxHeaders) : hash;
         }
+
+        if (typeof url !== "string") {
+            return withHeaders(level + "/" + x + "_" + y);
+        }
+        return withHeaders(url);
     },
 
     /**
diff --git a/src/viewer.js b/src/viewer.js
index 007f1bf1..df553e4c 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -1398,11 +1398,6 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
             options.ajaxHeaders = $.extend({}, this.ajaxHeaders, options.ajaxHeaders);
         }
 
-        if (!$.isFunction(options.tileSource.getTileHashKey)) {
-            //silently add custom implementation
-            options.tileSource.getTileHashKey = $.TileSource.prototype.getTileHashKey;
-        }
-
         var myQueueItem = {
             options: options
         };