echarts 3.5.4 → 3.6.0

package/src/coord/geo/Geo.js

@@ -36,7 +36,7 @@ define(function (require) {
          */
         this.map = map;
 
-        this._nameCoordMap = {};
+        this._nameCoordMap = zrUtil.createHashMap();
 
         this.loadGeoJson(geoJson, specialAreas, nameMap);
     }
@@ -85,14 +85,14 @@ define(function (require) {
             specialAreas = specialAreas || {};
             nameMap = nameMap || {};
             var regions = this.regions;
-            var regionsMap = {};
+            var regionsMap = zrUtil.createHashMap();
             for (var i = 0; i < regions.length; i++) {
                 var regionName = regions[i].name;
                 // Try use the alias in nameMap
-                regionName = nameMap[regionName] || regionName;
+                regionName = nameMap.hasOwnProperty(regionName) ? nameMap[regionName] : regionName;
                 regions[i].name = regionName;
 
-                regionsMap[regionName] = regions[i];
+                regionsMap.set(regionName, regions[i]);
                 // Add geoJson
                 this.addGeoCoord(regionName, regions[i].center);
 
@@ -144,7 +144,7 @@ define(function (require) {
          * @return {module:echarts/coord/geo/Region}
          */
         getRegion: function (name) {
-            return this._regionsMap[name];
+            return this._regionsMap.get(name);
         },
 
         getRegionByCoord: function (coord) {
@@ -162,7 +162,7 @@ define(function (require) {
          * @param {Array.<number>} geoCoord
          */
         addGeoCoord: function (name, geoCoord) {
-            this._nameCoordMap[name] = geoCoord;
+            this._nameCoordMap.set(name, geoCoord);
         },
 
         /**
@@ -171,7 +171,7 @@ define(function (require) {
          * @return {Array.<number>}
          */
         getGeoCoord: function (name) {
-            return this._nameCoordMap[name];
+            return this._nameCoordMap.get(name);
         },
 
         // Overwrite
@@ -208,7 +208,6 @@ define(function (require) {
             }, this);
         },
 
-        // Overwrite
         /**
          * @param {string|Array.<number>} data
          * @return {Array.<number>}
@@ -224,16 +223,12 @@ define(function (require) {
         },
 
         /**
-         * @override
-         * @implements
-         * see {module:echarts/CoodinateSystem}
+         * @inheritDoc
          */
         convertToPixel: zrUtil.curry(doConvert, 'dataToPoint'),
 
         /**
-         * @override
-         * @implements
-         * see {module:echarts/CoodinateSystem}
+         * @inheritDoc
          */
         convertFromPixel: zrUtil.curry(doConvert, 'pointToData')
 

package/src/coord/geo/GeoModel.js

@@ -36,12 +36,12 @@ define(function (require) {
 
             option.regions = geoCreator.getFilledRegions(option.regions, option.map);
 
-            this._optionModelMap = zrUtil.reduce(option.regions || [], function (obj, regionOpt) {
+            this._optionModelMap = zrUtil.reduce(option.regions || [], function (optionModelMap, regionOpt) {
                 if (regionOpt.name) {
-                    obj[regionOpt.name] = new Model(regionOpt, self);
+                    optionModelMap.set(regionOpt.name, new Model(regionOpt, self));
                 }
-                return obj;
-            }, {});
+                return optionModelMap;
+            }, zrUtil.createHashMap());
 
             this.updateSelectedMap(option.regions);
         },
@@ -129,7 +129,7 @@ define(function (require) {
          * @return {module:echarts/model/Model}
          */
         getRegionModel: function (name) {
-            return this._optionModelMap[name] || new Model(null, this, this.ecModel);
+            return this._optionModelMap.get(name) || new Model(null, this, this.ecModel);
         },
 
         /**

package/src/coord/geo/geoCreator.js

@@ -260,15 +260,15 @@ define(function (require) {
                 return originRegionArr;
             }
 
-            var dataNameMap = {};
+            var dataNameMap = zrUtil.createHashMap();
             var features = geoJson.features;
             for (var i = 0; i < regionsArr.length; i++) {
-                dataNameMap[regionsArr[i].name] = regionsArr[i];
+                dataNameMap.set(regionsArr[i].name, regionsArr[i]);
             }
 
             for (var i = 0; i < features.length; i++) {
                 var name = features[i].properties.name;
-                if (!dataNameMap[name]) {
+                if (!dataNameMap.get(name)) {
                     regionsArr.push({
                         name: name
                     });

package/src/coord/geo/prepareCustom.js

@@ -0,0 +1,37 @@
+define(function(require) {
+
+    var zrUtil = require('zrender/core/util');
+
+    function dataToCoordSize(dataSize, dataItem) {
+        dataItem = dataItem || [0, 0];
+        return zrUtil.map([0, 1], function (dimIdx) {
+            var val = dataItem[dimIdx];
+            var halfSize = dataSize[dimIdx] / 2;
+            var p1 = [];
+            var p2 = [];
+            p1[dimIdx] = val - halfSize;
+            p2[dimIdx] = val + halfSize;
+            p1[1 - dimIdx] = p2[1 - dimIdx] = dataItem[1 - dimIdx];
+            return Math.abs(this.dataToPoint(p1)[dimIdx] - this.dataToPoint(p2)[dimIdx]);
+        }, this);
+    }
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.getBoundingRect();
+        return {
+            coordSys: {
+                type: 'geo',
+                x: rect.x,
+                y: rect.y,
+                width: rect.width,
+                height: rect.height
+            },
+            api: {
+                coord: zrUtil.bind(coordSys.dataToPoint, coordSys),
+                size: zrUtil.bind(dataToCoordSize, coordSys)
+            }
+        };
+    }
+
+    return prepareCustom;
+});

package/src/coord/parallel/Parallel.js

@@ -29,7 +29,7 @@ define(function(require) {
          * @type {Object.<string, module:echarts/coord/parallel/Axis>}
          * @private
          */
-        this._axesMap = {};
+        this._axesMap = zrUtil.createHashMap();
 
         /**
          * key: dimension
@@ -79,13 +79,13 @@ define(function(require) {
                 var axisIndex = parallelAxisIndex[idx];
                 var axisModel = ecModel.getComponent('parallelAxis', axisIndex);
 
-                var axis = this._axesMap[dim] = new ParallelAxis(
+                var axis = this._axesMap.set(dim, new ParallelAxis(
                     dim,
                     axisHelper.createScaleByModel(axisModel),
                     [0, 0],
                     axisModel.get('type'),
                     axisIndex
-                );
+                ));
 
                 var isCategory = axis.type === 'category';
                 axis.onBand = isCategory && axisModel.get('boundaryGap');
@@ -139,7 +139,7 @@ define(function(require) {
                 var data = seriesModel.getData();
 
                 each(this.dimensions, function (dim) {
-                    var axis = this._axesMap[dim];
+                    var axis = this._axesMap.get(dim);
                     axis.scale.unionExtentFromData(data, dim);
                     axisHelper.niceScaleExtent(axis.scale, axis.model);
                 }, this);
@@ -249,7 +249,7 @@ define(function(require) {
             var layoutInfo = this._makeLayoutInfo();
             var layout = layoutInfo.layout;
 
-            each(axes, function (axis) {
+            axes.each(function (axis) {
                 var axisExtent = [0, layoutInfo.axisLength];
                 var idx = axis.inverse ? 1 : 0;
                 axis.setExtent(axisExtent[idx], axisExtent[1 - idx]);
@@ -299,7 +299,8 @@ define(function(require) {
                     axisLabelShow: posInfo.axisLabelShow,
                     nameTruncateMaxWidth: posInfo.nameTruncateMaxWidth,
                     tickDirection: 1,
-                    labelDirection: 1
+                    labelDirection: 1,
+                    labelInterval: axes.get(dim).getLabelInterval()
                 };
             }, this);
         },
@@ -310,7 +311,7 @@ define(function(require) {
          * @return {module:echarts/coord/parallel/ParallelAxis} [description]
          */
         getAxis: function (dim) {
-            return this._axesMap[dim];
+            return this._axesMap.get(dim);
         },
 
         /**
@@ -321,7 +322,7 @@ define(function(require) {
          */
         dataToPoint: function (value, dim) {
             return this.axisCoordToPoint(
-                this._axesMap[dim].dataToCoord(value),
+                this._axesMap.get(dim).dataToCoord(value),
                 dim
             );
         },
@@ -349,7 +350,7 @@ define(function(require) {
                     activeState = 'active';
                     for (var j = 0, lenj = dimensions.length; j < lenj; j++) {
                         var dimName = dimensions[j];
-                        var state = axesMap[dimName].model.getActiveState(values[j], j);
+                        var state = axesMap.get(dimName).model.getActiveState(values[j], j);
 
                         if (state === 'inactive') {
                             activeState = 'inactive';
@@ -372,7 +373,7 @@ define(function(require) {
             var hasActiveSet = false;
 
             for (var j = 0, lenj = dimensions.length; j < lenj; j++) {
-                if (axesMap[dimensions[j]].model.getActiveState() !== 'normal') {
+                if (axesMap.get(dimensions[j]).model.getActiveState() !== 'normal') {
                     hasActiveSet = true;
                 }
             }
@@ -443,7 +444,7 @@ define(function(require) {
                 }
                 delta *= layoutInfo.axisExpandWidth / axisCollapseWidth;
                 delta
-                    ? sliderMove(delta, axisExpandWindow, extent, 'rigid')
+                    ? sliderMove(delta, axisExpandWindow, extent, 'all')
                     // Avoid nonsense triger on mousemove.
                     : (behavior = 'none');
             }

package/src/coord/polar/Polar.js

@@ -174,7 +174,7 @@ define(function(require) {
         dataToPoints: function (data) {
             return data.mapArray(this.dimensions, function (radius, angle) {
                 return this.dataToPoint([radius, angle]);
-            }, this);
+            }, true, this);
         },
 
         /**
@@ -252,6 +252,7 @@ define(function(require) {
 
             return [x, y];
         }
+
     };
 
     return Polar;

package/src/coord/polar/prepareCustom.js

@@ -0,0 +1,54 @@
+define(function(require) {
+
+    var zrUtil = require('zrender/core/util');
+
+    function dataToCoordSize(dataSize, dataItem) {
+        // dataItem is necessary in log axis.
+        return zrUtil.map(['Radius', 'Angle'], function (dim, dimIdx) {
+            var axis = this['get' + dim + 'Axis']();
+            var val = dataItem[dimIdx];
+            var halfSize = dataSize[dimIdx] / 2;
+            var method = 'dataTo' + dim;
+
+            var result = axis.type === 'category'
+                ? axis.getBandWidth()
+                : Math.abs(axis[method](val - halfSize) - axis[method](val + halfSize));
+
+            if (dim === 'Angle') {
+                result = result * Math.PI / 180;
+            }
+
+            return result;
+
+        }, this);
+    }
+
+    function prepareCustom(coordSys) {
+        var radiusAxis = coordSys.getRadiusAxis();
+        var angleAxis = coordSys.getAngleAxis();
+        var radius = radiusAxis.getExtent();
+        radius[0] > radius[1] && radius.reverse();
+
+        return {
+            coordSys: {
+                type: 'polar',
+                cx: coordSys.cx,
+                cy: coordSys.cy,
+                r: radius[1],
+                r0: radius[0]
+            },
+            api: {
+                coord: zrUtil.bind(function (data) {
+                    var radius = radiusAxis.dataToRadius(data[0]);
+                    var angle = angleAxis.dataToAngle(data[1]);
+                    var coord = coordSys.coordToPoint([radius, angle]);
+                    coord.push(radius, angle * Math.PI / 180);
+                    return coord;
+                }),
+                size: zrUtil.bind(dataToCoordSize, coordSys)
+            }
+        };
+    }
+
+    return prepareCustom;
+});

package/src/coord/single/Single.js

@@ -167,19 +167,19 @@ define(function (require) {
             var extentSum = axisExtent[0] + axisExtent[1];
             var isHorizontal = axis.isHorizontal();
 
-            axis.toGlobalCoord = isHorizontal ?
-                function (coord) {
+            axis.toGlobalCoord = isHorizontal
+                ? function (coord) {
                     return coord + coordBase;
-                } :
-                function (coord) {
+                }
+                : function (coord) {
                     return extentSum - coord + coordBase;
                 };
 
-            axis.toLocalCoord = isHorizontal ?
-                function (coord) {
+            axis.toLocalCoord = isHorizontal
+                ? function (coord) {
                     return coord - coordBase;
-                } :
-                function (coord) {
+                }
+                : function (coord) {
                     return extentSum - coord + coordBase;
                 };
         },
@@ -267,6 +267,7 @@ define(function (require) {
             pt[1 - idx] = idx === 0 ? (rect.y + rect.height / 2) : (rect.x + rect.width / 2);
             return pt;
         }
+
     };
 
     return Single;

package/src/coord/single/SingleAxis.js

@@ -2,7 +2,6 @@ define(function (require) {
 
     var zrUtil = require('zrender/core/util');
     var Axis = require('../Axis');
-    var axisHelper = require('../axisHelper');
 
     /**
      * @constructor  module:echarts/coord/single/SingleAxis
@@ -72,32 +71,6 @@ define(function (require) {
 
         },
 
-        /**
-         * Get interval of the axis label.
-         * @return {number}
-         */
-        getLabelInterval: function () {
-            var labelInterval = this._labelInterval;
-            if (!labelInterval) {
-                var axisModel = this.model;
-                var labelModel = axisModel.getModel('axisLabel');
-                var interval = labelModel.get('interval');
-                if (!(this.type === 'category' && interval === 'auto')) {
-
-                    labelInterval = this._labelInterval = interval === 'auto' ? 0 : interval;
-                    return labelInterval;
-                }
-                labelInterval = this._labelInterval =
-                    axisHelper.getAxisLabelInterval(
-                        zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
-                        axisModel.getFormattedLabels(),
-                        labelModel.getModel('textStyle').getFont(),
-                        this.isHorizontal()
-                    );
-            }
-            return labelInterval;
-        },
-
         /**
          * @override
          */

package/src/coord/single/prepareCustom.js

@@ -0,0 +1,34 @@
+define(function(require) {
+
+    var zrUtil = require('zrender/core/util');
+
+    function dataToCoordSize(dataSize, dataItem) {
+        // dataItem is necessary in log axis.
+        var axis = this.getAxis();
+        var val = dataItem instanceof Array ? dataItem[0] : dataItem;
+        var halfSize = (dataSize instanceof Array ? dataSize[0] : dataSize) / 2;
+        return axis.type === 'category'
+            ? axis.getBandWidth()
+            : Math.abs(axis.dataToCoord(val - halfSize) - axis.dataToCoord(val + halfSize));
+    }
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.getRect();
+
+        return {
+            coordSys: {
+                type: 'singleAxis',
+                x: rect.x,
+                y: rect.y,
+                width: rect.width,
+                height: rect.height
+            },
+            api: {
+                coord: zrUtil.bind(coordSys.dataToPoint, coordSys),
+                size: zrUtil.bind(dataToCoordSize, coordSys)
+            }
+        };
+    }
+
+    return prepareCustom;
+});

package/src/data/DataDiffer.js

@@ -105,7 +105,8 @@ define(function(require) {
 
     function initIndexMap(arr, map, keyArr, keyGetter) {
         for (var i = 0; i < arr.length; i++) {
-            var key = keyGetter(arr[i], i);
+            // Add prefix to avoid conflict with Object.prototype.
+            var key = '_ec_' + keyGetter(arr[i], i);
             var existence = map[key];
             if (existence == null) {
                 keyArr.push(key);

package/src/data/Graph.js

@@ -10,6 +10,10 @@ define(function(require) {
 
     var zrUtil = require('zrender/core/util');
 
+    // id may be function name of Object, add a prefix to avoid this problem.
+    function generateNodeKey (id) {
+        return '_EC_' + id;
+    }
     /**
      * @alias module:echarts/data/Graph
      * @constructor
@@ -83,7 +87,7 @@ define(function(require) {
 
         var nodesMap = this._nodesMap;
 
-        if (nodesMap[id]) {
+        if (nodesMap[generateNodeKey(id)]) {
             return;
         }
 
@@ -92,7 +96,7 @@ define(function(require) {
 
         this.nodes.push(node);
 
-        nodesMap[id] = node;
+        nodesMap[generateNodeKey(id)] = node;
         return node;
     };
 
@@ -111,7 +115,7 @@ define(function(require) {
      * @return {module:echarts/data/Graph.Node}
      */
     graphProto.getNodeById = function (id) {
-        return this._nodesMap[id];
+        return this._nodesMap[generateNodeKey(id)];
     };
 
     /**
@@ -134,10 +138,10 @@ define(function(require) {
         }
 
         if (!(n1 instanceof Node)) {
-            n1 = nodesMap[n1];
+            n1 = nodesMap[generateNodeKey(n1)];
         }
         if (!(n2 instanceof Node)) {
-            n2 = nodesMap[n2];
+            n2 = nodesMap[generateNodeKey(n2)];
         }
         if (!n1 || !n2) {
             return;
@@ -244,7 +248,7 @@ define(function(require) {
         cb, startNode, direction, context
     ) {
         if (!(startNode instanceof Node)) {
-            startNode = this._nodesMap[startNode];
+            startNode = this._nodesMap[generateNodeKey(startNode)];
         }
         if (!startNode) {
             return;
@@ -271,7 +275,7 @@ define(function(require) {
                 var otherNode = e.node1 === currentNode
                     ? e.node2 : e.node1;
                 if (!otherNode.__visited) {
-                    if (cb.call(otherNode, otherNode, currentNode)) {
+                    if (cb.call(context, otherNode, currentNode)) {
                         // Stop traversing
                         return;
                     }