Only require IIIF level 1; Vary tile size based on src image when no tiles are reported. Toward openseadragon/openseadragon#313

src/iiif1_1tilesource.js

@@ -68,7 +68,7 @@ $.IIIF1_1TileSource = function( options ){
         // dimension
 
         var short_dim = Math.min(this.height, this.width),
-            tile_options = [128,256,512,1024],
+            tile_options = [256,512,1024],
             smaller_tiles = [];
 
             for ( var c = 0; c < tile_options.length; c++ ) {
@@ -76,13 +76,20 @@ $.IIIF1_1TileSource = function( options ){
                     smaller_tiles.push(tile_options[c]);
                 }
             }
-        options.tileSize = Math.max.apply(null, smaller_tiles);
 
+        if ( smaller_tiles.length > 0 ) {
+            options.tileSize = Math.max.apply(null, smaller_tiles);
+        } else {
+            // If we're smaller than 256, just use the short side.
+            options.tileSize = short_dim;
+        }
+        this.tile_width = options.tileSize;  // So that 'full' gets used for 
+        this.tile_height = options.tileSize; // the region below
     }
 
     if (! options.maxLevel ) {
-        var mf = -1
-;        var scfs = this.scale_factors || this.scale_factor;
+        var mf = -1;
+        var scfs = this.scale_factors || this.scale_factor;
         if ( scfs instanceof Array ) {
             for ( var i = 0; i < scfs.length; i++ ) {
                 var cf = Number( scfs[i] );
@@ -165,7 +172,7 @@ $.extend( $.IIIF1_1TileSource.prototype, $.TileSource.prototype, /** @lends Open
             uri;
 
         if ( level_width < this.tile_width && level_height < this.tile_height ){
-            iiif_size = level_width + "," + level_height;
+            iiif_size = level_width + ",";
             iiif_region = 'full';
         } else {
             iiif_tile_x = x * iiif_tile_size_width;
@@ -173,12 +180,7 @@ $.extend( $.IIIF1_1TileSource.prototype, $.TileSource.prototype, /** @lends Open
             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 );
 
-            if( (this.profile &&
-                this.profile == "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1" ) ){
-                iiif_size = Math.ceil(iiif_tile_w * scale) + ",";
-            } else {
-                iiif_size = Math.ceil(iiif_tile_w * scale) + "," +  Math.ceil(iiif_tile_h * scale);
-            }
+            iiif_size = Math.ceil(iiif_tile_w * scale) + ",";
 
             iiif_region = [ iiif_tile_x, iiif_tile_y, iiif_tile_w, iiif_tile_h ].join(',');
         }

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"
+}

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"
+}

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"
+}

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"
 }
-

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"
 }

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');
     });
 
 })();