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

added tests and modified radiusScale method for better range of values

Browse source
This commit is contained in:
Juan Thomassie 2015-05-11 15:53:37 -05:00
parent 6b3176c147
commit 1000f18740
2 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -307,7 +307,7 @@ define(function (require) {
var precision = mapData.properties.precision;
// multiplier to reduce size of all circles
var scaleFactor = 0.9;
var scaleFactor = 0.6;
var radiusScaler = 2.5;
@ -352,7 +352,7 @@ define(function (require) {
var max = mapData.properties.allmax;
// multiplier to reduce size of all circles
var scaleFactor = 0.9;
var scaleFactor = 0.8;
var featureLayer = L.geoJson(mapData, {
pointToLayer: function (feature, latlng) {
@ -615,7 +615,7 @@ define(function (require) {
var exp = 0.5;
var pct = count / max;
var constantZoomRadius = 0.5 * Math.pow(2, zoom);
var precisionScale = 160 / Math.pow(5, precision);
var precisionScale = 200 / Math.pow(5, precision);
return Math.pow(pct, exp) * constantZoomRadius * precisionScale;
};

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

@ -174,13 +174,41 @@ define(function (require) {
});
describe('radiusScale method', function () {
it('should return a number', function () {
vis.handler.charts.forEach(function (chart) {
var count = Math.random() * 50;
var max = 50;
var precision = 1;
var feature = chart.chartData.geoJson.features[0];
expect(_.isNumber(chart.radiusScale(count, max, feature))).to.be(true);
var countdata = [0, 10, 20, 30, 40, 50, 60];
var max = 60;
var zoom = _.random(1, 18);
var constantZoomRadius = 0.5 * Math.pow(2, zoom);
var precision = _.random(1, 12);
var precisionScale = 200 / Math.pow(5, precision);
var prev = -1;
it('test array should return a number equal to radius', function () {
countdata.forEach(function (data, i) {
vis.handler.charts.forEach(function (chart) {
var count = data;
var pct = count / max;
var exp = 0.5;
var radius = Math.pow(pct, exp) * constantZoomRadius * precisionScale;
var test = chart.radiusScale(count, max, zoom, precision);
expect(_.isNumber(test)).to.be(true);
expect(test).to.be(radius);
});
});
});
it('test array should return a radius greater than previous', function () {
countdata.forEach(function (data, i) {
vis.handler.charts.forEach(function (chart) {
var count = data;
var pct = count / max;
var exp = 0.5;
var radius = Math.pow(pct, exp) * constantZoomRadius * precisionScale;
var test = chart.radiusScale(count, max, zoom, precision);
expect(test).to.be.above(prev);
prev = chart.radiusScale(count, max, zoom, precision);
});
});
});
});