marker support map chart

richahuang · Mar 16, 2016 · 6cb9195 · 6cb9195
1 parent e336b7e
commit 6cb9195
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js
@@ -264,7 +264,7 @@ define(function (require) {
             coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
                 var info = seriesModel.getData().getDimensionInfo(
                     seriesModel.coordDimToDataDim(coordDim)[0]
-                );
+                ) || {}; // In map series data don't have lng and lat dimension. Fallback to same with coordSys
                 info.name = coordDim;
                 return info;
             });

diff --git a/src/component/marker/MarkPointView.js b/src/component/marker/MarkPointView.js
@@ -154,7 +154,7 @@ define(function (require) {
             coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
                 var info = seriesModel.getData().getDimensionInfo(
                     seriesModel.coordDimToDataDim(coordDim)[0]
-                );
+                ) || {}; // In map series data don't have lng and lat dimension. Fallback to same with coordSys
                 info.name = coordDim;
                 return info;
             });

diff --git a/src/component/marker/markerHelper.js b/src/component/marker/markerHelper.js
@@ -144,7 +144,7 @@ define(function (require) {
      */
     var dataFilter = function (coordSys, item) {
         // Alwalys return true if there is no coordSys
-        return (coordSys && item.coord && (item.x == null || item.y == null))
+        return (coordSys && coordSys.containData && item.coord && (item.x == null || item.y == null))
             ? coordSys.containData(item.coord) : true;
     };