IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor facet counting metric into facet if/else

Browse Source
This commit is contained in:
Zachary Tong
2013-04-15 17:19:42 -04:00
parent a16b38a91b
commit 18276eddbf
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
panels/map2/module.js
View File

@@ -78,6 +78,8 @@ angular.module('kibana.map2', [])
var request = $scope.ejs.Request().indices($scope.panel.index);
var metric = 'count';
//Use a regular term facet if there is no secondary field
if (typeof $scope.panel.secondaryfield === "undefined") {
var facet = $scope.ejs.TermsFacet('map')
@@ -90,6 +92,8 @@ angular.module('kibana.map2', [])
ejs.RangeFilter($scope.time.field)
.from($scope.time.from)
.to($scope.time.to))));
metric = 'count';
} else {
//otherwise, use term stats
//NOTE: this will break if valueField is a geo_point
@@ -104,6 +108,8 @@ angular.module('kibana.map2', [])
ejs.RangeFilter($scope.time.field)
.from($scope.time.from)
.to($scope.time.to))));
metric = 'total';
}
@@ -122,17 +128,6 @@ angular.module('kibana.map2', [])
_.each(results.facets.map.terms, function (v) {
var metric = 'count';
//If it is a Term facet, use count, otherwise use Total
//May retool this to allow users to pick mean/median/etc
if (typeof $scope.panel.secondaryfield === "undefined") {
metric = 'count';
} else {
metric = 'total';
}
//FIX THIS
if (!$scope.isNumber(v.term)) {
$scope.data[v.term.toUpperCase()] = v[metric];
@@ -359,9 +354,11 @@ angular.module('kibana.map2', [])
var path = d3.geo.path()
.projection(scope.projection);
console.log(scope.data);
//Geocoded points are decoded into lonlat
scope.points = _.map(scope.data, function (k, v) {
//console.log(k,v);
var decoded = geohash.decode(v);
return [decoded.longitude, decoded.latitude];
});