From 63a4f877162dbd2ac07762ed70f549697bf6ebf8 Mon Sep 17 00:00:00 2001 From: Sanghoon Kim <20144277+kim-sanghoon@users.noreply.github.com> Date: Tue, 9 Nov 2021 21:53:03 +0900 Subject: [PATCH] Fix getLevelScale to use image dimensions --- src/tilesource.js | 10 +++++++--- test/modules/tilesource.js | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/tilesource.js b/src/tilesource.js index aab7f134..32f10da8 100644 --- a/src/tilesource.js +++ b/src/tilesource.js @@ -284,10 +284,14 @@ $.TileSource.prototype = { // see https://github.com/openseadragon/openseadragon/issues/22 // we use the tilesources implementation of getLevelScale to generate // a memoized re-implementation - var levelScaleCache = {}, + var maxLevel = Math.ceil( + Math.log( Math.max( this.dimensions.x, this.dimensions.y ) ) / + Math.log( 2 ) + ), + levelScaleCache = {}, i; - for( i = 0; i <= this.maxLevel; i++ ){ - levelScaleCache[ i ] = 1 / Math.pow(2, this.maxLevel - i); + for( i = 0; i <= maxLevel; i++ ){ + levelScaleCache[ i ] = 1 / Math.pow(2, maxLevel - i); } this.getLevelScale = function( _level ){ return levelScaleCache[ _level ]; diff --git a/test/modules/tilesource.js b/test/modules/tilesource.js index 0d33f4e5..16fbb292 100644 --- a/test/modules/tilesource.js +++ b/test/modules/tilesource.js @@ -120,4 +120,27 @@ assertTileAtPoint(0, new OpenSeadragon.Point(1, 3033 / 2000), new OpenSeadragon.Point(0, 0)); }); + QUnit.test('changing maxLevel', function(assert) { + var tileSource = new OpenSeadragon.TileSource({ + width: 4096, + height: 4096, + }); + + assert.equal(tileSource.maxLevel, 12, 'The initial max level should be 12.'); + + tileSource.maxLevel = 9; + + function assertLevelScale(level, expected) { + var actual = tileSource.getLevelScale(level); + assert.ok(Math.abs(actual - expected) < Number.EPSILON, "The scale at level " + level + + " should be " + expected.toString() + + " got " + actual.toString()); + } + + assertLevelScale(12, 1); + assertLevelScale(10, 1 / 4); + assertLevelScale(8, 1 / 16); + assertLevelScale(6, 1 / 64); + }); + }());