From a27d0da8a5b8b0f7170c423b3b6bdb082093f85e Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 12 Aug 2016 07:27:47 -0600 Subject: [PATCH] Add transform2D to ol.geom.SimpleGeometry --- src/ol/geom/simplegeometry.js | 2 +- src/ol/render/canvas/immediate.js | 3 ++- test/spec/ol/geom/flat/transform.test.js | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ol/geom/simplegeometry.js b/src/ol/geom/simplegeometry.js index dbc739ec4a..083e598653 100644 --- a/src/ol/geom/simplegeometry.js +++ b/src/ol/geom/simplegeometry.js @@ -323,7 +323,7 @@ ol.geom.SimpleGeometry.prototype.translate = function(deltaX, deltaY) { * @param {Array.=} opt_dest Destination. * @return {Array.} Transformed flat coordinates. */ -ol.geom.transformSimpleGeometry2D = function(simpleGeometry, transform, opt_dest) { +ol.geom.SimpleGeometry.transform2D = function(simpleGeometry, transform, opt_dest) { var flatCoordinates = simpleGeometry.getFlatCoordinates(); if (!flatCoordinates) { return null; diff --git a/src/ol/render/canvas/immediate.js b/src/ol/render/canvas/immediate.js index e576e2cb0a..bd254e271c 100644 --- a/src/ol/render/canvas/immediate.js +++ b/src/ol/render/canvas/immediate.js @@ -10,6 +10,7 @@ goog.require('ol.color'); goog.require('ol.colorlike'); goog.require('ol.extent'); goog.require('ol.geom.GeometryType'); +goog.require('ol.geom.SimpleGeometry'); goog.require('ol.geom.flat.transform'); goog.require('ol.has'); goog.require('ol.render.VectorContext'); @@ -406,7 +407,7 @@ ol.render.canvas.Immediate.prototype.drawCircle = function(geometry) { if (this.strokeState_) { this.setContextStrokeState_(this.strokeState_); } - var pixelCoordinates = ol.geom.transformSimpleGeometry2D( + var pixelCoordinates = ol.geom.SimpleGeometry.transform2D( geometry, this.transform_, this.pixelCoordinates_); var dx = pixelCoordinates[2] - pixelCoordinates[0]; var dy = pixelCoordinates[3] - pixelCoordinates[1]; diff --git a/test/spec/ol/geom/flat/transform.test.js b/test/spec/ol/geom/flat/transform.test.js index b6397d32d3..aa665c4ef4 100644 --- a/test/spec/ol/geom/flat/transform.test.js +++ b/test/spec/ol/geom/flat/transform.test.js @@ -1,6 +1,7 @@ goog.provide('ol.test.geom.flat.transform'); goog.require('ol.geom.MultiPolygon'); +goog.require('ol.geom.SimpleGeometry'); goog.require('ol.geom.flat.transform'); @@ -32,7 +33,7 @@ describe('ol.geom.flat.transform', function() { 0, -0.0004088332670837288, 4480.991370439071, 1529.5752568707105 ]; - var pixelCoordinates = ol.geom.transformSimpleGeometry2D( + var pixelCoordinates = ol.geom.SimpleGeometry.transform2D( multiPolygonGeometry, transform, []); expect(pixelCoordinates[0]).to.roughlyEqual(806.6035275946265, 1e-9); expect(pixelCoordinates[1]).to.roughlyEqual(160.48916296287916, 1e-9);