diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer2.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer2.js index 789631c82b..60a5e7893b 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer2.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer2.js @@ -2,7 +2,6 @@ goog.provide('ol.renderer.canvas.VectorLayer2'); goog.require('goog.dom'); goog.require('goog.vec.Mat4'); -goog.require('ol.extent'); goog.require('ol.layer.Vector'); goog.require('ol.renderer.canvas.Layer'); goog.require('ol.renderer.canvas.Vector'); @@ -19,30 +18,12 @@ ol.renderer.canvas.VectorLayer2 = function(mapRenderer, layer) { goog.base(this, mapRenderer, layer); - /** - * @private - * @type {!goog.vec.Mat4.Number} - */ - this.coordsTransform_ = goog.vec.Mat4.createNumber(); - /** * @private * @type {!goog.vec.Mat4.Number} */ this.transform_ = goog.vec.Mat4.createNumber(); - /** - * @private - * @type {number} - */ - this.renderedResolution_ = 0; - - /** - * @private - * @type {ol.Extent} - */ - this.renderedExtent_ = null; - /** * @private * @type {function()} @@ -77,28 +58,22 @@ ol.renderer.canvas.VectorLayer2.prototype.composeFrame = return; } - this.renderedResolution_ = viewResolution; - this.renderedExtent_ = extent; - - var canvasWidth = frameState.size[0]; - var canvasHeight = frameState.size[1]; - - var halfWidth = canvasWidth; - var halfHeight = canvasHeight; - - // transform for map coords to sketch canvas pixel coords - var coordsTransform = this.coordsTransform_; - var origin = ol.extent.getTopLeft(extent); - goog.vec.Mat4.makeIdentity(coordsTransform); - goog.vec.Mat4.translate(coordsTransform, - halfWidth, halfHeight, 0); - goog.vec.Mat4.scale(coordsTransform, - 1 / viewResolution, -1 / viewResolution, 1); - goog.vec.Mat4.translate(coordsTransform, - -(origin[0] + halfWidth * viewResolution), - -(origin[1] - halfHeight * viewResolution), + var transform = this.transform_; + goog.vec.Mat4.makeIdentity(transform); + goog.vec.Mat4.translate(transform, + frameState.size[0] / 2, + frameState.size[1] / 2, 0); - var renderer = new ol.renderer.canvas.Vector(context, coordsTransform, + goog.vec.Mat4.scale(transform, + 1 / viewResolution, + -1 / viewResolution, + 1); + goog.vec.Mat4.rotateZ(transform, -viewRotation); + goog.vec.Mat4.translate(transform, + -viewCenter[0], + -viewCenter[1], + 0); + var renderer = new ol.renderer.canvas.Vector(context, transform, this.requestMapRenderFrame_); var groups = vectorLayer.groupFeaturesBySymbolizerLiteral(features, @@ -115,22 +90,6 @@ ol.renderer.canvas.VectorLayer2.prototype.composeFrame = } } - var transform = this.transform_; - goog.vec.Mat4.makeIdentity(transform); - goog.vec.Mat4.translate(transform, - frameState.size[0] / 2, - frameState.size[1] / 2, - 0); - goog.vec.Mat4.scale(transform, - this.renderedResolution_ / viewResolution, - this.renderedResolution_ / viewResolution, - 1); - goog.vec.Mat4.rotateZ(transform, viewRotation); - goog.vec.Mat4.translate(transform, - (this.renderedExtent_[0] - viewCenter[0]) / this.renderedResolution_, - (viewCenter[1] - this.renderedExtent_[3]) / this.renderedResolution_, - 0); - }; @@ -142,14 +101,6 @@ ol.renderer.canvas.VectorLayer2.prototype.getVectorLayer = function() { }; -/** - * @inheritDoc - */ -ol.renderer.canvas.VectorLayer2.prototype.getTransform = function() { - return this.transform_; -}; - - /** * @param {ol.layer.VectorEvent} event Vector layer event. * @private