Merge branch 'master' of https://github.com/apache/incubator-echarts

apache · Oct 29, 2018 · 5a3a3d2 · 5a3a3d2
2 parents 0357b08 + ef9cf76
commit 5a3a3d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/chart/sunburst/SunburstPiece.js b/src/chart/sunburst/SunburstPiece.js
@@ -94,6 +94,8 @@ SunburstPieceProto.updateData = function (
 
     var visualColor = getNodeColor(node, seriesModel, ecModel);
 
+    fillDefaultColor(node, seriesModel, visualColor)
+
     var normalStyle = itemModel.getModel('itemStyle').getItemStyle();
     var style;
     if (state === 'normal') {
@@ -411,3 +413,9 @@ function isNodeHighlighted(node, activeNode, policy) {
         return node === activeNode || node.isDescendantOf(activeNode);
     }
 }
+
+// Fix tooltip callback function params.color incorrect when pick a default color 
+function fillDefaultColor(node, seriesModel, color) {
+    var data = seriesModel.getData();
+    data.setItemVisual(node.dataIndex, 'color', color);
+}
diff --git a/src/coord/geo/Geo.js b/src/coord/geo/Geo.js
@@ -48,7 +48,7 @@ function Geo(name, map, nameMap, invertLongitute) {
     var source = geoSourceManager.load(map, nameMap);
 
     this._nameCoordMap = source.nameCoordMap;
-    this._regionsMap = source.nameCoordMap;
+    this._regionsMap = source.regionsMap;
     this._invertLongitute = invertLongitute == null ? true : invertLongitute;
 
     /**