From 8500441688dd6ebe3d6ac12a9ed53735613e5fe6 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 6 Nov 2014 16:50:53 -0700
Subject: [PATCH] [vislib/tilemap] implement custom resize and destroy handling

---
 .../vislib/lib/handler/types/tile_map.js      |  6 +++
 .../vislib/visualizations/tile_map.js         | 37 ++++++++++++++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/kibana/components/vislib/lib/handler/types/tile_map.js b/src/kibana/components/vislib/lib/handler/types/tile_map.js
index d413838b4fe7c..141e29031a1a4 100644
--- a/src/kibana/components/vislib/lib/handler/types/tile_map.js
+++ b/src/kibana/components/vislib/lib/handler/types/tile_map.js
@@ -12,6 +12,12 @@ define(function (require) {
         data: data
       });
 
+      MapHandler.resize = function () {
+        this.charts.forEach(function (chart) {
+          chart.resizeArea();
+        });
+      };
+
       return MapHandler;
     };
   };
diff --git a/src/kibana/components/vislib/visualizations/tile_map.js b/src/kibana/components/vislib/visualizations/tile_map.js
index 57e9aed348546..dde21a72c505e 100644
--- a/src/kibana/components/vislib/visualizations/tile_map.js
+++ b/src/kibana/components/vislib/visualizations/tile_map.js
@@ -35,10 +35,6 @@ define(function (require) {
       var mapDataExtents = handler.data.mapDataExtents(handler.data.data.raw);
       chartData.geoJSON.properties.allmin = mapDataExtents[0];
       chartData.geoJSON.properties.allmax = mapDataExtents[1];
-
-      // turn off resizeChecker for tile maps
-      this.handler.vis.resizeChecker.off('resize', this.resize);
-      this.handler.vis.resizeChecker.destroy();
     }
 
     /**
@@ -53,7 +49,12 @@ define(function (require) {
       var $elem = $(this.chartEl);
       var div;
       var worldBounds = L.latLngBounds([-200, -220], [200, 220]);
-      
+
+      // clean up old maps
+      _.invoke(self.maps, 'destroy');
+      // create a new maps array
+      self.maps = [];
+
       return function (selection) {
         selection.each(function (data) {
           div = $(this);
@@ -92,6 +93,7 @@ define(function (require) {
           };
 
           var map = L.map(div[0], mapOptions);
+          self.maps.push(map);
 
           // switch map types
           L.control.layers({
@@ -143,7 +145,7 @@ define(function (require) {
       var featureLayer = L.geoJson(mapData, {
         pointToLayer: function (feature, latlng) {
           var count = feature.properties.count;
-          
+
           var rad = zoomScale * self.radiusScale(count, max, precision);
           return L.circleMarker(latlng, {
             radius: rad
@@ -285,6 +287,20 @@ define(function (require) {
       legend.addTo(map);
     };
 
+    /**
+     * Invalidate the size of the map, so that leaflet will resize to fit.
+     * then moves to center
+     *
+     * @return {undefined}
+     */
+    TileMap.prototype.resizeArea = function () {
+      this.maps.forEach(function (map) {
+        map.invalidateSize({
+          debounceMoveend: true
+        });
+      });
+    };
+
     /**
      * Redraws feature layer markers
      *
@@ -496,6 +512,15 @@ define(function (require) {
       return darker;
     };
 
+    /**
+     * tell leaflet that it's time to cleanup the map
+     */
+    TileMap.prototype.destroy = function () {
+      this.maps.forEach(function (map) {
+        map.remove();
+      });
+    };
+
     return TileMap;
 
   };