From f8b87398552a144e8224167b144403385ed62864 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 25 Mar 2019 13:48:59 -0400
Subject: [PATCH] Add optional uninstall function to tools

---
 modules/ui/tools/notes.js | 11 +++++++++++
 modules/ui/top_toolbar.js |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/modules/ui/tools/notes.js b/modules/ui/tools/notes.js
index 710d7c3ff..eec016e76 100644
--- a/modules/ui/tools/notes.js
+++ b/modules/ui/tools/notes.js
@@ -127,5 +127,16 @@ export function uiToolNotes(context) {
         }
     };
 
+    tool.uninstall = function() {
+        context
+            .on('enter.editor.notes', null)
+            .on('exit.editor.notes', null)
+            .on('enter.notes', null);
+
+        context.map()
+            .on('move.notes', null)
+            .on('drawn.notes', null);
+    };
+
     return tool;
 }
diff --git a/modules/ui/top_toolbar.js b/modules/ui/top_toolbar.js
index 213fecf83..0595724d1 100644
--- a/modules/ui/top_toolbar.js
+++ b/modules/ui/top_toolbar.js
@@ -51,6 +51,11 @@ export function uiTopToolbar(context) {
                 });
 
             toolbarItems.exit()
+                .each(function(d) {
+                    if (d.uninstall) {
+                        d.uninstall();
+                    }
+                })
                 .remove();
 
             var itemsEnter = toolbarItems