mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 05:06:09 +03:00
Code Issues Projects Releases Wiki Activity

Fix hash tile generation by checking the validity of URL input parameter and fallback to level, x, y variables.

Browse Source
This commit is contained in:
Aiosa 2022-08-21 10:09:36 +02:00
parent 298f069c7e
commit 61c77a3440
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tilesource.js
View File

@ -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);
},
/**

5
src/viewer.js
View File

@ -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
};