echarts 3.5.1 → 3.6.0

package/src/coord/axisHelper.js

@@ -35,11 +35,36 @@ define(function (require) {
             if (!zrUtil.isArray(boundaryGap)) {
                 boundaryGap = [boundaryGap || 0, boundaryGap || 0];
             }
+            if (typeof boundaryGap[0] === 'boolean') {
+                if (__DEV__) {
+                    console.warn('Boolean type for boundaryGap is only '
+                        + 'allowed for ordinal axis. Please use string in '
+                        + 'percentage instead, e.g., "20%". Currently, '
+                        + 'boundaryGap is set to be 0.');
+                }
+                boundaryGap = [0, 0];
+            }
             boundaryGap[0] = numberUtil.parsePercent(boundaryGap[0], 1);
             boundaryGap[1] = numberUtil.parsePercent(boundaryGap[1], 1);
-            span = originalExtent[1] - originalExtent[0];
+            span = (originalExtent[1] - originalExtent[0])
+                || Math.abs(originalExtent[0]);
         }
 
+        // Notice: When min/max is not set (that is, when there are null/undefined,
+        // which is the most common case), these cases should be ensured:
+        // (1) For 'ordinal', show all axis.data.
+        // (2) For others:
+        //      + `boundaryGap` is applied (if min/max set, boundaryGap is
+        //      disabled).
+        //      + If `needCrossZero`, min/max should be zero, otherwise, min/max should
+        //      be the result that originalExtent enlarged by boundaryGap.
+        // (3) If no data, it should be ensured that `scale.setBlank` is set.
+
+        // FIXME
+        // (1) When min/max is 'dataMin' or 'dataMax', should boundaryGap be able to used?
+        // (2) When `needCrossZero` and all data is positive/negative, should it be ensured
+        // that the results processed by boundaryGap are positive/negative?
+
         if (min == null) {
             min = scaleType === 'ordinal'
                 ? (axisDataLen ? 0 : NaN)
@@ -89,31 +114,12 @@ define(function (require) {
         }
 
         scale.setExtent(extent[0], extent[1]);
-        scale.niceExtent(splitNumber, fixMin, fixMax);
-
-        // Use minInterval to constraint the calculated interval.
-        // If calculated interval is less than minInterval. increase the interval quantity until
-        // it is larger than minInterval.
-        // For example:
-        //  minInterval is 1, calculated interval is 0.2, so increase it to be 1. In this way we can get
-        //  an integer axis.
-        var minInterval = model.get('minInterval');
-        if (isFinite(minInterval) && !fixMin && !fixMax && scale.type === 'interval') {
-            var interval = scale.getInterval();
-            var intervalScale = Math.max(Math.abs(interval), minInterval) / interval;
-            // while (interval < minInterval) {
-            //     var quantity = numberUtil.quantity(interval);
-            //     interval = quantity * 10;
-            //     scaleQuantity *= 10;
-            // }
-            extent = scale.getExtent();
-            var origin = (extent[1] + extent[0]) / 2;
-            scale.setExtent(
-                intervalScale * (extent[0] - origin) + origin,
-                intervalScale * (extent[1] - origin) + origin
-            );
-            scale.niceExtent(splitNumber);
-        }
+        scale.niceExtent({
+            splitNumber: splitNumber,
+            fixMin: fixMin,
+            fixMax: fixMax,
+            minInterval: scale.type === 'interval' ? model.get('minInterval') : null
+        });
 
         // If some one specified the min, max. And the default calculated interval
         // is not good enough. He can specify the interval. It is often appeared

package/src/coord/axisModelCommonMixin.js

@@ -8,7 +8,7 @@ define(function (require) {
             return obj.value;
         }
         else {
-            return obj;
+            return obj + '';
         }
     }
 

package/src/coord/calendar/Calendar.js

@@ -35,7 +35,7 @@ define(function (require) {
             return [{name: 'time', type: 'time'}];
         },
 
-        getHandledRangeInfo: function () {
+        getRangeInfo: function () {
             return this._rangeInfo;
         },
 
@@ -161,18 +161,20 @@ define(function (require) {
          * Convert a time data(time, value) item to (x, y) point.
          *
          * @override
-         * @param  {Array} data  data
-         * @param  {boolean} noClip  out of range
-         * @return {Array}       point
+         * @param  {Array|number} data data
+         * @param  {boolean} [clamp=true] out of range
+         * @return {Array} point
          */
-        dataToPoint: function (data, noClip) {
+        dataToPoint: function (data, clamp) {
+            zrUtil.isArray(data) && (data = data[0]);
+            clamp == null && (clamp = true);
 
-            var dayInfo = this.getDateInfo(data[0]);
+            var dayInfo = this.getDateInfo(data);
             var range = this._rangeInfo;
             var date = dayInfo.formatedDate;
 
             // if not in range return [NaN, NaN]
-            if (!noClip && !(dayInfo.time >= range.start.time && dayInfo.time <= range.end.time)) {
+            if (clamp && !(dayInfo.time >= range.start.time && dayInfo.time <= range.end.time)) {
                 return [NaN, NaN];
             }
 
@@ -212,12 +214,11 @@ define(function (require) {
          * Convert a time date item to (x, y) four point.
          *
          * @param  {Array} data  date[0] is date
-         * @param  {boolean} noClip  out of range
+         * @param  {boolean} [clamp=true]  out of range
          * @return {Object}       point
          */
-        dataToRect: function (data, noClip) {
-
-            var point = this.dataToPoint(data, noClip);
+        dataToRect: function (data, clamp) {
+            var point = this.dataToPoint(data, clamp);
 
             return {
                 contentShape: {
@@ -271,16 +272,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/calendar/prepareCustom.js

@@ -0,0 +1,32 @@
+define(function(require) {
+
+    var zrUtil = require('zrender/core/util');
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.getRect();
+        var rangeInfo = coordSys.getRangeInfo();
+
+        return {
+            coordSys: {
+                type: 'calendar',
+                x: rect.x,
+                y: rect.y,
+                width: rect.width,
+                height: rect.height,
+                cellWidth: coordSys.getCellWidth(),
+                cellHeight: coordSys.getCellHeight(),
+                rangeInfo: {
+                    start: rangeInfo.start,
+                    end: rangeInfo.end,
+                    weeks: rangeInfo.weeks,
+                    dayCount: rangeInfo.allDay
+                }
+            },
+            api: {
+                coord: zrUtil.bind(coordSys.dataToPoint, coordSys)
+            }
+        };
+    }
+
+    return prepareCustom;
+});

package/src/coord/cartesian/Axis2D.js

@@ -2,7 +2,6 @@ define(function (require) {
 
     var zrUtil = require('zrender/core/util');
     var Axis = require('../Axis');
-    var axisLabelInterval = require('./axisLabelInterval');
 
     /**
      * Extend axis 2d
@@ -81,17 +80,6 @@ define(function (require) {
             this.grid.getOtherAxis();
         },
 
-        /**
-         * @return {number}
-         */
-        getLabelInterval: function () {
-            var labelInterval = this._labelInterval;
-            if (!labelInterval) {
-                labelInterval = this._labelInterval = axisLabelInterval(this);
-            }
-            return labelInterval;
-        },
-
         /**
          * If label is ignored.
          * Automatically used when axis is category and label can not be all shown

package/src/coord/cartesian/Cartesian2D.js

@@ -104,6 +104,7 @@ define(function(require) {
         getOtherAxis: function (axis) {
             return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
         }
+
     };
 
     zrUtil.inherits(Cartesian2D, Cartesian);

package/src/coord/cartesian/Grid.js

@@ -100,7 +100,9 @@ define(function(require, factory) {
             for (var idx in axes) {
                 if (axes.hasOwnProperty(idx)) {
                     var axis = axes[idx];
-                    if (axis && (axis.type === 'category' || !ifAxisCrossZero(axis))) {
+                    if (axis && (
+                        axis.type === 'category' || axis.type === 'time' || !ifAxisCrossZero(axis)
+                    )) {
                         return true;
                     }
                 }
@@ -555,7 +557,8 @@ define(function(require, factory) {
         ecModel.eachComponent('grid', function (gridModel, idx) {
             var grid = new Grid(gridModel, ecModel, api);
             grid.name = 'grid_' + idx;
-            grid.resize(gridModel, api);
+            // Postpone `resize` to `update`.
+            // grid.resize(gridModel, api);
 
             gridModel.coordinateSystem = grid;
 

package/src/coord/cartesian/prepareCustom.js

@@ -0,0 +1,37 @@
+define(function(require) {
+
+    var zrUtil = require('zrender/core/util');
+
+    function dataToCoordSize(dataSize, dataItem) {
+        // dataItem is necessary in log axis.
+        dataItem = dataItem || [0, 0];
+        return zrUtil.map(['x', 'y'], function (dim, dimIdx) {
+            var axis = this.getAxis(dim);
+            var val = dataItem[dimIdx];
+            var halfSize = dataSize[dimIdx] / 2;
+            return axis.type === 'category'
+                ? axis.getBandWidth()
+                : Math.abs(axis.dataToCoord(val - halfSize) - axis.dataToCoord(val + halfSize));
+        }, this);
+    }
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.grid.getRect();
+        return {
+            coordSys: {
+                // The name exposed to user is always 'cartesian2d' but not 'grid'.
+                type: 'cartesian2d',
+                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/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/parseGeoJson.js

@@ -12,6 +12,11 @@ define(function (require) {
         if (!json.UTF8Encoding) {
             return json;
         }
+        var encodeScale = json.UTF8Scale;
+        if (encodeScale == null) {
+            encodeScale = 1024;
+        }
+
         var features = json.features;
 
         for (var f = 0; f < features.length; f++) {
@@ -26,7 +31,8 @@ define(function (require) {
                 if (geometry.type === 'Polygon') {
                     coordinates[c] = decodePolygon(
                         coordinate,
-                        encodeOffsets[c]
+                        encodeOffsets[c],
+                        encodeScale
                     );
                 }
                 else if (geometry.type === 'MultiPolygon') {
@@ -34,7 +40,8 @@ define(function (require) {
                         var polygon = coordinate[c2];
                         coordinate[c2] = decodePolygon(
                             polygon,
-                            encodeOffsets[c][c2]
+                            encodeOffsets[c][c2],
+                            encodeScale
                         );
                     }
                 }
@@ -45,7 +52,7 @@ define(function (require) {
         return json;
     }
 
-    function decodePolygon(coordinate, encodeOffsets) {
+    function decodePolygon(coordinate, encodeOffsets, encodeScale) {
         var result = [];
         var prevX = encodeOffsets[0];
         var prevY = encodeOffsets[1];
@@ -63,7 +70,7 @@ define(function (require) {
             prevX = x;
             prevY = y;
             // Dequantize
-            result.push([x / 1024, y / 1024]);
+            result.push([x / encodeScale, y / encodeScale]);
         }
 
         return result;

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;
+});