From 97adb3d99b4cee986eb1568e3e3a1d85d167dc92 Mon Sep 17 00:00:00 2001
From: lang <bm2736892@gmail.com>
Date: Wed, 6 Jan 2016 15:06:54 +0800
Subject: [PATCH] Map add more statistic types

---
 src/chart/map/MapSeries.js        |  2 --
 src/chart/map/mapDataStatistic.js | 20 +++++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/chart/map/MapSeries.js b/src/chart/map/MapSeries.js
index dba487845..284cf4e7c 100644
--- a/src/chart/map/MapSeries.js
+++ b/src/chart/map/MapSeries.js
@@ -157,8 +157,6 @@ define(function (require) {
             // 选择模式，默认关闭，可选single，multiple
             // selectedMode: false,
             dataRangeHoverLink: true,
-            hoverable: true,
-            clickable: true,
             // 是否开启缩放及漫游模式
             // roam: false,
 
diff --git a/src/chart/map/mapDataStatistic.js b/src/chart/map/mapDataStatistic.js
index f96cec71d..132c7edfb 100644
--- a/src/chart/map/mapDataStatistic.js
+++ b/src/chart/map/mapDataStatistic.js
@@ -25,14 +25,28 @@ define(function (require) {
         return datas[0].map(dims, function (value, idx) {
             var name = datas[0].getName(idx);
             var sum = 0;
+            var min = Infinity;
+            var max = -Infinity;
             var len = dataNameMap[name].length;
             for (var i = 0; i < len; i++) {
+                min = Math.min(min, dataNameMap[name][i]);
+                max = Math.max(max, dataNameMap[name][i]);
                 sum += dataNameMap[name][i];
             }
-            if (statisticsType === 'average') {
-                sum /= len;
+            var result;
+            if (statisticsType === 'min') {
+                result = min;
             }
-            return len === 0 ? NaN : sum;
+            else if (statisticsType === 'max') {
+                result = max;
+            }
+            else if (statisticsType === 'average') {
+                result = sum / len;
+            }
+            else {
+                result = sum;
+            }
+            return len === 0 ? NaN : result;
         });
     }
 
-- 
GitLab