From 6e5bc3c5149e253d7922aa9615c3929666e6f18b Mon Sep 17 00:00:00 2001
From: Brandon Luong <bluong@palantir.com>
Date: Tue, 30 Sep 2014 14:20:57 -0700
Subject: [PATCH 1/2] Correcting typing for d3.map.entries

---
 d3/d3.d.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/d3/d3.d.ts b/d3/d3.d.ts
index e2bf337e4..6a38ecc2b 100644
--- a/d3/d3.d.ts
+++ b/d3/d3.d.ts
@@ -841,6 +841,11 @@ declare module D3 {
         entries(values: any[]): NestKeyValue[];
     }
 
+    export interface MapKeyValue<T> {
+        key: string;
+        value: T;
+    }
+
     export interface Map<T> {
         has(key: string): boolean;
         get(key: string): T;
@@ -848,7 +853,7 @@ declare module D3 {
         remove(key: string): boolean;
         keys(): string[];
         values(): T[];
-        entries(): any[][]; // Actually of form [key: string, val: T][], but this is inexpressible in Typescript
+        entries(): KeyValue<T>[];
         forEach(func: (key: string, value: T) => void ): void;
         empty(): boolean;
         size(): number;

From da6dfc85a7be239dceaa66d5259d4406ee88f9ef Mon Sep 17 00:00:00 2001
From: Brandon Luong <bluong@palantir.com>
Date: Tue, 30 Sep 2014 14:22:23 -0700
Subject: [PATCH 2/2] KeyValue -> MapKeyValue

---
 d3/d3.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/d3/d3.d.ts b/d3/d3.d.ts
index 6a38ecc2b..15df19464 100644
--- a/d3/d3.d.ts
+++ b/d3/d3.d.ts
@@ -853,7 +853,7 @@ declare module D3 {
         remove(key: string): boolean;
         keys(): string[];
         values(): T[];
-        entries(): KeyValue<T>[];
+        entries(): MapKeyValue<T>[];
         forEach(func: (key: string, value: T) => void ): void;
         empty(): boolean;
         size(): number;