Skip to content

Commit 1ca6508

Browse files
committed
use Lib.mod to cycle indices
1 parent 7d405a0 commit 1ca6508

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/plots/polar/polar.js

+6-10
Original file line numberDiff line numberDiff line change
@@ -756,12 +756,12 @@ proto.updateMainDrag = function(fullLayout, polarLayout) {
756756
}
757757

758758
function findEnclosingVertexAngles(a) {
759-
var cycleIndex = makeCycleIndexFn(vangles.length);
760759
var i0 = findIndexOfMin(vangles, function(v) {
761760
var adelta = angleDelta(v, a);
762761
return adelta > 0 ? adelta : Infinity;
763762
});
764-
return [vangles[i0], vangles[cycleIndex(i0 + 1)]];
763+
var i1 = Lib.mod(i0 + 1, vangles.length);
764+
return [vangles[i0], vangles[i1]];
765765
}
766766

767767
function findPolygonRadius(x, y, va0, va1) {
@@ -1391,13 +1391,6 @@ function findXYatLength(l, m, xp, yp) {
13911391
];
13921392
}
13931393

1394-
function makeCycleIndexFn(len) {
1395-
return function(index) {
1396-
return index < 0 ? len + index :
1397-
index < len ? index : index - len;
1398-
};
1399-
}
1400-
14011394
function makeRegularPolygon(r, vangles) {
14021395
var len = vangles.length;
14031396
var vertices = new Array(len + 1);
@@ -1423,7 +1416,10 @@ function makeClippedPolygon(r, sector, vangles) {
14231416
return findIntersectionXY(va0, va1, s, a2xy(va0));
14241417
}
14251418

1426-
var cycleIndex = makeCycleIndexFn(len);
1419+
function cycleIndex(ind) {
1420+
return Lib.mod(ind, len);
1421+
}
1422+
14271423
var s0 = deg2rad(sector[0]);
14281424
var s1 = deg2rad(sector[1]);
14291425

0 commit comments

Comments
 (0)