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

Rename ol.extent.segmentIntersects to intersectsSegment

Browse Source
This commit is contained in:
Éric Lemoine
2014-09-17 11:57:59 +02:00
parent 79445e993b
commit 72e173d925
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/extent.js
View File

@@ -774,7 +774,7 @@ ol.extent.scaleFromCenter = function(extent, value) {
* @param {ol.Coordinate} end Segment end coordinate. * @param {ol.Coordinate} end Segment end coordinate.
* @return {boolean} The segment intersects the extent. * @return {boolean} The segment intersects the extent.
*/ */
ol.extent.segmentIntersects = function(extent, start, end) { ol.extent.intersectsSegment = function(extent, start, end) {
var intersects = false; var intersects = false;
var startRel = ol.extent.coordinateRelationship(extent, start); var startRel = ol.extent.coordinateRelationship(extent, start);
var endRel = ol.extent.coordinateRelationship(extent, end); var endRel = ol.extent.coordinateRelationship(extent, end);

2
src/ol/geom/flat/intersectsextent.js
View File

@@ -40,7 +40,7 @@ ol.geom.flat.intersectsextent.lineString =
* `false` otherwise. * `false` otherwise.
*/ */
function(point1, point2) { function(point1, point2) {
return ol.extent.segmentIntersects(extent, point1, point2); return ol.extent.intersectsSegment(extent, point1, point2);
}); });
}; };

44
test/spec/ol/extent.test.js
View File

@@ -349,7 +349,7 @@ describe('ol.extent', function() {
}); });
}); });
describe('segmentIntersects()', function() { describe('intersectsSegment()', function() {
var extent = [-180, -90, 180, 90]; var extent = [-180, -90, 180, 90];
var north = [0, 100]; var north = [0, 100];
@@ -368,107 +368,107 @@ describe('ol.extent', function() {
var inside = [10, 10]; var inside = [10, 10];
it('returns true if contained', function() { it('returns true if contained', function() {
var intersects = ol.extent.segmentIntersects(extent, center, inside); var intersects = ol.extent.intersectsSegment(extent, center, inside);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses top', function() { it('returns true if crosses top', function() {
var intersects = ol.extent.segmentIntersects(extent, center, north); var intersects = ol.extent.intersectsSegment(extent, center, north);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses right', function() { it('returns true if crosses right', function() {
var intersects = ol.extent.segmentIntersects(extent, center, east); var intersects = ol.extent.intersectsSegment(extent, center, east);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses bottom', function() { it('returns true if crosses bottom', function() {
var intersects = ol.extent.segmentIntersects(extent, center, south); var intersects = ol.extent.intersectsSegment(extent, center, south);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses left', function() { it('returns true if crosses left', function() {
var intersects = ol.extent.segmentIntersects(extent, center, west); var intersects = ol.extent.intersectsSegment(extent, center, west);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns false if above', function() { it('returns false if above', function() {
var intersects = ol.extent.segmentIntersects(extent, northwest, north); var intersects = ol.extent.intersectsSegment(extent, northwest, north);
expect(intersects).to.be(false); expect(intersects).to.be(false);
}); });
it('returns false if right', function() { it('returns false if right', function() {
var intersects = ol.extent.segmentIntersects(extent, northeast, east); var intersects = ol.extent.intersectsSegment(extent, northeast, east);
expect(intersects).to.be(false); expect(intersects).to.be(false);
}); });
it('returns false if below', function() { it('returns false if below', function() {
var intersects = ol.extent.segmentIntersects(extent, south, southwest); var intersects = ol.extent.intersectsSegment(extent, south, southwest);
expect(intersects).to.be(false); expect(intersects).to.be(false);
}); });
it('returns false if left', function() { it('returns false if left', function() {
var intersects = ol.extent.segmentIntersects(extent, west, southwest); var intersects = ol.extent.intersectsSegment(extent, west, southwest);
expect(intersects).to.be(false); expect(intersects).to.be(false);
}); });
it('returns true if crosses top to bottom', function() { it('returns true if crosses top to bottom', function() {
var intersects = ol.extent.segmentIntersects(extent, north, south); var intersects = ol.extent.intersectsSegment(extent, north, south);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses bottom to top', function() { it('returns true if crosses bottom to top', function() {
var intersects = ol.extent.segmentIntersects(extent, south, north); var intersects = ol.extent.intersectsSegment(extent, south, north);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses left to right', function() { it('returns true if crosses left to right', function() {
var intersects = ol.extent.segmentIntersects(extent, west, east); var intersects = ol.extent.intersectsSegment(extent, west, east);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses right to left', function() { it('returns true if crosses right to left', function() {
var intersects = ol.extent.segmentIntersects(extent, east, west); var intersects = ol.extent.intersectsSegment(extent, east, west);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses northwest to east', function() { it('returns true if crosses northwest to east', function() {
var intersects = ol.extent.segmentIntersects(extent, northwest, east); var intersects = ol.extent.intersectsSegment(extent, northwest, east);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if crosses south to west', function() { it('returns true if crosses south to west', function() {
var intersects = ol.extent.segmentIntersects(extent, south, west); var intersects = ol.extent.intersectsSegment(extent, south, west);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if touches top', function() { it('returns true if touches top', function() {
var intersects = ol.extent.segmentIntersects(extent, northwest, top); var intersects = ol.extent.intersectsSegment(extent, northwest, top);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if touches right', function() { it('returns true if touches right', function() {
var intersects = ol.extent.segmentIntersects(extent, southeast, right); var intersects = ol.extent.intersectsSegment(extent, southeast, right);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if touches bottom', function() { it('returns true if touches bottom', function() {
var intersects = ol.extent.segmentIntersects(extent, bottom, south); var intersects = ol.extent.intersectsSegment(extent, bottom, south);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('returns true if touches left', function() { it('returns true if touches left', function() {
var intersects = ol.extent.segmentIntersects(extent, left, west); var intersects = ol.extent.intersectsSegment(extent, left, west);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('works for zero length inside', function() { it('works for zero length inside', function() {
var intersects = ol.extent.segmentIntersects(extent, center, center); var intersects = ol.extent.intersectsSegment(extent, center, center);
expect(intersects).to.be(true); expect(intersects).to.be(true);
}); });
it('works for zero length outside', function() { it('works for zero length outside', function() {
var intersects = ol.extent.segmentIntersects(extent, north, north); var intersects = ol.extent.intersectsSegment(extent, north, north);
expect(intersects).to.be(false); expect(intersects).to.be(false);
}); });