From 0f4e56978b1e931110130eb1f4edd3018597474b Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 12 Aug 2014 17:01:32 +0200 Subject: [PATCH 1/3] Remove unnecessary newlines --- src/ol/format/topojsonformat.js | 3 +-- src/ol/imagetile.js | 3 +-- src/ol/render/canvas/canvasreplay.js | 3 +-- src/ol/source/tilewmssource.js | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/ol/format/topojsonformat.js b/src/ol/format/topojsonformat.js index e7397886f2..1348e8146d 100644 --- a/src/ol/format/topojsonformat.js +++ b/src/ol/format/topojsonformat.js @@ -94,8 +94,7 @@ ol.format.TopoJSON.concatenateArcs_ = function(indices, arcs) { * @return {ol.geom.Point} Geometry. * @private */ -ol.format.TopoJSON.readPointGeometry_ = - function(object, scale, translate) { +ol.format.TopoJSON.readPointGeometry_ = function(object, scale, translate) { var coordinates = object.coordinates; if (!goog.isNull(scale) && !goog.isNull(translate)) { ol.format.TopoJSON.transformVertex_(coordinates, scale, translate); diff --git a/src/ol/imagetile.js b/src/ol/imagetile.js index 6820367917..57e85abd36 100644 --- a/src/ol/imagetile.js +++ b/src/ol/imagetile.js @@ -21,8 +21,7 @@ goog.require('ol.TileState'); * @param {?string} crossOrigin Cross origin. * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function. */ -ol.ImageTile = - function(tileCoord, state, src, crossOrigin, tileLoadFunction) { +ol.ImageTile = function(tileCoord, state, src, crossOrigin, tileLoadFunction) { goog.base(this, tileCoord, state); diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 896cadece8..88b70761a1 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -594,8 +594,7 @@ ol.render.canvas.Replay.prototype.drawText = goog.abstractMethod; * @param {ol.geom.Geometry} geometry Geometry. * @param {Object} data Opaque data object. */ -ol.render.canvas.Replay.prototype.endGeometry = - function(geometry, data) { +ol.render.canvas.Replay.prototype.endGeometry = function(geometry, data) { goog.asserts.assert(!goog.isNull(this.beginGeometryInstruction1_)); this.beginGeometryInstruction1_[3] = this.instructions.length; this.beginGeometryInstruction1_ = null; diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index bf7b2d7fee..9961f604a0 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -156,8 +156,7 @@ ol.source.TileWMS.prototype.getGetFeatureInfoUrl = } var tileResolution = tileGrid.getResolution(tileCoord[0]); - var tileExtent = tileGrid.getTileCoordExtent( - tileCoord, this.tmpExtent_); + var tileExtent = tileGrid.getTileCoordExtent(tileCoord, this.tmpExtent_); var tileSize = tileGrid.getTileSize(tileCoord[0]); var gutter = this.gutter_; From 102f214afe5209cca7b4af7046cddbed59866535 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 14 Aug 2014 12:43:45 +0200 Subject: [PATCH 2/3] Remove unnecessary local variable --- src/ol/source/tilevectorsource.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ol/source/tilevectorsource.js b/src/ol/source/tilevectorsource.js index 047dfdf67d..0a845574b0 100644 --- a/src/ol/source/tilevectorsource.js +++ b/src/ol/source/tilevectorsource.js @@ -29,8 +29,6 @@ ol.source.TileVector = function(options) { projection: options.projection }); - var tileGrid = options.tileGrid; - /** * @private * @type {ol.tilegrid.TileGrid} @@ -47,7 +45,7 @@ ol.source.TileVector = function(options) { * @private * @type {ol.TileCoordTransformType} */ - this.tileCoordTransform_ = tileGrid.createTileCoordTransform(); + this.tileCoordTransform_ = this.tileGrid_.createTileCoordTransform(); /** * @private From 1439ceafa1d43418be321a4286c63c9527eee39d Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 19 Aug 2014 11:58:50 +0200 Subject: [PATCH 3/3] Simplify goog.object.forEach call --- src/ol/renderer/maprenderer.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index 1727a6898b..29b509dd05 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -92,9 +92,7 @@ ol.renderer.Map.prototype.createLayerRenderer = function(layer) { * @inheritDoc */ ol.renderer.Map.prototype.disposeInternal = function() { - goog.object.forEach(this.layerRenderers_, function(layerRenderer) { - goog.dispose(layerRenderer); - }); + goog.object.forEach(this.layerRenderers_, goog.dispose); goog.base(this, 'disposeInternal'); };