Merge pull request #30 from mejackreed/respect-tile-size

respect tileSize key from info.json
mejackreed · Sep 16, 2015 · 05613df · 05613df
2 parents 31de935 + e449501
commit 05613df
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/leaflet-iiif.js b/leaflet-iiif.js
@@ -16,6 +16,12 @@ L.TileLayer.Iiif = L.TileLayer.extend({
     if (options.maxZoom) {
       this._customMaxZoom = true;
     }
+
+    // Check for explicit tileSize set
+    if (options.tileSize) {
+      this._explicitTileSize = true;
+    }
+
     options = L.setOptions(this, options);
     this._infoDeferred = new $.Deferred();
     this._infoUrl = url;
@@ -128,6 +134,17 @@ L.TileLayer.Iiif = L.TileLayer.extend({
             break;
         }
 
+        // Unless an explicit tileSize is set, use a preferred tileSize
+        if (!_this.explicitTileSize) {
+          if (data.tiles) {
+            // Image API 2.0 Case
+            _this.options.tileSize = data.tiles[0].width;
+          } else if (data.tile_width){
+            // Image API 1.1 Case
+            _this.options.tileSize = data.tile_width;
+          }
+        }
+
         ceilLog2 = function(x) {
           return Math.ceil(Math.log(x) / Math.LN2);
         };