echarts 4.5.0-rc.2 → 4.8.0

package/lib/component/toolbox/feature/MagicType.js

@@ -45,6 +45,7 @@ var featureManager = require("../featureManager");
 * under the License.
 */
 var magicTypeLang = lang.toolbox.magicType;
+var INNER_STACK_KEYWORD = '__ec_magicType_stack__';
 
 function MagicType(model) {
   this.model = model;
@@ -58,9 +59,8 @@ MagicType.defaultOption = {
     /* eslint-disable */
     line: 'M4.1,28.9h7.1l9.3-22l7.4,38l9.7-19.7l3,12.8h14.9M4.1,58h51.4',
     bar: 'M6.7,22.9h10V48h-10V22.9zM24.9,13h10v35h-10V13zM43.2,2h10v46h-10V2zM3.1,58h53.7',
-    stack: 'M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z',
-    // jshint ignore:line
-    tiled: 'M2.3,2.2h22.8V25H2.3V2.2z M35,2.2h22.8V25H35V2.2zM2.3,35h22.8v22.8H2.3V35z M35,35h22.8v22.8H35V35z'
+    stack: 'M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z' // jshint ignore:line
+
     /* eslint-enable */
 
   },
@@ -111,23 +111,18 @@ var seriesOptGenreator = {
     }
   },
   'stack': function (seriesType, seriesId, seriesModel, model) {
+    var isStack = seriesModel.get('stack') === INNER_STACK_KEYWORD;
+
     if (seriesType === 'line' || seriesType === 'bar') {
+      model.setIconStatus('stack', isStack ? 'normal' : 'emphasis');
       return zrUtil.merge({
         id: seriesId,
-        stack: '__ec_magicType_stack__'
+        stack: isStack ? '' : INNER_STACK_KEYWORD
       }, model.get('option.stack') || {}, true);
     }
-  },
-  'tiled': function (seriesType, seriesId, seriesModel, model) {
-    if (seriesType === 'line' || seriesType === 'bar') {
-      return zrUtil.merge({
-        id: seriesId,
-        stack: ''
-      }, model.get('option.tiled') || {}, true);
-    }
   }
 };
-var radioTypes = [['line', 'bar'], ['stack', 'tiled']];
+var radioTypes = [['line', 'bar'], ['stack']];
 
 proto.onclick = function (ecModel, api, type) {
   var model = this.model;
@@ -192,10 +187,21 @@ proto.onclick = function (ecModel, api, type) {
       seriesIndex: seriesIndex
     }
   }, generateNewSeriesTypes);
+  var newTitle; // Change title of stack
+
+  if (type === 'stack') {
+    var isStack = newOption.series && newOption.series[0] && newOption.series[0].stack === INNER_STACK_KEYWORD;
+    newTitle = isStack ? zrUtil.merge({
+      stack: magicTypeLang.title.tiled
+    }, magicTypeLang.title) : zrUtil.clone(magicTypeLang.title);
+  }
+
   api.dispatchAction({
     type: 'changeMagicType',
     currentType: type,
-    newOption: newOption
+    newOption: newOption,
+    newTitle: newTitle,
+    featureName: 'magicType'
   });
 };
 

package/lib/component/toolbox/feature/SaveAsImage.js

