Skip to content

Commit 57e79a4

Browse files
mbostockmbostock
committed
Use the more conventional name “pool”.
1 parent 1cb4a1a commit 57e79a4

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎d3.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4546,20 +4546,20 @@ d3 = function() {
45464546
var a = coordinates[0], b = coordinates[coordinates.length - 1];
45474547
return !(a[0] - b[0] || a[1] - b[1]);
45484548
}
4549-
var d3_geom_voronoiEdges, d3_geom_voronoiCells, d3_geom_voronoiBeaches, d3_geom_voronoiBeachJunkyard = [], d3_geom_voronoiFirstCircle, d3_geom_voronoiCircles, d3_geom_voronoiCircleJunkyard = [];
4549+
var d3_geom_voronoiEdges, d3_geom_voronoiCells, d3_geom_voronoiBeaches, d3_geom_voronoiBeachPool = [], d3_geom_voronoiFirstCircle, d3_geom_voronoiCircles, d3_geom_voronoiCirclePool = [];
45504550
function d3_geom_voronoiBeach() {
45514551
d3_geom_voronoiRedBlackNode(this);
45524552
this.edge = this.site = this.circle = null;
45534553
}
45544554
function d3_geom_voronoiCreateBeach(site) {
4555-
var beach = d3_geom_voronoiBeachJunkyard.pop() || new d3_geom_voronoiBeach();
4555+
var beach = d3_geom_voronoiBeachPool.pop() || new d3_geom_voronoiBeach();
45564556
beach.site = site;
45574557
return beach;
45584558
}
45594559
function d3_geom_voronoiDetachBeach(beach) {
45604560
d3_geom_voronoiDetachCircle(beach);
45614561
d3_geom_voronoiBeaches.remove(beach);
4562-
d3_geom_voronoiBeachJunkyard.push(beach);
4562+
d3_geom_voronoiBeachPool.push(beach);
45634563
d3_geom_voronoiRedBlackNode(beach);
45644564
}
45654565
function d3_geom_voronoiRemoveBeach(beach) {
@@ -4724,7 +4724,7 @@ d3 = function() {
47244724
var d = 2 * (ax * cy - ay * cx);
47254725
if (d >= -ε2) return;
47264726
var ha = ax * ax + ay * ay, hc = cx * cx + cy * cy, x = (cy * ha - ay * hc) / d, y = (ax * hc - cx * ha) / d, cy = y + by;
4727-
var circle = d3_geom_voronoiCircleJunkyard.pop() || new d3_geom_voronoiCircle();
4727+
var circle = d3_geom_voronoiCirclePool.pop() || new d3_geom_voronoiCircle();
47284728
circle.arc = arc;
47294729
circle.site = cSite;
47304730
circle[0] = x + bx;
@@ -4753,7 +4753,7 @@ d3 = function() {
47534753
if (circle) {
47544754
if (!circle.P) d3_geom_voronoiFirstCircle = circle.N;
47554755
d3_geom_voronoiCircles.remove(circle);
4756-
d3_geom_voronoiCircleJunkyard.push(circle);
4756+
d3_geom_voronoiCirclePool.push(circle);
47574757
d3_geom_voronoiRedBlackNode(circle);
47584758
arc.circle = null;
47594759
}

‎src/geom/voronoi/beach.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ function d3_geom_voronoiBeach() {
66
}
77

88
function d3_geom_voronoiCreateBeach(site) {
9-
var beach = d3_geom_voronoiBeachJunkyard.pop() || new d3_geom_voronoiBeach;
9+
var beach = d3_geom_voronoiBeachPool.pop() || new d3_geom_voronoiBeach;
1010
beach.site = site;
1111
return beach;
1212
}
1313

1414
function d3_geom_voronoiDetachBeach(beach) {
1515
d3_geom_voronoiDetachCircle(beach);
1616
d3_geom_voronoiBeaches.remove(beach);
17-
d3_geom_voronoiBeachJunkyard.push(beach);
17+
d3_geom_voronoiBeachPool.push(beach);
1818
d3_geom_voronoiRedBlackNode(beach);
1919
}
2020

‎src/geom/voronoi/circle.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function d3_geom_voronoiAttachCircle(arc) {
3535
y = (ax * hc - cx * ha) / d,
3636
cy = y + by;
3737

38-
var circle = d3_geom_voronoiCircleJunkyard.pop() || new d3_geom_voronoiCircle;
38+
var circle = d3_geom_voronoiCirclePool.pop() || new d3_geom_voronoiCircle;
3939
circle.arc = arc;
4040
circle.site = cSite;
4141
circle[0] = x + bx;
@@ -66,7 +66,7 @@ function d3_geom_voronoiDetachCircle(arc) {
6666
if (circle) {
6767
if (!circle.P) d3_geom_voronoiFirstCircle = circle.N;
6868
d3_geom_voronoiCircles.remove(circle);
69-
d3_geom_voronoiCircleJunkyard.push(circle);
69+
d3_geom_voronoiCirclePool.push(circle);
7070
d3_geom_voronoiRedBlackNode(circle);
7171
arc.circle = null;
7272
}

‎src/geom/voronoi/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import "../../math/trigonometry";
33
var d3_geom_voronoiEdges,
44
d3_geom_voronoiCells,
55
d3_geom_voronoiBeaches,
6-
d3_geom_voronoiBeachJunkyard = [],
6+
d3_geom_voronoiBeachPool = [],
77
d3_geom_voronoiFirstCircle,
88
d3_geom_voronoiCircles,
9-
d3_geom_voronoiCircleJunkyard = [];
9+
d3_geom_voronoiCirclePool = [];
1010

1111
import "beach";
1212
import "cell";

0 commit comments

Comments
 (0)