diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index c0dd5dbfa3..58aaf34ca7 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -426,11 +426,11 @@ ol.render.canvas.Immediate.prototype.drawAsync = function(zIndex, callback) { * Render a circle geometry into the canvas. Rendering is immediate and uses * the current fill and stroke styles. * - * @param {ol.geom.Circle} circleGeometry Circle geometry. + * @param {ol.geom.Circle} geometry Circle geometry. * @api */ -ol.render.canvas.Immediate.prototype.drawCircle = function(circleGeometry) { - if (!ol.extent.intersects(this.extent_, circleGeometry.getExtent())) { +ol.render.canvas.Immediate.prototype.drawCircle = function(geometry) { + if (!ol.extent.intersects(this.extent_, geometry.getExtent())) { return; } if (this.fillState_ || this.strokeState_) { @@ -441,7 +441,7 @@ ol.render.canvas.Immediate.prototype.drawCircle = function(circleGeometry) { this.setContextStrokeState_(this.strokeState_); } var pixelCoordinates = ol.geom.transformSimpleGeometry2D( - circleGeometry, this.transform_, this.pixelCoordinates_); + geometry, this.transform_, this.pixelCoordinates_); var dx = pixelCoordinates[2] - pixelCoordinates[0]; var dy = pixelCoordinates[3] - pixelCoordinates[1]; var radius = Math.sqrt(dx * dx + dy * dy); @@ -457,7 +457,7 @@ ol.render.canvas.Immediate.prototype.drawCircle = function(circleGeometry) { } } if (this.text_ !== '') { - this.drawText_(circleGeometry.getCenter(), 0, 2, 2); + this.drawText_(geometry.getCenter(), 0, 2, 2); } }; diff --git a/src/ol/render/webgl/webglimmediate.js b/src/ol/render/webgl/webglimmediate.js index c848d17928..01c783fe15 100644 --- a/src/ol/render/webgl/webglimmediate.js +++ b/src/ol/render/webgl/webglimmediate.js @@ -20,8 +20,7 @@ goog.require('ol.render.webgl.ReplayGroup'); * @param {number} pixelRatio Pixel ratio. * @struct */ -ol.render.webgl.Immediate = function(context, - center, resolution, rotation, size, extent, pixelRatio) { +ol.render.webgl.Immediate = function(context, center, resolution, rotation, size, extent, pixelRatio) { goog.base(this); /** @@ -173,8 +172,8 @@ ol.render.webgl.Immediate.prototype.drawFeature = function(feature, style) { /** * @inheritDoc */ -ol.render.webgl.Immediate.prototype.drawGeometryCollection = function(geometryCollectionGeometry, data) { - var geometries = geometryCollectionGeometry.getGeometriesArray(); +ol.render.webgl.Immediate.prototype.drawGeometryCollection = function(geometry, data) { + var geometries = geometry.getGeometriesArray(); var i, ii; for (i = 0, ii = geometries.length; i < ii; ++i) { this.drawGeometry(geometries[i]); @@ -185,13 +184,13 @@ ol.render.webgl.Immediate.prototype.drawGeometryCollection = function(geometryCo /** * @inheritDoc */ -ol.render.webgl.Immediate.prototype.drawPoint = function(pointGeometry, data) { +ol.render.webgl.Immediate.prototype.drawPoint = function(geometry, data) { var context = this.context_; var replayGroup = new ol.render.webgl.ReplayGroup(1, this.extent_); var replay = /** @type {ol.render.webgl.ImageReplay} */ ( replayGroup.getReplay(0, ol.render.ReplayType.IMAGE)); replay.setImageStyle(this.imageStyle_); - replay.drawPoint(pointGeometry, data); + replay.drawPoint(geometry, data); replay.finish(context); // default colors var opacity = 1; @@ -208,13 +207,13 @@ ol.render.webgl.Immediate.prototype.drawPoint = function(pointGeometry, data) { /** * @inheritDoc */ -ol.render.webgl.Immediate.prototype.drawMultiPoint = function(multiPointGeometry, data) { +ol.render.webgl.Immediate.prototype.drawMultiPoint = function(geometry, data) { var context = this.context_; var replayGroup = new ol.render.webgl.ReplayGroup(1, this.extent_); var replay = /** @type {ol.render.webgl.ImageReplay} */ ( replayGroup.getReplay(0, ol.render.ReplayType.IMAGE)); replay.setImageStyle(this.imageStyle_); - replay.drawMultiPoint(multiPointGeometry, data); + replay.drawMultiPoint(geometry, data); replay.finish(context); var opacity = 1; var skippedFeatures = {};