Named exports from ol/geom/SimpleGeometry

This commit is contained in:
Tim Schaub
2018-02-19 10:05:30 -07:00
parent 2abc524147
commit fba4d82bdb
3 changed files with 7 additions and 7 deletions

View File

@@ -321,7 +321,7 @@ SimpleGeometry.prototype.translate = function(deltaX, deltaY) {
* @param {Array.<number>=} opt_dest Destination.
* @return {Array.<number>} Transformed flat coordinates.
*/
SimpleGeometry.transform2D = function(simpleGeometry, transform, opt_dest) {
export function transformGeom2D(simpleGeometry, transform, opt_dest) {
const flatCoordinates = simpleGeometry.getFlatCoordinates();
if (!flatCoordinates) {
return null;
@@ -331,5 +331,6 @@ SimpleGeometry.transform2D = function(simpleGeometry, transform, opt_dest) {
flatCoordinates, 0, flatCoordinates.length, stride,
transform, opt_dest);
}
};
}
export default SimpleGeometry;

View File

@@ -10,7 +10,7 @@ import {equals} from '../../array.js';
import {asColorLike} from '../../colorlike.js';
import {intersects} from '../../extent.js';
import GeometryType from '../../geom/GeometryType.js';
import SimpleGeometry from '../../geom/SimpleGeometry.js';
import {transformGeom2D} from '../../geom/SimpleGeometry.js';
import {transform2D} from '../../geom/flat/transform.js';
import {CANVAS_LINE_DASH} from '../../has.js';
import VectorContext from '../VectorContext.js';
@@ -409,7 +409,7 @@ CanvasImmediateRenderer.prototype.drawCircle = function(geometry) {
if (this.strokeState_) {
this.setContextStrokeState_(this.strokeState_);
}
const pixelCoordinates = SimpleGeometry.transform2D(
const pixelCoordinates = transformGeom2D(
geometry, this.transform_, this.pixelCoordinates_);
const dx = pixelCoordinates[2] - pixelCoordinates[0];
const dy = pixelCoordinates[3] - pixelCoordinates[1];

View File

@@ -1,5 +1,5 @@
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import SimpleGeometry from '../../../../../src/ol/geom/SimpleGeometry.js';
import {transformGeom2D} from '../../../../../src/ol/geom/SimpleGeometry.js';
import {rotate, translate} from '../../../../../src/ol/geom/flat/transform.js';
@@ -31,8 +31,7 @@ describe('ol.geom.flat.transform', function() {
0, -0.0004088332670837288,
4480.991370439071, 1529.5752568707105
];
const pixelCoordinates = SimpleGeometry.transform2D(
multiPolygonGeometry, transform, []);
const pixelCoordinates = transformGeom2D(multiPolygonGeometry, transform, []);
expect(pixelCoordinates[0]).to.roughlyEqual(806.6035275946265, 1e-9);
expect(pixelCoordinates[1]).to.roughlyEqual(160.48916296287916, 1e-9);
expect(pixelCoordinates[2]).to.roughlyEqual(805.3521540835154, 1e-9);