|
184 | 184 | for(; tz[m - 1] > x1;)tz.pop(), --m;
|
185 | 185 | var bin, bins = Array(m + 1);
|
186 | 186 | for(i = 0; i <= m; ++i)(bin = bins[i] = []).x0 = i > 0 ? tz[i - 1] : x0, bin.x1 = i < m ? tz[i] : x1;
|
187 |
| - for(i = 0; i < n; ++i)x0 <= (x = values[i]) && x <= x1 && bins[bisectRight(tz, x, 0, m)].push(data[i]); |
| 187 | + for(i = 0; i < n; ++i)x = values[i], x0 <= x && x <= x1 && bins[bisectRight(tz, x, 0, m)].push(data[i]); |
188 | 188 | return bins;
|
189 | 189 | }
|
190 | 190 | return histogram.value = function(_) {
|
|
4577 | 4577 | phi * radians$1
|
4578 | 4578 | ]);
|
4579 | 4579 | if (p0) {
|
4580 |
| - var normal = cartesianCross(p0, p), inflection = cartesianCross([ |
| 4580 | + var normal = cartesianCross(p0, p), equatorial = [ |
4581 | 4581 | normal[1],
|
4582 | 4582 | -normal[0],
|
4583 | 4583 | 0
|
4584 |
| - ], normal); |
| 4584 | + ], inflection = cartesianCross(equatorial, normal); |
4585 | 4585 | cartesianNormalizeInPlace(inflection);
|
4586 | 4586 | var phii, delta = lambda - lambda2, sign = delta > 0 ? 1 : -1, lambdai = (inflection = spherical(inflection))[0] * degrees$2 * sign, antimeridian = abs$2(delta) > 180;
|
4587 | 4587 | antimeridian ^ (sign * lambda2 < lambdai && lambdai < sign * lambda) ? (phii = inflection[1] * degrees$2) > phi1 && (phi1 = phii) : antimeridian ^ (sign * lambda2 < (lambdai = (lambdai + 360) % 360 - 180) && lambdai < sign * lambda) ? (phii = -inflection[1] * degrees$2) < phi0 && (phi0 = phii) : (phi < phi0 && (phi0 = phi), phi > phi1 && (phi1 = phi)), antimeridian ? lambda < lambda2 ? angle(lambda0$1, lambda) > angle(lambda0$1, lambda1) && (lambda1 = lambda) : angle(lambda, lambda1) > angle(lambda0$1, lambda1) && (lambda0$1 = lambda) : lambda1 >= lambda0$1 ? (lambda < lambda0$1 && (lambda0$1 = lambda), lambda > lambda1 && (lambda1 = lambda)) : lambda > lambda2 ? angle(lambda0$1, lambda) > angle(lambda0$1, lambda1) && (lambda1 = lambda) : angle(lambda, lambda1) > angle(lambda0$1, lambda1) && (lambda0$1 = lambda);
|
|
6685 | 6685 | var transform, untransform, unknown, piecewise, output, input, domain = unit, range = unit, interpolate$1 = interpolate, clamp = identity$6;
|
6686 | 6686 | function rescale() {
|
6687 | 6687 | var a, b, t, n = Math.min(domain.length, range.length);
|
6688 |
| - return clamp !== identity$6 && ((a = domain[0]) > (b = domain[n - 1]) && (t = a, a = b, b = t), clamp = function(x) { |
| 6688 | + return clamp !== identity$6 && (a = domain[0], b = domain[n - 1], a > b && (t = a, a = b, b = t), clamp = function(x) { |
6689 | 6689 | return Math.max(a, Math.min(b, x));
|
6690 | 6690 | }), piecewise = n > 2 ? polymap : bimap, output = input = null, scale;
|
6691 | 6691 | }
|
|
9582 | 9582 | },
|
9583 | 9583 | find: function(x, y, radius) {
|
9584 | 9584 | var dx, dy, d2, node, closest, i = 0, n = nodes.length;
|
9585 |
| - for(null == radius ? radius = 1 / 0 : radius *= radius, i = 0; i < n; ++i)(d2 = (dx = x - (node = nodes[i]).x) * dx + (dy = y - node.y) * dy) < radius && (closest = node, radius = d2); |
| 9585 | + for(null == radius ? radius = 1 / 0 : radius *= radius, i = 0; i < n; ++i)node = nodes[i], (d2 = (dx = x - node.x) * dx + (dy = y - node.y) * dy) < radius && (closest = node, radius = d2); |
9586 | 9586 | return closest;
|
9587 | 9587 | },
|
9588 | 9588 | on: function(name, _) {
|
|
9757 | 9757 | if (phi1 = lambda1 = -(lambda0$1 = phi0 = 1 / 0), ranges = [], geoStream(feature, boundsStream), n = ranges.length) {
|
9758 | 9758 | for(ranges.sort(rangeCompare), i = 1, merged = [
|
9759 | 9759 | a = ranges[0]
|
9760 |
| - ]; i < n; ++i)rangeContains(a, (b = ranges[i])[0]) || rangeContains(a, b[1]) ? (angle(a[0], b[1]) > angle(a[0], a[1]) && (a[1] = b[1]), angle(b[0], a[1]) > angle(a[0], a[1]) && (a[0] = b[0])) : merged.push(a = b); |
| 9760 | + ]; i < n; ++i)b = ranges[i], rangeContains(a, b[0]) || rangeContains(a, b[1]) ? (angle(a[0], b[1]) > angle(a[0], a[1]) && (a[1] = b[1]), angle(b[0], a[1]) > angle(a[0], a[1]) && (a[0] = b[0])) : merged.push(a = b); |
9761 | 9761 | for(deltaMax = -1 / 0, n = merged.length - 1, i = 0, a = merged[n]; i <= n; a = b, ++i)b = merged[i], (delta = angle(a[1], b[0])) > deltaMax && (deltaMax = delta, lambda0$1 = b[0], lambda1 = a[1]);
|
9762 | 9762 | }
|
9763 | 9763 | return ranges = range$1 = null, lambda0$1 === 1 / 0 || phi0 === 1 / 0 ? [
|
|
10165 | 10165 | return sortValues(arcs[i], arcs[j]);
|
10166 | 10166 | }) : null != sort && index.sort(function(i, j) {
|
10167 | 10167 | return sort(data[i], data[j]);
|
10168 |
| - }), i = 0, k = sum ? (da - n * pa) / sum : 0; i < n; ++i, a0 = a1)a1 = a0 + ((v = arcs[j = index[i]]) > 0 ? v * k : 0) + pa, arcs[j] = { |
| 10168 | + }), i = 0, k = sum ? (da - n * pa) / sum : 0; i < n; ++i, a0 = a1)v = arcs[j = index[i]], a1 = a0 + (v > 0 ? v * k : 0) + pa, arcs[j] = { |
10169 | 10169 | data: data[j],
|
10170 | 10170 | index: i,
|
10171 | 10171 | value: v,
|
|
0 commit comments