From 4c9b70fa5c21c86204f57b6dcd517756f1a293d1 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 21 Feb 2013 16:47:10 +0100
Subject: [PATCH] Move useLowResolutionTiles from layer renderer to tile source

---
 .../canvas/canvastilelayerrenderer.js         |  2 +-
 src/ol/renderer/dom/domtilelayerrenderer.js   |  2 +-
 src/ol/renderer/layerrenderer.js              | 23 -------------------
 .../renderer/webgl/webgltilelayerrenderer.js  |  2 +-
 src/ol/source/tilesource.js                   | 19 +++++++++++++++
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js
index c60ef7e49a..8cd80ac388 100644
--- a/src/ol/renderer/canvas/canvastilelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js
@@ -199,7 +199,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
   }
 
   this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
-  this.useLowResolutionTiles(tileSource, z, frameState.extent);
+  tileSource.useLowResolutionTiles(z, frameState.extent);
   this.scheduleExpireCache(frameState, tileSource);
 
   var transform = this.transform_;
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
index 3821f2a22b..81c50f779e 100644
--- a/src/ol/renderer/dom/domtilelayerrenderer.js
+++ b/src/ol/renderer/dom/domtilelayerrenderer.js
@@ -217,7 +217,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
   }
 
   this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
-  this.useLowResolutionTiles(tileSource, z, frameState.extent);
+  tileSource.useLowResolutionTiles(z, frameState.extent);
   this.scheduleExpireCache(frameState, tileSource);
 
 };
diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js
index beb91f376a..f1477ac8d7 100644
--- a/src/ol/renderer/layerrenderer.js
+++ b/src/ol/renderer/layerrenderer.js
@@ -3,7 +3,6 @@ goog.provide('ol.renderer.Layer');
 goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('ol.Attribution');
-goog.require('ol.Extent');
 goog.require('ol.FrameState');
 goog.require('ol.Image');
 goog.require('ol.ImageState');
@@ -259,25 +258,3 @@ ol.renderer.Layer.prototype.updateWantedTiles =
   }
   wantedTiles[tileSourceKey][coordKey] = true;
 };
-
-
-/**
- * @protected
- * @param {ol.source.TileSource} tileSource Tile source.
- * @param {number} z Z.
- * @param {ol.Extent} extent Extent.
- */
-ol.renderer.Layer.prototype.useLowResolutionTiles =
-    function(tileSource, z, extent) {
-  var tileGrid = tileSource.getTileGrid();
-  var tileRange, x, y, zKey;
-  // FIXME this should loop up to tileGrid's minZ when implemented
-  for (; z >= 0; --z) {
-    tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z);
-    for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
-      for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
-        tileSource.useTile(new ol.TileCoord(z, x, y));
-      }
-    }
-  }
-};
diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js
index 0e939f8665..16df44aa6d 100644
--- a/src/ol/renderer/webgl/webgltilelayerrenderer.js
+++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js
@@ -459,7 +459,7 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
   }
 
   this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
-  this.useLowResolutionTiles(tileSource, z, frameState.extent);
+  tileSource.useLowResolutionTiles(z, frameState.extent);
   this.scheduleExpireCache(frameState, tileSource);
 
   goog.vec.Mat4.makeIdentity(this.texCoordMatrix_);
diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js
index 2199511127..2afd321a1b 100644
--- a/src/ol/source/tilesource.js
+++ b/src/ol/source/tilesource.js
@@ -121,6 +121,25 @@ ol.source.TileSource.prototype.getTileGrid = function() {
 };
 
 
+/**
+ * @param {number} z Z.
+ * @param {ol.Extent} extent Extent.
+ */
+ol.source.TileSource.prototype.useLowResolutionTiles = function(z, extent) {
+  var tileGrid = this.getTileGrid();
+  var tileRange, x, y, zKey;
+  // FIXME this should loop up to tileGrid's minZ when implemented
+  for (; z >= 0; --z) {
+    tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z);
+    for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
+      for (y = tileRange.minY; y <= tileRange.maxY; ++y) {
+        this.useTile(new ol.TileCoord(z, x, y));
+      }
+    }
+  }
+};
+
+
 /**
  * Marks a tile coord as being used, without triggering a load.
  * @param {ol.TileCoord} tileCoord Tile coordinate.