@@ -69,7 +69,8 @@ var proto = SaveAsImage.prototype;
 proto.onclick = function (ecModel, api) {
   var model = this.model;
   var title = model.get('name') || ecModel.get('title.0.text') || 'echarts';
-  var type = model.get('type', true) || 'png';
+  var isSvg = api.getZr().painter.getType() === 'svg';
+  var type = isSvg ? 'svg' : model.get('type', true) || 'png';
   var url = api.getConnectedDataURL({
     type: type,
     backgroundColor: model.get('backgroundColor', true) || ecModel.get('backgroundColor') || '#fff',

package/lib/component/tooltip/TooltipContent.js

@@ -24,6 +24,8 @@ var zrColor = require("zrender/lib/tool/color");
 
 var eventUtil = require("zrender/lib/core/event");
 
+var domUtil = require("zrender/lib/core/dom");
+
 var env = require("zrender/lib/core/env");
 
 var formatUtil = require("../../util/format");
@@ -124,24 +126,65 @@ function assembleCssText(tooltipModel) {
   }
 
   return cssText.join(';') + ';';
+} // If not able to make, do not modify the input `out`.
+
+
+function makeStyleCoord(out, zr, appendToBody, zrX, zrY) {
+  var zrPainter = zr && zr.painter;
+
+  if (appendToBody) {
+    var zrViewportRoot = zrPainter && zrPainter.getViewportRoot();
+
+    if (zrViewportRoot) {
+      // Some APPs might use scale on body, so we support CSS transform here.
+      domUtil.transformLocalCoord(out, zrViewportRoot, document.body, zrX, zrY);
+    }
+  } else {
+    out[0] = zrX;
+    out[1] = zrY; // xy should be based on canvas root. But tooltipContent is
+    // the sibling of canvas root. So padding of ec container
+    // should be considered here.
+
+    var viewportRootOffset = zrPainter && zrPainter.getViewportRootOffset();
+
+    if (viewportRootOffset) {
+      out[0] += viewportRootOffset.offsetLeft;
+      out[1] += viewportRootOffset.offsetTop;
+    }
+  }
 }
 /**
  * @alias module:echarts/component/tooltip/TooltipContent
+ * @param {HTMLElement} container
+ * @param {ExtensionAPI} api
+ * @param {Object} [opt]
+ * @param {boolean} [opt.appendToBody]
+ *        `false`: the DOM element will be inside the container. Default value.
+ *        `true`: the DOM element will be appended to HTML body, which avoid
+ *                some overflow clip but intrude outside of the container.
  * @constructor
  */
 
 
-function TooltipContent(container, api) {
+function TooltipContent(container, api, opt) {
   if (env.wxa) {
     return null;
   }
 
   var el = document.createElement('div');
-  var zr = this._zr = api.getZr();
+  el.domBelongToZr = true;
   this.el = el;
-  this._x = api.getWidth() / 2;
-  this._y = api.getHeight() / 2;
-  container.appendChild(el);
+  var zr = this._zr = api.getZr();
+  var appendToBody = this._appendToBody = opt && opt.appendToBody;
+  this._styleCoord = [0, 0];
+  makeStyleCoord(this._styleCoord, zr, appendToBody, api.getWidth() / 2, api.getHeight() / 2);
+
+  if (appendToBody) {
+    document.body.appendChild(el);
+  } else {
+    container.appendChild(el);
+  }
+
   this._container = container;
   this._show = false;
   /**
@@ -175,7 +218,8 @@ function TooltipContent(container, api) {
       // Try trigger zrender event to avoid mouse
       // in and out shape too frequently
       var handler = zr.handler;
-      eventUtil.normalizeEvent(container, e, true);
+      var zrViewportRoot = zr.painter.getViewportRoot();
+      eventUtil.normalizeEvent(zrViewportRoot, e, true);
       handler.dispatch('mousemove', e);
     }
   };
@@ -220,10 +264,11 @@ TooltipContent.prototype = {
   show: function (tooltipModel) {
     clearTimeout(this._hideTimeout);
     var el = this.el;
+    var styleCoord = this._styleCoord;
     el.style.cssText = gCssText + assembleCssText(tooltipModel) // Because of the reason described in:
     // http://stackoverflow.com/questions/21125587/css3-transition-not-working-in-chrome-anymore
     // we should set initial value to `left` and `top`.
-    + ';left:' + this._x + 'px;top:' + this._y + 'px;' + (tooltipModel.get('extraCssText') || '');
+    + ';left:' + styleCoord[0] + 'px;top:' + styleCoord[1] + 'px;' + (tooltipModel.get('extraCssText') || '');
     el.style.display = el.innerHTML ? 'block' : 'none'; // If mouse occsionally move over the tooltip, a mouseout event will be
     // triggered by canvas, and cuase some unexpectable result like dragging
     // stop, "unfocusAdjacency". Here `pointer-events: none` is used to solve
@@ -243,23 +288,12 @@ TooltipContent.prototype = {
     var el = this.el;
     return [el.clientWidth, el.clientHeight];
   },
-  moveTo: function (x, y) {
-    // xy should be based on canvas root. But tooltipContent is
-    // the sibling of canvas root. So padding of ec container
-    // should be considered here.
-    var zr = this._zr;
-    var viewportRootOffset;
-
-    if (zr && zr.painter && (viewportRootOffset = zr.painter.getViewportRootOffset())) {
-      x += viewportRootOffset.offsetLeft;
-      y += viewportRootOffset.offsetTop;
-    }
-
+  moveTo: function (zrX, zrY) {
+    var styleCoord = this._styleCoord;
+    makeStyleCoord(styleCoord, this._zr, this._appendToBody, zrX, zrY);
     var style = this.el.style;
-    style.left = x + 'px';
-    style.top = y + 'px';
-    this._x = x;
-    this._y = y;
+    style.left = styleCoord[0] + 'px';
+    style.top = styleCoord[1] + 'px';
   },
   hide: function () {
     this.el.style.display = 'none';
@@ -280,6 +314,9 @@ TooltipContent.prototype = {
   isShow: function () {
     return this._show;
   },
+  dispose: function () {
+    this.el.parentNode.removeChild(this.el);
+  },
   getOuterSize: function () {
     var width = this.el.clientWidth;
     var height = this.el.clientHeight; // Consider browser compatibility.

package/lib/component/tooltip/TooltipView.js

@@ -93,7 +93,9 @@ var _default = echarts.extendComponentView({
     var tooltipContent;
 
     if (this._renderMode === 'html') {
-      tooltipContent = new TooltipContent(api.getDom(), api);
+      tooltipContent = new TooltipContent(api.getDom(), api, {
+        appendToBody: tooltipModel.get('appendToBody', true)
+      });
       this._newLine = '<br/>';
     } else {
       tooltipContent = new TooltipRichContent(api);
@@ -228,7 +230,6 @@ var _default = echarts.extendComponentView({
         offsetX: payload.x,
         offsetY: payload.y,
         position: payload.position,
-        event: {},
         dataByCoordSys: payload.dataByCoordSys,
         tooltipOption: payload.tooltipOption
       }, dispatchAction);
@@ -246,8 +247,7 @@ var _default = echarts.extendComponentView({
           offsetX: cx,
           offsetY: cy,
           position: payload.position,
-          target: pointInfo.el,
-          event: {}
+          target: pointInfo.el
         }, dispatchAction);
       }
     } else if (payload.x != null && payload.y != null) {
@@ -263,8 +263,7 @@ var _default = echarts.extendComponentView({
         offsetX: payload.x,
         offsetY: payload.y,
         position: payload.position,
-        target: api.getZr().findHover(payload.x, payload.y).target,
-        event: {}
+        target: api.getZr().findHover(payload.x, payload.y).target
       }, dispatchAction);
     }
   },
@@ -452,7 +451,7 @@ var _default = echarts.extendComponentView({
     var dataModel = el.dataModel || seriesModel;
     var dataIndex = el.dataIndex;
     var dataType = el.dataType;
-    var data = dataModel.getData();
+    var data = dataModel.getData(dataType);
     var tooltipModel = buildTooltipModel([data.getItemModel(dataIndex), dataModel, seriesModel && (seriesModel.coordinateSystem || {}).model, this._tooltipModel]);
     var tooltipTrigger = tooltipModel.get('trigger');
 
@@ -658,7 +657,7 @@ var _default = echarts.extendComponentView({
       return;
     }
 
-    this._tooltipContent.hide();
+    this._tooltipContent.dispose();
 
     globalListener.unregister('itemTooltip', api);
   }

package/lib/component/visualMap/PiecewiseModel.js

@@ -417,20 +417,17 @@ var resetMethods = {
 
     thisOption.precision = precision;
     splitStep = +splitStep.toFixed(precision);
-    var index = 0;
 
     if (thisOption.minOpen) {
       pieceList.push({
-        index: index++,
         interval: [-Infinity, dataExtent[0]],
         close: [0, 0]
       });
     }
 
-    for (var curr = dataExtent[0], len = index + splitNumber; index < len; curr += splitStep) {
+    for (var index = 0, curr = dataExtent[0]; index < splitNumber; curr += splitStep, index++) {
       var max = index === splitNumber - 1 ? dataExtent[1] : curr + splitStep;
       pieceList.push({
-        index: index++,
         interval: [curr, max],
         close: [1, 1]
       });
@@ -438,14 +435,14 @@ var resetMethods = {
 
     if (thisOption.maxOpen) {
       pieceList.push({
-        index: index++,
         interval: [dataExtent[1], Infinity],
         close: [0, 0]
       });
     }
 
     reformIntervals(pieceList);
-    zrUtil.each(pieceList, function (piece) {
+    zrUtil.each(pieceList, function (piece, index) {
+      piece.index = index;
       piece.text = this.formatValueText(piece.interval);
     }, this);
   },

package/lib/coord/Axis.js

@@ -111,7 +111,7 @@ Axis.prototype = {
    * @return {boolean}
    */
   containData: function (data) {
-    return this.contain(this.dataToCoord(data));
+    return this.scale.contain(data);
   },
 
   /**
@@ -194,7 +194,7 @@ Axis.prototype = {
    * `axis.getTicksCoords` considers `onBand`, which is used by
    * `boundaryGap:true` of category axis and splitLine and splitArea.
    * @param {Object} [opt]
-   * @param {number} [opt.tickModel=axis.model.getModel('axisTick')]
+   * @param {Model} [opt.tickModel=axis.model.getModel('axisTick')]
    * @param {boolean} [opt.clamp] If `true`, the first and the last
    *        tick must be at the axis end points. Otherwise, clip ticks
    *        that outside the axis extent.
@@ -219,6 +219,34 @@ Axis.prototype = {
     return ticksCoords;
   },
 
+  /**
+   * @return {Array.<Array.<Object>>} [{ coord: ..., tickValue: ...}]
+   */
+  getMinorTicksCoords: function () {
+    if (this.scale.type === 'ordinal') {
+      // Category axis doesn't support minor ticks
+      return [];
+    }
+
+    var minorTickModel = this.model.getModel('minorTick');
+    var splitNumber = minorTickModel.get('splitNumber'); // Protection.
+
+    if (!(splitNumber > 0 && splitNumber < 100)) {
+      splitNumber = 5;
+    }
+
+    var minorTicks = this.scale.getMinorTicks(splitNumber);
+    var minorTicksCoords = map(minorTicks, function (minorTicksGroup) {
+      return map(minorTicksGroup, function (minorTick) {
+        return {
+          coord: this.dataToCoord(minorTick),
+          tickValue: minorTick
+        };
+      }, this);
+    }, this);
+    return minorTicksCoords;
+  },
+
   /**
    * @return {Array.<Object>} [{
    *     formattedLabel: string,

package/lib/coord/View.js

@@ -230,6 +230,15 @@ View.prototype = {
     matrix.invert(this.invTransform, this.transform);
     this.decomposeTransform();
   },
+  getTransformInfo: function () {
+    var roamTransform = this._roamTransformable.transform;
+    var rawTransformable = this._rawTransformable;
+    return {
+      roamTransform: roamTransform ? zrUtil.slice(roamTransform) : matrix.create(),
+      rawScale: zrUtil.slice(rawTransformable.scale),
+      rawPosition: zrUtil.slice(rawTransformable.position)
+    };
+  },
 
   /**
    * @return {module:zrender/core/BoundingRect}

package/lib/coord/axisDefault.js

@@ -170,13 +170,32 @@ axisDefault.valueAxis = zrUtil.merge({
   // + `true`: the extent do not consider value 0.
   // scale: false,
   // AxisTick and axisLabel and splitLine are caculated based on splitNumber.
-  splitNumber: 5 // Interval specifies the span of the ticks is mandatorily.
+  splitNumber: 5,
+  // Interval specifies the span of the ticks is mandatorily.
   // interval: null
   // Specify min interval when auto calculate tick interval.
   // minInterval: null
   // Specify max interval when auto calculate tick interval.
   // maxInterval: null
-
+  minorTick: {
+    // Minor tick, not available for cateogry axis.
+    show: false,
+    // Split number of minor ticks. The value should be in range of (0, 100)
+    splitNumber: 5,
+    // Lenght of minor tick
+    length: 3,
+    // Same inside with axisTick
+    // Line style
+    lineStyle: {// Default to be same with axisTick
+    }
+  },
+  minorSplitLine: {
+    show: false,
+    lineStyle: {
+      color: '#eee',
+      width: 1
+    }
+  }
 }, defaultOption);
 axisDefault.timeAxis = zrUtil.defaults({
   scale: true,

package/lib/coord/axisHelper.js

@@ -71,8 +71,6 @@ function getScaleExtent(scale, model) {
   var scaleType = scale.type;
   var min = model.getMin();
   var max = model.getMax();
-  var fixMin = min != null;
-  var fixMax = max != null;
   var originalExtent = scale.getExtent();
   var axisDataLen;
   var boundaryGap;
@@ -109,14 +107,6 @@ function getScaleExtent(scale, model) {
   // that the results processed by boundaryGap are positive/negative?
 
 
-  if (min == null) {
-    min = scaleType === 'ordinal' ? axisDataLen ? 0 : NaN : originalExtent[0] - boundaryGap[0] * span;
-  }
-
-  if (max == null) {
-    max = scaleType === 'ordinal' ? axisDataLen ? axisDataLen - 1 : NaN : originalExtent[1] + boundaryGap[1] * span;
-  }
-
   if (min === 'dataMin') {
     min = originalExtent[0];
   } else if (typeof min === 'function') {
@@ -135,6 +125,17 @@ function getScaleExtent(scale, model) {
     });
   }
 
+  var fixMin = min != null;
+  var fixMax = max != null;
+
+  if (min == null) {
+    min = scaleType === 'ordinal' ? axisDataLen ? 0 : NaN : originalExtent[0] - boundaryGap[0] * span;
+  }
+
+  if (max == null) {
+    max = scaleType === 'ordinal' ? axisDataLen ? axisDataLen - 1 : NaN : originalExtent[1] + boundaryGap[1] * span;
+  }
+
   (min == null || !isFinite(min)) && (min = NaN);
   (max == null || !isFinite(max)) && (max = NaN);
   scale.setBlank(zrUtil.eqNaN(min) || zrUtil.eqNaN(max) || scaleType === 'ordinal' && !scale.getOrdinalMeta().categories.length); // Evaluate if axis needs cross zero
@@ -181,7 +182,13 @@ function getScaleExtent(scale, model) {
     }
   }
 
-  return [min, max];
+  return {
+    extent: [min, max],
+    // "fix" means "fixed", the value should not be
+    // changed in the subsequent steps.
+    fixMin: fixMin,
+    fixMax: fixMax
+  };
 }
 
 function adjustScaleForOverflow(min, max, model, barWidthAndOffset) {
@@ -222,9 +229,8 @@ function adjustScaleForOverflow(min, max, model, barWidthAndOffset) {
 }
 
 function niceScaleExtent(scale, model) {
-  var extent = getScaleExtent(scale, model);
-  var fixMin = model.getMin() != null;
-  var fixMax = model.getMax() != null;
+  var extentInfo = getScaleExtent(scale, model);
+  var extent = extentInfo.extent;
   var splitNumber = model.get('splitNumber');
 
   if (scale.type === 'log') {
@@ -235,8 +241,8 @@ function niceScaleExtent(scale, model) {
   scale.setExtent(extent[0], extent[1]);
   scale.niceExtent({
     splitNumber: splitNumber,
-    fixMin: fixMin,
-    fixMax: fixMax,
+    fixMin: extentInfo.fixMin,
+    fixMax: extentInfo.fixMax,
     minInterval: scaleType === 'interval' || scaleType === 'time' ? model.get('minInterval') : null,
     maxInterval: scaleType === 'interval' || scaleType === 'time' ? model.get('maxInterval') : null
   }); // If some one specified the min, max. And the default calculated interval

package/lib/coord/calendar/Calendar.js

@@ -336,7 +336,9 @@ Calendar.prototype = {
       range.reverse();
     }
 
-    var allDay = Math.floor(range[1].time / PROXIMATE_ONE_DAY) - Math.floor(range[0].time / PROXIMATE_ONE_DAY) + 1; // Consider case:
+    var allDay = Math.floor(range[1].time / PROXIMATE_ONE_DAY) - Math.floor(range[0].time / PROXIMATE_ONE_DAY) + 1; // Consider case1 (#11677 #10430):
+    // Set the system timezone as "UK", set the range to `['2016-07-01', '2016-12-31']`
+    // Consider case2:
     // Firstly set system timezone as "Time Zone: America/Toronto",
     // ```
     // var first = new Date(1478412000000 - 3600 * 1000 * 2.5);
@@ -350,12 +352,14 @@ Calendar.prototype = {
     var endDateNum = range[1].date.getDate();
     date.setDate(startDateNum + allDay - 1); // The bias can not over a month, so just compare date.
 
-    if (date.getDate() !== endDateNum) {
+    var dateNum = date.getDate();
+
+    if (dateNum !== endDateNum) {
       var sign = date.getTime() - range[1].time > 0 ? 1 : -1;
 
-      while (date.getDate() !== endDateNum && (date.getTime() - range[1].time) * sign > 0) {
+      while ((dateNum = date.getDate()) !== endDateNum && (date.getTime() - range[1].time) * sign > 0) {
         allDay -= sign;
-        date.setDate(startDateNum + allDay - 1);
+        date.setDate(dateNum - sign);
       }
     }
 

package/lib/coord/geo/geoJSONLoader.js

@@ -60,9 +60,10 @@ var _default = {
   /**
    * @param {string} mapName
    * @param {Object} mapRecord {specialAreas, geoJSON}
+   * @param {string} nameProperty
    * @return {Object} {regions, boundingRect}
    */
-  load: function (mapName, mapRecord) {
+  load: function (mapName, mapRecord, nameProperty) {
     var parsed = inner(mapRecord).parsed;
 
     if (parsed) {
@@ -74,7 +75,7 @@ var _default = {
     var regions; // https://jsperf.com/try-catch-performance-overhead
 
     try {
-      regions = geoJSON ? parseGeoJson(geoJSON) : [];
+      regions = geoJSON ? parseGeoJson(geoJSON, nameProperty) : [];
     } catch (e) {
       throw new Error('Invalid geoJson format\n' + e.message);
     }

package/lib/coord/geo/geoSourceManager.js

@@ -61,16 +61,17 @@ var _default = {
   /**
    * @param {string} mapName
    * @param {Object} nameMap
+   * @param {string} nameProperty
    * @return {Object} source {regions, regionsMap, nameCoordMap, boundingRect}
    */
-  load: function (mapName, nameMap) {
+  load: function (mapName, nameMap, nameProperty) {
     var regions = [];
     var regionsMap = createHashMap();
     var nameCoordMap = createHashMap();
     var boundingRect;
     var mapRecords = retrieveMap(mapName);
     each(mapRecords, function (record) {
-      var singleSource = loaders[record.type].load(mapName, record);
+      var singleSource = loaders[record.type].load(mapName, record, nameProperty);
       each(singleSource.regions, function (region) {
         var regionName = region.name; // Try use the alias in geoNameMap
 

package/lib/coord/geo/parseGeoJson.js

@@ -108,11 +108,12 @@ function decodePolygon(coordinate, encodeOffsets, encodeScale) {
 /**
  * @alias module:echarts/coord/geo/parseGeoJson
  * @param {Object} geoJson
+ * @param {string} nameProperty
  * @return {module:zrender/container/Group}
  */
 
 
-function _default(geoJson) {
+function _default(geoJson, nameProperty) {
   decode(geoJson);
   return zrUtil.map(zrUtil.filter(geoJson.features, function (featureObj) {
     // Output of mapshaper may have geometry null
@@ -145,7 +146,7 @@ function _default(geoJson) {
       });
     }
 
-    var region = new Region(properties.name, geometries, properties.cp);
+    var region = new Region(properties[nameProperty || 'name'], geometries, properties.cp);
     region.properties = properties;
     return region;
   });

package/lib/coord/radar/Radar.js

@@ -210,7 +210,7 @@ Radar.prototype.update = function (ecModel, api) {
 
 
   zrUtil.each(indicatorAxes, function (indicatorAxis, idx) {
-    var rawExtent = getScaleExtent(indicatorAxis.scale, indicatorAxis.model);
+    var rawExtent = getScaleExtent(indicatorAxis.scale, indicatorAxis.model).extent;
     niceScaleExtent(indicatorAxis.scale, indicatorAxis.model);
     var axisModel = indicatorAxis.model;
     var scale = indicatorAxis.scale;
@@ -247,12 +247,12 @@ Radar.prototype.update = function (ecModel, api) {
 
       if (nicedSplitNumber > splitNumber) {
         interval = increaseInterval(interval);
-      } // PENDING
+      } // TODO
 
 
-      var center = Math.round((rawExtent[0] + rawExtent[1]) / 2 / interval) * interval;
-      var halfSplitNumber = Math.round(splitNumber / 2);
-      scale.setExtent(numberUtil.round(center - halfSplitNumber * interval), numberUtil.round(center + (splitNumber - halfSplitNumber) * interval));
+      var max = Math.ceil(rawExtent[1] / interval) * interval;
+      var min = numberUtil.round(max - interval * splitNumber);
+      scale.setExtent(min, max);
       scale.setInterval(interval);
     }
   });