Factor out ol.geom.flat.transform

This commit is contained in:
Tom Payne
2014-03-12 13:18:29 +01:00
parent 6a00c14841
commit ca44c6328c
5 changed files with 43 additions and 39 deletions

View File

@@ -18,6 +18,7 @@ goog.require('ol.extent');
goog.require('ol.extent.Relationship');
goog.require('ol.geom.flat');
goog.require('ol.geom.flat.simplify');
goog.require('ol.geom.flat.transform');
goog.require('ol.render.IReplayGroup');
goog.require('ol.render.IVectorContext');
goog.require('ol.render.canvas');
@@ -217,7 +218,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
if (ol.vec.Mat4.equals2D(transform, this.renderedTransform_)) {
pixelCoordinates = this.pixelCoordinates_;
} else {
pixelCoordinates = ol.geom.flat.transform2D(
pixelCoordinates = ol.geom.flat.transform.transform2D(
this.coordinates, 2, transform, this.pixelCoordinates_);
goog.vec.Mat4.setFromArray(this.renderedTransform_, transform);
goog.asserts.assert(pixelCoordinates === this.pixelCoordinates_);
@@ -1852,7 +1853,7 @@ ol.render.canvas.ReplayGroup.prototype.replay_ = function(
var minY = maxExtent[1];
var maxX = maxExtent[2];
var maxY = maxExtent[3];
var flatClipCoords = ol.geom.flat.transform2D(
var flatClipCoords = ol.geom.flat.transform.transform2D(
[minX, minY, minX, maxY, maxX, maxY, maxX, minY], 2, transform);
context.save();
context.beginPath();