Named exports from ol/coordinate

This commit is contained in:
Tim Schaub
2018-02-09 14:31:20 -07:00
parent ce12dc1253
commit b97554f2f3
16 changed files with 126 additions and 160 deletions

View File

@@ -1,4 +1,4 @@
import _ol_coordinate_ from '../../../src/ol/coordinate.js';
import {add as addCoordinate, scale as scaleCoordinate, rotate as rotateCoordinate, equals as coordinatesEqual, format as formatCoordinate, closestOnCircle, closestOnSegment, createStringXY, squaredDistanceToSegment, toStringXY, toStringHDMS} from '../../../src/ol/coordinate.js';
import Circle from '../../../src/ol/geom/Circle.js';
@@ -13,19 +13,19 @@ describe('ol.coordinate', function() {
});
it('returns a coordinate', function() {
const returnedCoordinate = _ol_coordinate_.add(coordinate, delta);
const returnedCoordinate = addCoordinate(coordinate, delta);
expect(returnedCoordinate).to.be.an('array');
expect(returnedCoordinate).to.have.length(2);
});
it('adds the delta', function() {
const returnedCoordinate = _ol_coordinate_.add(coordinate, delta);
const returnedCoordinate = addCoordinate(coordinate, delta);
expect(returnedCoordinate[0]).to.eql(48.73);
expect(returnedCoordinate[1]).to.eql(10.1);
});
it('modifies in place', function() {
_ol_coordinate_.add(coordinate, delta);
addCoordinate(coordinate, delta);
expect(coordinate[0]).to.eql(48.73);
expect(coordinate[1]).to.eql(10.1);
});
@@ -37,8 +37,8 @@ describe('ol.coordinate', function() {
const bonn2 = [50.73000, 7.10000];
it('compares correctly', function() {
const bonnEqualsBonn = _ol_coordinate_.equals(bonn1, bonn2);
const bonnEqualsCologne = _ol_coordinate_.equals(bonn1, cologne);
const bonnEqualsBonn = coordinatesEqual(bonn1, bonn2);
const bonnEqualsCologne = coordinatesEqual(bonn1, cologne);
expect(bonnEqualsBonn).to.be(true);
expect(bonnEqualsCologne).to.be(false);
});
@@ -51,12 +51,12 @@ describe('ol.coordinate', function() {
});
it('rounds the values', function() {
const string = _ol_coordinate_.format(coordinate, '{x} {y}', 0);
const string = formatCoordinate(coordinate, '{x} {y}', 0);
expect(string).to.eql('7 47');
});
it('handles the optional fractionDigits param', function() {
const string = _ol_coordinate_.format(coordinate, '{x} {y}', 3);
const string = formatCoordinate(coordinate, '{x} {y}', 3);
expect(string).to.eql('6.612 46.792');
});
});
@@ -70,7 +70,7 @@ describe('ol.coordinate', function() {
});
it('returns a CoordinateFormatType', function() {
created = _ol_coordinate_.createStringXY();
created = createStringXY();
expect(created).to.be.a('function');
formatted = created(coordinate);
@@ -79,7 +79,7 @@ describe('ol.coordinate', function() {
});
it('respects opt_fractionDigits', function() {
created = _ol_coordinate_.createStringXY(3);
created = createStringXY(3);
expect(created).to.be.a('function');
formatted = created(coordinate);
@@ -92,11 +92,11 @@ describe('ol.coordinate', function() {
const center = [5, 10];
const circle = new Circle(center, 10);
it('can find the closest point on circle', function() {
expect(_ol_coordinate_.closestOnCircle([-20, 10], circle))
expect(closestOnCircle([-20, 10], circle))
.to.eql([-5, 10]);
});
it('can handle coordinate equal circle center', function() {
expect(_ol_coordinate_.closestOnCircle(center, circle))
expect(closestOnCircle(center, circle))
.to.eql([15, 10]);
});
});
@@ -106,27 +106,27 @@ describe('ol.coordinate', function() {
function() {
const point = [2, 5];
const segment = [[-5, 0], [10, 0]];
expect(_ol_coordinate_.closestOnSegment(point, segment))
expect(closestOnSegment(point, segment))
.to.eql([2, 0]);
});
it('can handle points where the foot of the perpendicular is not closest',
function() {
const point = [0, -6];
const segment = [[-5, 0], [0, -1]];
expect(_ol_coordinate_.closestOnSegment(point, segment))
expect(closestOnSegment(point, segment))
.to.eql([0, -1]);
});
});
describe('#format', function() {
it('can deal with undefined coordinate', function() {
expect(_ol_coordinate_.format()).to.be('');
expect(formatCoordinate()).to.be('');
});
it('formats a coordinate into a template (default precision is 0)',
function() {
const coord = [7.85, 47.983333];
const template = 'Coordinate is ({x}|{y}).';
const got = _ol_coordinate_.format(coord, template);
const got = formatCoordinate(coord, template);
const expected = 'Coordinate is (8|48).';
expect(got).to.be(expected);
});
@@ -134,7 +134,7 @@ describe('ol.coordinate', function() {
function() {
const coord = [7.85, 47.983333];
const template = 'Coordinate is ({x}|{y}).';
const got = _ol_coordinate_.format(coord, template, 2);
const got = formatCoordinate(coord, template, 2);
const expected = 'Coordinate is (7.85|47.98).';
expect(got).to.be(expected);
});
@@ -144,14 +144,14 @@ describe('ol.coordinate', function() {
it('can rotate point in place', function() {
const coord = [7.85, 47.983333];
const rotateRadians = Math.PI / 2; // 90 degrees
_ol_coordinate_.rotate(coord, rotateRadians);
rotateCoordinate(coord, rotateRadians);
expect(coord[0].toFixed(6)).to.eql('-47.983333');
expect(coord[1].toFixed(6)).to.eql('7.850000');
});
it('returns the rotated point', function() {
const coord = [7.85, 47.983333];
const rotateRadians = Math.PI / 2; // 90 degrees
const rotated = _ol_coordinate_.rotate(coord, rotateRadians);
const rotated = rotateCoordinate(coord, rotateRadians);
expect(rotated[0].toFixed(7)).to.eql('-47.9833330');
expect(rotated[1].toFixed(7)).to.eql('7.8500000');
});
@@ -161,49 +161,32 @@ describe('ol.coordinate', function() {
it('can scale point in place', function() {
const coord = [7.85, 47.983333];
const scale = 1.2;
_ol_coordinate_.scale(coord, scale);
scaleCoordinate(coord, scale);
expect(coord[0].toFixed(7)).to.eql('9.4200000');
expect(coord[1].toFixed(7)).to.eql('57.5799996');
});
it('returns the scaled point', function() {
const coord = [7.85, 47.983333];
const scale = 1.2;
const scaledCoord = _ol_coordinate_.scale(coord, scale);
const scaledCoord = scaleCoordinate(coord, scale);
expect(scaledCoord[0].toFixed(7)).to.eql('9.4200000');
expect(scaledCoord[1].toFixed(7)).to.eql('57.5799996');
});
});
describe('#sub', function() {
it('can subtract from point in place', function() {
const coord = [47, 11];
const delta = [1, -1];
_ol_coordinate_.sub(coord, delta);
expect(coord[0]).to.eql(46);
expect(coord[1]).to.eql(12);
});
it('can subtract from point in place', function() {
const coord = [47, 11];
const delta = [1, -1];
const subtracted = _ol_coordinate_.sub(coord, delta);
expect(subtracted[0]).to.eql(46);
expect(subtracted[1]).to.eql(12);
});
});
describe('#squaredDistanceToSegment', function() {
it('can handle points where the foot of the perpendicular is closest',
function() {
const point = [2, 5];
const segment = [[-5, 0], [10, 0]];
expect(_ol_coordinate_.squaredDistanceToSegment(point, segment))
expect(squaredDistanceToSegment(point, segment))
.to.eql(25);
});
it('can handle points where the foot of the perpendicular is not closest',
function() {
const point = [0, -6];
const segment = [[-5, 0], [0, -1]];
expect(_ol_coordinate_.squaredDistanceToSegment(point, segment))
expect(squaredDistanceToSegment(point, segment))
.to.eql(25);
});
@@ -211,19 +194,19 @@ describe('ol.coordinate', function() {
describe('#toStringHDMS', function() {
it('returns the empty string on undefined input', function() {
const got = _ol_coordinate_.toStringHDMS();
const got = toStringHDMS();
const expected = '';
expect(got).to.be(expected);
});
it('formats with zero fractional digits as default', function() {
const coord = [7.85, 47.983333];
const got = _ol_coordinate_.toStringHDMS(coord);
const got = toStringHDMS(coord);
const expected = '47° 59 00″ N 7° 51 00″ E';
expect(got).to.be(expected);
});
it('formats with given fractional digits, if passed', function() {
const coord = [7.85, 47.983333];
const got = _ol_coordinate_.toStringHDMS(coord, 3);
const got = toStringHDMS(coord, 3);
const expected = '47° 58 59.999″ N 7° 51 00.000″ E';
expect(got).to.be(expected);
});
@@ -232,13 +215,13 @@ describe('ol.coordinate', function() {
describe('#toStringXY', function() {
it('formats with zero fractional digits as default', function() {
const coord = [7.85, 47.983333];
const got = _ol_coordinate_.toStringXY(coord);
const got = toStringXY(coord);
const expected = '8, 48';
expect(got).to.be(expected);
});
it('formats with given fractional digits, if passed', function() {
const coord = [7.85, 47.983333];
const got = _ol_coordinate_.toStringXY(coord, 2);
const got = toStringXY(coord, 2);
const expected = '7.85, 47.98';
expect(got).to.be(expected);
});