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 pull request #476 from azaroth42/master

Browse Source 
scale_factors -> scaleFactors in 2.0 API
This commit is contained in:
iangilman 2014-09-15 13:24:03 -07:00
commit 80bbd3c6e1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/iiiftilesource.js
View File

@ -54,6 +54,7 @@ $.IIIFTileSource = function( options ){
options.tileSizePerScaleFactor = {}; options.tileSizePerScaleFactor = {};
// N.B. 2.0 renamed scale_factors to scaleFactors
if ( this.tile_width ) { if ( this.tile_width ) {
options.tileSize = this.tile_width; options.tileSize = this.tile_width;
} else if ( this.tile_height ) { } else if ( this.tile_height ) {
@ -62,13 +63,13 @@ $.IIIFTileSource = function( options ){
// Version 2.0 forwards // Version 2.0 forwards
if ( this.tiles.length == 1 ) { if ( this.tiles.length == 1 ) {
options.tileSize = this.tiles[0].width; options.tileSize = this.tiles[0].width;
this.scale_factors = this.tiles[0].scale_factors; this.scale_factors = this.tiles[0].scaleFactors;
} else { } else {
// Multiple tile sizes at different levels // Multiple tile sizes at different levels
this.scale_factors = []; this.scale_factors = [];
for (var t = 0; t < this.tiles.length; t++ ) { for (var t = 0; t < this.tiles.length; t++ ) {
for (var sf = 0; sf < this.tiles[t].scale_factors.length; sf++) { for (var sf = 0; sf < this.tiles[t].scaleFactors.length; sf++) {
var scaleFactor = this.tiles[t].scale_factors[sf]; var scaleFactor = this.tiles[t].scaleFactors[sf];
this.scale_factors.push(scaleFactor); this.scale_factors.push(scaleFactor);
options.tileSizePerScaleFactor[scaleFactor] = this.tiles[t].width; options.tileSizePerScaleFactor[scaleFactor] = this.tiles[t].width;
} }

2
test/data/iiif_2_0_tiled/info.json
View File

@ -4,7 +4,7 @@
"protocol": "http://iiif.io/api/image", "protocol": "http://iiif.io/api/image",
"height": 1024, "height": 1024,
"width": 775, "width": 775,
"tiles" : [{"width":256, "scale_factors":[1,2,4,8]}], "tiles" : [{"width":256, "scaleFactors":[1,2,4,8]}],
"profile": ["http://iiif.io/api/image/2/level1.json", "profile": ["http://iiif.io/api/image/2/level1.json",
{ {