From e334b41a8cd66d4b2ffadc1e7239fec6349a763a Mon Sep 17 00:00:00 2001
From: Bryan Johnson <bryanjjohnson05@gmail.com>
Date: Wed, 15 Jun 2016 11:09:33 -0600
Subject: [PATCH 1/3] Add Handlers to the typings

---
 mapbox-gl.d.ts | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/mapbox-gl.d.ts b/mapbox-gl.d.ts
index 6115480..f66095b 100644
--- a/mapbox-gl.d.ts
+++ b/mapbox-gl.d.ts
@@ -314,6 +314,59 @@ declare namespace mapboxgl {
 		flyTo(options: CameraAndAnimationOptions, eventData?: EventData): this;
 
 		stop(): this;
+
+		scrollZoom: ScrollZoomHandler;
+
+		boxZoom: BoxZoomHandler;
+
+		dragRotate: DragRotateHandler;
+
+		dragPan: DragPanHandler;
+
+		keyboard: KeyboardHandler;
+
+		doubleClickZoom: DoubleClickZoomHandler;
+
+		touchZoomRotate: TouchZoomRotateHandler;
+	}
+
+	class Handler {
+		constructor(map: Map);
+
+		isEnabled(): boolean;
+
+		enable(): undefined;
+
+		disable(): undefined;
+	}
+
+	class BoxZoomHandler extends Handler {
+		isActive(): boolean;
+	}
+
+	class ScrollZoomHandler extends Handler {
+	}
+
+	class DragPanHandler extends Handler {
+		isActive(): boolean;
+	}
+
+	class DragRotateHandler extends Handler {
+		constructor(map: Map, options: {bearingSnap?: number});
+
+		isActive(): boolean;
+	}
+
+	class KeyboardHandler extends Handler {
+	}
+
+	class DoubleClickZoomHandler extends Handler {
+	}
+
+	class TouchZoomRotateHandler extends Handler {
+		disableRotation(): undefined;
+
+		enableRotation(): undefined;
 	}
 
 	/** TODO: Should be a class */

From c39bbf785142406c9fcff46b064fec90c6d4c9bd Mon Sep 17 00:00:00 2001
From: Bryan Johnson <bryanjjohnson05@gmail.com>
Date: Thu, 23 Jun 2016 09:01:37 -0600
Subject: [PATCH 2/3] Swap undefined for voids

---
 mapbox-gl.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mapbox-gl.d.ts b/mapbox-gl.d.ts
index f66095b..af314a8 100644
--- a/mapbox-gl.d.ts
+++ b/mapbox-gl.d.ts
@@ -218,7 +218,7 @@ declare namespace mapboxgl {
 
 		getBounds(): LngLatBounds;
 
-		setMaxBounds(bounds: LngLatBounds | Array<Array<number>> |null| undefined): this;
+		setMaxBounds(bounds: LngLatBounds | Array<Array<number>> |null| void): this;
 
 		setMinZoom(minZoom: number): this;
 
@@ -271,7 +271,7 @@ declare namespace mapboxgl {
 
 		loaded(): boolean;
 
-		remove(): undefined;
+		remove(): void;
 
 		getCenter(): LngLat;
 
@@ -335,9 +335,9 @@ declare namespace mapboxgl {
 
 		isEnabled(): boolean;
 
-		enable(): undefined;
+		enable(): void;
 
-		disable(): undefined;
+		disable(): void;
 	}
 
 	class BoxZoomHandler extends Handler {
@@ -364,9 +364,9 @@ declare namespace mapboxgl {
 	}
 
 	class TouchZoomRotateHandler extends Handler {
-		disableRotation(): undefined;
+		disableRotation(): void;
 
-		enableRotation(): undefined;
+		enableRotation(): void;
 	}
 
 	/** TODO: Should be a class */

From 2edd5b954343872757192e9d6abc7176d7e789d8 Mon Sep 17 00:00:00 2001
From: Bryan Johnson <bryanjjohnson05@gmail.com>
Date: Thu, 23 Jun 2016 09:13:23 -0600
Subject: [PATCH 3/3] more updates to match latest features

---
 mapbox-gl.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mapbox-gl.d.ts b/mapbox-gl.d.ts
index af314a8..1a81a66 100644
--- a/mapbox-gl.d.ts
+++ b/mapbox-gl.d.ts
@@ -557,8 +557,8 @@ declare namespace mapboxgl {
 	interface CirclePaint {
 		"circle-radius"?: number | StyleFunction;
 		"circle-color"?: number | StyleFunction;
-		"circle-blur"?: number;
-		"circle-opacity"?: number;
+		"circle-blur"?: number | StyleFunction;
+		"circle-opacity"?: number | StyleFunction;
 		"circle-translate"?: Array<number>;
 		"circle-translate-anchor"?: "map" | "viewport";
 	}