From fcfb2291629c0405074626b69e9066a3202327b9 Mon Sep 17 00:00:00 2001 From: Noah Chen Date: Mon, 12 Oct 2015 17:16:09 -0400 Subject: [PATCH] d3.geom.quadtree(..) should accept 4 arguments --- d3/d3-tests.ts | 4 ++-- d3/d3.d.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/d3/d3-tests.ts b/d3/d3-tests.ts index 98888dde7..f4efa75d4 100644 --- a/d3/d3-tests.ts +++ b/d3/d3-tests.ts @@ -1450,7 +1450,7 @@ function quadtree() { // Collapse the quadtree into an array of rectangles. function nodes(quadtree: d3.geom.quadtree.Quadtree<[number, number]>) { var nodes: Array<{x: number; y: number; width: number; height: number}> = []; - quadtree.visit(function (node, x1, y1, x2, y2) { + quadtree.visit(function (node: d3.geom.quadtree.Node<[number, number]>, x1: number, y1: number, x2:number, y2: number) { nodes.push({ x: x1, y: y1, width: x2 - x1, height: y2 - y1 }); } ); return nodes; @@ -1458,7 +1458,7 @@ function quadtree() { // Find the nodes within the specified rectangle. function search(quadtree: d3.geom.quadtree.Quadtree<{ scanned?: boolean; selected?: boolean; 0: number; 1: number }>, x0: number, y0: number, x3: number, y3: number) { - quadtree.visit(function (node, x1, y1, x2, y2) { + quadtree.visit(function (node: d3.geom.quadtree.Node<{ scanned?: boolean; selected?: boolean; 0: number; 1: number }>, x1: number, y1: number, x2:number, y2: number) { var p = node.point; if (p) { p.scanned = true; diff --git a/d3/d3.d.ts b/d3/d3.d.ts index fbeca365e..87e6ef0e0 100644 --- a/d3/d3.d.ts +++ b/d3/d3.d.ts @@ -3251,7 +3251,7 @@ declare module d3 { export function delaunay(vertices: Array<[number, number]>): Array<[[number, number], [number, number], [number, number]]>; export function quadtree(): Quadtree<[number, number]>; - export function quadtree(): Quadtree; + export function quadtree(nodes: T[], x1?: number, y1?: number, x2?: number, y2?: number): quadtree.Quadtree; module quadtree { interface Node {