replace wrap360 with Lib.mod & wrap180 with new Lib.modHalf

Author: etpinard

src/lib/angles.js

@@ -8,26 +8,14 @@
 
 'use strict';
 
+var mod = require('./mod').mod;
+
 var PI = Math.PI;
 var twoPI = 2 * PI;
 
-function deg2rad(deg) {
-    return deg / 180 * PI;
-}
-
-function rad2deg(rad) {
-    return rad / PI * 180;
-}
+function deg2rad(deg) { return deg / 180 * PI; }
 
-function wrap360(deg) {
-    var out = deg % 360;
-    return out < 0 ? out + 360 : out;
-}
-
-function wrap180(deg) {
-    if(Math.abs(deg) > 180) deg -= Math.round(deg / 360) * 360;
-    return deg;
-}
+function rad2deg(rad) { return rad / PI * 180; }
 
 /**
  * is sector a full circle?
@@ -84,12 +72,12 @@ function isAngleInsideSector(a, aBnds) {
         s1 = aBnds[0];
     }
 
-    s0 = wrap360(rad2deg(s0));
-    s1 = wrap360(rad2deg(s1));
-    if(s0 > s1) s1 += 360;
+    s0 = mod(s0, twoPI);
+    s1 = mod(s1, twoPI);
+    if(s0 > s1) s1 += twoPI;
 
-    var a0 = wrap360(rad2deg(a));
-    var a1 = a0 + 360;
+    var a0 = mod(a, twoPI);
+    var a1 = a0 + twoPI;
 
     return (a0 >= s0 && a0 <= s1) || (a1 >= s0 && a1 <= s1);
 }
@@ -237,8 +225,6 @@ function pathAnnulus(r0, r1, a0, a1, cx, cy) {
 module.exports = {
     deg2rad: deg2rad,
     rad2deg: rad2deg,
-    wrap360: wrap360,
-    wrap180: wrap180,
     angleDelta: angleDelta,
     angleDist: angleDist,
     isFullCircle: isFullCircle,

src/lib/coerce.js

@@ -18,7 +18,7 @@ var colorscaleNames = Object.keys(require('../components/colorscale/scales'));
 var nestedProperty = require('./nested_property');
 var counterRegex = require('./regex').counter;
 var DESELECTDIM = require('../constants/interactions').DESELECTDIM;
-var wrap180 = require('./angles').wrap180;
+var modHalf = require('./mod').modHalf;
 var isArrayOrTypedArray = require('./is_array').isArrayOrTypedArray;
 
 exports.valObjectMeta = {
@@ -186,7 +186,7 @@ exports.valObjectMeta = {
         coerceFunction: function(v, propOut, dflt) {
             if(v === 'auto') propOut.set('auto');
             else if(!isNumeric(v)) propOut.set(dflt);
-            else propOut.set(wrap180(+v));
+            else propOut.set(modHalf(+v, 180));
         }
     },
     subplotid: {

src/lib/dates.js

@@ -13,7 +13,7 @@ var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
 var Loggers = require('./loggers');
-var mod = require('./mod');
+var mod = require('./mod').mod;
 
 var constants = require('../constants/numerical');
 var BADNUM = constants.BADNUM;

src/lib/geometry2d.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-var mod = require('./mod');
+var mod = require('./mod').mod;
 
 /*
  * look for intersection of two line segments

src/lib/index.js

@@ -22,11 +22,14 @@ lib.nestedProperty = require('./nested_property');
 lib.keyedContainer = require('./keyed_container');
 lib.relativeAttr = require('./relative_attr');
 lib.isPlainObject = require('./is_plain_object');
-lib.mod = require('./mod');
 lib.toLogRange = require('./to_log_range');
 lib.relinkPrivateKeys = require('./relink_private');
 lib.ensureArray = require('./ensure_array');
 
+var modModule = require('./mod');
+lib.mod = modModule.mod;
+lib.modHalf = modModule.modHalf;
+
 var isArrayModule = require('./is_array');
 lib.isTypedArray = isArrayModule.isTypedArray;
 lib.isArrayOrTypedArray = isArrayModule.isArrayOrTypedArray;
@@ -86,8 +89,6 @@ lib.apply2DTransform2 = matrixModule.apply2DTransform2;
 var anglesModule = require('./angles');
 lib.deg2rad = anglesModule.deg2rad;
 lib.rad2deg = anglesModule.rad2deg;
-lib.wrap360 = anglesModule.wrap360;
-lib.wrap180 = anglesModule.wrap180;
 lib.angleDelta = anglesModule.angleDelta;
 lib.angleDist = anglesModule.angleDist;
 lib.isFullCircle = anglesModule.isFullCircle;

src/lib/mod.js

@@ -12,7 +12,23 @@
  * sanitized modulus function that always returns in the range [0, d)
  * rather than (-d, 0] if v is negative
  */
