Skip to content

Commit 66ad0d2

Browse files
mbostockmbostock
committed
Shorten.
1 parent 83950ec commit 66ad0d2

3 files changed

Lines changed: 10 additions & 27 deletions

File tree

‎d3.js‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4678,7 +4678,7 @@ d3 = function() {
46784678
return halfEdges.length;
46794679
};
46804680
function d3_geom_voronoiCloseCells(extent) {
4681-
var x0 = extent[0][0], x1 = extent[1][0], y0 = extent[0][1], y1 = extent[1][1], cells = d3_geom_voronoiCells, iCell = cells.length, cell, iLeft, iRight, halfEdges, nHalfEdges, edge, start, end, va, vb;
4681+
var x0 = extent[0][0], x1 = extent[1][0], y0 = extent[0][1], y1 = extent[1][1], cells = d3_geom_voronoiCells, iCell = cells.length, cell, iLeft, iRight, halfEdges, nHalfEdges, edge, start, end;
46824682
while (iCell--) {
46834683
cell = cells[iCell];
46844684
if (!cell || !cell.prepare()) continue;
@@ -4690,17 +4690,7 @@ d3 = function() {
46904690
end = halfEdges[iLeft].end();
46914691
start = halfEdges[iRight].start();
46924692
if (abs(end[0] - start[0]) > ε || abs(end[1] - start[1]) > ε) {
4693-
va = end;
4694-
if (abs(end[0] - x0) < ε && y1 - end[1] > ε) {
4695-
vb = [ x0, abs(start[0] - x0) < ε ? start[1] : y1 ];
4696-
} else if (abs(end[1] - y1) < ε && x1 - end[0] > ε) {
4697-
vb = [ abs(start[1] - y1) < ε ? start[0] : x1, y1 ];
4698-
} else if (abs(end[0] - x1) < ε && end[1] - y0 > ε) {
4699-
vb = [ x1, abs(start[0] - x1) < ε ? start[1] : y0 ];
4700-
} else if (abs(end[1] - y0) < ε && end[0] - x0 > ε) {
4701-
vb = [ abs(start[1] - y0) < ε ? start[0] : x0, y0 ];
4702-
}
4703-
edge = d3_geom_voronoiCreateBorderEdge(cell.site, va, vb);
4693+
edge = d3_geom_voronoiCreateBorderEdge(cell.site, end, abs(end[0] - x0) < ε && y1 - end[1] > ε ? [ x0, abs(start[0] - x0) < ε ? start[1] : y1 ] : abs(end[1] - y1) < ε && x1 - end[0] > ε ? [ abs(start[1] - y1) < ε ? start[0] : x1, y1 ] : abs(end[0] - x1) < ε && end[1] - y0 > ε ? [ x1, abs(start[0] - x1) < ε ? start[1] : y0 ] : abs(end[1] - y0) < ε && end[0] - x0 > ε ? [ abs(start[1] - y0) < ε ? start[0] : x0, y0 ] : null);
47044694
halfEdges.splice(iLeft + 1, 0, new d3_geom_voronoiHalfEdge(edge, cell.site, null));
47054695
nHalfEdges = halfEdges.length;
47064696
}

0 commit comments

Comments
 (0)