github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use the same tooltip for all map type, remove normalize

Browse source
This commit is contained in:
Rashid Khan 2015-05-13 15:46:33 -07:00
parent ec74972e0d
commit 9f6ac49ec0
2 changed files with 21 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/kibana/components/vislib/visualizations/tile_map.js
View file

@ -442,7 +442,7 @@ define(function (require) {
return L.circle(latlng, scaledRadius);
},
onEachFeature: function (feature, layer) {
self.bindPopup(feature, layer);
self.bindPopup(feature, layer, map);
},
style: function (feature) {
return self.applyShadingStyle(feature, min, max);
@ -482,7 +482,7 @@ define(function (require) {
return L.circle(latlng, radius);
},
onEachFeature: function (feature, layer) {
self.bindPopup(feature, layer);
self.bindPopup(feature, layer, map);
},
style: function (feature) {
return self.applyShadingStyle(feature, min, max);
@ -529,7 +529,7 @@ define(function (require) {
return L.rectangle(corners);
},
onEachFeature: function (feature, layer) {
self.bindPopup(feature, layer);
self.bindPopup(feature, layer, map);
layer.on({
mouseover: function (e) {
var layer = e.target;
@ -737,26 +737,24 @@ define(function (require) {
* @param layer {Object}
* return {undefined}
*/
TileMap.prototype.bindPopup = function (feature, layer) {
var props = feature.properties;
var popup = L.popup({
className: 'leaflet-popup-kibana',
autoPan: false
})
.setContent(
'Geohash: ' + props.geohash + '<br>' +
'Center: ' + props.center[1].toFixed(1) + ', ' + props.center[0].toFixed(1) + '<br>' +
props.valueLabel + ': ' + props.count
);
layer.bindPopup(popup)
.on('mouseover', function (e) {
layer.openPopup();
})
.on('mouseout', function (e) {
layer.closePopup();
TileMap.prototype.bindPopup = function (feature, layer, map) {
var self = this;
var popup = layer.on({
mouseover: function (e) {
var layer = e.target;
// bring layer to front if not older browser
if (!L.Browser.ie && !L.Browser.opera) {
layer.bringToFront();
}
var latlng = L.latLng(feature.geometry.coordinates[0], feature.geometry.coordinates[1]);
self.showTooltip(map, feature, latlng);
},
mouseout: function (e) {
map.closePopup();
}
});
this.popups.push({elem: popup, layer: layer});
this.popups.push(popup);
};
/**
@ -902,8 +900,7 @@ define(function (require) {
TileMap.prototype.destroy = function () {
if (this.popups) {
this.popups.forEach(function (popup) {
popup.elem.off('mouseover').off('mouseout');
popup.layer.unbindPopup(popup.elem);
popup.off('mouseover').off('mouseout');
});
this.popups = [];
}

12
src/kibana/plugins/vis_types/vislib/editors/tile_map.html
View file

@ -56,7 +56,7 @@
<div>
<label>
Maximum zoom
&nbsp;<kbn-info placement="right" info="Map zoom at which all dots are display at full intensity. Default: 16"></kbn-info>
&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
@ -95,16 +95,6 @@
</div>
</div>
</div>
<div class="form-group">
<span class="hintbox-label" ng-click="heatNormalizeData = !heatNormalizeData">
<label>
<input type="checkbox" value="{{heatNormalizeData}}" ng-model="vis.params.heatNormalizeData" name="heatNormalizeData" ng-checked="vis.params.heatNormalizeData">
Normalize data for heatmap intesity
</label>
<i class="fa fa-info-circle"></i>
</span>
<div class="hintbox" ng-show="heatNormalizeData">Default is checked to show heatmap intensity of bucket count as a percent of max count. Uncheck to show heatmap intensity simply as bucket count.</div>
</div>
<div class="form-group">
<label>