-module.exports = function mod(v, d) {
+function mod(v, d) {
     var out = v % d;
     return out < 0 ? out + d : out;
+}
+
+/**
+ * sanitized modulus function that always returns in the range [-1.5*d, 1.5*d]
+ * rather than (-d, 0] if v is negative
+ */
+function modHalf(v, d) {
+    var d2 = 2 * d;
+    return Math.abs(v) > d ?
+        v - Math.round(v / d2) * d2 :
+        v;
+}
+
+module.exports = {
+    mod: mod,
+    modHalf: modHalf
 };

src/plots/polar/polar.js

@@ -33,10 +33,9 @@ var constants = require('./constants');
 var helpers = require('./helpers');
 
 var _ = Lib._;
+var mod = Lib.mod;
 var deg2rad = Lib.deg2rad;
 var rad2deg = Lib.rad2deg;
-var wrap360 = Lib.wrap360;
-var wrap180 = Lib.wrap180;
 
 function Polar(gd, id) {
     this.id = id;
@@ -375,7 +374,7 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
     var cx = _this.cx;
     var cy = _this.cy;
     var radialLayout = polarLayout.radialaxis;
-    var a0 = wrap360(polarLayout.sector[0]);
+    var a0 = mod(polarLayout.sector[0], 360);
     var ax = _this.radialAxis;
 
     _this.fillViewInitialKey('radialaxis.angle', radialLayout.angle);
@@ -1122,7 +1121,7 @@ proto.updateAngularDrag = function(fullLayout) {
         });
 
         // update rotation -> range -> _m,_b
-        angularAxis.rotation = wrap180(rot1);
+        angularAxis.rotation = Lib.modHalf(rot1, 180);
         angularAxis.setGeometry();
         angularAxis.setScale();
 
@@ -1238,7 +1237,7 @@ function computeSectorBBox(sector) {
     var s0 = sector[0];
     var s1 = sector[1];
     var arc = s1 - s0;
-    var a0 = wrap360(s0);
+    var a0 = mod(s0, 360);
     var a1 = a0 + arc;
 
     var ax0 = Math.cos(deg2rad(a0));

src/traces/scattermapbox/hover.js

@@ -35,7 +35,7 @@ module.exports = function hoverPoints(pointData, xval, yval) {
         var lonlat = d.lonlat;
         if(lonlat[0] === BADNUM) return Infinity;
 
-        var lon = Lib.wrap180(lonlat[0]);
+        var lon = Lib.modHalf(lonlat[0], 180);
         var lat = lonlat[1];
         var pt = subplot.project([lon, lat]);
         var dx = pt.x - xa.c2p([xval2, lat]);
@@ -52,7 +52,7 @@ module.exports = function hoverPoints(pointData, xval, yval) {
 
     var di = cd[pointData.index];
     var lonlat = di.lonlat;
-    var lonlatShifted = [Lib.wrap180(lonlat[0]) + lonShift, lonlat[1]];
+    var lonlatShifted = [Lib.modHalf(lonlat[0], 180) + lonShift, lonlat[1]];
 
     // shift labels back to original winded globe
     var xc = xa.c2p(lonlatShifted);

src/traces/scattermapbox/select.js

@@ -32,7 +32,7 @@ module.exports = function selectPoints(searchInfo, polygon) {
             var lonlat = di.lonlat;
 
             if(lonlat[0] !== BADNUM) {
-                var lonlat2 = [Lib.wrap180(lonlat[0]), lonlat[1]];
+                var lonlat2 = [Lib.modHalf(lonlat[0], 180), lonlat[1]];
                 var xy = [xa.c2p(lonlat2), ya.c2p(lonlat2)];
 
                 if(polygon.contains(xy)) {