From 76c5a86b25459721593ba4ff5b7005e0dee76b19 Mon Sep 17 00:00:00 2001
From: spalger <email@spalger.com>
Date: Wed, 19 Oct 2016 14:01:26 -0700
Subject: [PATCH] [vislib/tilemap/heatmap] scale the heatmap maxZoom with map
 zoom

---
 .../public/editors/tile_map.html              | 39 +++++--------------
 .../kbn_vislib_vis_types/public/tile_map.js   |  1 -
 .../visualizations/marker_types/heatmap.js    |  4 +-
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/src/core_plugins/kbn_vislib_vis_types/public/editors/tile_map.html b/src/core_plugins/kbn_vislib_vis_types/public/editors/tile_map.html
index e4b1f6091afc4..6a8f09e05ff09 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/editors/tile_map.html
+++ b/src/core_plugins/kbn_vislib_vis_types/public/editors/tile_map.html
@@ -53,27 +53,6 @@
       </div>
     </div>
   </div>
-  <div>
-    <label>
-      Maximum zoom
-      &nbsp;<kbn-info placement="right" info="Map zoom at which all dots are displayed at full intensity. Default: 16"></kbn-info>
-    </label>
-    <div class="vis-editor-agg-form-row">
-      <input
-        name="heatMaxZoom"
-        ng-model="vis.params.heatMaxZoom"
-        required
-        class="form-control"
-        type="range"
-        min="1"
-        max="18"
-        step="1"
-        >
-      <div class="vis-editor-agg-form-value">
-        {{vis.params.heatMaxZoom}}
-      </div>
-    </div>
-  </div>
   <div>
     <label>
       Minimum opacity
@@ -131,9 +110,9 @@
 
 <div ng-show="vis.params.wms.enabled" class="well">
   <div class="vis-option-item form-group">
-    
+
     <p>
-      WMS maps are 3rd party mapping services that have not been verified to work with Kibana. 
+      WMS maps are 3rd party mapping services that have not been verified to work with Kibana.
       These should be considered expert settings.
     </p>
 
@@ -142,7 +121,7 @@
     </label>
     <input type="text" class="form-control"
       name="wms.url"
-      ng-model="vis.params.wms.url">    
+      ng-model="vis.params.wms.url">
   </div>
 
   <div class="vis-option-item form-group">
@@ -151,7 +130,7 @@
     </label>
     <input type="text" class="form-control"
       ng-require="vis.params.wms.enabled"
-      ng-model="vis.params.wms.options.layers"   
+      ng-model="vis.params.wms.options.layers"
       name="wms.options.layers">
   </div>
 
@@ -161,7 +140,7 @@
     </label>
     <input type="text" class="form-control"
       name="wms.options.version"
-      ng-model="vis.params.wms.options.version">    
+      ng-model="vis.params.wms.options.version">
   </div>
 
   <div class="vis-option-item form-group">
@@ -170,16 +149,16 @@
     </label>
     <input type="text" class="form-control"
       name="wms.options.format"
-      ng-model="vis.params.wms.options.format">    
+      ng-model="vis.params.wms.options.format">
   </div>
-  
+
   <div class="vis-option-item form-group">
     <label>
       WMS attribution <kbn-info info="Attribution string for the lower right corner<"></kbn-info>
     </label>
     <input type="text" class="form-control"
       name="wms.options.attribution"
-      ng-model="vis.params.wms.options.attribution">    
+      ng-model="vis.params.wms.options.attribution">
   </div>
 
   <div class="vis-option-item form-group">
@@ -188,7 +167,7 @@
     </label>
     <input type="text" class="form-control"
       name="wms.options.styles"
-      ng-model="vis.params.wms.options.styles">    
+      ng-model="vis.params.wms.options.styles">
   </div>
 
   <p>* if this parameter is incorrect, maps will fail to load.</p>
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js b/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js
index 8c2e18ed3e2b5..7b36ac2e057d0 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js
@@ -22,7 +22,6 @@ export default function TileMapVisType(Private, getAppState, courier, config) {
         mapType: 'Scaled Circle Markers',
         isDesaturated: true,
         addTooltip: true,
-        heatMaxZoom: 16,
         heatMinOpacity: 0.1,
         heatRadius: 25,
         heatBlur: 15,
diff --git a/src/ui/public/vislib/visualizations/marker_types/heatmap.js b/src/ui/public/vislib/visualizations/marker_types/heatmap.js
index d5878dec75d7a..30a613478055d 100644
--- a/src/ui/public/vislib/visualizations/marker_types/heatmap.js
+++ b/src/ui/public/vislib/visualizations/marker_types/heatmap.js
@@ -21,7 +21,7 @@ export default function HeatmapMarkerFactory(Private) {
       this._createMarkerGroup({
         radius: +this._attr.heatRadius,
         blur: +this._attr.heatBlur,
-        maxZoom: +this._attr.heatMaxZoom,
+        maxZoom: map.getZoom(),
         minOpacity: +this._attr.heatMinOpacity
       });
 
@@ -34,7 +34,7 @@ export default function HeatmapMarkerFactory(Private) {
         );
       }, function (feature) {
         // turn coords into a string for the memoize cache
-        return [feature.geometry.coordinates[1], feature.geometry.coordinates[0]].join(',');
+        return `${feature.geometry.coordinates[1]},${feature.geometry.coordinates[0]}`;
       });
     }