github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 01:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

removed geojson property that was not used, applied addLatLng method for heatmap tooltips, added tests, fixed tests

Browse source
This commit is contained in:
Juan Thomassie 2015-05-06 16:09:38 -05:00
parent b4ff3124ea
commit e238894055
3 changed files with 186 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/kibana/components/agg_response/geo_json/geo_json.js
View file

@ -34,8 +34,7 @@ define(function (require) {
label: table.title(),
length: 0,
min: 0,
max: 0,
metricType : agg.metric._opts.type
max: 0
};
if (agg.metric._opts.params && agg.metric._opts.params.field) {

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

@ -73,7 +73,9 @@ define(function (require) {
mapCenter = self._attr.mapCenter;
}
var mapData = data.geoJson;
// add leaflet latLngs to properties for tooltip
var mapData = self.addLatLng(data.geoJson);
var div = $(this).addClass('tilemap');
var tileLayer = L.tileLayer('https://otile{s}-s.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpeg', {
attribution: 'Tiles by <a href="http://www.mapquest.com/">MapQuest</a> &mdash; ' +
@ -744,7 +746,7 @@ define(function (require) {
*
* @method getBounds
* @param mapData {geoJson Object}
* @return {Leaflet}
* @return bounds {Leaflet Object}
*/
TileMap.prototype.getBounds = function (mapData) {
var bounds = L.geoJson(mapData).getBounds();

185
test/unit/specs/vislib/visualizations/tile_map.js
View file

@ -208,17 +208,29 @@ define(function (require) {
});
});
it('should return a min number', function () {
it('should return the min of all features.properties.count', function () {
vis.handler.charts.forEach(function (chart) {
var data = chart.handler.data.data;
expect(_.isFinite(chart.getMinMax(data).min)).to.be(true);
var min = _.chain(data.geoJson.features)
.map(function (n) {
return n.properties.count;
})
.min()
.value();
expect(chart.getMinMax(data).min).to.be(min);
});
});
it('should return a max number', function () {
it('should return the max of all features.properties.count', function () {
vis.handler.charts.forEach(function (chart) {
var data = chart.handler.data.data;
expect(_.isFinite(chart.getMinMax(data).max)).to.be(true);
var max = _.chain(data.geoJson.features)
.map(function (n) {
return n.properties.count;
})
.max()
.value();
expect(chart.getMinMax(data).max).to.be(max);
});
});
});
@ -239,6 +251,48 @@ define(function (require) {
expect(chart.dataToHeatArray(mapData, max).length).to.be(mapData.features.length);
});
});
it('should return an array item with lat, lng, metric for each feature', function () {
vis.handler.charts.forEach(function (chart) {
var mapData = chart.chartData.geoJson;
var max = mapData.properties.allmax;
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
var lat = feature.geometry.coordinates[1];
var lng = feature.geometry.coordinates[0];
var intensity = feature.properties.count;
var array = chart.dataToHeatArray(mapData, max);
console.log(array);
console.log(feature);
console.log(i, array[i][0], array[i][1], array[i][2]);
console.log(i, lat, lng, intensity);
expect(array[i][0]).to.be(lat);
expect(array[i][1]).to.be(lng);
expect(array[i][2]).to.be(intensity);
});
});
it('should return an array item with lat, lng, normalized metric for each feature', function () {
vis.handler.charts.forEach(function (chart) {
chart._attr.heatNormalizeData = true;
var mapData = chart.chartData.geoJson;
var max = mapData.properties.allmax;
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
var lat = feature.geometry.coordinates[1];
var lng = feature.geometry.coordinates[0];
var intensity = parseInt(feature.properties.count / max * 100);
var array = chart.dataToHeatArray(mapData, max);
console.log(array);
console.log(feature);
console.log(i, array[i][0], array[i][1], array[i][2]);
console.log(i, lat, lng, intensity);
expect(array[i][0]).to.be(lat);
expect(array[i][1]).to.be(lng);
expect(array[i][2]).to.be(intensity);
});
});
});
describe('applyShadingStyle method', function () {
@ -253,6 +307,129 @@ define(function (require) {
});
});
});
describe('getBounds method', function () {
it('should return bounds object that contains every point in mapData', function () {
vis.handler.charts.forEach(function (chart) {
var mapData = chart.chartData.geoJson;
var containsPoint = [];
var bounds = chart.getBounds(mapData);
for (var i = 0; i < mapData.features.length; i++) {
var pt = [mapData.features[i].geometry.coordinates[1], mapData.features[i].geometry.coordinates[0]];
containsPoint.push(bounds.contains(pt));
}
containsPoint = _.compact(containsPoint);
expect(containsPoint.length).to.be(mapData.features.length);
});
});
});
describe('showTooltip method', function () {
it('should create a .leaflet-popup-kibana div for the tooltip', function () {
vis.handler.charts.forEach(function (chart) {
chart.tooltipFormatter = function (str) {
return str;
};
var map = chart.maps[0];
var mapData = chart.chartData.geoJson;
var layerIds = _.keys(map._layers);
var id = layerIds[_.random(1, layerIds.length - 1)]; // layer 0 is tileLayer
map._layers[id].fire('mouseover');
expect($(vis.el).find('.leaflet-popup-kibana').length).to.be(1);
});
});
});
describe('tooltipProximity method', function () {
it('should return true if feature is close enough to event latlng to display tooltip', function () {
vis.handler.charts.forEach(function (chart) {
var mapData = chart.chartData.geoJson;
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
var point = feature.properties.latLng;
var zoom = _.random(1, 12);
var map = chart.maps[0];
expect(chart.tooltipProximity(point, zoom, feature, map)).to.be(true);
});
});
it('should return false if feature is not close enough to event latlng to display tooltip', function () {
vis.handler.charts.forEach(function (chart) {
var mapData = chart.chartData.geoJson;
var i = _.random(0, mapData.features.length - 1);
var point = L.latLng(90, -180);
var zoom = _.random(1, 12);
var feature = mapData.features[i];
var map = chart.maps[0];
expect(chart.tooltipProximity(point, zoom, feature, map)).to.be(false);
});
});
});
describe('nearestFeature method', function () {
it('should return an object', function () {
vis.handler.charts.forEach(function (chart) {
var mapData = chart.chartData.geoJson;
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
var point = feature.properties.latLng;
expect(_.isObject(chart.nearestFeature(point, mapData))).to.be(true);
});
});
it('should return a geoJson feature', function () {
vis.handler.charts.forEach(function (chart) {
var mapData = chart.chartData.geoJson;
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
var point = feature.properties.latLng;
expect(chart.nearestFeature(point, mapData).type).to.be('Feature');
});
});
it('should return the geoJson feature with same latlng as point', function () {
vis.handler.charts.forEach(function (chart) {
var mapData = chart.chartData.geoJson;
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
var point = feature.properties.latLng;
expect(chart.nearestFeature(point, mapData)).to.be(feature);
});
});
});
describe('addLatLng method', function () {
it('should add object to properties of each feature', function () {
vis.handler.charts.forEach(function (chart) {
var map = chart.maps[0];
var mapData = chart.addLatLng(chart.chartData.geoJson);
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
expect(_.isObject(feature.properties.latLng)).to.be(true);
});
});
it('should add latLng with lat to properties of each feature', function () {
vis.handler.charts.forEach(function (chart) {
var map = chart.maps[0];
var mapData = chart.addLatLng(chart.chartData.geoJson);
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
expect(_.isFinite(feature.properties.latLng.lat)).to.be(true);
});
});
it('should add latLng with lng to properties of each feature', function () {
vis.handler.charts.forEach(function (chart) {
var map = chart.maps[0];
var mapData = chart.addLatLng(chart.chartData.geoJson);
var i = _.random(0, mapData.features.length - 1);
var feature = mapData.features[i];
expect(_.isFinite(feature.properties.latLng.lng)).to.be(true);
});
});
});
});
});