Add tests, remove unused code, encapsulate repeated code in functions

This commit is contained in:
Andreas Hocevar
2016-02-15 01:35:20 +01:00
parent a109062b1f
commit 952b99742e
5 changed files with 120 additions and 63 deletions

View File

@@ -7,6 +7,7 @@ goog.require('ol.dom');
goog.require('ol.extent');
goog.require('ol.layer.Vector');
goog.require('ol.render.EventType');
goog.require('ol.render.canvas');
goog.require('ol.render.canvas.ReplayGroup');
goog.require('ol.renderer.canvas.Layer');
goog.require('ol.renderer.vector');
@@ -108,9 +109,8 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = function(frameState, lay
var width = frameState.size[0] * pixelRatio;
var height = frameState.size[1] * pixelRatio;
replayContext.translate(width / 2, height / 2);
replayContext.rotate(-rotation);
replayContext.translate(-width / 2, -height / 2);
ol.render.canvas.rotateAtOffset(replayContext, -rotation,
width / 2, height / 2);
replayGroup.replay(replayContext, pixelRatio, transform, rotation,
skippedFeatureUids);
if (vectorSource.getWrapX() && projection.canWrapX() &&
@@ -140,9 +140,8 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = function(frameState, lay
// restore original transform for render and compose events
transform = this.getTransform(frameState, 0);
}
replayContext.translate(width / 2, height / 2);
replayContext.rotate(rotation);
replayContext.translate(-width / 2, -height / 2);
ol.render.canvas.rotateAtOffset(replayContext, rotation,
width / 2, height / 2);
if (replayContext != context) {
this.dispatchRenderEvent(replayContext, frameState, transform);