Use blocked scoped variables
In addition to using const and let, this also upgrades our linter config and removes lint (mostly whitespace).
This commit is contained in:
@@ -7,7 +7,7 @@ describe('ol.extent', function() {
|
||||
describe('buffer', function() {
|
||||
|
||||
it('buffers an extent by some value', function() {
|
||||
var extent = [-10, -20, 10, 20];
|
||||
const extent = [-10, -20, 10, 20];
|
||||
expect(_ol_extent_.buffer(extent, 15)).to.eql([-25, -35, 25, 35]);
|
||||
});
|
||||
|
||||
@@ -16,8 +16,8 @@ describe('ol.extent', function() {
|
||||
describe('clone', function() {
|
||||
|
||||
it('creates a copy of an extent', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(1, 2, 3, 4);
|
||||
var clone = _ol_extent_.clone(extent);
|
||||
const extent = _ol_extent_.createOrUpdate(1, 2, 3, 4);
|
||||
const clone = _ol_extent_.clone(extent);
|
||||
expect(_ol_extent_.equals(extent, clone)).to.be(true);
|
||||
|
||||
_ol_extent_.extendCoordinate(extent, [10, 20]);
|
||||
@@ -29,44 +29,44 @@ describe('ol.extent', function() {
|
||||
describe('closestSquaredDistanceXY', function() {
|
||||
|
||||
it('returns correct result when x left of extent', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
var x = -2;
|
||||
var y = 0;
|
||||
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
const x = -2;
|
||||
const y = 0;
|
||||
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
|
||||
});
|
||||
|
||||
it('returns correct result when x right of extent', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
var x = 3;
|
||||
var y = 0;
|
||||
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
const x = 3;
|
||||
const y = 0;
|
||||
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
|
||||
});
|
||||
|
||||
it('returns correct result for other x values', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
var x = 0.5;
|
||||
var y = 3;
|
||||
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
const x = 0.5;
|
||||
const y = 3;
|
||||
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
|
||||
});
|
||||
|
||||
it('returns correct result when y below extent', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
var x = 0;
|
||||
var y = -2;
|
||||
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
const x = 0;
|
||||
const y = -2;
|
||||
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
|
||||
});
|
||||
|
||||
it('returns correct result when y above extent', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
var x = 0;
|
||||
var y = 3;
|
||||
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
const x = 0;
|
||||
const y = 3;
|
||||
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
|
||||
});
|
||||
|
||||
it('returns correct result for other y values', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
var x = 3;
|
||||
var y = 0.5;
|
||||
const extent = _ol_extent_.createOrUpdate(0, 0, 1, 1);
|
||||
const x = 3;
|
||||
const y = 0.5;
|
||||
expect(_ol_extent_.closestSquaredDistanceXY(extent, x, y)).to.be(4);
|
||||
});
|
||||
|
||||
@@ -75,16 +75,16 @@ describe('ol.extent', function() {
|
||||
describe('createOrUpdateFromCoordinate', function() {
|
||||
|
||||
it('works when no extent passed', function() {
|
||||
var coords = [0, 1];
|
||||
var expected = [0, 1, 0, 1];
|
||||
var got = _ol_extent_.createOrUpdateFromCoordinate(coords);
|
||||
const coords = [0, 1];
|
||||
const expected = [0, 1, 0, 1];
|
||||
const got = _ol_extent_.createOrUpdateFromCoordinate(coords);
|
||||
expect(got).to.eql(expected);
|
||||
});
|
||||
|
||||
it('updates a passed extent', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(-4, -7, -3, -6);
|
||||
var coords = [0, 1];
|
||||
var expected = [0, 1, 0, 1];
|
||||
const extent = _ol_extent_.createOrUpdate(-4, -7, -3, -6);
|
||||
const coords = [0, 1];
|
||||
const expected = [0, 1, 0, 1];
|
||||
_ol_extent_.createOrUpdateFromCoordinate(coords, extent);
|
||||
expect(extent).to.eql(expected);
|
||||
});
|
||||
@@ -94,31 +94,31 @@ describe('ol.extent', function() {
|
||||
describe('createOrUpdateFromCoordinates', function() {
|
||||
|
||||
it('works when single coordinate and no extent passed', function() {
|
||||
var coords = [[0, 1]];
|
||||
var expected = [0, 1, 0, 1];
|
||||
var got = _ol_extent_.createOrUpdateFromCoordinates(coords);
|
||||
const coords = [[0, 1]];
|
||||
const expected = [0, 1, 0, 1];
|
||||
const got = _ol_extent_.createOrUpdateFromCoordinates(coords);
|
||||
expect(got).to.eql(expected);
|
||||
});
|
||||
|
||||
it('changes the passed extent when single coordinate', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(-4, -7, -3, -6);
|
||||
var coords = [[0, 1]];
|
||||
var expected = [0, 1, 0, 1];
|
||||
const extent = _ol_extent_.createOrUpdate(-4, -7, -3, -6);
|
||||
const coords = [[0, 1]];
|
||||
const expected = [0, 1, 0, 1];
|
||||
_ol_extent_.createOrUpdateFromCoordinates(coords, extent);
|
||||
expect(extent).to.eql(expected);
|
||||
});
|
||||
|
||||
it('works when multiple coordinates and no extent passed', function() {
|
||||
var coords = [[0, 1], [2, 3]];
|
||||
var expected = [0, 1, 2, 3];
|
||||
var got = _ol_extent_.createOrUpdateFromCoordinates(coords);
|
||||
const coords = [[0, 1], [2, 3]];
|
||||
const expected = [0, 1, 2, 3];
|
||||
const got = _ol_extent_.createOrUpdateFromCoordinates(coords);
|
||||
expect(got).to.eql(expected);
|
||||
});
|
||||
|
||||
it('changes the passed extent when multiple coordinates given', function() {
|
||||
var extent = _ol_extent_.createOrUpdate(-4, -7, -3, -6);
|
||||
var coords = [[0, 1], [-2, -1]];
|
||||
var expected = [-2, -1, 0, 1];
|
||||
const extent = _ol_extent_.createOrUpdate(-4, -7, -3, -6);
|
||||
const coords = [[0, 1], [-2, -1]];
|
||||
const expected = [-2, -1, 0, 1];
|
||||
_ol_extent_.createOrUpdateFromCoordinates(coords, extent);
|
||||
expect(extent).to.eql(expected);
|
||||
});
|
||||
@@ -128,37 +128,37 @@ describe('ol.extent', function() {
|
||||
describe('createOrUpdateFromRings', function() {
|
||||
|
||||
it('works when single ring and no extent passed', function() {
|
||||
var ring = [[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]];
|
||||
var rings = [ring];
|
||||
var expected = [0, 0, 2, 2];
|
||||
var got = _ol_extent_.createOrUpdateFromRings(rings);
|
||||
const ring = [[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]];
|
||||
const rings = [ring];
|
||||
const expected = [0, 0, 2, 2];
|
||||
const got = _ol_extent_.createOrUpdateFromRings(rings);
|
||||
expect(got).to.eql(expected);
|
||||
});
|
||||
|
||||
it('changes the passed extent when single ring given', function() {
|
||||
var ring = [[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]];
|
||||
var rings = [ring];
|
||||
var extent = [1, 1, 4, 7];
|
||||
var expected = [0, 0, 2, 2];
|
||||
const ring = [[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]];
|
||||
const rings = [ring];
|
||||
const extent = [1, 1, 4, 7];
|
||||
const expected = [0, 0, 2, 2];
|
||||
_ol_extent_.createOrUpdateFromRings(rings, extent);
|
||||
expect(extent).to.eql(expected);
|
||||
});
|
||||
|
||||
it('works when multiple rings and no extent passed', function() {
|
||||
var ring1 = [[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]];
|
||||
var ring2 = [[1, 1], [1, 3], [3, 3], [3, 1], [1, 1]];
|
||||
var rings = [ring1, ring2];
|
||||
var expected = [0, 0, 3, 3];
|
||||
var got = _ol_extent_.createOrUpdateFromRings(rings);
|
||||
const ring1 = [[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]];
|
||||
const ring2 = [[1, 1], [1, 3], [3, 3], [3, 1], [1, 1]];
|
||||
const rings = [ring1, ring2];
|
||||
const expected = [0, 0, 3, 3];
|
||||
const got = _ol_extent_.createOrUpdateFromRings(rings);
|
||||
expect(got).to.eql(expected);
|
||||
});
|
||||
|
||||
it('changes the passed extent when multiple rings given', function() {
|
||||
var ring1 = [[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]];
|
||||
var ring2 = [[1, 1], [1, 3], [3, 3], [3, 1], [1, 1]];
|
||||
var rings = [ring1, ring2];
|
||||
var extent = [1, 1, 4, 7];
|
||||
var expected = [0, 0, 3, 3];
|
||||
const ring1 = [[0, 0], [0, 2], [2, 2], [2, 0], [0, 0]];
|
||||
const ring2 = [[1, 1], [1, 3], [3, 3], [3, 1], [1, 1]];
|
||||
const rings = [ring1, ring2];
|
||||
const extent = [1, 1, 4, 7];
|
||||
const expected = [0, 0, 3, 3];
|
||||
_ol_extent_.createOrUpdateFromRings(rings, extent);
|
||||
expect(extent).to.eql(expected);
|
||||
});
|
||||
@@ -167,8 +167,8 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('forEachCorner', function() {
|
||||
|
||||
var callbackFalse;
|
||||
var callbackTrue;
|
||||
let callbackFalse;
|
||||
let callbackTrue;
|
||||
beforeEach(function() {
|
||||
callbackFalse = sinon.spy(function() {
|
||||
return false;
|
||||
@@ -179,18 +179,18 @@ describe('ol.extent', function() {
|
||||
});
|
||||
|
||||
it('calls the passed callback for each corner', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
const extent = [1, 2, 3, 4];
|
||||
_ol_extent_.forEachCorner(extent, callbackFalse);
|
||||
expect(callbackFalse.callCount).to.be(4);
|
||||
});
|
||||
|
||||
it('calls the passed callback with each corner', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
const extent = [1, 2, 3, 4];
|
||||
_ol_extent_.forEachCorner(extent, callbackFalse);
|
||||
var firstCallFirstArg = callbackFalse.args[0][0];
|
||||
var secondCallFirstArg = callbackFalse.args[1][0];
|
||||
var thirdCallFirstArg = callbackFalse.args[2][0];
|
||||
var fourthCallFirstArg = callbackFalse.args[3][0];
|
||||
const firstCallFirstArg = callbackFalse.args[0][0];
|
||||
const secondCallFirstArg = callbackFalse.args[1][0];
|
||||
const thirdCallFirstArg = callbackFalse.args[2][0];
|
||||
const fourthCallFirstArg = callbackFalse.args[3][0];
|
||||
expect(firstCallFirstArg).to.eql([1, 2]); // bl
|
||||
expect(secondCallFirstArg).to.eql([3, 2]); // br
|
||||
expect(thirdCallFirstArg).to.eql([3, 4]); // tr
|
||||
@@ -198,23 +198,23 @@ describe('ol.extent', function() {
|
||||
});
|
||||
|
||||
it('calls a truthy callback only once', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
const extent = [1, 2, 3, 4];
|
||||
_ol_extent_.forEachCorner(extent, callbackTrue);
|
||||
expect(callbackTrue.callCount).to.be(1);
|
||||
});
|
||||
|
||||
it('ensures that any corner can cancel the callback execution', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
var bottomLeftSpy = sinon.spy(function(corner) {
|
||||
const extent = [1, 2, 3, 4];
|
||||
const bottomLeftSpy = sinon.spy(function(corner) {
|
||||
return (corner[0] === 1 && corner[1] === 2) ? true : false;
|
||||
});
|
||||
var bottomRightSpy = sinon.spy(function(corner) {
|
||||
const bottomRightSpy = sinon.spy(function(corner) {
|
||||
return (corner[0] === 3 && corner[1] === 2) ? true : false;
|
||||
});
|
||||
var topRightSpy = sinon.spy(function(corner) {
|
||||
const topRightSpy = sinon.spy(function(corner) {
|
||||
return (corner[0] === 3 && corner[1] === 4) ? true : false;
|
||||
});
|
||||
var topLeftSpy = sinon.spy(function(corner) {
|
||||
const topLeftSpy = sinon.spy(function(corner) {
|
||||
return (corner[0] === 1 && corner[1] === 4) ? true : false;
|
||||
});
|
||||
|
||||
@@ -230,18 +230,18 @@ describe('ol.extent', function() {
|
||||
});
|
||||
|
||||
it('returns false eventually, if no invocation returned a truthy value',
|
||||
function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
var spy = sinon.spy(); // will return undefined for each corner
|
||||
var got = _ol_extent_.forEachCorner(extent, spy);
|
||||
expect(spy.callCount).to.be(4);
|
||||
expect(got).to.be(false);
|
||||
}
|
||||
function() {
|
||||
const extent = [1, 2, 3, 4];
|
||||
const spy = sinon.spy(); // will return undefined for each corner
|
||||
const got = _ol_extent_.forEachCorner(extent, spy);
|
||||
expect(spy.callCount).to.be(4);
|
||||
expect(got).to.be(false);
|
||||
}
|
||||
);
|
||||
|
||||
it('calls the callback with given scope', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
var scope = {humpty: 'dumpty'};
|
||||
const extent = [1, 2, 3, 4];
|
||||
const scope = {humpty: 'dumpty'};
|
||||
_ol_extent_.forEachCorner(extent, callbackTrue, scope);
|
||||
expect(callbackTrue.calledOn(scope)).to.be(true);
|
||||
});
|
||||
@@ -250,37 +250,37 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('getArea', function() {
|
||||
it('returns zero for empty extents', function() {
|
||||
var emptyExtent = _ol_extent_.createEmpty();
|
||||
var areaEmpty = _ol_extent_.getArea(emptyExtent);
|
||||
const emptyExtent = _ol_extent_.createEmpty();
|
||||
const areaEmpty = _ol_extent_.getArea(emptyExtent);
|
||||
expect(areaEmpty).to.be(0);
|
||||
|
||||
var extentDeltaXZero = [45, 67, 45, 78];
|
||||
var areaDeltaXZero = _ol_extent_.getArea(extentDeltaXZero);
|
||||
const extentDeltaXZero = [45, 67, 45, 78];
|
||||
const areaDeltaXZero = _ol_extent_.getArea(extentDeltaXZero);
|
||||
expect(areaDeltaXZero).to.be(0);
|
||||
|
||||
var extentDeltaYZero = [11, 67, 45, 67];
|
||||
var areaDeltaYZero = _ol_extent_.getArea(extentDeltaYZero);
|
||||
const extentDeltaYZero = [11, 67, 45, 67];
|
||||
const areaDeltaYZero = _ol_extent_.getArea(extentDeltaYZero);
|
||||
expect(areaDeltaYZero).to.be(0);
|
||||
});
|
||||
it('calculates correct area for other extents', function() {
|
||||
var extent = [0, 0, 10, 10];
|
||||
var area = _ol_extent_.getArea(extent);
|
||||
const extent = [0, 0, 10, 10];
|
||||
const area = _ol_extent_.getArea(extent);
|
||||
expect(area).to.be(100);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getIntersection()', function() {
|
||||
it('returns the intersection of two extents', function() {
|
||||
var world = [-180, -90, 180, 90];
|
||||
var north = [-180, 0, 180, 90];
|
||||
var farNorth = [-180, 45, 180, 90];
|
||||
var east = [0, -90, 180, 90];
|
||||
var farEast = [90, -90, 180, 90];
|
||||
var south = [-180, -90, 180, 0];
|
||||
var farSouth = [-180, -90, 180, -45];
|
||||
var west = [-180, -90, 0, 90];
|
||||
var farWest = [-180, -90, -90, 90];
|
||||
var none = _ol_extent_.createEmpty();
|
||||
const world = [-180, -90, 180, 90];
|
||||
const north = [-180, 0, 180, 90];
|
||||
const farNorth = [-180, 45, 180, 90];
|
||||
const east = [0, -90, 180, 90];
|
||||
const farEast = [90, -90, 180, 90];
|
||||
const south = [-180, -90, 180, 0];
|
||||
const farSouth = [-180, -90, 180, -45];
|
||||
const west = [-180, -90, 0, 90];
|
||||
const farWest = [-180, -90, -90, 90];
|
||||
const none = _ol_extent_.createEmpty();
|
||||
expect(_ol_extent_.getIntersection(world, none)).to.eql(none);
|
||||
expect(_ol_extent_.getIntersection(world, north)).to.eql(north);
|
||||
expect(_ol_extent_.getIntersection(world, east)).to.eql(east);
|
||||
@@ -297,7 +297,7 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('positive', function() {
|
||||
it('returns true', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
const extent = [1, 2, 3, 4];
|
||||
expect(_ol_extent_.containsCoordinate(extent, [1, 2])).to.be.ok();
|
||||
expect(_ol_extent_.containsCoordinate(extent, [1, 3])).to.be.ok();
|
||||
expect(_ol_extent_.containsCoordinate(extent, [1, 4])).to.be.ok();
|
||||
@@ -312,7 +312,7 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('negative', function() {
|
||||
it('returns false', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
const extent = [1, 2, 3, 4];
|
||||
expect(_ol_extent_.containsCoordinate(extent, [0, 1])).to.not.be();
|
||||
expect(_ol_extent_.containsCoordinate(extent, [0, 2])).to.not.be();
|
||||
expect(_ol_extent_.containsCoordinate(extent, [0, 3])).to.not.be();
|
||||
@@ -335,78 +335,78 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('coordinateRelationship()', function() {
|
||||
|
||||
var extent = [-180, -90, 180, 90];
|
||||
var INTERSECTING = 1;
|
||||
var ABOVE = 2;
|
||||
var RIGHT = 4;
|
||||
var BELOW = 8;
|
||||
var LEFT = 16;
|
||||
const extent = [-180, -90, 180, 90];
|
||||
const INTERSECTING = 1;
|
||||
const ABOVE = 2;
|
||||
const RIGHT = 4;
|
||||
const BELOW = 8;
|
||||
const LEFT = 16;
|
||||
|
||||
it('returns intersecting for within', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [0, 0]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [0, 0]);
|
||||
expect(rel).to.be(INTERSECTING);
|
||||
});
|
||||
|
||||
it('returns intersecting for touching top', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [0, 90]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [0, 90]);
|
||||
expect(rel).to.be(INTERSECTING);
|
||||
});
|
||||
|
||||
it('returns intersecting for touching right', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [180, 0]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [180, 0]);
|
||||
expect(rel).to.be(INTERSECTING);
|
||||
});
|
||||
|
||||
it('returns intersecting for touching bottom', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [0, -90]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [0, -90]);
|
||||
expect(rel).to.be(INTERSECTING);
|
||||
});
|
||||
|
||||
it('returns intersecting for touching left', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [-180, 0]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [-180, 0]);
|
||||
expect(rel).to.be(INTERSECTING);
|
||||
});
|
||||
|
||||
it('above for north', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [0, 100]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [0, 100]);
|
||||
expect(rel).to.be(ABOVE);
|
||||
});
|
||||
|
||||
it('above and right for northeast', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [190, 100]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [190, 100]);
|
||||
expect(rel & ABOVE).to.be(ABOVE);
|
||||
expect(rel & RIGHT).to.be(RIGHT);
|
||||
});
|
||||
|
||||
it('right for east', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [190, 0]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [190, 0]);
|
||||
expect(rel).to.be(RIGHT);
|
||||
});
|
||||
|
||||
it('below and right for southeast', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [190, -100]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [190, -100]);
|
||||
expect(rel & BELOW).to.be(BELOW);
|
||||
expect(rel & RIGHT).to.be(RIGHT);
|
||||
});
|
||||
|
||||
it('below for south', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [0, -100]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [0, -100]);
|
||||
expect(rel).to.be(BELOW);
|
||||
});
|
||||
|
||||
it('below and left for southwest', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [-190, -100]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [-190, -100]);
|
||||
expect(rel & BELOW).to.be(BELOW);
|
||||
expect(rel & LEFT).to.be(LEFT);
|
||||
});
|
||||
|
||||
it('left for west', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [-190, 0]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [-190, 0]);
|
||||
expect(rel).to.be(LEFT);
|
||||
});
|
||||
|
||||
it('above and left for northwest', function() {
|
||||
var rel = _ol_extent_.coordinateRelationship(extent, [-190, 100]);
|
||||
const rel = _ol_extent_.coordinateRelationship(extent, [-190, 100]);
|
||||
expect(rel & ABOVE).to.be(ABOVE);
|
||||
expect(rel & LEFT).to.be(LEFT);
|
||||
});
|
||||
@@ -415,39 +415,39 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('getCenter', function() {
|
||||
it('returns the expected center', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
var center = _ol_extent_.getCenter(extent);
|
||||
const extent = [1, 2, 3, 4];
|
||||
const center = _ol_extent_.getCenter(extent);
|
||||
expect(center[0]).to.eql(2);
|
||||
expect(center[1]).to.eql(3);
|
||||
});
|
||||
it('returns [NaN, NaN] for empty extents', function() {
|
||||
var extent = _ol_extent_.createEmpty();
|
||||
var center = _ol_extent_.getCenter(extent);
|
||||
const extent = _ol_extent_.createEmpty();
|
||||
const center = _ol_extent_.getCenter(extent);
|
||||
expect('' + center[0]).to.be('NaN');
|
||||
expect('' + center[1]).to.be('NaN');
|
||||
});
|
||||
});
|
||||
|
||||
describe('getCorner', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
const extent = [1, 2, 3, 4];
|
||||
|
||||
it('gets the bottom left', function() {
|
||||
var corner = 'bottom-left';
|
||||
const corner = 'bottom-left';
|
||||
expect(_ol_extent_.getCorner(extent, corner)).to.eql([1, 2]);
|
||||
});
|
||||
|
||||
it('gets the bottom right', function() {
|
||||
var corner = 'bottom-right';
|
||||
const corner = 'bottom-right';
|
||||
expect(_ol_extent_.getCorner(extent, corner)).to.eql([3, 2]);
|
||||
});
|
||||
|
||||
it('gets the top left', function() {
|
||||
var corner = 'top-left';
|
||||
const corner = 'top-left';
|
||||
expect(_ol_extent_.getCorner(extent, corner)).to.eql([1, 4]);
|
||||
});
|
||||
|
||||
it('gets the top right', function() {
|
||||
var corner = 'top-right';
|
||||
const corner = 'top-right';
|
||||
expect(_ol_extent_.getCorner(extent, corner)).to.eql([3, 4]);
|
||||
});
|
||||
|
||||
@@ -461,9 +461,9 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('getEnlargedArea', function() {
|
||||
it('returns enlarged area of two extents', function() {
|
||||
var extent1 = [-1, -1, 0, 0];
|
||||
var extent2 = [0, 0, 1, 1];
|
||||
var enlargedArea = _ol_extent_.getEnlargedArea(extent1, extent2);
|
||||
const extent1 = [-1, -1, 0, 0];
|
||||
const extent2 = [0, 0, 1, 1];
|
||||
const enlargedArea = _ol_extent_.getEnlargedArea(extent1, extent2);
|
||||
expect(enlargedArea).to.be(4);
|
||||
});
|
||||
});
|
||||
@@ -471,8 +471,8 @@ describe('ol.extent', function() {
|
||||
describe('getForViewAndSize', function() {
|
||||
|
||||
it('works for a unit square', function() {
|
||||
var extent = _ol_extent_.getForViewAndSize(
|
||||
[0, 0], 1, 0, [1, 1]);
|
||||
const extent = _ol_extent_.getForViewAndSize(
|
||||
[0, 0], 1, 0, [1, 1]);
|
||||
expect(extent[0]).to.be(-0.5);
|
||||
expect(extent[2]).to.be(0.5);
|
||||
expect(extent[1]).to.be(-0.5);
|
||||
@@ -480,8 +480,8 @@ describe('ol.extent', function() {
|
||||
});
|
||||
|
||||
it('works for center', function() {
|
||||
var extent = _ol_extent_.getForViewAndSize(
|
||||
[5, 10], 1, 0, [1, 1]);
|
||||
const extent = _ol_extent_.getForViewAndSize(
|
||||
[5, 10], 1, 0, [1, 1]);
|
||||
expect(extent[0]).to.be(4.5);
|
||||
expect(extent[2]).to.be(5.5);
|
||||
expect(extent[1]).to.be(9.5);
|
||||
@@ -489,8 +489,8 @@ describe('ol.extent', function() {
|
||||
});
|
||||
|
||||
it('works for rotation', function() {
|
||||
var extent = _ol_extent_.getForViewAndSize(
|
||||
[0, 0], 1, Math.PI / 4, [1, 1]);
|
||||
const extent = _ol_extent_.getForViewAndSize(
|
||||
[0, 0], 1, Math.PI / 4, [1, 1]);
|
||||
expect(extent[0]).to.roughlyEqual(-Math.sqrt(0.5), 1e-9);
|
||||
expect(extent[2]).to.roughlyEqual(Math.sqrt(0.5), 1e-9);
|
||||
expect(extent[1]).to.roughlyEqual(-Math.sqrt(0.5), 1e-9);
|
||||
@@ -498,8 +498,8 @@ describe('ol.extent', function() {
|
||||
});
|
||||
|
||||
it('works for resolution', function() {
|
||||
var extent = _ol_extent_.getForViewAndSize(
|
||||
[0, 0], 2, 0, [1, 1]);
|
||||
const extent = _ol_extent_.getForViewAndSize(
|
||||
[0, 0], 2, 0, [1, 1]);
|
||||
expect(extent[0]).to.be(-1);
|
||||
expect(extent[2]).to.be(1);
|
||||
expect(extent[1]).to.be(-1);
|
||||
@@ -507,8 +507,8 @@ describe('ol.extent', function() {
|
||||
});
|
||||
|
||||
it('works for size', function() {
|
||||
var extent = _ol_extent_.getForViewAndSize(
|
||||
[0, 0], 1, 0, [10, 5]);
|
||||
const extent = _ol_extent_.getForViewAndSize(
|
||||
[0, 0], 1, 0, [10, 5]);
|
||||
expect(extent[0]).to.be(-5);
|
||||
expect(extent[2]).to.be(5);
|
||||
expect(extent[1]).to.be(-2.5);
|
||||
@@ -519,30 +519,30 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('getSize', function() {
|
||||
it('returns the expected size', function() {
|
||||
var extent = [0, 1, 2, 4];
|
||||
var size = _ol_extent_.getSize(extent);
|
||||
const extent = [0, 1, 2, 4];
|
||||
const size = _ol_extent_.getSize(extent);
|
||||
expect(size).to.eql([2, 3]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getIntersectionArea', function() {
|
||||
it('returns correct area when extents intersect', function() {
|
||||
var extent1 = [0, 0, 2, 2];
|
||||
var extent2 = [1, 1, 3, 3];
|
||||
var intersectionArea = _ol_extent_.getIntersectionArea(extent1, extent2);
|
||||
const extent1 = [0, 0, 2, 2];
|
||||
const extent2 = [1, 1, 3, 3];
|
||||
const intersectionArea = _ol_extent_.getIntersectionArea(extent1, extent2);
|
||||
expect(intersectionArea).to.be(1);
|
||||
});
|
||||
it('returns 0 when extents do not intersect', function() {
|
||||
var extent1 = [0, 0, 1, 1];
|
||||
var extent2 = [2, 2, 3, 3];
|
||||
var intersectionArea = _ol_extent_.getIntersectionArea(extent1, extent2);
|
||||
const extent1 = [0, 0, 1, 1];
|
||||
const extent2 = [2, 2, 3, 3];
|
||||
const intersectionArea = _ol_extent_.getIntersectionArea(extent1, extent2);
|
||||
expect(intersectionArea).to.be(0);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getMargin', function() {
|
||||
it('returns the correct margin (sum of width and height)', function() {
|
||||
var extent = [1, 2, 3, 4];
|
||||
const extent = [1, 2, 3, 4];
|
||||
expect(_ol_extent_.getMargin(extent)).to.be(4);
|
||||
});
|
||||
});
|
||||
@@ -550,8 +550,8 @@ describe('ol.extent', function() {
|
||||
describe('intersects', function() {
|
||||
|
||||
it('returns the expected value', function() {
|
||||
var intersects = _ol_extent_.intersects;
|
||||
var extent = [50, 50, 100, 100];
|
||||
const intersects = _ol_extent_.intersects;
|
||||
const extent = [50, 50, 100, 100];
|
||||
expect(intersects(extent, extent)).to.be(true);
|
||||
expect(intersects(extent, [20, 20, 80, 80])).to.be(true);
|
||||
expect(intersects(extent, [20, 50, 80, 100])).to.be(true);
|
||||
@@ -584,7 +584,7 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('scaleFromCenter', function() {
|
||||
it('scales the extent from its center', function() {
|
||||
var extent = [1, 1, 3, 3];
|
||||
const extent = [1, 1, 3, 3];
|
||||
_ol_extent_.scaleFromCenter(extent, 2);
|
||||
expect(extent[0]).to.eql(0);
|
||||
expect(extent[2]).to.eql(4);
|
||||
@@ -595,139 +595,139 @@ describe('ol.extent', function() {
|
||||
|
||||
describe('intersectsSegment()', function() {
|
||||
|
||||
var extent = [-180, -90, 180, 90];
|
||||
var north = [0, 100];
|
||||
var northeast = [190, 100];
|
||||
var east = [190, 0];
|
||||
var southeast = [190, -100];
|
||||
var south = [0, -100];
|
||||
var southwest = [-190, -100];
|
||||
var west = [-190, 0];
|
||||
var northwest = [-190, 100];
|
||||
var center = [0, 0];
|
||||
var top = [0, 90];
|
||||
var right = [180, 0];
|
||||
var bottom = [-90, 0];
|
||||
var left = [-180, 0];
|
||||
var inside = [10, 10];
|
||||
const extent = [-180, -90, 180, 90];
|
||||
const north = [0, 100];
|
||||
const northeast = [190, 100];
|
||||
const east = [190, 0];
|
||||
const southeast = [190, -100];
|
||||
const south = [0, -100];
|
||||
const southwest = [-190, -100];
|
||||
const west = [-190, 0];
|
||||
const northwest = [-190, 100];
|
||||
const center = [0, 0];
|
||||
const top = [0, 90];
|
||||
const right = [180, 0];
|
||||
const bottom = [-90, 0];
|
||||
const left = [-180, 0];
|
||||
const inside = [10, 10];
|
||||
|
||||
it('returns true if contained', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, center, inside);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, center, inside);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses top', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, center, north);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, center, north);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses right', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, center, east);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, center, east);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses bottom', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, center, south);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, center, south);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses left', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, center, west);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, center, west);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns false if above', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, northwest, north);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, northwest, north);
|
||||
expect(intersects).to.be(false);
|
||||
});
|
||||
|
||||
it('returns false if right', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, northeast, east);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, northeast, east);
|
||||
expect(intersects).to.be(false);
|
||||
});
|
||||
|
||||
it('returns false if below', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, south, southwest);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, south, southwest);
|
||||
expect(intersects).to.be(false);
|
||||
});
|
||||
|
||||
it('returns false if left', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, west, southwest);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, west, southwest);
|
||||
expect(intersects).to.be(false);
|
||||
});
|
||||
|
||||
it('returns true if crosses top to bottom', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, north, south);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, north, south);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses bottom to top', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, south, north);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, south, north);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses left to right', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, west, east);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, west, east);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses right to left', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, east, west);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, east, west);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses northwest to east', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, northwest, east);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, northwest, east);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if crosses south to west', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, south, west);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, south, west);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if touches top', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, northwest, top);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, northwest, top);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if touches right', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, southeast, right);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, southeast, right);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if touches bottom', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, bottom, south);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, bottom, south);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true if touches left', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, left, west);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, left, west);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('works for zero length inside', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, center, center);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, center, center);
|
||||
expect(intersects).to.be(true);
|
||||
});
|
||||
|
||||
it('works for zero length outside', function() {
|
||||
var intersects = _ol_extent_.intersectsSegment(extent, north, north);
|
||||
const intersects = _ol_extent_.intersectsSegment(extent, north, north);
|
||||
expect(intersects).to.be(false);
|
||||
});
|
||||
|
||||
it('works for left/right intersection spanning top to bottom', function() {
|
||||
var extent = [2, 1, 3, 4];
|
||||
var start = [0, 0];
|
||||
var end = [5, 5];
|
||||
const extent = [2, 1, 3, 4];
|
||||
const start = [0, 0];
|
||||
const end = [5, 5];
|
||||
expect(_ol_extent_.intersectsSegment(extent, start, end)).to.be(true);
|
||||
expect(_ol_extent_.intersectsSegment(extent, end, start)).to.be(true);
|
||||
});
|
||||
|
||||
it('works for top/bottom intersection spanning left to right', function() {
|
||||
var extent = [1, 2, 4, 3];
|
||||
var start = [0, 0];
|
||||
var end = [5, 5];
|
||||
const extent = [1, 2, 4, 3];
|
||||
const start = [0, 0];
|
||||
const end = [5, 5];
|
||||
expect(_ol_extent_.intersectsSegment(extent, start, end)).to.be(true);
|
||||
expect(_ol_extent_.intersectsSegment(extent, end, start)).to.be(true);
|
||||
});
|
||||
@@ -737,37 +737,37 @@ describe('ol.extent', function() {
|
||||
describe('#applyTransform()', function() {
|
||||
|
||||
it('does transform', function() {
|
||||
var transformFn = getTransform('EPSG:4326', 'EPSG:3857');
|
||||
var sourceExtent = [-15, -30, 45, 60];
|
||||
var destinationExtent = _ol_extent_.applyTransform(
|
||||
sourceExtent, transformFn);
|
||||
const transformFn = getTransform('EPSG:4326', 'EPSG:3857');
|
||||
const sourceExtent = [-15, -30, 45, 60];
|
||||
const destinationExtent = _ol_extent_.applyTransform(
|
||||
sourceExtent, transformFn);
|
||||
expect(destinationExtent).not.to.be(undefined);
|
||||
expect(destinationExtent).not.to.be(null);
|
||||
// FIXME check values with third-party tool
|
||||
expect(destinationExtent[0])
|
||||
.to.roughlyEqual(-1669792.3618991037, 1e-9);
|
||||
.to.roughlyEqual(-1669792.3618991037, 1e-9);
|
||||
expect(destinationExtent[2]).to.roughlyEqual(5009377.085697311, 1e-9);
|
||||
expect(destinationExtent[1]).to.roughlyEqual(-3503549.843504376, 1e-8);
|
||||
expect(destinationExtent[3]).to.roughlyEqual(8399737.889818361, 1e-8);
|
||||
});
|
||||
|
||||
it('takes arbitrary function', function() {
|
||||
var transformFn = function(input, output, opt_dimension) {
|
||||
var dimension = opt_dimension !== undefined ? opt_dimension : 2;
|
||||
const transformFn = function(input, output, opt_dimension) {
|
||||
const dimension = opt_dimension !== undefined ? opt_dimension : 2;
|
||||
if (output === undefined) {
|
||||
output = new Array(input.length);
|
||||
}
|
||||
var n = input.length;
|
||||
var i;
|
||||
const n = input.length;
|
||||
let i;
|
||||
for (i = 0; i < n; i += dimension) {
|
||||
output[i] = -input[i];
|
||||
output[i + 1] = -input[i + 1];
|
||||
}
|
||||
return output;
|
||||
};
|
||||
var sourceExtent = [-15, -30, 45, 60];
|
||||
var destinationExtent = _ol_extent_.applyTransform(
|
||||
sourceExtent, transformFn);
|
||||
const sourceExtent = [-15, -30, 45, 60];
|
||||
const destinationExtent = _ol_extent_.applyTransform(
|
||||
sourceExtent, transformFn);
|
||||
expect(destinationExtent).not.to.be(undefined);
|
||||
expect(destinationExtent).not.to.be(null);
|
||||
expect(destinationExtent[0]).to.be(-45);
|
||||
|
||||
Reference in New Issue
Block a user