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

Merge pull request #4188 from fredj/rm_goog_object_getKeys

Browse Source 
Remove use of goog.object.getKeys
This commit is contained in:
Frédéric Junod
2015-09-29 17:33:13 +02:00
parent 8209ed0a4c d2dd7584d8
commit fd729216b5
10 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/render/canvas/canvasimmediate.js
View File

@@ -6,7 +6,6 @@ goog.provide('ol.render.canvas.Immediate');
goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.object');
goog.require('goog.vec.Mat4');
goog.require('ol.color');
goog.require('ol.extent');
@@ -41,7 +40,7 @@ ol.render.canvas.Immediate =
/**
* @private
* @type {Object.<string,
* @type {!Object.<string,
* Array.<function(ol.render.canvas.Immediate)>>}
*/
this.callbacksByZIndex_ = {};
@@ -725,7 +724,7 @@ ol.render.canvas.Immediate.prototype.drawText = goog.abstractMethod;
*/
ol.render.canvas.Immediate.prototype.flush = function() {
/** @type {Array.<number>} */
var zs = goog.object.getKeys(this.callbacksByZIndex_).map(Number);
var zs = Object.keys(this.callbacksByZIndex_).map(Number);
goog.array.sort(zs);
var i, ii, callbacks, j, jj;
for (i = 0, ii = zs.length; i < ii; ++i) {

6
src/ol/render/canvas/canvasreplay.js
View File

@@ -1831,7 +1831,7 @@ ol.render.canvas.ReplayGroup = function(
/**
* @private
* @type {Object.<string,
* @type {!Object.<string,
* Object.<ol.render.ReplayType, ol.render.canvas.Replay>>}
*/
this.replaysByZIndex_ = {};
@@ -1961,7 +1961,7 @@ ol.render.canvas.ReplayGroup.prototype.replay = function(
context, pixelRatio, transform, viewRotation, skippedFeaturesHash) {
/** @type {Array.<number>} */
var zs = goog.object.getKeys(this.replaysByZIndex_).map(Number);
var zs = Object.keys(this.replaysByZIndex_).map(Number);
goog.array.sort(zs);
// setup clipping so that the parts of over-simplified geometries are not
@@ -2016,7 +2016,7 @@ ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = function(
context, transform, viewRotation, skippedFeaturesHash,
featureCallback, opt_hitExtent) {
/** @type {Array.<number>} */
var zs = goog.object.getKeys(this.replaysByZIndex_).map(Number);
var zs = Object.keys(this.replaysByZIndex_).map(Number);
goog.array.sort(zs, function(a, b) { return b - a; });
var i, ii, j, replays, replay, result;