diff --git a/src/ol/geom/flatgeom.js b/src/ol/geom/flatgeom.js index 14fb98b3a6..b146aa31a7 100644 --- a/src/ol/geom/flatgeom.js +++ b/src/ol/geom/flatgeom.js @@ -2,7 +2,6 @@ goog.provide('ol.geom.flat'); goog.require('goog.asserts'); goog.require('goog.vec.Mat4'); -goog.require('ol.geom.Geometry'); /** @@ -173,17 +172,3 @@ ol.geom.flat.transform2D = } return dest; }; - - -/** - * @param {ol.geom.Geometry} geometry Geometry. - * @param {goog.vec.Mat4.AnyType} transform Transform. - * @param {Array.=} opt_dest Destination. - * @return {Array.} Transformed flat coordinates. - */ -ol.geom.flat.transformGeometry2D = function(geometry, transform, opt_dest) { - var flatCoordinates = geometry.getFlatCoordinates(); - var stride = geometry.getStride(); - return ol.geom.flat.transform2D( - flatCoordinates, stride, transform, opt_dest); -}; diff --git a/src/ol/geom/geometry.js b/src/ol/geom/geometry.js index 7337ea84ca..385f448591 100644 --- a/src/ol/geom/geometry.js +++ b/src/ol/geom/geometry.js @@ -7,6 +7,7 @@ goog.require('goog.events.EventTarget'); goog.require('goog.events.EventType'); goog.require('goog.functions'); goog.require('ol.extent'); +goog.require('ol.geom.flat'); /** @@ -435,3 +436,17 @@ ol.geom.reverseFlatCoordinates = end -= stride; } }; + + +/** + * @param {ol.geom.Geometry} geometry Geometry. + * @param {goog.vec.Mat4.AnyType} transform Transform. + * @param {Array.=} opt_dest Destination. + * @return {Array.} Transformed flat coordinates. + */ +ol.geom.transformGeometry2D = function(geometry, transform, opt_dest) { + var flatCoordinates = geometry.getFlatCoordinates(); + var stride = geometry.getStride(); + return ol.geom.flat.transform2D( + flatCoordinates, stride, transform, opt_dest); +}; diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index ab7c968723..ed498a2eed 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -5,7 +5,6 @@ goog.provide('ol.render.canvas.Immediate'); goog.require('goog.asserts'); goog.require('ol.extent'); -goog.require('ol.geom.flat'); goog.require('ol.render.IRender'); goog.require('ol.style.fill'); goog.require('ol.style.stroke'); @@ -71,7 +70,7 @@ ol.render.canvas.Immediate.prototype.drawImages_ = function(geometry) { goog.isNull(imageStyle)) { return; } - var pixelCoordinates = ol.geom.flat.transformGeometry2D( + var pixelCoordinates = ol.geom.transformGeometry2D( geometry, this.transform_, this.pixelCoordinates_); var i, ii; for (i = 0, ii = pixelCoordinates.length; i < ii; i += 2) { @@ -169,7 +168,7 @@ ol.render.canvas.Immediate.prototype.drawLineStringGeometry = return; } var context = this.context_; - var pixelCoordinates = ol.geom.flat.transformGeometry2D( + var pixelCoordinates = ol.geom.transformGeometry2D( lineStringGeometry, this.transform_, this.pixelCoordinates_); context.beginPath(); this.moveToLineTo_(pixelCoordinates, 0, pixelCoordinates.length, false); @@ -188,7 +187,7 @@ ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry = return; } var context = this.context_; - var pixelCoordinates = ol.geom.flat.transformGeometry2D( + var pixelCoordinates = ol.geom.transformGeometry2D( multiLineStringGeometry, this.transform_, this.pixelCoordinates_); context.beginPath(); var ends = multiLineStringGeometry.getEnds(); @@ -214,7 +213,7 @@ ol.render.canvas.Immediate.prototype.drawPolygonGeometry = return; } var context = this.context_; - var pixelCoordinates = ol.geom.flat.transformGeometry2D( + var pixelCoordinates = ol.geom.transformGeometry2D( polygonGeometry, this.transform_, this.pixelCoordinates_); var ends = polygonGeometry.getEnds(); context.beginPath(); @@ -241,7 +240,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry = return; } var context = this.context_; - var pixelCoordinates = ol.geom.flat.transformGeometry2D( + var pixelCoordinates = ol.geom.transformGeometry2D( multiPolygonGeometry, this.transform_, this.pixelCoordinates_); var endss = multiPolygonGeometry.getEndss(); var offset = 0;