From 8ae1edfd480b5b476cc206f797e3c86cb3eb0eb9 Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Tue, 17 Dec 2019 16:22:48 +0100 Subject: [PATCH 1/9] Add support for IIIF Image API 3.0 beta --- src/iiiftilesource.js | 76 ++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 49fbc1e9..33e26d72 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -59,6 +59,8 @@ $.IIIFTileSource = function( options ){ this.tileFormat = this.tileFormat || 'jpg'; + this.version = options.version; + // N.B. 2.0 renamed scale_factors to scaleFactors if ( this.tile_width && this.tile_height ) { options.tileWidth = this.tile_width; @@ -88,7 +90,7 @@ $.IIIFTileSource = function( options ){ } } } - } else if ( canBeTiled(options.profile) ) { + } else if ( canBeTiled(options) ) { // use the largest of tileOptions that is smaller than the short dimension var shortDim = Math.min( this.height, this.width ), tileOptions = [256, 512, 1024], @@ -201,11 +203,42 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea var options = configureFromXml10( data ); options['@context'] = "http://iiif.io/api/image/1.0/context.json"; options['@id'] = url.replace('/info.xml', ''); + options.version = 1; return options; } else { if ( !data['@context'] ) { data['@context'] = 'http://iiif.io/api/image/1.0/context.json'; data['@id'] = url.replace('/info.json', ''); + data.version = 1; + } else { + var context = data['@context']; + if (Array.isArray(context)) { + for (var i = 0; i < context.length; i++) { + if (typeof context[i] === 'string' && + ( /^http:\/\/iiif\.io\/api\/image\/[0-2]\/context\.json$/.test(context[i]) || + context[i] === 'http://library.stanford.edu/iiif/image-api/1.1/context.json' ) ) { + context = context[i]; + break; + } + } + } + switch (data['@context']) { + case 'http://iiif.io/api/image/1/context.json': + case 'http://library.stanford.edu/iiif/image-api/1.1/context.json': + data.version = 1; + break; + case 'http://iiif.io/api/image/2/context.json': + data.version = 2; + break; + case 'http://iiif.io/api/image/3/context.json': + data.version = 3; + break; + default: + // unexpected context + } + } + if ( !data['@id'] && data['id'] ) { + data['@id'] = data['id']; } if(data.preferredFormats) { for (var f = 0; f < data.preferredFormats.length; f++ ) { @@ -350,25 +383,22 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea iiifTileH, iiifSize, iiifSizeW, + iiifSizeH, iiifQuality, - uri, - isv1; + uri; tileWidth = this.getTileWidth(level); tileHeight = this.getTileHeight(level); iiifTileSizeWidth = Math.ceil( tileWidth / scale ); iiifTileSizeHeight = Math.ceil( tileHeight / scale ); - isv1 = ( this['@context'].indexOf('/1.0/context.json') > -1 || - this['@context'].indexOf('/1.1/context.json') > -1 || - this['@context'].indexOf('/1/context.json') > -1 ); - if (isv1) { + if (this.version === 1) { iiifQuality = "native." + this.tileFormat; } else { iiifQuality = "default." + this.tileFormat; } if ( levelWidth < tileWidth && levelHeight < tileHeight ){ - if ( isv1 || levelWidth !== this.width ) { - iiifSize = levelWidth + ","; + if ( this.version === 1 || levelWidth !== this.width ) { + iiifSize = levelWidth + "," + ( this.version === 3 ? levelHeight : "" ); } else { iiifSize = "max"; } @@ -384,10 +414,11 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea iiifRegion = [ iiifTileX, iiifTileY, iiifTileW, iiifTileH ].join( ',' ); } iiifSizeW = Math.ceil( iiifTileW * scale ); - if ( (!isv1) && iiifSizeW === this.width ) { + iiifSizeH = Math.ceil( iiifTileH * scale ); + if ( this.version !== 1 && iiifSizeW === this.width && ( this.version !== 3 || iiifSizeH === this.height ) ) { iiifSize = "max"; } else { - iiifSize = iiifSizeW + ","; + iiifSize = iiifSizeW + "," + ( this.version === 3 ? iiifSizeH : "" ); } } uri = [ this['@id'], iiifRegion, iiifSize, IIIF_ROTATION, iiifQuality ].join( '/' ); @@ -403,18 +434,23 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea * @param {array} profile - IIIF profile array * @throws {Error} */ - function canBeTiled ( profile ) { + function canBeTiled ( options ) { var level0Profiles = [ "http://library.stanford.edu/iiif/image-api/compliance.html#level0", "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0", - "http://iiif.io/api/image/2/level0.json" + "http://iiif.io/api/image/2/level0.json", + "level0", + "https://iiif.io/api/image/3/level0.json" ]; - var isLevel0 = (level0Profiles.indexOf(profile[0]) !== -1); - var hasSizeByW = false; - if ( profile.length > 1 && profile[1].supports ) { - hasSizeByW = profile[1].supports.indexOf( "sizeByW" ) !== -1; + var isLevel0 = (level0Profiles.indexOf(options.profile[0]) !== -1); + var hasCanoncicalSizeFeature = false; + if ( options.version === 2 && options.profile.length > 1 && options.profile[1].supports ) { + hasCanoncicalSizeFeature = options.profile[1].supports.indexOf( "sizeByW" ) !== -1; } - return !isLevel0 || hasSizeByW; + if ( options.version === 3 && options.extraFeatures ) { + hasCanoncicalSizeFeature = options.extraFeatures.indexOf( "sizeByWh" ) !== -1; + } + return !isLevel0 || hasCanoncicalSizeFeature; } /** @@ -427,7 +463,9 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea var levels = []; for(var i = 0; i < options.sizes.length; i++) { levels.push({ - url: options['@id'] + '/full/' + options.sizes[i].width + ',/0/default.' + options.tileFormat, + url: options['@id'] + '/full/' + options.sizes[i].width + ',' + + (options.version === 3 ? options.sizes[i].height : '') + + '/0/default.' + options.tileFormat, width: options.sizes[i].width, height: options.sizes[i].height }); From 07cb95e99b3295de0d67b8337c574c0e282a5ff8 Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Tue, 17 Dec 2019 17:58:57 +0100 Subject: [PATCH 2/9] Improve code readability --- src/iiiftilesource.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 33e26d72..9fd481ae 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -397,10 +397,12 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea iiifQuality = "default." + this.tileFormat; } if ( levelWidth < tileWidth && levelHeight < tileHeight ){ - if ( this.version === 1 || levelWidth !== this.width ) { - iiifSize = levelWidth + "," + ( this.version === 3 ? levelHeight : "" ); - } else { + if ( levelWidth === this.width && this.version !== 1 ) { iiifSize = "max"; + } else if ( this.version === 3 ) { + iiifSize = levelWidth + "," + levelHeight; + } else { + iiifSize = levelWidth + ","; } iiifRegion = 'full'; } else { @@ -417,8 +419,10 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea iiifSizeH = Math.ceil( iiifTileH * scale ); if ( this.version !== 1 && iiifSizeW === this.width && ( this.version !== 3 || iiifSizeH === this.height ) ) { iiifSize = "max"; + } else if (this.version === 3) { + iiifSize = iiifSizeW + "," + iiifSizeH; } else { - iiifSize = iiifSizeW + "," + ( this.version === 3 ? iiifSizeH : "" ); + iiifSize = iiifSizeW + ","; } } uri = [ this['@id'], iiifRegion, iiifSize, IIIF_ROTATION, iiifQuality ].join( '/' ); From ddf42bf2248f071a8c33e88f718b80c57001c5d6 Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Wed, 18 Dec 2019 17:07:40 +0100 Subject: [PATCH 3/9] Improve clarity and remove error in IIIF size param determination --- src/iiiftilesource.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 9fd481ae..2f07f461 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -397,7 +397,9 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea iiifQuality = "default." + this.tileFormat; } if ( levelWidth < tileWidth && levelHeight < tileHeight ){ - if ( levelWidth === this.width && this.version !== 1 ) { + if ( this.version === 2 && levelWidth === this.width ) { + iiifSize = "max"; + } else if ( this.version === 3 && levelWidth === this.width && levelHeight === this.height ) { iiifSize = "max"; } else if ( this.version === 3 ) { iiifSize = levelWidth + "," + levelHeight; @@ -417,7 +419,9 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea } iiifSizeW = Math.ceil( iiifTileW * scale ); iiifSizeH = Math.ceil( iiifTileH * scale ); - if ( this.version !== 1 && iiifSizeW === this.width && ( this.version !== 3 || iiifSizeH === this.height ) ) { + if ( this.version === 2 && iiifSizeW === this.width ) { + iiifSize = "max"; + } else if ( this.version === 3 && iiifSizeW === this.width && iiifSizeH === this.height ) { iiifSize = "max"; } else if (this.version === 3) { iiifSize = iiifSizeW + "," + iiifSizeH; From e851620df4ae25c8f37b41de57f65cf557ef6567 Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Wed, 18 Dec 2019 17:52:00 +0100 Subject: [PATCH 4/9] Add some unit tests for the handling of different IIIF versions --- test/modules/iiif.js | 101 +++++++++++++++++++++++++++++++++++++++++++ test/test.html | 1 + 2 files changed, 102 insertions(+) create mode 100644 test/modules/iiif.js diff --git a/test/modules/iiif.js b/test/modules/iiif.js new file mode 100644 index 00000000..ab9ece03 --- /dev/null +++ b/test/modules/iiif.js @@ -0,0 +1,101 @@ +(function() { + + var id = "http://example.com/identifier"; + + var configure = function(data) { + return OpenSeadragon.IIIFTileSource.prototype.configure.apply( + new OpenSeadragon.TileSource(), [ data, 'http://example.com/identifier' ] + ); + }; + + var infoXml10level0 = new DOMParser().parseFromString('' + + '' + + 'http://example.com/identifier' + + '6000' + + '4000' + + '' + + '1' + + '2' + + '4' + + '' + + 'http://library.stanford.edu/iiif/image-api/compliance.html#level0' + + '', + 'text/xml' + ), + infoXml10level0sizeByW, + infoXml10level1, + infoJson10level0 = { + "identifier": id, + "width": 200, + "height": 100, + "profile" : "http://library.stanford.edu/iiif/image-api/compliance.html#level0" + }, + infoJson10level0sizeByW, + infoJson10level1, + infoJson11level0 = { + "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", + "@id": id, + "width": 200, + "height": 100, + "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0" + }, + infoJson11level0sizeByW, + infoJson11level1, + infoJson2level0 = { + "@context": "http://iiif.io/api/image/2/context.json", + "@id": id, + "width": 200, + "height": 100, + "profile": ["http://iiif.io/api/image/2/level0.json"] + }, + infoJson2level0sizeByW, + infoJson2level1, + infoJson3level0 = { + "@context": "http://iiif.io/api/image/3/context.json", + "id": id, + "width": 200, + "height": 100, + "profile": "level0" + }, + infoJson3level0ContextExtension = { + "@context": [ + "http://iiif.io/api/image/3/context.json", + { + "example": "http://example.com/vocab" + } + ], + "id": id, + "width": 200, + "height": 100, + "profile": "level0" + }, + infoJson3level0sizeByW, + infoJson3level1; + + QUnit.test('IIIFTileSource.configure determins correct version', function(assert) { + var options1_0xml = configure(infoXml10level0); + assert.ok(options1_0xml.version); + assert.equal(options1_0xml.version, 1, 'Version is 1 for version 1.0 info.xml'); + + var options1_0 = configure(infoJson10level0); + assert.ok(options1_0.version); + assert.equal(options1_0.version, 1, 'Version is 1 for version 1.0 info.json'); + + var options1_1 = configure(infoJson11level0); + assert.ok(options1_1.version); + assert.equal(options1_1.version, 1, 'Version is 1 for version 1.1 info.json'); + + var options2 = configure(infoJson2level0); + assert.ok(options2.version); + assert.equal(options2.version, 2, 'Version is 2 for version 2 info.json'); + + var options3 = configure(infoJson3level0); + assert.ok(options3.version); + assert.equal(options3.version, 3, 'Version is 3 for version 3 info.json'); + + var options3withContextExtension = configure(infoJson3level0ContextExtension); + assert.ok(options3withContextExtension.version); + assert.equal(options3withContextExtension.version, 3, 'Version is 3 for version 3 info.json'); + }); + +})(); diff --git a/test/test.html b/test/test.html index 786af542..c740b01c 100644 --- a/test/test.html +++ b/test/test.html @@ -44,6 +44,7 @@ + From 456567af591bdc4f77e9f88aece939ab2e5592a9 Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Wed, 18 Dec 2019 17:52:39 +0100 Subject: [PATCH 5/9] Fix error in IIIF version detection --- src/iiiftilesource.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 2f07f461..96a75bb1 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -215,14 +215,14 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea if (Array.isArray(context)) { for (var i = 0; i < context.length; i++) { if (typeof context[i] === 'string' && - ( /^http:\/\/iiif\.io\/api\/image\/[0-2]\/context\.json$/.test(context[i]) || + ( /^http:\/\/iiif\.io\/api\/image\/[1-3]\/context\.json$/.test(context[i]) || context[i] === 'http://library.stanford.edu/iiif/image-api/1.1/context.json' ) ) { context = context[i]; break; } } } - switch (data['@context']) { + switch (context) { case 'http://iiif.io/api/image/1/context.json': case 'http://library.stanford.edu/iiif/image-api/1.1/context.json': data.version = 1; From 11719baaafa5be0efa90f14b7c6e7e4988c88935 Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Mon, 6 Jan 2020 16:16:05 +0100 Subject: [PATCH 6/9] Expose private functions in IIIFTileSource for testing purposes --- src/iiiftilesource.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 96a75bb1..059bbe3e 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -432,6 +432,11 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea uri = [ this['@id'], iiifRegion, iiifSize, IIIF_ROTATION, iiifQuality ].join( '/' ); return uri; + }, + + __testonly__: { + canBeTiled: canBeTiled, + constructLevels: constructLevels } }); From d5d0b4ce6eb5ece0650a1c7e0b4058d6fe791c4a Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Tue, 7 Jan 2020 16:10:14 +0100 Subject: [PATCH 7/9] Add tests for IIIF, fix error in OpenSedragonIIIFTileSource.canBeTiled --- src/iiiftilesource.js | 3 +- test/modules/iiif.js | 188 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 170 insertions(+), 21 deletions(-) diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 059bbe3e..65ec3d8f 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -455,7 +455,8 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea "level0", "https://iiif.io/api/image/3/level0.json" ]; - var isLevel0 = (level0Profiles.indexOf(options.profile[0]) !== -1); + var profileLevel = Array.isArray(options.profile) ? options.profile[0] : options.profile; + var isLevel0 = (level0Profiles.indexOf(profileLevel) !== -1); var hasCanoncicalSizeFeature = false; if ( options.version === 2 && options.profile.length > 1 && options.profile[1].supports ) { hasCanoncicalSizeFeature = options.profile[1].supports.indexOf( "sizeByW" ) !== -1; diff --git a/test/modules/iiif.js b/test/modules/iiif.js index ab9ece03..3c98e24b 100644 --- a/test/modules/iiif.js +++ b/test/modules/iiif.js @@ -8,6 +8,11 @@ ); }; + var getSource = function( data ) { + var options = configure( data ); + return new OpenSeadragon.IIIFTileSource( options ); + }; + var infoXml10level0 = new DOMParser().parseFromString('' + '' + 'http://example.com/identifier' + @@ -22,39 +27,84 @@ '', 'text/xml' ), - infoXml10level0sizeByW, - infoXml10level1, + infoXml10level1 = new DOMParser().parseFromString('' + + '' + + 'http://example.com/identifier' + + '6000' + + '4000' + + 'http://library.stanford.edu/iiif/image-api/compliance.html#level1' + + '', + 'text/xml' + ), infoJson10level0 = { "identifier": id, - "width": 200, - "height": 100, + "width": 2000, + "height": 1000, "profile" : "http://library.stanford.edu/iiif/image-api/compliance.html#level0" }, - infoJson10level0sizeByW, - infoJson10level1, + infoJson10level1 = { + "identifier": id, + "width": 2000, + "height": 1000, + "profile" : "http://library.stanford.edu/iiif/image-api/compliance.html#level1" + }, infoJson11level0 = { "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", "@id": id, - "width": 200, - "height": 100, + "width": 2000, + "height": 1000, "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0" }, - infoJson11level0sizeByW, - infoJson11level1, + infoJson11level1 = { + "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", + "@id": id, + "width": 2000, + "height": 1000, + "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1" + }, + infoJson11level1WithTiles = { + "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json", + "@id": id, + "width": 2000, + "height": 1000, + "tile_width": 512, + "tile_height": 256, + "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1" + }, infoJson2level0 = { "@context": "http://iiif.io/api/image/2/context.json", "@id": id, - "width": 200, - "height": 100, + "width": 2000, + "height": 1000, + "sizes": [ + { width: 2000, height: 1000 }, + { width: 1000, height: 500 } + ], "profile": ["http://iiif.io/api/image/2/level0.json"] }, - infoJson2level0sizeByW, - infoJson2level1, + infoJson2level0sizeByW = { + "@context": "http://iiif.io/api/image/2/context.json", + "@id": id, + "width": 2000, + "height": 1000, + "profile": ["http://iiif.io/api/image/2/level0.json", {"supports": "sizeByW"} ] + }, + infoJson2level1 = { + "@context": "http://iiif.io/api/image/2/context.json", + "@id": id, + "width": 2000, + "height": 1000, + "profile": ["http://iiif.io/api/image/2/level1.json"] + }, infoJson3level0 = { "@context": "http://iiif.io/api/image/3/context.json", "id": id, - "width": 200, - "height": 100, + "width": 2000, + "height": 1000, + "sizes": [ + { width: 2000, height: 1000 }, + { width: 1000, height: 500 } + ], "profile": "level0" }, infoJson3level0ContextExtension = { @@ -65,12 +115,33 @@ } ], "id": id, - "width": 200, - "height": 100, + "width": 2000, + "height": 1000, "profile": "level0" }, - infoJson3level0sizeByW, - infoJson3level1; + infoJson3level0sizeByW = { + "@context": "http://iiif.io/api/image/3/context.json", + "id": id, + "width": 2000, + "height": 1000, + "profile": "level0", + "extraFeatures": "sizeByW" + }, + infoJson3level0sizeByWh = { + "@context": "http://iiif.io/api/image/3/context.json", + "id": id, + "width": 2000, + "height": 1000, + "profile": "level0", + "extraFeatures": "sizeByWh" + }, + infoJson3level1 = { + "@context": "http://iiif.io/api/image/3/context.json", + "id": id, + "width": 2000, + "height": 1000, + "profile": "level1" + }; QUnit.test('IIIFTileSource.configure determins correct version', function(assert) { var options1_0xml = configure(infoXml10level0); @@ -98,4 +169,81 @@ assert.equal(options3withContextExtension.version, 3, 'Version is 3 for version 3 info.json'); }); + QUnit.test('IIIFTileSource private function canBeTiled works as expected', function(assert) { + var canBeTiled = function( data ) { + var source = getSource( data ); + return source.__testonly__.canBeTiled( source ); + }; + + assert.notOk(canBeTiled(infoXml10level0)); + assert.ok(canBeTiled(infoXml10level1)); + assert.notOk(canBeTiled(infoJson10level0)); + assert.ok(canBeTiled(infoJson10level1)); + assert.notOk(canBeTiled(infoJson11level0)); + assert.ok(canBeTiled(infoJson11level1)); + assert.notOk(canBeTiled(infoJson2level0)); + assert.ok(canBeTiled(infoJson2level0sizeByW)); + assert.ok(canBeTiled(infoJson2level1)); + assert.notOk(canBeTiled(infoJson3level0)); + assert.notOk(canBeTiled(infoJson3level0sizeByW)); + assert.ok(canBeTiled(infoJson3level0sizeByWh)); + assert.ok(canBeTiled(infoJson3level1)); + }); + + QUnit.test('IIIFTileSource private function constructLevels creates correct URLs for legacy pyramid', function( assert ) { + var constructLevels = function( data ) { + var source = getSource( data ); + return source.__testonly__.constructLevels( source ); + }; + var levelsVersion2 = constructLevels(infoJson2level0); + assert.ok(Array.isArray(levelsVersion2)); + assert.equal(levelsVersion2.length, 2, 'Constructed levels contain 2 entries'); + assert.equal(levelsVersion2[0].url, 'http://example.com/identifier/full/1000,/0/default.jpg'); + assert.equal(levelsVersion2[1].url, 'http://example.com/identifier/full/2000,/0/default.jpg'); + // FIXME see below + // assert.equal(levelsVersion2[1].url, 'http://example.com/identifier/full/full/0/default.jpg'); + + var levelsVersion3 = constructLevels(infoJson3level0); + assert.ok(Array.isArray(levelsVersion3)); + assert.equal(levelsVersion3.length, 2, 'Constructed levels contain 2 entries'); + assert.equal(levelsVersion3[0].url, 'http://example.com/identifier/full/1000,500/0/default.jpg'); + assert.equal(levelsVersion3[1].url, 'http://example.com/identifier/full/2000,1000/0/default.jpg'); + /* + * FIXME: following https://iiif.io/api/image/3.0/#47-canonical-uri-syntax and + * https://iiif.io/api/image/2.1/#canonical-uri-syntax, I'd expect 'max' to be required to + * be served by a level 0 compliant service instead of 'w,h', 'full' instead of 'w,' respectivley. + */ + //assert.equal(levelsVersion3[1].url, 'http://example.com/identifier/full/max/0/default.jpg'); + }); + + QUnit.test('IIIFTileSource.getTileUrl returns the correct URLs', function( assert ) { + var source11Level1 = getSource(infoJson11level1); + assert.equal(source11Level1.getTileUrl(0, 0, 0), "http://example.com/identifier/full/8,/0/native.jpg"); + assert.equal(source11Level1.getTileUrl(7, 0, 0), "http://example.com/identifier/0,0,1024,1000/512,/0/native.jpg"); + assert.equal(source11Level1.getTileUrl(7, 1, 0), "http://example.com/identifier/1024,0,976,1000/488,/0/native.jpg"); + assert.equal(source11Level1.getTileUrl(8, 0, 0), "http://example.com/identifier/0,0,512,512/512,/0/native.jpg"); + + var source2Level1 = getSource(infoJson2level1); + assert.equal(source2Level1.getTileUrl(0, 0, 0), "http://example.com/identifier/full/8,/0/default.jpg"); + assert.equal(source2Level1.getTileUrl(7, 0, 0), "http://example.com/identifier/0,0,1024,1000/512,/0/default.jpg"); + assert.equal(source2Level1.getTileUrl(7, 1, 0), "http://example.com/identifier/1024,0,976,1000/488,/0/default.jpg"); + assert.equal(source2Level1.getTileUrl(8, 0, 0), "http://example.com/identifier/0,0,512,512/512,/0/default.jpg"); + assert.equal(source2Level1.getTileUrl(8, 3, 0), "http://example.com/identifier/1536,0,464,512/464,/0/default.jpg"); + assert.equal(source2Level1.getTileUrl(8, 0, 1), "http://example.com/identifier/0,512,512,488/512,/0/default.jpg"); + assert.equal(source2Level1.getTileUrl(8, 3, 1), "http://example.com/identifier/1536,512,464,488/464,/0/default.jpg"); + + var source2Level0 = getSource(infoJson2level0); + assert.equal(source2Level0.getTileUrl(0, 0, 0), "http://example.com/identifier/full/1000,/0/default.jpg"); + assert.equal(source2Level0.getTileUrl(1, 0, 0), "http://example.com/identifier/full/2000,/0/default.jpg"); + + var source3Level1 = getSource(infoJson3level1); + assert.equal(source3Level1.getTileUrl(0, 0, 0), "http://example.com/identifier/full/8,4/0/default.jpg"); + assert.equal(source3Level1.getTileUrl(7, 0, 0), "http://example.com/identifier/0,0,1024,1000/512,500/0/default.jpg"); + assert.equal(source3Level1.getTileUrl(7, 1, 0), "http://example.com/identifier/1024,0,976,1000/488,500/0/default.jpg"); + assert.equal(source3Level1.getTileUrl(8, 0, 0), "http://example.com/identifier/0,0,512,512/512,512/0/default.jpg"); + assert.equal(source3Level1.getTileUrl(8, 3, 0), "http://example.com/identifier/1536,0,464,512/464,512/0/default.jpg"); + assert.equal(source3Level1.getTileUrl(8, 0, 1), "http://example.com/identifier/0,512,512,488/512,488/0/default.jpg"); + assert.equal(source3Level1.getTileUrl(8, 3, 1), "http://example.com/identifier/1536,512,464,488/464,488/0/default.jpg"); + }); + })(); From 996cf610c35e1b11a0b5816ef65fa35a79c2d673 Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Wed, 15 Jan 2020 09:50:31 +0100 Subject: [PATCH 8/9] Add iiif.js tests to coverage.html --- test/coverage.html | 1 + 1 file changed, 1 insertion(+) diff --git a/test/coverage.html b/test/coverage.html index e2abc706..df0e9781 100644 --- a/test/coverage.html +++ b/test/coverage.html @@ -87,6 +87,7 @@ + From 8afdce3e00340fa5807b3f428cb4656d8fa70ceb Mon Sep 17 00:00:00 2001 From: Lutz Helm Date: Wed, 15 Jan 2020 09:56:45 +0100 Subject: [PATCH 9/9] Add error message if IIIF data @context property contains no IIIF context URI --- src/iiiftilesource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 65ec3d8f..f5df16fb 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -234,7 +234,7 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea data.version = 3; break; default: - // unexpected context + $.console.error('Data has a @context property which contains no known IIIF context URI.'); } } if ( !data['@id'] && data['id'] ) {