From 76845f4e0ee0417b14500d44fea3f021f3fba785 Mon Sep 17 00:00:00 2001
From: David Manthey <david.manthey@kitware.com>
Date: Mon, 26 Mar 2018 13:03:53 -0400
Subject: [PATCH] Clear the map animation queue when the map is destroyed.

Otherwise, it is possible to trigger one more animation frame on
features that have been destroyed.

This also rearranges some tests so that they don't show as skipped when
they shouldn't be referenced.
---
 src/map.js         |  2 ++
 tests/cases/map.js | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/map.js b/src/map.js
index 9abbf9450b..69c40a1225 100644
--- a/src/map.js
+++ b/src/map.js
@@ -937,6 +937,8 @@ var map = function (arg) {
       m_this.interactor().destroy();
       m_this.interactor(null);
     }
+    // if the animation queue was shared, this clears it
+    m_animationQueue = [];
     m_this.node().data('data-geojs-map', null);
     m_this.node().off('.geo');
     /* make sure the map node has nothing left in it */
diff --git a/tests/cases/map.js b/tests/cases/map.js
index a48b3bf667..898dbbaddf 100644
--- a/tests/cases/map.js
+++ b/tests/cases/map.js
@@ -424,6 +424,12 @@ describe('geo.core.map', function () {
       m.exit();
       expect(count_events(m.node(), 'geo')).toBe(0);
       expect($('#map').children().length).toBe(0);
+
+      m = createMap();
+      m.scheduleAnimationFrame(function () { });
+      expect(m.animationQueue().length).toBeGreaterThan(0);
+      m.exit();
+      expect(m.animationQueue().length).toBe(0);
     });
     it('pan, clampBoundsX, and clampBoundsY', function () {
       var m = createMap({
@@ -816,9 +822,9 @@ describe('geo.core.map', function () {
         done();
       });
     });
-    it('layer background', function (done) {
+    if (!isPhantomJS()) {
       // this test won't work in PhantomJS.
-      if (!isPhantomJS()) {
+      it('layer background', function (done) {
         var layer3 = m.createLayer('ui');
         layer3.node().css('background-image', 'url(/data/tilefancy.png)');
         m.screenshot().then(function (result) {
@@ -827,13 +833,11 @@ describe('geo.core.map', function () {
           m.deleteLayer(layer3);
           done();
         });
-      } else {
-        done();
-      }
-    }, 10000);
-    it('layer css background', function (done) {
+      }, 10000);
+    }
+    if (!isPhantomJS()) {
       // this test won't work in PhantomJS.
-      if (!isPhantomJS()) {
+      it('layer css background', function (done) {
         geo.jQuery('head').append('<link rel="stylesheet" href="/testdata/test.css" type="text/css"/>');
         var layer3 = m.createLayer('ui');
         layer3.node().addClass('image-background');
@@ -844,10 +848,8 @@ describe('geo.core.map', function () {
           m.deleteLayer(layer3);
           done();
         });
-      } else {
-        done();
-      }
-    }, 10000);
+      }, 10000);
+    }
     it('layers in a different order', function (done) {
       m.screenshot([layer2, layer1]).then(function (result) {
         // the order doesn't matter