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

Merge branch 'master' into collections

Browse Source
This commit is contained in:
Ian Gilman 2015-02-05 14:46:43 -08:00
commit 4bf40bffc1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.txt
View File

@ -51,6 +51,8 @@ OPENSEADRAGON CHANGELOG
1.2.2: (in progress) 1.2.2: (in progress)
* Corrected IIIF tile source to use canonical syntax (#586)
1.2.1: 1.2.1:
* Added preserveOverlays option (#561) * Added preserveOverlays option (#561)

7
src/iiiftilesource.js
View File

@ -216,6 +216,7 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea
levelHeight = Math.ceil( this.height * scale ), levelHeight = Math.ceil( this.height * scale ),
//## iiif region //## iiif region
tileSize,
iiifTileSizeWidth, iiifTileSizeWidth,
iiifTileSizeHeight, iiifTileSizeHeight,
iiifRegion, iiifRegion,
@ -227,7 +228,8 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea
iiifQuality, iiifQuality,
uri; uri;
iiifTileSizeWidth = Math.ceil( this.getTileSize(level) / scale ); tileSize = this.getTileSize(level);
iiifTileSizeWidth = Math.ceil( tileSize / scale );
iiifTileSizeHeight = iiifTileSizeWidth; iiifTileSizeHeight = iiifTileSizeWidth;
if ( this['@context'].indexOf('/1.0/context.json') > -1 || if ( this['@context'].indexOf('/1.0/context.json') > -1 ||
@ -238,7 +240,7 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea
iiifQuality = "default.jpg"; iiifQuality = "default.jpg";
} }
if ( levelWidth < this.tile_width && levelHeight < this.tile_height ){ if ( levelWidth < tileSize && levelHeight < tileSize ){
iiifSize = levelWidth + ","; iiifSize = levelWidth + ",";
iiifRegion = 'full'; iiifRegion = 'full';
} else { } else {
@ -256,6 +258,7 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea
}); });
function configureFromXml10(xmlDoc) { function configureFromXml10(xmlDoc) {
//parse the xml //parse the xml
if ( !xmlDoc || !xmlDoc.documentElement ) { if ( !xmlDoc || !xmlDoc.documentElement ) {