ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove use of goog.object.getKeys

Browse Source
This commit is contained in:
Frederic Junod
2015-09-29 11:15:47 +02:00
parent 23de622d29
commit d2dd7584d8
9 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvastilelayerrenderer.js
+1 -2
View File
@@ -5,7 +5,6 @@ goog.provide('ol.renderer.canvas.TileLayer');
goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.object');
goog.require('goog.vec.Mat4');
goog.require('ol.Size');
goog.require('ol.TileRange');
@@ -354,7 +353,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
}
/** @type {Array.<number>} */
var zs = goog.object.getKeys(tilesToDrawByZ).map(Number);
var zs = Object.keys(tilesToDrawByZ).map(Number);
goog.array.sort(zs);
var opaque = tileSource.getOpaque();
var origin = ol.extent.getTopLeft(tileGrid.getTileCoordExtent(
src/ol/renderer/dom/domtilelayerrenderer.js
+3 -4
View File
@@ -7,7 +7,6 @@ goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.object');
goog.require('goog.style');
goog.require('goog.vec.Mat4');
goog.require('ol');
@@ -59,7 +58,7 @@ ol.renderer.dom.TileLayer = function(tileLayer) {
/**
* @private
* @type {Object.<number, ol.renderer.dom.TileLayerZ_>}
* @type {!Object.<number, ol.renderer.dom.TileLayerZ_>}
*/
this.tileLayerZs_ = {};
@@ -172,7 +171,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
}
/** @type {Array.<number>} */
var zs = goog.object.getKeys(tilesToDrawByZ).map(Number);
var zs = Object.keys(tilesToDrawByZ).map(Number);
goog.array.sort(zs);
/** @type {Object.<number, boolean>} */
@@ -198,7 +197,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
}
/** @type {Array.<number>} */
var tileLayerZKeys = goog.object.getKeys(this.tileLayerZs_).map(Number);
var tileLayerZKeys = Object.keys(this.tileLayerZs_).map(Number);
goog.array.sort(tileLayerZKeys);
var i, ii, j, origin, resolution;
src/ol/renderer/webgl/webgltilelayerrenderer.js
+1 -2
View File
@@ -5,7 +5,6 @@ goog.provide('ol.renderer.webgl.TileLayer');
goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.object');
goog.require('goog.vec.Mat4');
goog.require('goog.vec.Vec4');
goog.require('goog.webgl');
@@ -286,7 +285,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
}
/** @type {Array.<number>} */
var zs = goog.object.getKeys(tilesToDrawByZ).map(Number);
var zs = Object.keys(tilesToDrawByZ).map(Number);
goog.array.sort(zs);
var u_tileOffset = goog.vec.Vec4.createFloat32();
var i, ii, sx, sy, tileKey, tilesToDraw, tx, ty;