refactor facet counting metric into facet if/else

panels/map2/module.js

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