echarts 4.0.4 → 4.1.0

package/lib/model/mixin/lineStyle.js

@@ -1,5 +1,23 @@
 var makeStyleMapper = require("./makeStyleMapper");
 
+/*
+* 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 getLineStyle = makeStyleMapper([['lineWidth', 'width'], ['stroke', 'color'], ['opacity'], ['shadowBlur'], ['shadowOffsetX'], ['shadowOffsetY'], ['shadowColor']]);
 var _default = {
   getLineStyle: function (excludes) {

package/lib/model/mixin/makeStyleMapper.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.
+*/
 // TODO Parse shadow style
 // TODO Only shallow path support
 function _default(properties) {

package/lib/model/mixin/textStyle.js

@@ -2,6 +2,24 @@ var textContain = require("zrender/lib/contain/text");
 
 var graphicUtil = require("../../util/graphic");
 
+/*
+* 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 PATH_COLOR = ['textStyle', 'color'];
 var _default = {
   /**

package/lib/model/referHelper.js

@@ -8,6 +8,25 @@ var createHashMap = _util.createHashMap;
 var retrieve = _util.retrieve;
 var each = _util.each;
 
+/*
+* 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.
+*/
+
 /**
  * Helper for model references.
  * There are many manners to refer axis/coordSys.

package/lib/preprocessor/backwardCompat.js

@@ -10,6 +10,24 @@ var _model = require("../util/model");
 
 var normalizeToArray = _model.normalizeToArray;
 
+/*
+* 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.
+*/
 // Compatitable with 2.0
 function get(opt, path) {
   path = path.split(',');

package/lib/preprocessor/helper/compatStyle.js

@@ -2,6 +2,24 @@ var zrUtil = require("zrender/lib/core/util");
 
 var modelUtil = require("../../util/model");
 
+/*
+* 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 each = zrUtil.each;
 var isObject = zrUtil.isObject;
 var POSSIBLE_STYLES = ['areaStyle', 'lineStyle', 'nodeStyle', 'linkStyle', 'chordStyle', 'label', 'labelLine'];
@@ -204,6 +222,8 @@ function processSeries(seriesOpt) {
     zrUtil.each(seriesOpt.levels, function (opt) {
       removeEC3NormalStatus(opt);
     });
+  } else if (seriesOpt.type === 'tree') {
+    removeEC3NormalStatus(seriesOpt.leaves);
   } // sunburst starts from ec4, so it does not need to compat levels.
 
 }

package/lib/processor/dataFilter.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.
+*/
 function _default(seriesType) {
   return {
     seriesType: seriesType,

package/lib/processor/dataSample.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.
+*/
 var samplers = {
   average: function (frame) {
     var sum = 0;
@@ -28,18 +46,20 @@ var samplers = {
 
     for (var i = 0; i < frame.length; i++) {
       frame[i] > max && (max = frame[i]);
-    }
+    } // NaN will cause illegal axis extent.
+
 
-    return max;
+    return isFinite(max) ? max : NaN;
   },
   min: function (frame) {
     var min = Infinity;
 
     for (var i = 0; i < frame.length; i++) {
       frame[i] < min && (min = frame[i]);
-    }
+    } // NaN will cause illegal axis extent.
+
 
-    return min;
+    return isFinite(min) ? min : NaN;
   },
   // TODO
   // Median
@@ -55,6 +75,7 @@ var indexSampler = function (frame, value) {
 function _default(seriesType) {
   return {
     seriesType: seriesType,
+    modifyOutputEnd: true,
     reset: function (seriesModel, ecModel, api) {
       var data = seriesModel.getData();
       var sampling = seriesModel.get('sampling');
@@ -78,7 +99,8 @@ function _default(seriesType) {
           }
 
           if (sampler) {
-            seriesModel.setData(data.downSample(valueAxis.dim, 1 / rate, sampler, indexSampler));
+            // Only support sample the first dim mapped from value axis.
+            seriesModel.setData(data.downSample(data.mapDimension(valueAxis.dim), 1 / rate, sampler, indexSampler));
           }
         }
       }

package/lib/processor/dataStack.js

@@ -3,6 +3,24 @@ var _util = require("zrender/lib/core/util");
 var createHashMap = _util.createHashMap;
 var each = _util.each;
 
+/*
+* 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.
+*/
 // (1) [Caution]: the logic is correct based on the premises:
 //     data processing stage is blocked in stream.
 //     See <module:echarts/stream/Scheduler#performDataProcessorTasks>

package/lib/scale/Interval.js

@@ -6,6 +6,25 @@ var Scale = require("./Scale");
 
 var helper = require("./helper");
 
+/*
+* 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.
+*/
+
 /**
  * Interval scale
  * @module echarts/scale/Interval
@@ -64,20 +83,6 @@ var IntervalScale = Scale.extend({
     return helper.intervalScaleGetTicks(this._interval, this._extent, this._niceExtent, this._intervalPrecision);
   },
 
-  /**
-   * @return {Array.<string>}
-   */
-  getTicksLabels: function () {
-    var labels = [];
-    var ticks = this.getTicks();
-
-    for (var i = 0; i < ticks.length; i++) {
-      labels.push(this.getLabel(ticks[i]));
-    }
-
-    return labels;
-  },
-
   /**
    * @param {number} data
    * @param {Object} [opt]

package/lib/scale/Log.js

@@ -6,6 +6,25 @@ var numberUtil = require("../util/number");
 
 var IntervalScale = require("./Interval");
 
+/*
+* 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.
+*/
+
 /**
  * Log scale
  * @module echarts/scale/Log

package/lib/scale/Ordinal.js

@@ -4,6 +4,25 @@ var Scale = require("./Scale");
 
 var OrdinalMeta = require("../data/OrdinalMeta");
 
+/*
+* 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.
+*/
+
 /**
  * Linear continuous scale
  * @module echarts/coord/scale/Ordinal
@@ -73,7 +92,10 @@ var OrdinalScale = Scale.extend({
    * @return {string}
    */
   getLabel: function (n) {
-    return this._ordinalMeta.categories[n];
+    if (!this.isBlank()) {
+      // Note that if no data, ordinalMeta.categories is an empty array.
+      return this._ordinalMeta.categories[n];
+    }
   },
 
   /**
@@ -89,6 +111,9 @@ var OrdinalScale = Scale.extend({
   unionExtentFromData: function (data, dim) {
     this.unionExtent(data.getApproximateExtent(dim));
   },
+  getOrdinalMeta: function () {
+    return this._ordinalMeta;
+  },
   niceTicks: zrUtil.noop,
   niceExtent: zrUtil.noop
 });

package/lib/scale/Scale.js

@@ -1,5 +1,24 @@
 var clazzUtil = require("../util/clazz");
 
+/*
+* 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.
+*/
+
 /**
  * // Scale class management
  * @module echarts/scale/Scale
@@ -125,21 +144,6 @@ Scale.prototype.setExtent = function (start, end) {
     thisExtent[1] = end;
   }
 };
-/**
- * @return {Array.<string>}
- */
-
-
-Scale.prototype.getTicksLabels = function () {
-  var labels = [];
-  var ticks = this.getTicks();
-
-  for (var i = 0; i < ticks.length; i++) {
-    labels.push(this.getLabel(ticks[i]));
-  }
-
-  return labels;
-};
 /**
  * When axis extent depends on data and no data exists,
  * axis ticks should not be drawn, which is named 'blank'.
@@ -156,6 +160,13 @@ Scale.prototype.isBlank = function () {
 Scale.prototype.setBlank = function (isBlank) {
   this._isBlank = isBlank;
 };
+/**
+ * @abstract
+ * @param {*} tick
+ * @return {string} label of the tick.
+ */
+
+Scale.prototype.getLabel = null;
 clazzUtil.enableClassExtend(Scale);
 clazzUtil.enableClassManagement(Scale, {
   registerWhenExtend: true

package/lib/scale/Time.js

@@ -8,6 +8,24 @@ var scaleHelper = require("./helper");
 
 var IntervalScale = require("./Interval");
 
+/*
+* 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.
+*/
 // [About UTC and local time zone]:
 // In most cases, `number.parseDate` will treat input data string as local time
 // (except time zone is specified in time string). And `format.formateTime` returns

package/lib/scale/helper.js

@@ -1,5 +1,24 @@
 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.
+*/
+
 /**
  * For testable.
  */