Don't call onSuccess and onError callbacks after control was removed (#…

…9291)
mapbox · Feb 12, 2020 · 7de4857 · 7de4857
1 parent f9b5ef7
commit 7de4857
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/ui/control/geolocate_control.js b/src/ui/control/geolocate_control.js
@@ -193,6 +193,11 @@ class GeolocateControl extends Evented {
     }
 
     _onSuccess(position: Position) {
+        if (!this._map) {
+            // control has since been removed
+            return;
+        }
+
         if (this._isOutOfMapMaxBounds(position)) {
             this._setErrorState();
 
@@ -293,6 +298,11 @@ class GeolocateControl extends Evented {
     }
 
     _onError(error: PositionError) {
+        if (!this._map) {
+            // control has since been removed
+            return;
+        }
+
         if (this.options.trackUserLocation) {
             if (error.code === 1) {
                 // PERMISSION_DENIED

diff --git a/test/unit/ui/control/geolocate.test.js b/test/unit/ui/control/geolocate.test.js
@@ -162,6 +162,17 @@ test('GeolocateControl geolocate fitBoundsOptions', (t) => {
     geolocation.send({latitude: 10, longitude: 20, accuracy: 1});
 });
 
+test('GeolocateControl with removed before Geolocation callback', (t) => {
+    const map = createMap(t);
+    t.plan(0);
+
+    const geolocate = new GeolocateControl();
+    map.addControl(geolocate);
+    geolocate.trigger();
+    map.removeControl(geolocate);
+    t.end();
+});
+
 test('GeolocateControl non-zero bearing', (t) => {
     t.plan(3);