Merge branch 'master' of https://github.com/ecomfe/echarts
diff --git a/extension/BMap/doc/doc.html b/extension/BMap/doc/doc.html
new file mode 100644
index 0000000..8336ab0
--- /dev/null
+++ b/extension/BMap/doc/doc.html
@@ -0,0 +1,119 @@
+<html>
+ <head>
+ <link href="../../../doc/asset/css/echartsHome.css" rel="stylesheet">
+ <style type="text/css">
+ body {
+ margin: 0;
+ padding: 50px;
+ }
+ pre {
+ display: block;
+ padding: 9.5px;
+ margin: 0 0 10px;
+ font-size: 13px;
+ line-height: 1.42857143;
+ color: #333;
+ word-break: break-all;
+ word-wrap: break-word;
+ background-color: #f5f5f5;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ }
+ </style>
+ </head>
+ <body>
+ <h3>简介</h3>
+ <p>BMapExt是在Echarts基础上使用百度地图API进行地图绘制，使用的时候除了需要Echarts的相关知识外，还需要对百度地图API(<a target='_blank' href='http://developer.baidu.com/map/index.php?title=jspopular'>官网</a>)有所了解</p>
+ <h3>实例方法</h3>
+ <table cellspacing="0" class="ADoc_table full">
+ <tr>
+ <th> 名称 </th>
+ <th> 参数 </th>
+ <th> 描述 </th>
+ </tr>
+ <tr>
+ <td> <b>{HTMLElement}</b> getEchartsContainer </td>
+ <td> 无 </td>
+ <td> 获取扩展为Echarts生成的容器 </td>
+ </tr>
+ <tr>
+ <td> <b>{BMap.Map} </b> getMap </td>
+ <td> 无 </td>
+ <td> 获取扩展使用的百度地图实例 </td>
+ </tr>
+ <tr>
+ <td> <b>{ECharts}</b> initECharts </td>
+ <td> 参数同Echarts实例的init </td>
+ <td> 初始化echarts实例，参数完全使用<a target="_blank" href="http://nirvana/github/echarts/doc/doc.html#初始化" >ECharts实例的init()</a>， 返回扩展使用的Echarts实例 </td>
+ </tr>
+ <tr>
+ <td> <b>{ECharts}</b> getECharts </td>
+ <td> 无 </td>
+ <td> 获取扩展使用的Echarts实例 </td>
+ </tr>
+ <tr>
+ <td> setOption </td>
+ <td> 参数同Echarts实例的setOption
+ </td>
+ <td>
+ 此方法会讲option中的series中的markPoint、markLine的坐标重新计算为与百度地图匹配的坐标，<a target="_blank" href="http://nirvana/github/echarts/doc/doc.html#实例方法">Echarts的实例方法</a>
+ </td>
+ </tr>
+ <tr>
+ <td> refresh </td>
+ <td> 无 </td>
+ <td> 页面刷新 </td>
+ </tr>
+ <tr>
+ <td> <b>{Array.<number>}</b> getMapOffset </td>
+ <td> 无 </td>
+ <td> 获取扩展当前的地图偏移量 </td>
+ </tr>
+ <tr>
+ <td> <b>{Array.<number>}</b> geoCoord2Pixel </td>
+ <td> <b>{Array.<number>}</b> geoCoord </td>
+ <td> 经纬度坐标转换为像素坐标 </td>
+ </tr>
+ <tr>
+ <td> <b>{Array.<number>}</b> pixel2GeoCoord </td>
+ <td> <b>{Array.<number>}</b> pixel </td>
+ <td> 像素坐标转换成经纬度坐标 </td>
+ </tr>
+ </table>
+
+ <h3>如何使用</h3>
+ <p>1、引用Echarts、扩展、百度地图API</p>
+ <p>2、实例化扩展，传人容器、百度地图API的变量、echarts</p>
+ <p>3、获取扩展中使用的百度地图实例，进行地图操作</p>
+ <p>4、获取扩展生成Echarts容器</p>
+ <p>5、使用扩展初始化Echarts（initECharts），操作（setOption）</p>
+ <div class="code">
+ <pre>
+ // 在这之前必须加装ECharts、百度地图API文件、引用扩展文件
+ var myBMapExt = new BMapExt($('#main')[0], BMap, echarts);
+ // 获取地图实例
+ var map = myBMapExt.getMap();
+
+ // 以下是地图的操作，详细api请前往百度地图API官网
+ var startPoint = {
+ x: 104.114129,
+ y: 37.550339
+ };
+ var point = new BMap.Point(startPoint.x, startPoint.y);
+ map.centerAndZoom(point, 5);
+ map.enableScrollWheelZoom(true);
+ // ....
+
+ // 配置option
+ var option = {...}
+ // 获取echarts的dom容器
+ var container = BMapExt.getEchartsContainer();
+ // 通过initEcharts初始化echarts并获取实例
+ var myChart = BMapExt.initECharts(container);
+ // 设置option
+ BMapExt.setOption(option);
+
+ </pre>
+ </div>
+ </body>
+</html>
\ No newline at end of file
diff --git a/extension/BMap/doc/example.html b/extension/BMap/doc/example.html
index e69de29..8d93fcd 100644
--- a/extension/BMap/doc/example.html
+++ b/extension/BMap/doc/example.html
@@ -0,0 +1,17 @@
+<html>
+ <head>
+ <meta charset="utf-8">
+ <script src="../../../doc/asset/js/esl/esl.js"></script>
+ <style type="text/css">
+ body {
+ margin: 0;
+ }
+ </style>
+ </head>
+ <body>
+ <div id="main"></div>
+ <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZUONbpqGBsYGXNIYHicvbAbM"></script>
+ <script src="../../../doc/asset/js/jquery.min.js"></script>
+ <script src="./example.js"></script>
+ </body>
+</html>
\ No newline at end of file
diff --git a/extension/BMap/doc/example.js b/extension/BMap/doc/example.js
new file mode 100644
index 0000000..57a4d2b
--- /dev/null
+++ b/extension/BMap/doc/example.js
@@ -0,0 +1,720 @@
+(function () {
+ require.config({
+ packages: [
+ {
+ name: 'echarts',
+ location: '../../../src',
+ main: 'echarts'
+ },
+ {
+ name: 'zrender',
+ //location: 'http://ecomfe.github.io/zrender/src',
+ location: '../../../../zrender/src',
+ main: 'zrender'
+ },
+ {
+ name: 'BMap',
+ location: '../src',
+ main: 'main'
+ }
+ ]
+ });
+
+ require(
+ [
+ 'echarts',
+ 'BMap',
+ 'echarts/chart/map',
+ 'echarts/chart/pie'
+ ],
+ function (echarts, BMapExtension) {
+ $('#main').css({
+ height:$('body').height(),
+ width: $('body').width()
+ });
+
+ // 初始化地图
+ var BMapExt = new BMapExtension($('#main')[0], BMap, echarts);
+ var map = BMapExt.getMap();
+ var container = BMapExt.getEchartsContainer();
+
+ var startPoint = {
+ x: 104.114129,
+ y: 37.550339
+ };
+ var point = new BMap.Point(startPoint.x, startPoint.y);
+ map.centerAndZoom(point, 5);
+ map.enableScrollWheelZoom(true);
+ // 地图自定义样式
+ map.setMapStyle({
+ styleJson: [
+ {
+ "featureType": "water",
+ "elementType": "all",
+ "stylers": {
+ "color": "#044161"
+ }
+ },
+ {
+ "featureType": "land",
+ "elementType": "all",
+ "stylers": {
+ "color": "#004981"
+ }
+ },
+ {
+ "featureType": "boundary",
+ "elementType": "geometry",
+ "stylers": {
+ "color": "#064f85"
+ }
+ },
+ {
+ "featureType": "railway",
+ "elementType": "all",
+ "stylers": {
+ "visibility": "off"
+ }
+ },
+ {
+ "featureType": "highway",
+ "elementType": "geometry",
+ "stylers": {
+ "color": "#004981"
+ }
+ },
+ {
+ "featureType": "highway",
+ "elementType": "geometry.fill",
+ "stylers": {
+ "color": "#005b96",
+ "lightness": 1
+ }
+ },
+ {
+ "featureType": "highway",
+ "elementType": "labels",
+ "stylers": {
+ "visibility": "off"
+ }
+ },
+ {
+ "featureType": "arterial",
+ "elementType": "geometry",
+ "stylers": {
+ "color": "#004981"
+ }
+ },
+ {
+ "featureType": "arterial",
+ "elementType": "geometry.fill",
+ "stylers": {
+ "color": "#00508b"
+ }
+ },
+ {
+ "featureType": "poi",
+ "elementType": "all",
+ "stylers": {
+ "visibility": "off"
+ }
+ },
+ {
+ "featureType": "green",
+ "elementType": "all",
+ "stylers": {
+ "color": "#056197",
+ "visibility": "off"
+ }
+ },
+ {
+ "featureType": "subway",
+ "elementType": "all",
+ "stylers": {
+ "visibility": "off"
+ }
+ },
+ {
+ "featureType": "manmade",
+ "elementType": "all",
+ "stylers": {
+ "visibility": "off"
+ }
+ },
+ {
+ "featureType": "local",
+ "elementType": "all",
+ "stylers": {
+ "visibility": "off"
+ }
+ },
+ {
+ "featureType": "arterial",
+ "elementType": "labels",
+ "stylers": {
+ "visibility": "off"
+ }
+ },
+ {
+ "featureType": "boundary",
+ "elementType": "geometry.fill",
+ "stylers": {
+ "color": "#029fd4"
+ }
+ },
+ {
+ "featureType": "building",
+ "elementType": "all",
+ "stylers": {
+ "color": "#1a5787"
+ }
+ },
+ {
+ "featureType": "label",
+ "elementType": "all",
+ "stylers": {
+ "visibility": "off"
+ }
+ }
+ ]
+ });
+
+ option = {
+ color: ['gold','aqua','lime'],
+ title : {
+ text: '模拟迁徙',
+ subtext:'数据纯属虚构',
+ x:'center',
+ textStyle : {
+ color: '#fff'
+ }
+ },
+ tooltip : {
+ trigger: 'item',
+ formatter: function (v) {
+ return v[1].replace(':', ' > ');
+ }
+ },
+ legend: {
+ orient: 'vertical',
+ x:'left',
+ data:['北京', '上海', '广州'],
+ selectedMode: 'single',
+ selected:{
+ '上海' : false,
+ '广州' : false
+ },
+ textStyle : {
+ color: '#fff'
+ }
+ },
+ toolbox: {
+ show : true,
+ orient : 'vertical',
+ x: 'right',
+ y: 'center',
+ feature : {
+ mark : {show: true},
+ dataView : {show: true, readOnly: false},
+ restore : {show: true},
+ saveAsImage : {show: true}
+ }
+ },
+ dataRange: {
+ min : 0,
+ max : 100,
+ calculable : true,
+ color: ['#ff3333', 'orange', 'yellow','lime','aqua'],
+ textStyle:{
+ color:'#fff'
+ }
+ },
+ series : [
+ {
+ name:'北京',
+ type:'map',
+ mapType: 'none',
+ data:[],
+ geoCoord: {
+ '上海': [121.4648,31.2891],
+ '东莞': [113.8953,22.901],
+ '东营': [118.7073,37.5513],
+ '中山': [113.4229,22.478],
+ '临汾': [111.4783,36.1615],
+ '临沂': [118.3118,35.2936],
+ '丹东': [124.541,40.4242],
+ '丽水': [119.5642,28.1854],
+ '乌鲁木齐': [87.9236,43.5883],
+ '佛山': [112.8955,23.1097],
+ '保定': [115.0488,39.0948],
+ '兰州': [103.5901,36.3043],
+ '包头': [110.3467,41.4899],
+ '北京': [116.4551,40.2539],
+ '北海': [109.314,21.6211],
+ '南京': [118.8062,31.9208],
+ '南宁': [108.479,23.1152],
+ '南昌': [116.0046,28.6633],
+ '南通': [121.1023,32.1625],
+ '厦门': [118.1689,24.6478],
+ '台州': [121.1353,28.6688],
+ '合肥': [117.29,32.0581],
+ '呼和浩特': [111.4124,40.4901],
+ '咸阳': [108.4131,34.8706],
+ '哈尔滨': [127.9688,45.368],
+ '唐山': [118.4766,39.6826],
+ '嘉兴': [120.9155,30.6354],
+ '大同': [113.7854,39.8035],
+ '大连': [122.2229,39.4409],
+ '天津': [117.4219,39.4189],
+ '太原': [112.3352,37.9413],
+ '威海': [121.9482,37.1393],
+ '宁波': [121.5967,29.6466],
+ '宝鸡': [107.1826,34.3433],
+ '宿迁': [118.5535,33.7775],
+ '常州': [119.4543,31.5582],
+ '广州': [113.5107,23.2196],
+ '廊坊': [116.521,39.0509],
+ '延安': [109.1052,36.4252],
+ '张家口': [115.1477,40.8527],
+ '徐州': [117.5208,34.3268],
+ '德州': [116.6858,37.2107],
+ '惠州': [114.6204,23.1647],
+ '成都': [103.9526,30.7617],
+ '扬州': [119.4653,32.8162],
+ '承德': [117.5757,41.4075],
+ '拉萨': [91.1865,30.1465],
+ '无锡': [120.3442,31.5527],
+ '日照': [119.2786,35.5023],
+ '昆明': [102.9199,25.4663],
+ '杭州': [119.5313,29.8773],
+ '枣庄': [117.323,34.8926],
+ '柳州': [109.3799,24.9774],
+ '株洲': [113.5327,27.0319],
+ '武汉': [114.3896,30.6628],
+ '汕头': [117.1692,23.3405],
+ '江门': [112.6318,22.1484],
+ '沈阳': [123.1238,42.1216],
+ '沧州': [116.8286,38.2104],
+ '河源': [114.917,23.9722],
+ '泉州': [118.3228,25.1147],
+ '泰安': [117.0264,36.0516],
+ '泰州': [120.0586,32.5525],
+ '济南': [117.1582,36.8701],
+ '济宁': [116.8286,35.3375],
+ '海口': [110.3893,19.8516],
+ '淄博': [118.0371,36.6064],
+ '淮安': [118.927,33.4039],
+ '深圳': [114.5435,22.5439],
+ '清远': [112.9175,24.3292],
+ '温州': [120.498,27.8119],
+ '渭南': [109.7864,35.0299],
+ '湖州': [119.8608,30.7782],
+ '湘潭': [112.5439,27.7075],
+ '滨州': [117.8174,37.4963],
+ '潍坊': [119.0918,36.524],
+ '烟台': [120.7397,37.5128],
+ '玉溪': [101.9312,23.8898],
+ '珠海': [113.7305,22.1155],
+ '盐城': [120.2234,33.5577],
+ '盘锦': [121.9482,41.0449],
+ '石家庄': [114.4995,38.1006],
+ '福州': [119.4543,25.9222],
+ '秦皇岛': [119.2126,40.0232],
+ '绍兴': [120.564,29.7565],
+ '聊城': [115.9167,36.4032],
+ '肇庆': [112.1265,23.5822],
+ '舟山': [122.2559,30.2234],
+ '苏州': [120.6519,31.3989],
+ '莱芜': [117.6526,36.2714],
+ '菏泽': [115.6201,35.2057],
+ '营口': [122.4316,40.4297],
+ '葫芦岛': [120.1575,40.578],
+ '衡水': [115.8838,37.7161],
+ '衢州': [118.6853,28.8666],
+ '西宁': [101.4038,36.8207],
+ '西安': [109.1162,34.2004],
+ '贵阳': [106.6992,26.7682],
+ '连云港': [119.1248,34.552],
+ '邢台': [114.8071,37.2821],
+ '邯郸': [114.4775,36.535],
+ '郑州': [113.4668,34.6234],
+ '鄂尔多斯': [108.9734,39.2487],
+ '重庆': [107.7539,30.1904],
+ '金华': [120.0037,29.1028],
+ '铜川': [109.0393,35.1947],
+ '银川': [106.3586,38.1775],
+ '镇江': [119.4763,31.9702],
+ '长春': [125.8154,44.2584],
+ '长沙': [113.0823,28.2568],
+ '长治': [112.8625,36.4746],
+ '阳泉': [113.4778,38.0951],
+ '青岛': [120.4651,36.3373],
+ '韶关': [113.7964,24.7028]
+ },
+
+ markLine : {
+ smooth:true,
+ effect : {
+ show: true,
+ scaleSize: 1,
+ period: 30,
+ color: '#fff',
+ shadowBlur: 10
+ },
+ itemStyle : {
+ normal: {
+ borderWidth:1,
+ lineStyle: {
+ type: 'solid',
+ shadowBlur: 10
+ }
+ }
+ },
+ data : [
+ [{name:'北京'}, {name:'上海',value:95}],
+ [{name:'北京'}, {name:'广州',value:90}],
+ [{name:'北京'}, {name:'大连',value:80}],
+ [{name:'北京'}, {name:'南宁',value:70}],
+ [{name:'北京'}, {name:'南昌',value:60}],
+ [{name:'北京'}, {name:'拉萨',value:50}],
+ [{name:'北京'}, {name:'长春',value:40}],
+ [{name:'北京'}, {name:'包头',value:30}],
+ [{name:'北京'}, {name:'重庆',value:20}],
+ [{name:'北京'}, {name:'常州',value:10}]
+ ]
+ },
+ markPoint : {
+ symbol:'emptyCircle',
+ symbolSize : function (v){
+ return 10 + v/10
+ },
+ effect : {
+ show: true,
+ shadowBlur : 0
+ },
+ itemStyle:{
+ normal:{
+ label:{show:false}
+ }
+ },
+ data : [
+ {name:'上海',value:95},
+ {name:'广州',value:90},
+ {name:'大连',value:80},
+ {name:'南宁',value:70},
+ {name:'南昌',value:60},
+ {name:'拉萨',value:50},
+ {name:'长春',value:40},
+ {name:'包头',value:30},
+ {name:'重庆',value:20},
+ {name:'常州',value:10}
+ ]
+ }
+
+ },
+ {
+ name:'上海',
+ type:'map',
+ mapType: 'none',
+ data:[],
+ markLine : {
+ smooth:true,
+ effect : {
+ show: true,
+ scaleSize: 1,
+ period: 30,
+ color: '#fff',
+ shadowBlur: 10
+ },
+ itemStyle : {
+ normal: {
+ borderWidth:1,
+ lineStyle: {
+ type: 'solid',
+ shadowBlur: 10
+ }
+ }
+ },
+ data : [
+ [{name:'上海'},{name:'包头',value:95}],
+ [{name:'上海'},{name:'昆明',value:90}],
+ [{name:'上海'},{name:'广州',value:80}],
+ [{name:'上海'},{name:'郑州',value:70}],
+ [{name:'上海'},{name:'长春',value:60}],
+ [{name:'上海'},{name:'重庆',value:50}],
+ [{name:'上海'},{name:'长沙',value:40}],
+ [{name:'上海'},{name:'北京',value:30}],
+ [{name:'上海'},{name:'丹东',value:20}],
+ [{name:'上海'},{name:'大连',value:10}]
+ ]
+ },
+ markPoint : {
+ symbol:'emptyCircle',
+ symbolSize : function (v){
+ return 10 + v/10
+ },
+ effect : {
+ show: true,
+ shadowBlur : 0
+ },
+ itemStyle:{
+ normal:{
+ label:{show:false}
+ }
+ },
+ data : [
+ {name:'包头',value:95},
+ {name:'昆明',value:90},
+ {name:'广州',value:80},
+ {name:'郑州',value:70},
+ {name:'长春',value:60},
+ {name:'重庆',value:50},
+ {name:'长沙',value:40},
+ {name:'北京',value:30},
+ {name:'丹东',value:20},
+ {name:'大连',value:10}
+ ]
+ }
+ },
+ {
+ name:'广州',
+ type:'map',
+ mapType: 'none',
+ data:[],
+ markLine : {
+ smooth:true,
+ effect : {
+ show: true,
+ scaleSize: 1,
+ period: 30,
+ color: '#fff',
+ shadowBlur: 10
+ },
+ itemStyle : {
+ normal: {
+ borderWidth:1,
+ lineStyle: {
+ type: 'solid',
+ shadowBlur: 10
+ }
+ }
+ },
+ data : [
+ [{name:'广州'},{name:'福州',value:95}],
+ [{name:'广州'},{name:'太原',value:90}],
+ [{name:'广州'},{name:'长春',value:80}],
+ [{name:'广州'},{name:'重庆',value:70}],
+ [{name:'广州'},{name:'西安',value:60}],
+ [{name:'广州'},{name:'成都',value:50}],
+ [{name:'广州'},{name:'常州',value:40}],
+ [{name:'广州'},{name:'北京',value:30}],
+ [{name:'广州'},{name:'北海',value:20}],
+ [{name:'广州'},{name:'海口',value:10}]
+ ]
+ },
+ markPoint : {
+ symbol:'emptyCircle',
+ symbolSize : function (v){
+ return 10 + v/10
+ },
+ effect : {
+ show: true,
+ shadowBlur : 0
+ },
+ itemStyle:{
+ normal:{
+ label:{show:false}
+ }
+ },
+ data : [
+ {name:'福州',value:95},
+ {name:'太原',value:90},
+ {name:'长春',value:80},
+ {name:'重庆',value:70},
+ {name:'西安',value:60},
+ {name:'成都',value:50},
+ {name:'常州',value:40},
+ {name:'北京',value:30},
+ {name:'北海',value:20},
+ {name:'海口',value:10}
+ ]
+ }
+ },
+ {
+ name:'全国',
+ type:'map',
+ mapType: 'none',
+ data:[],
+ markLine : {
+ smooth:true,
+ symbol: ['none', 'circle'],
+ symbolSize : 1,
+ itemStyle : {
+ normal: {
+ color:'#fff',
+ borderWidth:1,
+ borderColor:'rgba(30,144,255,0.5)'
+ }
+ },
+ data : [
+ [{name:'北京'},{name:'包头'}],
+ [{name:'北京'},{name:'北海'}],
+ [{name:'北京'},{name:'广州'}],
+ [{name:'北京'},{name:'郑州'}],
+ [{name:'北京'},{name:'长春'}],
+ [{name:'北京'},{name:'长治'}],
+ [{name:'北京'},{name:'重庆'}],
+ [{name:'北京'},{name:'长沙'}],
+ [{name:'北京'},{name:'成都'}],
+ [{name:'北京'},{name:'常州'}],
+ [{name:'北京'},{name:'丹东'}],
+ [{name:'北京'},{name:'大连'}],
+ [{name:'北京'},{name:'东营'}],
+ [{name:'北京'},{name:'延安'}],
+ [{name:'北京'},{name:'福州'}],
+ [{name:'北京'},{name:'海口'}],
+ [{name:'北京'},{name:'呼和浩特'}],
+ [{name:'北京'},{name:'合肥'}],
+ [{name:'北京'},{name:'杭州'}],
+ [{name:'北京'},{name:'哈尔滨'}],
+ [{name:'北京'},{name:'舟山'}],
+ [{name:'北京'},{name:'银川'}],
+ [{name:'北京'},{name:'衢州'}],
+ [{name:'北京'},{name:'南昌'}],
+ [{name:'北京'},{name:'昆明'}],
+ [{name:'北京'},{name:'贵阳'}],
+ [{name:'北京'},{name:'兰州'}],
+ [{name:'北京'},{name:'拉萨'}],
+ [{name:'北京'},{name:'连云港'}],
+ [{name:'北京'},{name:'临沂'}],
+ [{name:'北京'},{name:'柳州'}],
+ [{name:'北京'},{name:'宁波'}],
+ [{name:'北京'},{name:'南京'}],
+ [{name:'北京'},{name:'南宁'}],
+ [{name:'北京'},{name:'南通'}],
+ [{name:'北京'},{name:'上海'}],
+ [{name:'北京'},{name:'沈阳'}],
+ [{name:'北京'},{name:'西安'}],
+ [{name:'北京'},{name:'汕头'}],
+ [{name:'北京'},{name:'深圳'}],
+ [{name:'北京'},{name:'青岛'}],
+ [{name:'北京'},{name:'济南'}],
+ [{name:'北京'},{name:'太原'}],
+ [{name:'北京'},{name:'乌鲁木齐'}],
+ [{name:'北京'},{name:'潍坊'}],
+ [{name:'北京'},{name:'威海'}],
+ [{name:'北京'},{name:'温州'}],
+ [{name:'北京'},{name:'武汉'}],
+ [{name:'北京'},{name:'无锡'}],
+ [{name:'北京'},{name:'厦门'}],
+ [{name:'北京'},{name:'西宁'}],
+ [{name:'北京'},{name:'徐州'}],
+ [{name:'北京'},{name:'烟台'}],
+ [{name:'北京'},{name:'盐城'}],
+ [{name:'北京'},{name:'珠海'}],
+ [{name:'上海'},{name:'包头'}],
+ [{name:'上海'},{name:'北海'}],
+ [{name:'上海'},{name:'广州'}],
+ [{name:'上海'},{name:'郑州'}],
+ [{name:'上海'},{name:'长春'}],
+ [{name:'上海'},{name:'重庆'}],
+ [{name:'上海'},{name:'长沙'}],
+ [{name:'上海'},{name:'成都'}],
+ [{name:'上海'},{name:'丹东'}],
+ [{name:'上海'},{name:'大连'}],
+ [{name:'上海'},{name:'福州'}],
+ [{name:'上海'},{name:'海口'}],
+ [{name:'上海'},{name:'呼和浩特'}],
+ [{name:'上海'},{name:'合肥'}],
+ [{name:'上海'},{name:'哈尔滨'}],
+ [{name:'上海'},{name:'舟山'}],
+ [{name:'上海'},{name:'银川'}],
+ [{name:'上海'},{name:'南昌'}],
+ [{name:'上海'},{name:'昆明'}],
+ [{name:'上海'},{name:'贵阳'}],
+ [{name:'上海'},{name:'兰州'}],
+ [{name:'上海'},{name:'拉萨'}],
+ [{name:'上海'},{name:'连云港'}],
+ [{name:'上海'},{name:'临沂'}],
+ [{name:'上海'},{name:'柳州'}],
+ [{name:'上海'},{name:'宁波'}],
+ [{name:'上海'},{name:'南宁'}],
+ [{name:'上海'},{name:'北京'}],
+ [{name:'上海'},{name:'沈阳'}],
+ [{name:'上海'},{name:'秦皇岛'}],
+ [{name:'上海'},{name:'西安'}],
+ [{name:'上海'},{name:'石家庄'}],
+ [{name:'上海'},{name:'汕头'}],
+ [{name:'上海'},{name:'深圳'}],
+ [{name:'上海'},{name:'青岛'}],
+ [{name:'上海'},{name:'济南'}],
+ [{name:'上海'},{name:'天津'}],
+ [{name:'上海'},{name:'太原'}],
+ [{name:'上海'},{name:'乌鲁木齐'}],
+ [{name:'上海'},{name:'潍坊'}],
+ [{name:'上海'},{name:'威海'}],
+ [{name:'上海'},{name:'温州'}],
+ [{name:'上海'},{name:'武汉'}],
+ [{name:'上海'},{name:'厦门'}],
+ [{name:'上海'},{name:'西宁'}],
+ [{name:'上海'},{name:'徐州'}],
+ [{name:'上海'},{name:'烟台'}],
+ [{name:'上海'},{name:'珠海'}],
+ [{name:'广州'},{name:'北海'}],
+ [{name:'广州'},{name:'郑州'}],
+ [{name:'广州'},{name:'长春'}],
+ [{name:'广州'},{name:'重庆'}],
+ [{name:'广州'},{name:'长沙'}],
+ [{name:'广州'},{name:'成都'}],
+ [{name:'广州'},{name:'常州'}],
+ [{name:'广州'},{name:'大连'}],
+ [{name:'广州'},{name:'福州'}],
+ [{name:'广州'},{name:'海口'}],
+ [{name:'广州'},{name:'呼和浩特'}],
+ [{name:'广州'},{name:'合肥'}],
+ [{name:'广州'},{name:'杭州'}],
+ [{name:'广州'},{name:'哈尔滨'}],
+ [{name:'广州'},{name:'舟山'}],
+ [{name:'广州'},{name:'银川'}],
+ [{name:'广州'},{name:'南昌'}],
+ [{name:'广州'},{name:'昆明'}],
+ [{name:'广州'},{name:'贵阳'}],
+ [{name:'广州'},{name:'兰州'}],
+ [{name:'广州'},{name:'拉萨'}],
+ [{name:'广州'},{name:'连云港'}],
+ [{name:'广州'},{name:'临沂'}],
+ [{name:'广州'},{name:'柳州'}],
+ [{name:'广州'},{name:'宁波'}],
+ [{name:'广州'},{name:'南京'}],
+ [{name:'广州'},{name:'南宁'}],
+ [{name:'广州'},{name:'南通'}],
+ [{name:'广州'},{name:'北京'}],
+ [{name:'广州'},{name:'上海'}],
+ [{name:'广州'},{name:'沈阳'}],
+ [{name:'广州'},{name:'西安'}],
+ [{name:'广州'},{name:'石家庄'}],
+ [{name:'广州'},{name:'汕头'}],
+ [{name:'广州'},{name:'青岛'}],
+ [{name:'广州'},{name:'济南'}],
+ [{name:'广州'},{name:'天津'}],
+ [{name:'广州'},{name:'太原'}],
+ [{name:'广州'},{name:'乌鲁木齐'}],
+ [{name:'广州'},{name:'温州'}],
+ [{name:'广州'},{name:'武汉'}],
+ [{name:'广州'},{name:'无锡'}],
+ [{name:'广州'},{name:'厦门'}],
+ [{name:'广州'},{name:'西宁'}],
+ [{name:'广州'},{name:'徐州'}],
+ [{name:'广州'},{name:'烟台'}],
+ [{name:'广州'},{name:'盐城'}]
+ ]
+ }
+ }
+ ]
+ };
+
+ var myChart = BMapExt.initECharts(container);
+ BMapExt.setOption(option);
+ }
+);
+})();
\ No newline at end of file
diff --git a/extension/BMap/src/main.js b/extension/BMap/src/main.js
index c0b5347..c3abcda 100644
--- a/extension/BMap/src/main.js
+++ b/extension/BMap/src/main.js
@@ -15,7 +15,7 @@
* @constructor
*/
function BMapExt(obj, BMap, ec) {
- this.init(obj, BMap, ec);
+ this._init(obj, BMap, ec);
};
/**
@@ -65,9 +65,9 @@
* @param {String|HTMLElement|BMap.Map} obj
* @param {BMap} BMap
* @param {echarts} ec
- * @public
+ * @private
*/
- BMapExt.prototype.init = function (obj, BMap, ec) {
+ BMapExt.prototype._init = function (obj, BMap, ec) {
var self = this;
self._map = obj.constructor == BMap.Map ? obj : new BMap.Map(obj);
diff --git a/src/chart/map.js b/src/chart/map.js
index c61f90e..e799e1c 100644
--- a/src/chart/map.js
+++ b/src/chart/map.js
@@ -915,6 +915,9 @@
this._mapDataMap[mapType].transform.left,
this._mapDataMap[mapType].transform.top
];
+ if (mapType == 'none') {
+ position = [0, 0];
+ }
for (var sIdx in mapSeries) {
this._seriesIndexToMapType[sIdx] = mapType;
this.markAttachStyle[sIdx] = {
