From e65de72e3a80dda227cc3a8eae945c657838dfb7 Mon Sep 17 00:00:00 2001 From: Antoine Vandecreme Date: Sat, 4 Feb 2017 15:37:50 +0100 Subject: [PATCH] Fix simple image being drawn twice. Fix #1113 --- src/tilesource.js | 9 +++++++++ test/modules/tilesource.js | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/tilesource.js b/src/tilesource.js index 271fca7d..f826ab48 100644 --- a/src/tilesource.js +++ b/src/tilesource.js @@ -356,6 +356,15 @@ $.TileSource.prototype = { var x = Math.floor(pixelX / this.getTileWidth(level)); var y = Math.floor(pixelY / this.getTileHeight(level)); + // When point.x == 1 or point.y == 1 / this.aspectRatio we want to + // return the last tile of the row/column + if (point.x >= 1) { + x = this.getNumTiles(level).x - 1; + } + if (point.y >= 1 / this.aspectRatio) { + y = this.getNumTiles(level).y - 1; + } + return new $.Point(x, y); }, diff --git a/test/modules/tilesource.js b/test/modules/tilesource.js index 71fb053d..21a9f30c 100644 --- a/test/modules/tilesource.js +++ b/test/modules/tilesource.js @@ -85,6 +85,17 @@ assertTileAtPoint(level, new OpenSeadragon.Point(0.5, 0.5), new OpenSeadragon.Point(0, 0)); assertTileAtPoint(level, new OpenSeadragon.Point(1, 10 / 15), new OpenSeadragon.Point(0, 0)); } + + // Test for issue #1113 + tileSource = new OpenSeadragon.TileSource({ + width: 1006, + height: 1009, + tileWidth: 1006, + tileHeight: 1009, + tileOverlap: 0, + maxLevel: 0, + }); + assertTileAtPoint(0, new OpenSeadragon.Point(1, 1009 / 1006), new OpenSeadragon.Point(0, 0)); }); }());