Merge pull request #1018 from ahocevar/tilemanager-image-only

UTFGrid examples broken because of TileManager. r=@bartvde
openlayers · Jul 9, 2013 · d020e8f · d020e8f
1 parent c8d4105
commit d020e8f
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/lib/OpenLayers/TileManager.js b/lib/OpenLayers/TileManager.js
@@ -8,6 +8,8 @@
  * @requires OpenLayers/Util.js
  * @requires OpenLayers/BaseTypes.js
  * @requires OpenLayers/BaseTypes/Element.js
+ * @requires OpenLayers/Layer/Grid.js
+ * @requires OpenLayers/Tile/Image.js
  */
 
 /**
@@ -300,13 +302,18 @@ OpenLayers.TileManager = OpenLayers.Class({
      * evt - {Object} The listener argument
      */
     addTile: function(evt) {
-        evt.tile.events.on({
-            beforedraw: this.queueTileDraw,
-            beforeload: this.manageTileCache,
-            loadend: this.addToCache,
-            unload: this.unloadTile,
-            scope: this
-        });        
+        if (evt.tile instanceof OpenLayers.Tile.Image) {
+            evt.tile.events.on({
+                beforedraw: this.queueTileDraw,
+                beforeload: this.manageTileCache,
+                loadend: this.addToCache,
+                unload: this.unloadTile,
+                scope: this
+            });        
+        } else {
+            // Layer has the wrong tile type, so don't handle it any longer
+            this.removeLayer({layer: evt.tile.layer});
+        }
     },
 
     /**