diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index 710c49b416..2821b2c8fe 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -728,7 +728,7 @@ ol.render.canvas.Immediate.prototype.drawText = goog.abstractMethod; ol.render.canvas.Immediate.prototype.flush = function() { /** @type {Array.} */ var zs = Object.keys(this.callbacksByZIndex_).map(Number); - goog.array.sort(zs); + zs.sort(); var i, ii, callbacks, j, jj; for (i = 0, ii = zs.length; i < ii; ++i) { callbacks = this.callbacksByZIndex_[zs[i].toString()]; diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index f3572cc86e..35c4d17160 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -1979,7 +1979,7 @@ ol.render.canvas.ReplayGroup.prototype.replay = function( /** @type {Array.} */ var zs = Object.keys(this.replaysByZIndex_).map(Number); - goog.array.sort(zs); + zs.sort(); // setup clipping so that the parts of over-simplified geometries are not // visible outside the current extent when panning @@ -2035,7 +2035,7 @@ ol.render.canvas.ReplayGroup.prototype.replayHitDetection_ = function( featureCallback, opt_hitExtent) { /** @type {Array.} */ var zs = Object.keys(this.replaysByZIndex_).map(Number); - goog.array.sort(zs, function(a, b) { return b - a; }); + zs.sort(function(a, b) { return b - a; }); var i, ii, j, replays, replay, result; for (i = 0, ii = zs.length; i < ii; ++i) { diff --git a/src/ol/render/webgl/webglimmediate.js b/src/ol/render/webgl/webglimmediate.js index 1981e67ef2..4233c16c05 100644 --- a/src/ol/render/webgl/webglimmediate.js +++ b/src/ol/render/webgl/webglimmediate.js @@ -1,5 +1,4 @@ goog.provide('ol.render.webgl.Immediate'); -goog.require('goog.array'); goog.require('ol.extent'); goog.require('ol.render.VectorContext'); goog.require('ol.render.webgl.ImageReplay'); @@ -80,7 +79,7 @@ goog.inherits(ol.render.webgl.Immediate, ol.render.VectorContext); ol.render.webgl.Immediate.prototype.flush = function() { /** @type {Array.} */ var zs = Object.keys(this.callbacksByZIndex_).map(Number); - goog.array.sort(zs); + zs.sort(); var i, ii, callbacks, j, jj; for (i = 0, ii = zs.length; i < ii; ++i) { callbacks = this.callbacksByZIndex_[zs[i].toString()]; diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 94ab39f092..bd11ddaf38 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -3,7 +3,6 @@ goog.provide('ol.renderer.canvas.TileLayer'); -goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.vec.Mat4'); goog.require('ol.Size'); @@ -365,7 +364,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame = /** @type {Array.} */ var zs = Object.keys(tilesToDrawByZ).map(Number); - goog.array.sort(zs); + zs.sort(); var opaque = tileSource.getOpaque(); var origin = ol.extent.getTopLeft(tileGrid.getTileCoordExtent( [z, canvasTileRange.minX, canvasTileRange.maxY], diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index 6ff320cd3e..a6b1e4ab2e 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -1,6 +1,5 @@ goog.provide('ol.renderer.canvas.VectorLayer'); -goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.events'); goog.require('ol.ViewHint'); @@ -300,7 +299,7 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = function(feature) { features.push(feature); }, this); - goog.array.sort(features, vectorLayerRenderOrder); + features.sort(vectorLayerRenderOrder); features.forEach(renderFeature, this); } else { vectorSource.forEachFeatureInExtent(extent, renderFeature, this); diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index c5429a3bb8..5d2c5dfe42 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -3,7 +3,6 @@ goog.provide('ol.renderer.dom.TileLayer'); -goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.dom'); goog.require('goog.style'); @@ -178,7 +177,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = /** @type {Array.} */ var zs = Object.keys(tilesToDrawByZ).map(Number); - goog.array.sort(zs); + zs.sort(); /** @type {Object.} */ var newTileLayerZKeys = {}; @@ -204,7 +203,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = /** @type {Array.} */ var tileLayerZKeys = Object.keys(this.tileLayerZs_).map(Number); - goog.array.sort(tileLayerZKeys); + tileLayerZKeys.sort(); var i, ii, j, origin, resolution; var transform = goog.vec.Mat4.createNumber(); diff --git a/src/ol/renderer/dom/domvectorlayerrenderer.js b/src/ol/renderer/dom/domvectorlayerrenderer.js index 444d2eab62..2352bcd516 100644 --- a/src/ol/renderer/dom/domvectorlayerrenderer.js +++ b/src/ol/renderer/dom/domvectorlayerrenderer.js @@ -1,6 +1,5 @@ goog.provide('ol.renderer.dom.VectorLayer'); -goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.events'); goog.require('goog.vec.Mat4'); @@ -308,7 +307,7 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame = function(feature) { features.push(feature); }, this); - goog.array.sort(features, vectorLayerRenderOrder); + features.sort(vectorLayerRenderOrder); features.forEach(renderFeature, this); } else { vectorSource.forEachFeatureInExtent(extent, renderFeature, this); diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index 84f7f8c530..8b5f4e3df7 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -3,7 +3,6 @@ goog.provide('ol.renderer.webgl.TileLayer'); -goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.vec.Mat4'); goog.require('goog.vec.Vec4'); @@ -297,7 +296,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = /** @type {Array.} */ var zs = Object.keys(tilesToDrawByZ).map(Number); - goog.array.sort(zs); + zs.sort(); var u_tileOffset = goog.vec.Vec4.createFloat32(); var i, ii, sx, sy, tileKey, tilesToDraw, tx, ty; for (i = 0, ii = zs.length; i < ii; ++i) { diff --git a/src/ol/renderer/webgl/webglvectorlayerrenderer.js b/src/ol/renderer/webgl/webglvectorlayerrenderer.js index c9d9f47e4b..e09a283472 100644 --- a/src/ol/renderer/webgl/webglvectorlayerrenderer.js +++ b/src/ol/renderer/webgl/webglvectorlayerrenderer.js @@ -1,6 +1,5 @@ goog.provide('ol.renderer.webgl.VectorLayer'); -goog.require('goog.array'); goog.require('goog.asserts'); goog.require('goog.events'); goog.require('ol.ViewHint'); @@ -276,7 +275,7 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(feature) { features.push(feature); }, this); - goog.array.sort(features, vectorLayerRenderOrder); + features.sort(vectorLayerRenderOrder); features.forEach(renderFeature, this); } else { vectorSource.forEachFeatureInExtent(extent, renderFeature, this); diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmtstilegrid.js index 40c2dab150..e13060b9b6 100644 --- a/src/ol/tilegrid/wmtstilegrid.js +++ b/src/ol/tilegrid/wmtstilegrid.js @@ -1,6 +1,5 @@ goog.provide('ol.tilegrid.WMTS'); -goog.require('goog.array'); goog.require('goog.asserts'); goog.require('ol.proj'); goog.require('ol.tilegrid.TileGrid'); @@ -104,7 +103,7 @@ ol.tilegrid.WMTS.createFromCapabilitiesMatrixSet = // swap origin x and y coordinates if axis orientation is lat/long var switchOriginXY = projection.getAxisOrientation().substr(0, 2) == 'ne'; - goog.array.sort(matrixSet[matrixIdsPropName], function(a, b) { + matrixSet[matrixIdsPropName].sort(function(a, b) { return b[scaleDenominatorPropName] - a[scaleDenominatorPropName]; });