echarts 4.0.1 → 4.1.0

package/lib/coord/cartesian/Grid.js

@@ -2,15 +2,24 @@ var _config = require("../../config");
 
 var __DEV__ = _config.__DEV__;
 
-var zrUtil = require("zrender/lib/core/util");
+var _util = require("zrender/lib/core/util");
 
-var BoundingRect = require("zrender/lib/core/BoundingRect");
+var isObject = _util.isObject;
+var each = _util.each;
+var map = _util.map;
+var indexOf = _util.indexOf;
+var retrieve = _util.retrieve;
 
 var _layout = require("../../util/layout");
 
 var getLayoutRect = _layout.getLayoutRect;
 
-var axisHelper = require("../../coord/axisHelper");
+var _axisHelper = require("../../coord/axisHelper");
+
+var createScaleByModel = _axisHelper.createScaleByModel;
+var ifAxisCrossZero = _axisHelper.ifAxisCrossZero;
+var niceScaleExtent = _axisHelper.niceScaleExtent;
+var estimateLabelUnionRect = _axisHelper.estimateLabelUnionRect;
 
 var Cartesian2D = require("./Cartesian2D");
 
@@ -18,61 +27,46 @@ var Axis2D = require("./Axis2D");
 
 var CoordinateSystem = require("../../CoordinateSystem");
 
+var _dataStackHelper = require("../../data/helper/dataStackHelper");
+
+var getStackedDimension = _dataStackHelper.getStackedDimension;
+
 require("./GridModel");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * Grid is a region which contains at most 4 cartesian systems
  *
  * TODO Default cartesian
  */
 // Depends on GridModel, AxisModel, which performs preprocess.
-var each = zrUtil.each;
-var ifAxisCrossZero = axisHelper.ifAxisCrossZero;
-var niceScaleExtent = axisHelper.niceScaleExtent;
+
 /**
  * Check if the axis is used in the specified grid
  * @inner
  */
-
 function isAxisUsedInTheGrid(axisModel, gridModel, ecModel) {
   return axisModel.getCoordSysModel() === gridModel;
 }
 
