diff --git a/src/ol/renderer/canvas/canvasrenderer.js b/src/ol/renderer/canvas/canvasrenderer.js index b6e041c17d..da8c2d0cff 100644 --- a/src/ol/renderer/canvas/canvasrenderer.js +++ b/src/ol/renderer/canvas/canvasrenderer.js @@ -32,12 +32,6 @@ ol.renderer.canvas.CanvasRenderer = function() { */ this.context_ = null; - /** - * @type {ol.renderer.Layer} - * @private - */ - this.layerRenderer_ = null; - /** * @type {ol.Pixel} * @private @@ -54,22 +48,11 @@ ol.renderer.canvas.CanvasRenderer = function() { ol.renderer.canvas.CanvasRenderer.prototype.assertReady_ = function() { goog.asserts.assert(!goog.isNull(this.context_), 'Call setTarget before rendering'); - goog.asserts.assert(!goog.isNull(this.layerRenderer_), - 'Call setLayerRenderer before rendering'); goog.asserts.assert(!goog.isNull(this.offset_), 'Call setOffset before rendering'); }; -/** - * @param {ol.renderer.Layer} layerRenderer Layer renderer. - */ -ol.renderer.canvas.CanvasRenderer.prototype.setLayerRenderer = - function(layerRenderer) { - this.layerRenderer_ = layerRenderer; -}; - - /** * @param {ol.Pixel} offset Pixel offset of top left corner of canvas. */ @@ -85,95 +68,3 @@ ol.renderer.canvas.CanvasRenderer.prototype.setTarget = function(canvas) { this.context_ = canvas.getContext('2d'); }; - -/** - * Render a geometry. - * @param {ol.geom.Geometry} geometry The geometry to render. - * @param {Array.} symbolizers Symbolizers to render - * with. - * @private - */ -ol.renderer.canvas.CanvasRenderer.prototype.renderGeometry_ = - function(geometry, symbolizers) { - this.assertReady_(); - if (geometry instanceof ol.geom.Point) { - this.renderPoint_(geometry, symbolizers); - } else { - // TODO: render other geometry types - goog.asserts.assert(false, 'Not yet implemented'); - } -}; - - -/** - * Render a point geometry. - * @param {ol.geom.Point} point Point geometry. - * @param {Array.} symbolizers Symbolizers. - * @private - */ -ol.renderer.canvas.CanvasRenderer.prototype.renderPoint_ = - function(point, symbolizers) { - for (var i = 0, ii = symbolizers.length; i < ii; ++i) { - var symbolizer = symbolizers[i]; - if (symbolizer instanceof ol.style.LiteralShape) { - if (symbolizer.type === ol.style.ShapeType.CIRCLE) { - this.renderPointCircle_(point, symbolizer); - } else { - this.renderPointShape_(point, symbolizer); - } - } - } -}; - - -/** - * Render a point as a circle. - * @param {ol.geom.Point} point Point geometry. - * @param {ol.style.LiteralShape} symbolizer Shape symbolizer. - * @private - */ -ol.renderer.canvas.CanvasRenderer.prototype.renderPointCircle_ = - function(point, symbolizer) { - var coords = point.coordinates, - coordinate = new ol.Coordinate(coords[0], coords[1]), - mapRenderer = this.layerRenderer_.getMapRenderer(), - pixel = mapRenderer.getPixelFromCoordinate(coordinate), - px = pixel.x + this.offset_.x, - py = pixel.y + this.offset_.y, - twoPi = Math.PI * 2, - radius = symbolizer.size / 2, - /** @type {ol.style.LiteralFill} */ - fill = symbolizer.fill, - /** @type {ol.style.LiteralStroke} */ - stroke = symbolizer.stroke, - context = this.context_; - - if (!goog.isNull(fill)) { - context.globalAlpha = fill.opacity; - context.fillStyle = fill.color; - context.beginPath(); - context.arc(px, py, radius, 0, twoPi, true); - context.fill(); - } - if (!goog.isNull(stroke)) { - context.globalAlpha = stroke.opacity; - context.strokeStyle = stroke.color; - context.lineWidth = stroke.width; - context.beginPath(); - context.arc(px, py, radius, 0, twoPi, true); - context.stroke(); - } -}; - - -/** - * Render a point as a shape (other than circle). - * @param {ol.geom.Point} point Point geometry. - * @param {ol.style.LiteralShape} symbolizer Shape symbolizer. - * @private - */ -ol.renderer.canvas.CanvasRenderer.prototype.renderPointShape_ = - function(point, symbolizer) { - // TODO: other shape types - goog.asserts.assert(false, 'Not implemented'); -};