From 4d53049a7fbb83829672b7a2c54d9923a02ef136 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 1 Oct 2015 12:26:12 +0200 Subject: [PATCH 1/2] Remove unnecessary cast --- src/ol/format/gml/gml3format.js | 2 +- src/ol/interaction/interaction.js | 2 +- src/ol/interaction/modifyinteraction.js | 2 +- src/ol/layer/heatmaplayer.js | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/ol/format/gml/gml3format.js b/src/ol/format/gml/gml3format.js index 94f04feb2d..65a5e9bc0d 100644 --- a/src/ol/format/gml/gml3format.js +++ b/src/ol/format/gml/gml3format.js @@ -66,7 +66,7 @@ ol.format.GML3 = function(opt_options) { * @type {boolean} */ this.multiSurface_ = options.multiSurface !== undefined ? - /** @type {boolean} */ (options.multiSurface) : true; + options.multiSurface : true; /** * @inheritDoc diff --git a/src/ol/interaction/interaction.js b/src/ol/interaction/interaction.js index 3f7d7c8be0..85d7103926 100644 --- a/src/ol/interaction/interaction.js +++ b/src/ol/interaction/interaction.js @@ -225,7 +225,7 @@ ol.interaction.Interaction.zoomWithoutConstraints = resolution !== currentResolution && opt_duration && opt_duration > 0) { map.beforeRender(ol.animation.zoom({ - resolution: /** @type {number} */ (currentResolution), + resolution: currentResolution, duration: opt_duration, easing: ol.easing.easeOut })); diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index de04fdc1d1..e160c3e0f8 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -824,7 +824,7 @@ ol.interaction.Modify.prototype.insertVertex_ = function(segmentData, vertex) { goog.asserts.assert(segment !== undefined, 'segment should be defined'); rTree.remove(segmentData); goog.asserts.assert(index !== undefined, 'index should be defined'); - this.updateSegmentIndices_(geometry, /** @type {number} */ (index), depth, 1); + this.updateSegmentIndices_(geometry, index, depth, 1); var newSegmentData = /** @type {ol.interaction.SegmentDataType} */ ({ segment: [segment[0], vertex], feature: feature, diff --git a/src/ol/layer/heatmaplayer.js b/src/ol/layer/heatmaplayer.js index 05354da0a8..75152234ce 100644 --- a/src/ol/layer/heatmaplayer.js +++ b/src/ol/layer/heatmaplayer.js @@ -80,11 +80,9 @@ ol.layer.Heatmap = function(opt_options) { this.setGradient(options.gradient ? options.gradient : ol.layer.Heatmap.DEFAULT_GRADIENT); - this.setBlur(options.blur !== undefined ? - /** @type {number} */ (options.blur) : 15); + this.setBlur(options.blur !== undefined ? options.blur : 15); - this.setRadius(options.radius !== undefined ? - /** @type {number} */ (options.radius) : 8); + this.setRadius(options.radius !== undefined ? options.radius : 8); goog.events.listen(this, [ ol.Object.getChangeEventType(ol.layer.HeatmapLayerProperty.BLUR), From ef9b64673e222f4e090f7300f6115b2d3674f676 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 1 Oct 2015 12:33:51 +0200 Subject: [PATCH 2/2] Remove unused local variables --- src/ol/geom/polygon.js | 2 +- src/ol/layer/heatmaplayer.js | 2 +- src/ol/render/canvas/canvasreplay.js | 2 +- src/ol/render/webgl/webglreplay.js | 2 +- src/ol/renderer/canvas/canvastilelayerrenderer.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ol/geom/polygon.js b/src/ol/geom/polygon.js index c72659fbe5..9e7d735465 100644 --- a/src/ol/geom/polygon.js +++ b/src/ol/geom/polygon.js @@ -464,7 +464,7 @@ ol.geom.Polygon.makeRegular = function(polygon, center, radius, opt_angle) { goog.asserts.assert(ends.length === 1, 'only 1 ring is supported'); var sides = flatCoordinates.length / stride - 1; var startAngle = opt_angle ? opt_angle : 0; - var angle, coord, offset; + var angle, offset; for (var i = 0; i <= sides; ++i) { offset = i * stride; angle = startAngle + (goog.math.modulo(i, sides) * 2 * Math.PI / sides); diff --git a/src/ol/layer/heatmaplayer.js b/src/ol/layer/heatmaplayer.js index 75152234ce..5c9bfeb428 100644 --- a/src/ol/layer/heatmaplayer.js +++ b/src/ol/layer/heatmaplayer.js @@ -254,7 +254,7 @@ ol.layer.Heatmap.prototype.handleRender_ = function(event) { var canvas = context.canvas; var image = context.getImageData(0, 0, canvas.width, canvas.height); var view8 = image.data; - var i, ii, alpha, offset; + var i, ii, alpha; for (i = 0, ii = view8.length; i < ii; i += 4) { alpha = view8[i + 3] * 4; if (alpha) { diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 2043330560..076f8dabd1 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -1978,7 +1978,7 @@ ol.render.canvas.ReplayGroup.prototype.replay = function( context.closePath(); context.clip(); - var i, ii, j, jj, replays, replay, result; + var i, ii, j, jj, replays, replay; for (i = 0, ii = zs.length; i < ii; ++i) { replays = this.replaysByZIndex_[zs[i].toString()]; for (j = 0, jj = ol.render.REPLAY_ORDER.length; j < jj; ++j) { diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/webglreplay.js index 7fe8ba6c1c..9534570587 100644 --- a/src/ol/render/webgl/webglreplay.js +++ b/src/ol/render/webgl/webglreplay.js @@ -1028,7 +1028,7 @@ ol.render.webgl.ReplayGroup.prototype.isEmpty = function() { ol.render.webgl.ReplayGroup.prototype.replay = function(context, center, resolution, rotation, size, pixelRatio, opacity, skippedFeaturesHash) { - var i, ii, replay, result; + var i, ii, replay; for (i = 0, ii = ol.render.REPLAY_ORDER.length; i < ii; ++i) { replay = this.replays_[ol.render.REPLAY_ORDER[i]]; if (replay !== undefined) { diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 7cca1ebb1b..e6ce046ab9 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -360,7 +360,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame = [z, canvasTileRange.minX, canvasTileRange.maxY], tmpExtent)); var currentZ, index, scale, tileCoordKey, tileExtent, tilesToDraw; - var ix, iy, interimTileExtent, interimTileRange, maxX, maxY; + var ix, iy, interimTileRange, maxX, maxY; var height, width; for (i = 0, ii = zs.length; i < ii; ++i) { currentZ = zs[i];