DataSymbol => SymbolDraw

src/chart/graph/GraphView.js

 define(function (require) {
 
-    var DataSymbol = require('../helper/DataSymbol');
+    var SymbolDraw = require('../helper/SymbolDraw');
+    var LineDraw = require('../helper/LineDraw');
 
     require('../../echarts').extendChartView({
 
         type: 'graph',
 
         init: function () {
-            var dataSymbol = new DataSymbol();
-            this.group.add(dataSymbol.group);
+            var symbolDraw = new SymbolDraw();
+            this.group.add(symbolDraw.group);
 
-            this._dataSymbol = dataSymbol;
+            this._symbolDraw = symbolDraw;
         },
 
         render: function (seriesModel, ecModel, api) {
             var data = seriesModel.getData();
 
-            this._dataSymbol.updateData(
+            this._symbolDraw.updateData(
                 data, seriesModel, api, false
             );
         },

src/chart/graph/simpleLayout.js

@@ -23,7 +23,8 @@ define(function (require) {
         ecModel.eachSeriesByType('graph', function (seriesModel) {
             var layout = seriesModel.get('layout');
             if (!layout || layout === 'none') {
-                var coordSys = seriesModel.coordinateSystem = seriesModel.coordinateSystem || new View();
+                var coordSys = seriesModel.coordinateSystem
+                    = seriesModel.coordinateSystem || new View();
                 var viewRect = getViewRect(seriesModel, api);
                 var graph = seriesModel.getData().graph;
                 var positions = graph.data.mapArray(function (idx) {

src/chart/helper/DataSymbol.js → src/chart/helper/SymbolDraw.js

@@ -61,11 +61,11 @@ define(function (require) {
         return symbolEl;
     }
 
-    function DataSymbol() {
+    function SymbolDraw() {
         this.group = new graphic.Group();
     }
 
-    DataSymbol.prototype = {
+    SymbolDraw.prototype = {
 
         getData: function () {
             return this._data;
@@ -124,7 +124,7 @@ define(function (require) {
                     // Symbol changed
                     if (
                         oldData.getItemVisual(oldIdx, 'symbol') !== symbolType
-                        || (!el && !(ignoreMap && ignoreMap[newIdx]))
+                    || (!el && !(ignoreMap && ignoreMap[newIdx]))
                     ) {
                         // Remove the old one
                         el && group.remove(el);
@@ -259,5 +259,5 @@ define(function (require) {
         }
     }
 
-    return DataSymbol;
+    return SymbolDraw;
 });
\ No newline at end of file

src/chart/line/LineView.js

@@ -4,7 +4,7 @@ define(function(require) {
 
     var zrUtil = require('zrender/core/util');
     var vector = require('zrender/core/vector');
-    var DataSymbol = require('../helper/DataSymbol');
+    var SymbolDraw = require('../helper/SymbolDraw');
     var lineAnimationDiff = require('./lineAnimationDiff');
     var graphic = require('../../util/graphic');
 
@@ -83,9 +83,9 @@ define(function(require) {
         type: 'line',
 
         init: function () {
-            var dataSymbol = new DataSymbol();
-            this.group.add(dataSymbol.group);
-            this._dataSymbol = dataSymbol;
+            var symbolDraw = new SymbolDraw();
+            this.group.add(symbolDraw.group);
+            this._symbolDraw = symbolDraw;
         },
 
         render: function (seriesModel, ecModel, api) {
@@ -100,7 +100,7 @@ define(function(require) {
             var isCoordSysPolar = coordSys.type === 'polar';
             var prevCoordSys = this._coordSys;
 
-            var dataSymbol = this._dataSymbol;
+            var symbolDraw = this._symbolDraw;
             var polyline = this._polyline;
             var polygon = this._polygon;
 
@@ -119,7 +119,7 @@ define(function(require) {
                 && prevCoordSys.type === coordSys.type
                 && hasAnimation)
             ) {
-                dataSymbol.updateData(
+                symbolDraw.updateData(
                     data, seriesModel, api, hasAnimation, symbolIgnoreMap
                 );
 
@@ -134,7 +134,7 @@ define(function(require) {
             }
             else {
 
-                dataSymbol.updateData(
+                symbolDraw.updateData(
                     data, seriesModel, api, false, symbolIgnoreMap
                 );
 
@@ -441,7 +441,7 @@ define(function(require) {
             var group = this.group;
             group.remove(this._polyline);
             group.remove(this._polygon);
-            this._dataSymbol.remove(ecModel.get('animation'));
+            this._symbolDraw.remove(ecModel.get('animation'));
         }
     });
 });
\ No newline at end of file

src/chart/scatter/ScatterView.js

 define(function (require) {
 
-    var DataSymbol = require('../helper/DataSymbol');
+    var SymbolDraw = require('../helper/SymbolDraw');
 
     require('../../echarts').extendChartView({
 
         type: 'scatter',
 
         init: function () {
-            this._dataSymbol = new DataSymbol();
-            this.group.add(this._dataSymbol.group);
+            this._symbolDraw = new SymbolDraw();
+            this.group.add(this._symbolDraw.group);
         },
 
         render: function (seriesModel, ecModel, api) {
-            this._dataSymbol.updateData(
+            this._symbolDraw.updateData(
                 seriesModel.getData(), seriesModel, api, ecModel.get('animation')
             );
         },
 
         updateLayout: function () {
-            this._dataSymbol.updateLayout();
+            this._symbolDraw.updateLayout();
         },
 
         remove: function (ecModel) {
-            this._dataSymbol.remove(ecModel.get('animation'));
+            this._symbolDraw.remove(ecModel.get('animation'));
         }
     });
 });
\ No newline at end of file

src/component/marker/MarkPointView.js

 define(function (require) {
 
-    var DataSymbol = require('../../chart/helper/DataSymbol');
+    var SymbolDraw = require('../../chart/helper/SymbolDraw');
     var zrUtil = require('zrender/core/util');
 
     var List = require('../../data/List');
@@ -12,13 +12,13 @@ define(function (require) {
         type: 'markPoint',
 
         init: function () {
-            this._dataSymbolMap = {};
+            this._symbolDrawMap = {};
         },
 
         render: function (markPointModel, ecModel) {
-            var dataSymbolMap = this._dataSymbolMap;
-            for (var name in dataSymbolMap) {
-                dataSymbolMap[name].__keep = false;
+            var symbolDrawMap = this._symbolDrawMap;
+            for (var name in symbolDrawMap) {
+                symbolDrawMap[name].__keep = false;
             }
 
             ecModel.eachSeries(function (seriesModel) {
@@ -26,10 +26,10 @@ define(function (require) {
                 mpModel && this._renderSeriesMP(seriesModel, mpModel);
             }, this);
 
-            for (var name in dataSymbolMap) {
-                if (!dataSymbolMap[name].__keep) {
-                    dataSymbolMap[name].remove();
-                    this.group.remove(dataSymbolMap[name].group);
+            for (var name in symbolDrawMap) {
+                if (!symbolDrawMap[name].__keep) {
+                    symbolDrawMap[name].remove();
+                    this.group.remove(symbolDrawMap[name].group);
                 }
             }
         },
@@ -39,10 +39,10 @@ define(function (require) {
             var seriesName = seriesModel.name;
             var seriesData = seriesModel.getData();
 
-            var dataSymbolMap = this._dataSymbolMap;
-            var dataSymbol = dataSymbolMap[seriesName];
-            if (!dataSymbol) {
-                dataSymbol = dataSymbolMap[seriesName] = new DataSymbol();
+            var symbolDrawMap = this._symbolDrawMap;
+            var symbolDraw = symbolDrawMap[seriesName];
+            if (!symbolDraw) {
+                symbolDraw = symbolDrawMap[seriesName] = new SymbolDraw();
             }
 
             var mpData = createList(coordSys, seriesData, mpModel);
@@ -73,11 +73,11 @@ define(function (require) {
             });
 
             // TODO Text are wrong
-            dataSymbol.updateData(mpData, seriesModel, true);
+            symbolDraw.updateData(mpData, seriesModel, true);
 
-            this.group.add(dataSymbol.group);
+            this.group.add(symbolDraw.group);
 
-            dataSymbol.__keep = true;
+            symbolDraw.__keep = true;
         }
     });