Rename tileUsage to usedTiles

src/ol/control/attributioncontrol.js

@@ -69,7 +69,7 @@ ol.control.Attribution.prototype.handleMapPostrender = function(mapEvent) {
   if (goog.isNull(frameState)) {
     this.updateElement_(null);
   } else {
-    this.updateElement_(frameState.tileUsage);
+    this.updateElement_(frameState.usedTiles);
   }
 };
 
@@ -94,12 +94,12 @@ ol.control.Attribution.prototype.setMap = function(map) {
 
 /**
  * @private
- * @param {?Object.<string, Object.<string, ol.TileRange>>} tileUsage Tile
+ * @param {?Object.<string, Object.<string, ol.TileRange>>} usedTiles Used
- *     usage.
+ *     tiles.
  */
-ol.control.Attribution.prototype.updateElement_ = function(tileUsage) {
+ol.control.Attribution.prototype.updateElement_ = function(usedTiles) {
 
-  if (goog.isNull(tileUsage)) {
+  if (goog.isNull(usedTiles)) {
     if (this.renderedVisible_) {
       goog.style.showElement(this.element, false);
       this.renderedVisible_ = false;
@@ -136,14 +136,14 @@ ol.control.Attribution.prototype.updateElement_ = function(tileUsage) {
   var attributions = {};
   var i, tileRanges, tileSource, tileSourceAttribution,
       tileSourceAttributionKey, tileSourceAttributions, tileSourceKey, z;
-  for (tileSourceKey in tileUsage) {
+  for (tileSourceKey in usedTiles) {
     goog.asserts.assert(tileSourceKey in tileSources);
     tileSource = tileSources[tileSourceKey];
     tileSourceAttributions = tileSource.getAttributions();
     if (goog.isNull(tileSourceAttributions)) {
       continue;
     }
-    tileRanges = tileUsage[tileSourceKey];
+    tileRanges = usedTiles[tileSourceKey];
     for (i = 0; i < tileSourceAttributions.length; ++i) {
       tileSourceAttribution = tileSourceAttributions[i];
       tileSourceAttributionKey = goog.getUid(tileSourceAttribution).toString();

src/ol/framestate.js

@@ -1,6 +1,5 @@
 // FIXME add view3DState
-// FIXME rename tileUsage to usedTiles
+// FIXME factor out common code between usedTiles and wantedTiles
-// FIXME factor out common code between tileUsage and wantedTiles
 
 goog.provide('ol.FrameState');
 goog.provide('ol.PostRenderFunction');
@@ -28,8 +27,8 @@ goog.require('ol.layer.LayerState');
  *            postRenderFunctions: Array.<ol.PostRenderFunction>,
  *            size: ol.Size,
  *            tileQueue: ol.TileQueue,
- *            tileUsage: Object.<string, Object.<string, ol.TileRange>>,
  *            time: number,
+ *            usedTiles: Object.<string, Object.<string, ol.TileRange>>,
  *            view2DState: ol.View2DState,
  *            viewHints: Array.<number>,
  *            wantedTiles: Object.<string, Object.<string, ol.TileRange>>}}

src/ol/map.js

@@ -632,8 +632,8 @@ ol.Map.prototype.renderFrame_ = function(time) {
       postRenderFunctions: [],
       size: size,
       tileQueue: this.tileQueue_,
-      tileUsage: {},
       time: time,
+      usedTiles: {},
       view2DState: view2DState,
       viewHints: viewHints,
       wantedTiles: {}

src/ol/renderer/canvas/canvastilelayerrenderer.js

@@ -216,7 +216,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
     frameState.animate = true;
   }
 
-  this.updateTileUsage(frameState.tileUsage, tileSource, z, tileRange);
+  this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
   this.updateWantedTiles(frameState.wantedTiles, tileSource, z, tileRange);
 
   var transform = this.transform_;

src/ol/renderer/dom/domtilelayerrenderer.js

@@ -237,7 +237,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
     frameState.animate = true;
   }
 
-  this.updateTileUsage(frameState.tileUsage, tileSource, z, tileRange);
+  this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
   this.updateWantedTiles(frameState.wantedTiles, tileSource, z, tileRange);
 
 };

src/ol/renderer/layerrenderer.js

@@ -130,25 +130,25 @@ ol.renderer.Layer.prototype.handleLayerVisibleChange = goog.nullFunction;
 
 /**
  * @protected
- * @param {Object.<string, Object.<string, ol.TileRange>>} tileUsage Tile usage.
+ * @param {Object.<string, Object.<string, ol.TileRange>>} usedTiles Used tiles.
  * @param {ol.source.Source} source Source.
  * @param {number} z Z.
  * @param {ol.TileRange} tileRange Tile range.
  */
-ol.renderer.Layer.prototype.updateTileUsage =
+ol.renderer.Layer.prototype.updateUsedTiles =
-    function(tileUsage, source, z, tileRange) {
+    function(usedTiles, source, z, tileRange) {
   // FIXME should we use tilesToDrawByZ instead?
   var sourceKey = goog.getUid(source).toString();
   var zKey = z.toString();
-  if (sourceKey in tileUsage) {
+  if (sourceKey in usedTiles) {
-    if (zKey in tileUsage[sourceKey]) {
+    if (zKey in usedTiles[sourceKey]) {
-      tileUsage[sourceKey][zKey].extend(tileRange);
+      usedTiles[sourceKey][zKey].extend(tileRange);
     } else {
-      tileUsage[sourceKey][zKey] = tileRange;
+      usedTiles[sourceKey][zKey] = tileRange;
     }
   } else {
-    tileUsage[sourceKey] = {};
+    usedTiles[sourceKey] = {};
-    tileUsage[sourceKey][zKey] = tileRange;
+    usedTiles[sourceKey][zKey] = tileRange;
   }
 };
 

src/ol/renderer/webgl/webgltilelayerrenderer.js

@@ -460,7 +460,7 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
 
   }
 
-  this.updateTileUsage(frameState.tileUsage, tileSource, z, tileRange);
+  this.updateUsedTiles(frameState.usedTiles, tileSource, z, tileRange);
   this.updateWantedTiles(frameState.wantedTiles, tileSource, z, tileRange);
 
   goog.vec.Mat4.makeIdentity(this.matrix_);