diff --git a/changelog.txt b/changelog.txt index ffa4e708..b7086bf9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -11,6 +11,7 @@ OPENSEADRAGON CHANGELOG * Added a navigatorMaintainSizeRatio option. If set to true, the navigator minimap resizes when the viewer element is resized (#310) * Added 'ABSOLUTE' as a navigatorPosition option, along with corresponding navigatorTop, navigatorLeft options. Allows the navigator minimap to be placed anywhere in the viewer (#310) * Enhanced the navigatorTop, navigatorLeft, navigatorHeight, and navigatorWidth options to allow a number for pixel units or a string for other element units (%, em, etc.) (#310) +* Additional enhancements for IIIF support (#315) 1.0.0: diff --git a/src/iiif1_1tilesource.js b/src/iiif1_1tilesource.js index 6f001a1b..6997ba20 100644 --- a/src/iiif1_1tilesource.js +++ b/src/iiif1_1tilesource.js @@ -45,20 +45,49 @@ */ $.IIIF1_1TileSource = function( options ){ + $.extend( true, this, options ); - if( !(this.height && this.width && this['@id'] ) ){ - throw new Error('IIIF required parameters not provided.'); + + if ( !( this.height && this.width && this['@id'] ) ){ + throw new Error( 'IIIF required parameters not provided.' ); } - if ( !(this.tile_width && this.tile_height) ) { - // use the short dimension if there aren't tile sizes provided. - options.tileSize = Math.min(this.height, this.width); - } else { + if ( ( this.profile && + this.profile == "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0" ) ){ + // what if not reporting a profile? + throw new Error( 'IIIF Image API 1.1 compliance level 1 or greater is required.' ); + } + + if ( this.tile_width ) { options.tileSize = this.tile_width; + } else if ( this.tile_height ) { + options.tileSize = this.tile_height; + } else { + // use the largest of tileOptions that is smaller than the short + // dimension + + var shortDim = Math.min( this.height, this.width ), + tileOptions = [256,512,1024], + smallerTiles = []; + + for ( var c = 0; c < tileOptions.length; c++ ) { + if ( tileOptions[c] <= shortDim ) { + smallerTiles.push( tileOptions[c] ); + } + } + + if ( smallerTiles.length > 0 ) { + options.tileSize = Math.max.apply( null, smallerTiles ); + } else { + // If we're smaller than 256, just use the short side. + options.tileSize = shortDim; + } + this.tile_width = options.tileSize; // So that 'full' gets used for + this.tile_height = options.tileSize; // the region below } - if (! options.maxLevel ) { + if ( !options.maxLevel ) { var mf = -1; var scfs = this.scale_factors || this.scale_factor; if ( scfs instanceof Array ) { @@ -67,7 +96,7 @@ $.IIIF1_1TileSource = function( options ){ if ( !isNaN( cf ) && cf > mf ) { mf = cf; } } } - if ( mf < 0 ) { options.maxLevel = Number(Math.ceil(Math.log(Math.max(this.width, this.height), 2))); } + if ( mf < 0 ) { options.maxLevel = Number( Math.ceil( Math.log( Math.max( this.width, this.height ), 2 ) ) ); } else { options.maxLevel = mf; } } @@ -82,13 +111,9 @@ $.extend( $.IIIF1_1TileSource.prototype, $.TileSource.prototype, /** @lends Open * @param {Object|Array} data * @param {String} optional - url */ - supports: function( data, url ){ - return data.profile && ( - "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0" == data.profile || - "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1" == data.profile || - "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2" == data.profile || - "http://library.stanford.edu/iiif/image-api/1.1/compliance.html" == data.profile - ); + supports: function( data, url ) { + return ( data['@context'] && + data['@context'] == "http://library.stanford.edu/iiif/image-api/1.1/context.json" ); }, /** @@ -124,6 +149,7 @@ $.extend( $.IIIF1_1TileSource.prototype, $.TileSource.prototype, /** @lends Open getTileUrl: function( level, x, y ){ //# constants + var IIIF_ROTATION = '0', IIIF_QUALITY = 'native.jpg', @@ -131,32 +157,34 @@ $.extend( $.IIIF1_1TileSource.prototype, $.TileSource.prototype, /** @lends Open scale = Math.pow( 0.5, this.maxLevel - level ), //# image dimensions at this level - level_width = Math.ceil( this.width * scale ), - level_height = Math.ceil( this.height * scale ), + levelWidth = Math.ceil( this.width * scale ), + levelHeight = Math.ceil( this.height * scale ), //## iiif region - iiif_tile_size_width = Math.ceil( this.tileSize / scale ), - iiif_tile_size_height = Math.ceil( this.tileSize / scale ), - iiif_region, - iiif_tile_x, - iiif_tile_y, - iiif_tile_w, - iiif_tile_h, - iiif_size, + iiifTileSizeWidth = Math.ceil( this.tileSize / scale ), + iiifTileSizeHeight = Math.ceil( this.tileSize / scale ), + iiifRegion, + iiifTileX, + iiifTileY, + iiifTileW, + iiifTileH, + iiifSize, uri; - if ( level_width < this.tile_width && level_height < this.tile_height ){ - iiif_size = level_width + "," + level_height; - iiif_region = 'full'; + if ( levelWidth < this.tile_width && levelHeight < this.tile_height ){ + iiifSize = levelWidth + ","; + iiifRegion = 'full'; } else { - iiif_tile_x = x * iiif_tile_size_width; - iiif_tile_y = y * iiif_tile_size_height; - iiif_tile_w = Math.min( iiif_tile_size_width, this.width - iiif_tile_x ); - iiif_tile_h = Math.min( iiif_tile_size_height, this.height - iiif_tile_y ); - iiif_size = Math.ceil(iiif_tile_w * scale) + "," + Math.ceil(iiif_tile_h * scale); - iiif_region = [ iiif_tile_x, iiif_tile_y, iiif_tile_w, iiif_tile_h ].join(','); + iiifTileX = x * iiifTileSizeWidth; + iiifTileY = y * iiifTileSizeHeight; + iiifTileW = Math.min( iiifTileSizeWidth, this.width - iiifTileX ); + iiifTileH = Math.min( iiifTileSizeHeight, this.height - iiifTileY ); + + iiifSize = Math.ceil( iiifTileW * scale ) + ","; + + iiifRegion = [ iiifTileX, iiifTileY, iiifTileW, iiifTileH ].join( ',' ); } - uri = [ this['@id'], iiif_region, iiif_size, IIIF_ROTATION, IIIF_QUALITY ].join('/'); + uri = [ this['@id'], iiifRegion, iiifSize, IIIF_ROTATION, IIIF_QUALITY ].join( '/' ); return uri; } }); diff --git a/test/data/iiif_1_1_no_tiles_1048.json b/test/data/iiif_1_1_no_tiles_1048.json new file mode 100644 index 00000000..e5789846 --- /dev/null +++ b/test/data/iiif_1_1_no_tiles_1048.json @@ -0,0 +1,18 @@ +{ + "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1", + "height": 870, + "width": 1048, + "qualities": [ + "native", + "color", + "grey", + "bitonal" + ], + "formats": [ + "jpg", + "png", + "gif" + ], + "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", + "@id": "http://localhost:8000/test/data/iiif_1_1_no_tiles_1048" +} diff --git a/test/data/iiif_1_1_no_tiles_1048/0,0,1024,870/512,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/0,0,1024,870/512,/0/native.jpg new file mode 100644 index 00000000..2a103534 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/0,0,1024,870/512,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/0,0,512,512/512,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/0,0,512,512/512,/0/native.jpg new file mode 100644 index 00000000..abe1eab4 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/0,0,512,512/512,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/0,512,512,358/512,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/0,512,512,358/512,/0/native.jpg new file mode 100644 index 00000000..2e3a12c9 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/0,512,512,358/512,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/1024,0,24,512/24,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/1024,0,24,512/24,/0/native.jpg new file mode 100644 index 00000000..55fffb23 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/1024,0,24,512/24,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/1024,0,24,870/12,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/1024,0,24,870/12,/0/native.jpg new file mode 100644 index 00000000..ed7a45c1 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/1024,0,24,870/12,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/1024,512,24,358/24,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/1024,512,24,358/24,/0/native.jpg new file mode 100644 index 00000000..2ad1ab7a Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/1024,512,24,358/24,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/512,0,512,512/512,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/512,0,512,512/512,/0/native.jpg new file mode 100644 index 00000000..ec687491 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/512,0,512,512/512,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/512,512,512,358/512,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/512,512,512,358/512,/0/native.jpg new file mode 100644 index 00000000..9609e3e0 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/512,512,512,358/512,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/full/131,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/full/131,/0/native.jpg new file mode 100644 index 00000000..b2d34820 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/full/131,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/full/17,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/full/17,/0/native.jpg new file mode 100644 index 00000000..e66b6ef7 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/full/17,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/full/262,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/full/262,/0/native.jpg new file mode 100644 index 00000000..b6a4288d Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/full/262,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/full/33,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/full/33,/0/native.jpg new file mode 100644 index 00000000..c8dd168c Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/full/33,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_1048/full/66,/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/full/66,/0/native.jpg new file mode 100644 index 00000000..65d0a09d Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_1048/full/66,/0/native.jpg differ diff --git a/test/data/iiif_no_tiles/0,0,1024,850/16,14/0/native.jpg b/test/data/iiif_1_1_no_tiles_1048/full/9,/0/native.jpg similarity index 66% rename from test/data/iiif_no_tiles/0,0,1024,850/16,14/0/native.jpg rename to test/data/iiif_1_1_no_tiles_1048/full/9,/0/native.jpg index 4cee30fa..f51d6103 100644 Binary files a/test/data/iiif_no_tiles/0,0,1024,850/16,14/0/native.jpg and b/test/data/iiif_1_1_no_tiles_1048/full/9,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_255.json b/test/data/iiif_1_1_no_tiles_255.json new file mode 100644 index 00000000..12a09460 --- /dev/null +++ b/test/data/iiif_1_1_no_tiles_255.json @@ -0,0 +1,18 @@ +{ + "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1", + "height": 212, + "width": 255, + "qualities": [ + "native", + "color", + "grey", + "bitonal" + ], + "formats": [ + "jpg", + "png", + "gif" + ], + "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", + "@id": "http://localhost:8000/test/data/iiif_1_1_no_tiles_255" +} diff --git a/test/data/iiif_1_1_no_tiles_255/0,0,212,212/212,/0/native.jpg b/test/data/iiif_1_1_no_tiles_255/0,0,212,212/212,/0/native.jpg new file mode 100644 index 00000000..b41466da Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_255/0,0,212,212/212,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_255/212,0,43,212/43,/0/native.jpg b/test/data/iiif_1_1_no_tiles_255/212,0,43,212/43,/0/native.jpg new file mode 100644 index 00000000..03cc9619 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_255/212,0,43,212/43,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_255/full/128,/0/native.jpg b/test/data/iiif_1_1_no_tiles_255/full/128,/0/native.jpg new file mode 100644 index 00000000..69c602b8 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_255/full/128,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_255/full/16,/0/native.jpg b/test/data/iiif_1_1_no_tiles_255/full/16,/0/native.jpg new file mode 100644 index 00000000..42b54ec6 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_255/full/16,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_255/full/32,/0/native.jpg b/test/data/iiif_1_1_no_tiles_255/full/32,/0/native.jpg new file mode 100644 index 00000000..c341f30b Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_255/full/32,/0/native.jpg differ diff --git a/test/data/iiif_no_tiles/0,0,1024,850/8,7/0/native.jpg b/test/data/iiif_1_1_no_tiles_255/full/4,/0/native.jpg similarity index 79% rename from test/data/iiif_no_tiles/0,0,1024,850/8,7/0/native.jpg rename to test/data/iiif_1_1_no_tiles_255/full/4,/0/native.jpg index 893409b0..62fdf391 100644 Binary files a/test/data/iiif_no_tiles/0,0,1024,850/8,7/0/native.jpg and b/test/data/iiif_1_1_no_tiles_255/full/4,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_255/full/64,/0/native.jpg b/test/data/iiif_1_1_no_tiles_255/full/64,/0/native.jpg new file mode 100644 index 00000000..83629b8e Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_255/full/64,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_255/full/8,/0/native.jpg b/test/data/iiif_1_1_no_tiles_255/full/8,/0/native.jpg new file mode 100644 index 00000000..087db0a1 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_255/full/8,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384.json b/test/data/iiif_1_1_no_tiles_384.json new file mode 100644 index 00000000..112a0be6 --- /dev/null +++ b/test/data/iiif_1_1_no_tiles_384.json @@ -0,0 +1,18 @@ +{ + "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1", + "height": 319, + "width": 384, + "qualities": [ + "native", + "color", + "grey", + "bitonal" + ], + "formats": [ + "jpg", + "png", + "gif" + ], + "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", + "@id": "http://localhost:8000/test/data/iiif_1_1_no_tiles_384" +} diff --git a/test/data/iiif_1_1_no_tiles_384/0,0,256,256/256,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/0,0,256,256/256,/0/native.jpg new file mode 100644 index 00000000..f2affd34 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/0,0,256,256/256,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/0,256,256,63/256,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/0,256,256,63/256,/0/native.jpg new file mode 100644 index 00000000..a44db124 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/0,256,256,63/256,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/256,0,128,256/128,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/256,0,128,256/128,/0/native.jpg new file mode 100644 index 00000000..61f8d677 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/256,0,128,256/128,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/256,256,128,63/128,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/256,256,128,63/128,/0/native.jpg new file mode 100644 index 00000000..a1002c86 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/256,256,128,63/128,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/full/12,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/full/12,/0/native.jpg new file mode 100644 index 00000000..2677d6c1 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/full/12,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/full/192,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/full/192,/0/native.jpg new file mode 100644 index 00000000..00593f8a Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/full/192,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/full/24,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/full/24,/0/native.jpg new file mode 100644 index 00000000..ee21015d Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/full/24,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/full/48,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/full/48,/0/native.jpg new file mode 100644 index 00000000..5597681c Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/full/48,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/full/6,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/full/6,/0/native.jpg new file mode 100644 index 00000000..8c4134df Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/full/6,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_384/full/96,/0/native.jpg b/test/data/iiif_1_1_no_tiles_384/full/96,/0/native.jpg new file mode 100644 index 00000000..38a07820 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_384/full/96,/0/native.jpg differ diff --git a/test/data/iiif_no_tiles.json b/test/data/iiif_1_1_no_tiles_768.json similarity index 75% rename from test/data/iiif_no_tiles.json rename to test/data/iiif_1_1_no_tiles_768.json index 7f677b32..743d6128 100644 --- a/test/data/iiif_no_tiles.json +++ b/test/data/iiif_1_1_no_tiles_768.json @@ -1,7 +1,7 @@ { "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2", - "height": 850, - "width": 1024, + "height": 637, + "width": 768, "qualities": [ "native", "color", @@ -14,6 +14,5 @@ "gif" ], "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", - "@id": "http://localhost:8000/test/data/iiif_no_tiles" + "@id": "http://localhost:8000/test/data/iiif_1_1_no_tiles_768" } - diff --git a/test/data/iiif_1_1_no_tiles_768/0,0,512,512/512,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/0,0,512,512/512,/0/native.jpg new file mode 100644 index 00000000..c547135f Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/0,0,512,512/512,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/0,512,512,125/512,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/0,512,512,125/512,/0/native.jpg new file mode 100644 index 00000000..88717a4d Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/0,512,512,125/512,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/512,0,256,512/256,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/512,0,256,512/256,/0/native.jpg new file mode 100644 index 00000000..3423bc3a Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/512,0,256,512/256,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/512,512,256,125/256,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/512,512,256,125/256,/0/native.jpg new file mode 100644 index 00000000..8fee2e2e Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/512,512,256,125/256,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/full/12,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/full/12,/0/native.jpg new file mode 100644 index 00000000..97ddd626 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/full/12,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/full/192,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/full/192,/0/native.jpg new file mode 100644 index 00000000..0f786ee9 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/full/192,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/full/24,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/full/24,/0/native.jpg new file mode 100644 index 00000000..151eed0f Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/full/24,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/full/384,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/full/384,/0/native.jpg new file mode 100644 index 00000000..9dcd340f Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/full/384,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/full/48,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/full/48,/0/native.jpg new file mode 100644 index 00000000..6ceb6842 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/full/48,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/full/6,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/full/6,/0/native.jpg new file mode 100644 index 00000000..20139e5e Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/full/6,/0/native.jpg differ diff --git a/test/data/iiif_1_1_no_tiles_768/full/96,/0/native.jpg b/test/data/iiif_1_1_no_tiles_768/full/96,/0/native.jpg new file mode 100644 index 00000000..299589b6 Binary files /dev/null and b/test/data/iiif_1_1_no_tiles_768/full/96,/0/native.jpg differ diff --git a/test/data/iiif1_1.json b/test/data/iiif_1_1_tiled.json similarity index 88% rename from test/data/iiif1_1.json rename to test/data/iiif_1_1_tiled.json index 1ad7a6fa..641d8511 100644 --- a/test/data/iiif1_1.json +++ b/test/data/iiif_1_1_tiled.json @@ -24,5 +24,5 @@ "gif" ], "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", - "@id": "http://localhost:8000/test/data/iiif_1_1_files" + "@id": "http://localhost:8000/test/data/iiif_1_1_tiled" } diff --git a/test/data/iiif_1_1_files/0,0,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/0,0,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/0,0,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/0,0,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/0,0,512,512/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/0,0,512,512/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/0,0,512,512/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/0,0,512,512/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/0,0,775,1024/194,256/0/native.jpg b/test/data/iiif_1_1_tiled/0,0,775,1024/194,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/0,0,775,1024/194,256/0/native.jpg rename to test/data/iiif_1_1_tiled/0,0,775,1024/194,/0/native.jpg diff --git a/test/data/iiif_1_1_files/0,256,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/0,256,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/0,256,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/0,256,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/0,512,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/0,512,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/0,512,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/0,512,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/0,512,512,512/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/0,512,512,512/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/0,512,512,512/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/0,512,512,512/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/0,768,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/0,768,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/0,768,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/0,768,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/256,0,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/256,0,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/256,0,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/256,0,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/256,256,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/256,256,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/256,256,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/256,256,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/256,512,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/256,512,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/256,512,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/256,512,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/256,768,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/256,768,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/256,768,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/256,768,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/512,0,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/512,0,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/512,0,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/512,0,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/512,0,263,512/132,256/0/native.jpg b/test/data/iiif_1_1_tiled/512,0,263,512/132,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/512,0,263,512/132,256/0/native.jpg rename to test/data/iiif_1_1_tiled/512,0,263,512/132,/0/native.jpg diff --git a/test/data/iiif_1_1_files/512,256,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/512,256,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/512,256,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/512,256,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/512,512,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/512,512,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/512,512,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/512,512,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/512,512,263,512/132,256/0/native.jpg b/test/data/iiif_1_1_tiled/512,512,263,512/132,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/512,512,263,512/132,256/0/native.jpg rename to test/data/iiif_1_1_tiled/512,512,263,512/132,/0/native.jpg diff --git a/test/data/iiif_1_1_files/512,768,256,256/256,256/0/native.jpg b/test/data/iiif_1_1_tiled/512,768,256,256/256,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/512,768,256,256/256,256/0/native.jpg rename to test/data/iiif_1_1_tiled/512,768,256,256/256,/0/native.jpg diff --git a/test/data/iiif_1_1_files/768,0,7,256/7,256/0/native.jpg b/test/data/iiif_1_1_tiled/768,0,7,256/7,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/768,0,7,256/7,256/0/native.jpg rename to test/data/iiif_1_1_tiled/768,0,7,256/7,/0/native.jpg diff --git a/test/data/iiif_1_1_files/768,256,7,256/7,256/0/native.jpg b/test/data/iiif_1_1_tiled/768,256,7,256/7,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/768,256,7,256/7,256/0/native.jpg rename to test/data/iiif_1_1_tiled/768,256,7,256/7,/0/native.jpg diff --git a/test/data/iiif_1_1_files/768,512,7,256/7,256/0/native.jpg b/test/data/iiif_1_1_tiled/768,512,7,256/7,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/768,512,7,256/7,256/0/native.jpg rename to test/data/iiif_1_1_tiled/768,512,7,256/7,/0/native.jpg diff --git a/test/data/iiif_1_1_files/768,768,7,256/7,256/0/native.jpg b/test/data/iiif_1_1_tiled/768,768,7,256/7,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/768,768,7,256/7,256/0/native.jpg rename to test/data/iiif_1_1_tiled/768,768,7,256/7,/0/native.jpg diff --git a/test/data/iiif_1_1_files/full/1,1/0/native.jpg b/test/data/iiif_1_1_tiled/full/1,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/full/1,1/0/native.jpg rename to test/data/iiif_1_1_tiled/full/1,/0/native.jpg diff --git a/test/data/iiif_1_1_files/full/13,16/0/native.jpg b/test/data/iiif_1_1_tiled/full/13,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/full/13,16/0/native.jpg rename to test/data/iiif_1_1_tiled/full/13,/0/native.jpg diff --git a/test/data/iiif_1_1_files/full/2,2/0/native.jpg b/test/data/iiif_1_1_tiled/full/2,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/full/2,2/0/native.jpg rename to test/data/iiif_1_1_tiled/full/2,/0/native.jpg diff --git a/test/data/iiif_1_1_files/full/25,32/0/native.jpg b/test/data/iiif_1_1_tiled/full/25,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/full/25,32/0/native.jpg rename to test/data/iiif_1_1_tiled/full/25,/0/native.jpg diff --git a/test/data/iiif_1_1_files/full/4,4/0/native.jpg b/test/data/iiif_1_1_tiled/full/4,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/full/4,4/0/native.jpg rename to test/data/iiif_1_1_tiled/full/4,/0/native.jpg diff --git a/test/data/iiif_1_1_files/full/49,64/0/native.jpg b/test/data/iiif_1_1_tiled/full/49,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/full/49,64/0/native.jpg rename to test/data/iiif_1_1_tiled/full/49,/0/native.jpg diff --git a/test/data/iiif_1_1_files/full/7,8/0/native.jpg b/test/data/iiif_1_1_tiled/full/7,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/full/7,8/0/native.jpg rename to test/data/iiif_1_1_tiled/full/7,/0/native.jpg diff --git a/test/data/iiif_1_1_files/full/97,128/0/native.jpg b/test/data/iiif_1_1_tiled/full/97,/0/native.jpg similarity index 100% rename from test/data/iiif_1_1_files/full/97,128/0/native.jpg rename to test/data/iiif_1_1_tiled/full/97,/0/native.jpg diff --git a/test/data/iiif_no_tiles/0,0,1024,850/128,107/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/128,107/0/native.jpg deleted file mode 100644 index e0bacd02..00000000 Binary files a/test/data/iiif_no_tiles/0,0,1024,850/128,107/0/native.jpg and /dev/null differ diff --git a/test/data/iiif_no_tiles/0,0,1024,850/256,213/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/256,213/0/native.jpg deleted file mode 100644 index 6c8c5441..00000000 Binary files a/test/data/iiif_no_tiles/0,0,1024,850/256,213/0/native.jpg and /dev/null differ diff --git a/test/data/iiif_no_tiles/0,0,1024,850/32,27/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/32,27/0/native.jpg deleted file mode 100644 index f97752d8..00000000 Binary files a/test/data/iiif_no_tiles/0,0,1024,850/32,27/0/native.jpg and /dev/null differ diff --git a/test/data/iiif_no_tiles/0,0,1024,850/512,425/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/512,425/0/native.jpg deleted file mode 100644 index c3300449..00000000 Binary files a/test/data/iiif_no_tiles/0,0,1024,850/512,425/0/native.jpg and /dev/null differ diff --git a/test/data/iiif_no_tiles/0,0,1024,850/64,54/0/native.jpg b/test/data/iiif_no_tiles/0,0,1024,850/64,54/0/native.jpg deleted file mode 100644 index ad7f30c8..00000000 Binary files a/test/data/iiif_no_tiles/0,0,1024,850/64,54/0/native.jpg and /dev/null differ diff --git a/test/data/iiif_no_tiles/full/full/0/native.jpg b/test/data/iiif_no_tiles/full/full/0/native.jpg deleted file mode 100644 index dcc1d22b..00000000 Binary files a/test/data/iiif_no_tiles/full/full/0/native.jpg and /dev/null differ diff --git a/test/formats.js b/test/formats.js index 9cabf816..7a54048f 100644 --- a/test/formats.js +++ b/test/formats.js @@ -77,12 +77,27 @@ // ---------- asyncTest('IIIF 1.1 JSON', function() { - testOpen('iiif1_1.json'); + testOpen('iiif_1_1_tiled.json'); }); - // ---------- - asyncTest('IIIF No Tiles', function() { - testOpen('iiif_no_tiles.json'); + // ---------- + asyncTest('IIIF No Tiles, Less than 256', function() { + testOpen('iiif_1_1_no_tiles_255.json'); + }); + + // ---------- + asyncTest('IIIF No Tiles, Bet. 256 and 512', function() { + testOpen('iiif_1_1_no_tiles_384.json'); + }); + + // ---------- + asyncTest('IIIF No Tiles, Bet. 512 and 1024', function() { + testOpen('iiif_1_1_no_tiles_768.json'); + }); + + // ---------- + asyncTest('IIIF No Tiles, Larger than 1024', function() { + testOpen('iiif_1_1_no_tiles_1048.json'); }); })();