Merge pull request #3708 from elastic/revert-3667-tilemap-zoom-precision

Revert "Tilemap zoom precision"

src/kibana/components/agg_types/buckets/geo_hash.js

@@ -3,7 +3,7 @@ define(function (require) {
     var _ = require('lodash');
     var moment = require('moment');
     var BucketAggType = Private(require('components/agg_types/buckets/_bucket_agg_type'));
-    var defaultPrecision = 2;
+    var defaultPrecision = 3;
 
     function getPrecision(precision) {
       var maxPrecision = _.parseInt(config.get('visualization:tileMap:maxPrecision'));

src/kibana/components/vislib/lib/dispatch.js

@@ -19,7 +19,7 @@ define(function (require) {
 
       this.handler = handler;
       this.dispatch = d3.dispatch('brush', 'click', 'hover', 'mouseup',
-        'mousedown', 'mouseover', 'mouseout', 'mapZoomEnd');
+        'mousedown', 'mouseover', 'mouseout');
     }
 
     /**

src/kibana/components/vislib/visualizations/tile_map.js

@@ -105,14 +105,6 @@ define(function (require) {
             mapCenter = self._attr.mapCenter = map.getCenter();
           });
 
-          map.on('zoomend', function (e) {
-            var mapInfo = {
-              zoom: map.getZoom(),
-              zoomPct: map.getZoom() / 18
-            };
-            self.events.dispatch.mapZoomEnd(mapInfo);
-          });
-
           // add label for splits
           if (mapData.properties.label) {
             self.addLabel(mapData.properties.label, map);
@@ -142,14 +134,6 @@ define(function (require) {
       };
     };
 
-    TileMap.prototype.addZoomEndEvent = function (element) {
-      var events = this.events;
-      var zoomend = events.addMapZoomEndEvent();
-      var attachedEvents = element.call(zoomend);
-
-      return attachedEvents;
-    };
-
     /**
      * zoom map to fit all features in featureLayer
      *

src/kibana/plugins/vis_types/vislib/editors/tile_map.html

@@ -11,25 +11,9 @@
 </div>
 
 <div class="vis-option-item">
+  </br>
   <label>
-    <input type="checkbox"
-    name="autoPrecision"
-    value="{{autoPrecision}}"
-    ng-model="vis.params.autoPrecision"
-    ng-checked="vis.params.autoPrecision">
-    Change geoHash precision on map zoom
-  </label>
-</div>
-
-<div class="vis-option-item">
-  <label>
-    <input type="checkbox"
-    name="isDesaturated"
-    value="{{isDesaturated}}"
-    ng-model="vis.params.isDesaturated"
-    ng-checked="vis.params.isDesaturated">
+    <input type="checkbox" value="{{isDesaturated}}" ng-model="vis.params.isDesaturated" name="isDesaturated" ng-checked="vis.params.isDesaturated">
     Desaturate map tiles
   </label>
-</div>
-
 </div>

src/kibana/plugins/vis_types/vislib/tile_map.js

@@ -13,8 +13,7 @@ define(function (require) {
       params: {
         defaults: {
           mapType: 'Scaled Circle Markers',
-          isDesaturated: true,
-          autoPrecision: true
+          isDesaturated: true
         },
         mapTypes: ['Scaled Circle Markers', 'Shaded Circle Markers', 'Shaded Geohash Grid'],
         editor: require('text!plugins/vis_types/vislib/editors/tile_map.html')

src/kibana/plugins/visualize/editor/editor.js

@@ -50,7 +50,7 @@ define(function (require) {
     'kibana/notify',
     'kibana/courier'
   ])
-  .controller('VisEditor', function ($scope, $route, timefilter, AppState, $location, kbnUrl, $timeout, courier, Private, Promise, config) {
+  .controller('VisEditor', function ($scope, $route, timefilter, AppState, $location, kbnUrl, $timeout, courier, Private, Promise) {
 
     var _ = require('lodash');
     var angular = require('angular');
@@ -125,16 +125,6 @@ define(function (require) {
 
       editableVis.listeners.click = vis.listeners.click = filterBarClickHandler($state);
       editableVis.listeners.brush = vis.listeners.brush = brushEvent;
-      editableVis.listeners.mapZoomEnd = vis.listeners.mapZoomEnd = function (event) {
-        if (!vis.params.autoPrecision) return;
-
-        var geoHash = _.find(vis.aggs, function (agg) {
-          return agg.type.name === 'geohash_grid';
-        });
-
-        geoHash.params.precision = autoPrecision(event.zoom, config.get('visualization:tileMap:maxPrecision'));
-        $scope.fetch();
-      };
 
       // track state of editable vis vs. "actual" vis
       $scope.stageEditableVis = transferVisState(editableVis, vis, true);
@@ -298,10 +288,6 @@ define(function (require) {
       };
     }
 
-    function autoPrecision(zoom, limit) {
-      return Math.min(Math.round(0.02 * Math.pow(zoom, 2) + 0.24 * zoom + 0.723), limit);
-    }
-
     init();
   });
 });