-function rotateTextRect(textRect, rotate) {
-  var rotateRadians = rotate * Math.PI / 180;
-  var boundingBox = textRect.plain();
-  var beforeWidth = boundingBox.width;
-  var beforeHeight = boundingBox.height;
-  var afterWidth = beforeWidth * Math.cos(rotateRadians) + beforeHeight * Math.sin(rotateRadians);
-  var afterHeight = beforeWidth * Math.sin(rotateRadians) + beforeHeight * Math.cos(rotateRadians);
-  var rotatedRect = new BoundingRect(boundingBox.x, boundingBox.y, afterWidth, afterHeight);
-  return rotatedRect;
-}
-
-function getLabelUnionRect(axis) {
-  var axisModel = axis.model;
-  var labels = axisModel.get('axisLabel.show') ? axisModel.getFormattedLabels() : [];
-  var axisLabelModel = axisModel.getModel('axisLabel');
-  var rect;
-  var step = 1;
-  var labelCount = labels.length;
-
-  if (labelCount > 40) {
-    // Simple optimization for large amount of labels
-    step = Math.ceil(labelCount / 40);
-  }
-
-  for (var i = 0; i < labelCount; i += step) {
-    if (!axis.isLabelIgnored(i)) {
-      var unrotatedSingleRect = axisLabelModel.getTextRect(labels[i]);
-      var singleRect = rotateTextRect(unrotatedSingleRect, axisLabelModel.get('rotate') || 0);
-      rect ? rect.union(singleRect) : rect = singleRect;
-    }
-  }
-
-  return rect;
-}
-
 function Grid(gridModel, ecModel, api) {
   /**
    * @type {Object.<string, module:echarts/coord/cartesian/Cartesian2D>}
@@ -134,47 +128,44 @@ gridProto.update = function (ecModel, api) {
 };
 
 function fixAxisOnZero(axesMap, otherAxisDim, axis) {
-  // onZero can not be enabled in these two situations:
+  axis.getAxesOnZeroOf = function () {
+    // TODO: onZero of multiple axes.
+    return otherAxis ? [otherAxis] : [];
+  }; // onZero can not be enabled in these two situations:
   // 1. When any other axis is a category axis.
   // 2. When no axis is cross 0 point.
-  var axes = axesMap[otherAxisDim];
 
-  if (!axis.onZero) {
+
+  var otherAxes = axesMap[otherAxisDim];
+  var otherAxis;
+  var axisModel = axis.model;
+  var onZero = axisModel.get('axisLine.onZero');
+  var onZeroAxisIndex = axisModel.get('axisLine.onZeroAxisIndex');
+
+  if (!onZero) {
     return;
-  }
+  } // If target axis is specified.
 
-  var onZeroAxisIndex = axis.onZeroAxisIndex; // If target axis is specified.
 
   if (onZeroAxisIndex != null) {
-    var otherAxis = axes[onZeroAxisIndex];
-
-    if (otherAxis && canNotOnZeroToAxis(otherAxis)) {
-      axis.onZero = false;
+    if (canOnZeroToAxis(otherAxes[onZeroAxisIndex])) {
+      otherAxis = otherAxes[onZeroAxisIndex];
     }
 
     return;
-  }
+  } // Find the first available other axis.
 
-  for (var idx in axes) {
-    if (axes.hasOwnProperty(idx)) {
-      var otherAxis = axes[idx];
 
-      if (otherAxis && !canNotOnZeroToAxis(otherAxis)) {
-        onZeroAxisIndex = +idx;
-        break;
-      }
+  for (var idx in otherAxes) {
+    if (otherAxes.hasOwnProperty(idx) && canOnZeroToAxis(otherAxes[idx])) {
+      otherAxis = otherAxes[idx];
+      break;
     }
   }
-
-  if (onZeroAxisIndex == null) {
-    axis.onZero = false;
-  }
-
-  axis.onZeroAxisIndex = onZeroAxisIndex;
 }
 
-function canNotOnZeroToAxis(axis) {
-  return axis.type === 'category' || axis.type === 'time' || !ifAxisCrossZero(axis);
+function canOnZeroToAxis(axis) {
+  return axis && axis.type !== 'category' && axis.type !== 'time' && ifAxisCrossZero(axis);
 }
 /**
  * Resize the grid
@@ -195,7 +186,7 @@ gridProto.resize = function (gridModel, api, ignoreContainLabel) {
   if (!ignoreContainLabel && gridModel.get('containLabel')) {
     each(axesList, function (axis) {
       if (!axis.model.get('axisLabel.inside')) {
-        var labelUnionRect = getLabelUnionRect(axis);
+        var labelUnionRect = estimateLabelUnionRect(axis);
 
         if (labelUnionRect) {
           var dim = axis.isHorizontal() ? 'height' : 'width';
@@ -271,7 +262,7 @@ gridProto.getCartesian = function (xAxisIndex, yAxisIndex) {
     return this._coordsMap[key];
   }
 
-  if (zrUtil.isObject(xAxisIndex)) {
+  if (isObject(xAxisIndex)) {
     yAxisIndex = xAxisIndex.yAxisIndex;
     xAxisIndex = xAxisIndex.xAxisIndex;
   } // When only xAxisIndex or yAxisIndex given, find its first cartesian.
@@ -325,7 +316,7 @@ gridProto._findConvertTarget = function (ecModel, finder) {
 
   if (seriesModel) {
     cartesian = seriesModel.coordinateSystem;
-    zrUtil.indexOf(coordsList, cartesian) < 0 && (cartesian = null);
+    indexOf(coordsList, cartesian) < 0 && (cartesian = null);
   } else if (xAxisModel && yAxisModel) {
     cartesian = this.getCartesian(xAxisModel.componentIndex, yAxisModel.componentIndex);
   } else if (xAxisModel) {
@@ -439,12 +430,10 @@ gridProto._initCartesian = function (gridModel, ecModel, api) {
       }
 
       axisPositionUsed[axisPosition] = true;
-      var axis = new Axis2D(axisType, axisHelper.createScaleByModel(axisModel), [0, 0], axisModel.get('type'), axisPosition);
+      var axis = new Axis2D(axisType, createScaleByModel(axisModel), [0, 0], axisModel.get('type'), axisPosition);
       var isCategory = axis.type === 'category';
       axis.onBand = isCategory && axisModel.get('boundaryGap');
-      axis.inverse = axisModel.get('inverse');
-      axis.onZero = axisModel.get('axisLine.onZero');
-      axis.onZeroAxisIndex = axisModel.get('axisLine.onZeroAxisIndex'); // Inject axis into axisModel
+      axis.inverse = axisModel.get('inverse'); // Inject axis into axisModel
 
       axisModel.axis = axis; // Inject axisModel into axis
 
@@ -470,7 +459,7 @@ gridProto._initCartesian = function (gridModel, ecModel, api) {
 
 gridProto._updateScale = function (ecModel, gridModel) {
   // Reset scale
-  zrUtil.each(this._axesList, function (axis) {
+  each(this._axesList, function (axis) {
     axis.scale.setExtent(Infinity, -Infinity);
   });
   ecModel.eachSeries(function (seriesModel) {
@@ -497,7 +486,10 @@ gridProto._updateScale = function (ecModel, gridModel) {
 
   function unionExtent(data, axis, seriesModel) {
     each(data.mapDimension(axis.dim, true), function (dim) {
-      axis.scale.unionExtentFromData(data, dim);
+      axis.scale.unionExtentFromData( // For example, the extent of the orginal dimension
+      // is [0.1, 0.5], the extent of the `stackResultDimension`
+      // is [7, 9], the final extent should not include [0.1, 0.5].
+      data, getStackedDimension(data, dim));
     });
   }
 };
@@ -513,8 +505,8 @@ gridProto.getTooltipAxes = function (dim) {
   each(this.getCartesians(), function (cartesian) {
     var baseAxis = dim != null && dim !== 'auto' ? cartesian.getAxis(dim) : cartesian.getBaseAxis();
     var otherAxis = cartesian.getOtherAxis(baseAxis);
-    zrUtil.indexOf(baseAxes, baseAxis) < 0 && baseAxes.push(baseAxis);
-    zrUtil.indexOf(otherAxes, otherAxis) < 0 && otherAxes.push(otherAxis);
+    indexOf(baseAxes, baseAxis) < 0 && baseAxes.push(baseAxis);
+    indexOf(otherAxes, otherAxis) < 0 && otherAxes.push(otherAxis);
   });
   return {
     baseAxes: baseAxes,
@@ -548,7 +540,7 @@ var axesTypes = ['xAxis', 'yAxis'];
  */
 
 function findAxesModels(seriesModel, ecModel) {
-  return zrUtil.map(axesTypes, function (axisType) {
+  return map(axesTypes, function (axisType) {
     var axisModel = seriesModel.getReferringComponents(axisType)[0];
     return axisModel;
   });

package/lib/coord/cartesian/GridModel.js

@@ -2,6 +2,24 @@ require("./AxisModel");
 
 var ComponentModel = require("../../model/Component");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // Grid 是在有直角坐标系的时候必须要存在的
 // 所以这里也要被 Cartesian2D 依赖
 var _default = ComponentModel.extend({

package/lib/{component/axis → coord/cartesian}/cartesianAxisHelper.js

@@ -1,10 +1,32 @@
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
+ * Can only be called after coordinate system creation stage.
+ * (Can be called before coordinate system update stage).
+ *
  * @param {Object} opt {labelInside}
  * @return {Object} {
  *  position, rotation, labelDirection, labelOffset,
- *  tickDirection, labelRotate, labelInterval, z2
+ *  tickDirection, labelRotate, z2
  * }
  */
 function layout(gridModel, axisModel, opt) {
@@ -12,8 +34,9 @@ function layout(gridModel, axisModel, opt) {
   var grid = gridModel.coordinateSystem;
   var axis = axisModel.axis;
   var layout = {};
+  var otherAxisOnZeroOf = axis.getAxesOnZeroOf()[0];
   var rawAxisPosition = axis.position;
-  var axisPosition = axis.onZero ? 'onZero' : rawAxisPosition;
+  var axisPosition = otherAxisOnZeroOf ? 'onZero' : rawAxisPosition;
   var axisDim = axis.dim;
   var rect = grid.getRect();
   var rectBound = [rect.x, rect.x + rect.width, rect.y, rect.y + rect.height];
@@ -27,9 +50,8 @@ function layout(gridModel, axisModel, opt) {
   var axisOffset = axisModel.get('offset') || 0;
   var posBound = axisDim === 'x' ? [rectBound[2] - axisOffset, rectBound[3] + axisOffset] : [rectBound[0] - axisOffset, rectBound[1] + axisOffset];
 
-  if (axis.onZero) {
-    var otherAxis = grid.getAxis(axisDim === 'x' ? 'y' : 'x', axis.onZeroAxisIndex);
-    var onZeroCoord = otherAxis.toGlobalCoord(otherAxis.dataToCoord(0));
+  if (otherAxisOnZeroOf) {
+    var onZeroCoord = otherAxisOnZeroOf.toGlobalCoord(otherAxisOnZeroOf.dataToCoord(0));
     posBound[idx['onZero']] = Math.max(Math.min(onZeroCoord, posBound[1]), posBound[0]);
   } // Axis position
 
@@ -45,7 +67,7 @@ function layout(gridModel, axisModel, opt) {
     right: 1
   };
   layout.labelDirection = layout.tickDirection = layout.nameDirection = dirMap[rawAxisPosition];
-  layout.labelOffset = axis.onZero ? posBound[idx[rawAxisPosition]] - posBound[idx['onZero']] : 0;
+  layout.labelOffset = otherAxisOnZeroOf ? posBound[idx[rawAxisPosition]] - posBound[idx['onZero']] : 0;
 
   if (axisModel.get('axisTick.inside')) {
     layout.tickDirection = -layout.tickDirection;
@@ -57,9 +79,7 @@ function layout(gridModel, axisModel, opt) {
 
 
   var labelRotate = axisModel.get('axisLabel.rotate');
-  layout.labelRotate = axisPosition === 'top' ? -labelRotate : labelRotate; // label interval when auto mode.
-
-  layout.labelInterval = axis.getLabelInterval(); // Over splitLine and splitArea
+  layout.labelRotate = axisPosition === 'top' ? -labelRotate : labelRotate; // Over splitLine and splitArea
 
   layout.z2 = 1;
   return layout;

package/lib/coord/cartesian/prepareCustom.js

@@ -1,5 +1,23 @@
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function dataToCoordSize(dataSize, dataItem) {
   // dataItem is necessary in log axis.
   dataItem = dataItem || [0, 0];

package/lib/coord/geo/Geo.js

@@ -14,6 +14,24 @@ var fixGeoCoord = require("./fix/geoCoord");
 
 var fixDiaoyuIsland = require("./fix/diaoyuIsland");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // Geo fix functions
 var geoFixFuncs = [fixNanhai, fixTextCoord, fixGeoCoord, fixDiaoyuIsland];
 /**

package/lib/coord/geo/GeoModel.js

@@ -10,6 +10,24 @@ var selectableMixin = require("../../component/helper/selectableMixin");
 
 var geoCreator = require("./geoCreator");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var GeoModel = ComponentModel.extend({
   type: 'geo',
 

package/lib/coord/geo/Region.js

@@ -6,6 +6,25 @@ var vec2 = require("zrender/lib/core/vector");
 
 var polygonContain = require("zrender/lib/contain/polygon");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * @module echarts/coord/geo/Region
  */

package/lib/coord/geo/fix/diaoyuIsland.js

@@ -1,3 +1,21 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // Fix for 钓鱼岛
 // var Region = require('../Region');
 // var zrUtil = require('zrender/src/core/util');

package/lib/coord/geo/fix/geoCoord.js

@@ -1,5 +1,23 @@
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var geoCoordMap = {
   'Russia': [100, 60],
   'United States': [-99, 38],

package/lib/coord/geo/fix/nanhai.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 var Region = require("../Region");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // Fix for 南海诸岛
 var geoCoord = [126, 25];
 var points = [[[0, 3.5], [7, 11.2], [15, 11.9], [30, 7], [42, 0.7], [52, 0.7], [56, 7.7], [59, 0.7], [64, 0.7], [64, 0], [5, 0], [0, 3.5]], [[13, 16.1], [19, 14.7], [16, 21.7], [11, 23.1], [13, 16.1]], [[12, 32.2], [14, 38.5], [15, 38.5], [13, 32.2], [12, 32.2]], [[16, 47.6], [12, 53.2], [13, 53.2], [18, 47.6], [16, 47.6]], [[6, 64.4], [8, 70], [9, 70], [8, 64.4], [6, 64.4]], [[23, 82.6], [29, 79.8], [30, 79.8], [25, 82.6], [23, 82.6]], [[37, 70.7], [43, 62.3], [44, 62.3], [39, 70.7], [37, 70.7]], [[48, 51.1], [51, 45.5], [53, 45.5], [50, 51.1], [48, 51.1]], [[51, 35], [51, 28.7], [53, 28.7], [53, 35], [51, 35]], [[52, 22.4], [55, 17.5], [56, 17.5], [53, 22.4], [52, 22.4]], [[58, 12.6], [62, 7], [63, 7], [60, 12.6], [58, 12.6]], [[0, 3.5], [0, 93.1], [64, 93.1], [64, 0], [63, 0], [63, 92.4], [1, 92.4], [1, 3.5], [0, 3.5]]];

package/lib/coord/geo/fix/textCoord.js

@@ -1,5 +1,23 @@
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var coordsOffsetMap = {
   '南海诸岛': [32, 80],
   // 全国

package/lib/coord/geo/geoCreator.js

@@ -12,6 +12,25 @@ var layout = require("../../util/layout");
 
 var numberUtil = require("../../util/number");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * Resize method bound to the geo
  * @param {module:echarts/coord/geo/GeoModel|module:echarts/chart/map/MapModel} geoModel

package/lib/coord/geo/parseGeoJson.js

@@ -2,6 +2,25 @@ var zrUtil = require("zrender/lib/core/util");
 
 var Region = require("./Region");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * Parse and decode geo json
  * @module echarts/coord/geo/parseGeoJson

package/lib/coord/geo/prepareCustom.js

@@ -1,5 +1,23 @@
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 function dataToCoordSize(dataSize, dataItem) {
   dataItem = dataItem || [0, 0];
   return zrUtil.map([0, 1], function (dimIdx) {
@@ -25,9 +43,11 @@ function _default(coordSys) {
       height: rect.height
     },
     api: {
-      coord: function (data, noRoam) {
-        // do not provide "out" param
-        return coordSys.dataToPoint(data, noRoam);
+      coord: function (data) {
+        // do not provide "out" and noRoam param,
+        // Compatible with this usage:
+        // echarts.util.map(item.points, api.coord)
+        return coordSys.dataToPoint(data);
       },
       size: zrUtil.bind(dataToCoordSize, coordSys)
     }