Merge branch 'master' into Button-Event-Signatures

changelog.txt

@@ -20,6 +20,7 @@ OPENSEADRAGON CHANGELOG
 * MouseTracker now passes the original event objects to its handler methods (#23)
 * MouseTracker now supports an optional 'moveHandler' method for tracking mousemove events (#215)
 * Fixed: Element-relative mouse coordinates now correct if the element and/or page is scrolled (using new OpenSeadragon.getElementOffset() method) (#131)
+* Added IIIF Image API 1.1 Tile Source (#230)
 * Fixed: Touch event issue where no canvas-click events were being raised (#240)
 
 0.9.131:

src/iiiftilesource.js

@@ -169,7 +169,7 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, {
             scale = Math.pow( 0.5, this.maxLevel - level ),
 
             //## get iiif size
-            iiif_size = 'pct:' + ( scale * 100 ),
+            // iiif_size = 'pct:' + ( scale * 100 ),
 
             //# image dimensions at this level
             level_width = Math.ceil( this.width * scale ),
@@ -182,16 +182,19 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, {
             iiif_tile_x,
             iiif_tile_y,
             iiif_tile_w,
-            iiif_tile_h;
+            iiif_tile_h,
+            iiif_size;
 
 
         if ( level_width < this.tile_width && level_height < this.tile_height ){
+            iiif_size = level_width + ","; // + level_height; only one dim. for IIIF level 1 compliance
             iiif_region = '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) + ",";
             iiif_region = [ iiif_tile_x, iiif_tile_y, iiif_tile_w, iiif_tile_h ].join(',');
         }
 

test/data/iiif1_0.json

@@ -1,13 +1,14 @@
 {
-  "identifier": "pudl0001/4609321/s42/00000001",
-  "width": 2584,
-  "height": 3600,
+  "identifier": "iiif_1_0_files",
+  "width": 775,
+  "height": 1024,
   "scale_factors": [
     1,
     2,
     3,
     4,
-    5
+    5,
+    6
   ],
   "tile_width": 256,
   "tile_height": 256,
@@ -21,6 +22,5 @@
     "grey",
     "color"
   ],
-  "profile": "http://library.stanford.edu/iiif/image-api/compliance.html#level1",
-  "image_host":   "http://lorisimg.princeton.edu/loris"
+  "profile": "http://library.stanford.edu/iiif/image-api/compliance.html#level1"
 }

test/data/iiif1_0.xml

@@ -1 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?><info xmlns="http://library.stanford.edu/iiif/image-api/ns/"><identifier>pudl0001/4609321/s42/00000001</identifier><width>2584</width><height>3600</height><scale_factors><scale_factor>1</scale_factor><scale_factor>2</scale_factor><scale_factor>3</scale_factor><scale_factor>4</scale_factor><scale_factor>5</scale_factor></scale_factors><tile_width>256</tile_width><tile_height>256</tile_height><formats><format>jpg</format><format>png</format></formats><qualities><quality>native</quality><quality>bitonal</quality><quality>grey</quality><quality>color</quality></qualities><profile>http://library.stanford.edu/iiif/image-api/compliance.html#level1</profile><image_host>http://lorisimg.princeton.edu/loris</image_host></info>
+<info xmlns="http://library.stanford.edu/iiif/image-api/ns/">
+  <identifier>iiif_1_0_files</identifier>
+  <width>775</width>
+  <height>1024</height>
+  <scale_factors>
+    <scale_factor>1</scale_factor>
+    <scale_factor>2</scale_factor>
+    <scale_factor>3</scale_factor>
+    <scale_factor>4</scale_factor>
+    <scale_factor>5</scale_factor>
+    <scale_factor>6</scale_factor>
+  </scale_factors>
+  <tile_width>256</tile_width>
+  <tile_height>256</tile_height>
+  <formats>
+    <format>jpg</format>
+    <format>png</format>
+  </formats>
+  <qualities>
+    <quality>native</quality>
+    <quality>bitonal</quality>
+    <quality>grey</quality>
+    <quality>color</quality>
+  </qualities>
+  <profile>http://library.stanford.edu/iiif/image-api/compliance.html#level1</profile>
+</info>

test/data/iiif1_1.json

@@ -5,11 +5,12 @@
     2,
     4,
     8,
-    16
+    16,
+    32
   ],
   "tile_height": 256,
-  "height": 3600,
-  "width": 2584,
+  "height": 1024,
+  "width": 775,
   "tile_width": 256,
   "qualities": [
     "native",
@@ -23,5 +24,5 @@
     "gif"
   ],
   "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json",
-  "@id": "http://libimages.princeton.edu/loris/pudl0071%2F4055459%2F01%2F00000030.jp2"
+  "@id": "http://localhost:8000/test/data/iiif_1_1_files"
 }