ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename ol.geom.Geometry#containsCoordinate to intersectsCoordinate

Browse Source
This commit is contained in:
Frederic Junod
2016-08-23 14:36:09 +02:00
parent 985dda28eb
commit 9074bd9783
5 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/spec/ol/geom/circle.test.js
View File

@@ -24,31 +24,31 @@ describe('ol.geom.Circle', function() {
});
describe('#containsCoordinate', function() {
describe('#intersectsCoordinate', function() {
it('contains the center', function() {
expect(circle.containsCoordinate([0, 0])).to.be(true);
expect(circle.intersectsCoordinate([0, 0])).to.be(true);
});
it('contains points inside the perimeter', function() {
expect(circle.containsCoordinate([0.5, 0.5])).to.be(true);
expect(circle.containsCoordinate([-0.5, 0.5])).to.be(true);
expect(circle.containsCoordinate([-0.5, -0.5])).to.be(true);
expect(circle.containsCoordinate([0.5, -0.5])).to.be(true);
expect(circle.intersectsCoordinate([0.5, 0.5])).to.be(true);
expect(circle.intersectsCoordinate([-0.5, 0.5])).to.be(true);
expect(circle.intersectsCoordinate([-0.5, -0.5])).to.be(true);
expect(circle.intersectsCoordinate([0.5, -0.5])).to.be(true);
});
it('contains points on the perimeter', function() {
expect(circle.containsCoordinate([1, 0])).to.be(true);
expect(circle.containsCoordinate([0, 1])).to.be(true);
expect(circle.containsCoordinate([-1, 0])).to.be(true);
expect(circle.containsCoordinate([0, -1])).to.be(true);
expect(circle.intersectsCoordinate([1, 0])).to.be(true);
expect(circle.intersectsCoordinate([0, 1])).to.be(true);
expect(circle.intersectsCoordinate([-1, 0])).to.be(true);
expect(circle.intersectsCoordinate([0, -1])).to.be(true);
});
it('does not contain points outside the perimeter', function() {
expect(circle.containsCoordinate([2, 0])).to.be(false);
expect(circle.containsCoordinate([1, 1])).to.be(false);
expect(circle.containsCoordinate([-2, 0])).to.be(false);
expect(circle.containsCoordinate([0, -2])).to.be(false);
expect(circle.intersectsCoordinate([2, 0])).to.be(false);
expect(circle.intersectsCoordinate([1, 1])).to.be(false);
expect(circle.intersectsCoordinate([-2, 0])).to.be(false);
expect(circle.intersectsCoordinate([0, -2])).to.be(false);
});
});

26
test/spec/ol/geom/polygon.test.js
View File

@@ -113,15 +113,15 @@ describe('ol.geom.Polygon', function() {
});
it('does not contain outside coordinates', function() {
expect(polygon.containsCoordinate(outsideOuter)).to.be(false);
expect(polygon.intersectsCoordinate(outsideOuter)).to.be(false);
});
it('does contain inside coordinates', function() {
expect(polygon.containsCoordinate(inside)).to.be(true);
expect(polygon.intersectsCoordinate(inside)).to.be(true);
});
it('does not contain inside inner coordinates', function() {
expect(polygon.containsCoordinate(insideInner)).to.be(false);
expect(polygon.intersectsCoordinate(insideInner)).to.be(false);
});
describe('#getCoordinates()', function() {
@@ -208,15 +208,15 @@ describe('ol.geom.Polygon', function() {
});
it('does not contain outside coordinates', function() {
expect(polygon.containsCoordinate(outsideOuter)).to.be(false);
expect(polygon.intersectsCoordinate(outsideOuter)).to.be(false);
});
it('does contain inside coordinates', function() {
expect(polygon.containsCoordinate(inside)).to.be(true);
expect(polygon.intersectsCoordinate(inside)).to.be(true);
});
it('does not contain inside inner coordinates', function() {
expect(polygon.containsCoordinate(insideInner)).to.be(false);
expect(polygon.intersectsCoordinate(insideInner)).to.be(false);
});
describe('#intersectsExtent', function() {
@@ -307,15 +307,15 @@ describe('ol.geom.Polygon', function() {
});
it('does not contain outside coordinates', function() {
expect(polygon.containsCoordinate(outsideOuter)).to.be(false);
expect(polygon.intersectsCoordinate(outsideOuter)).to.be(false);
});
it('does contain inside coordinates', function() {
expect(polygon.containsCoordinate(inside)).to.be(true);
expect(polygon.intersectsCoordinate(inside)).to.be(true);
});
it('does not contain inside inner coordinates', function() {
expect(polygon.containsCoordinate(insideInner)).to.be(false);
expect(polygon.intersectsCoordinate(insideInner)).to.be(false);
});
describe('#intersectsExtent', function() {
@@ -413,16 +413,16 @@ describe('ol.geom.Polygon', function() {
});
it('does not contain outside coordinates', function() {
expect(polygon.containsCoordinate(outsideOuter)).to.be(false);
expect(polygon.intersectsCoordinate(outsideOuter)).to.be(false);
});
it('does contain inside coordinates', function() {
expect(polygon.containsCoordinate(inside)).to.be(true);
expect(polygon.intersectsCoordinate(inside)).to.be(true);
});
it('does not contain inside inner coordinates', function() {
expect(polygon.containsCoordinate(insideInner1)).to.be(false);
expect(polygon.containsCoordinate(insideInner2)).to.be(false);
expect(polygon.intersectsCoordinate(insideInner1)).to.be(false);
expect(polygon.intersectsCoordinate(insideInner2)).to.be(false);
});
describe('#intersectsExtent', function() {