单文件更新，例子更新，图片更新

.jshintignore

-src/util/mapData/china/*
-src/util/mapData/rawData/china/*
\ No newline at end of file
+src/util/mapData/geoJson/*
+src/util/mapData/rawData/geoJson/*
\ No newline at end of file

build/echarts-original-map.js

@@ -12645,7 +12645,7 @@ define(
                 require('zrender/shape').get('image').brush(ctx, {
                     style : style
                 });                
-            },100)
+            },100);
         }
 
         Icon.prototype =  {
@@ -21068,10 +21068,10 @@ define('echarts/component/toolbox',['require','./base','../config','zrender/conf
                         d.innerHTML = '';
                         document.body.removeChild(d);
                         d = null;
-                    }
+                    };
                     _d = null;
                 }
-            }, 500)
+            }, 500);
             
             /*
             function _saveImageForIE() {
@@ -29227,7 +29227,7 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
                                 || window.msRequestAnimationFrame
                                 || window.mozRequestAnimationFrame
                                 || window.webkitRequestAnimationFrame
-                                || function(func){setTimeout(func, 16)};
+                                || function(func){setTimeout(func, 16);};
     /**
      * 构造函数
      * @param {Object} messageCenter echart消息中心
@@ -29717,9 +29717,13 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
                     var forceFactor = 1 * (w1 + w2) * k2 / d;
 
                     //节点1受到的力
-                    vec2.scaleAndAdd(nodeForces[i], nodeForces[i], v12, -forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[i], nodeForces[i], v12, -forceFactor
+                    );
                     //节点2受到的力
-                    vec2.scaleAndAdd(nodeForces[j], nodeForces[j], v12, forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[j], nodeForces[j], v12, forceFactor
+                    );
                 }
             }
             // 计算节点之间引力
@@ -29739,9 +29743,13 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
 
                 var forceFactor = w * d2 / k / Math.sqrt(d2);
                 // 节点1受到的力
-                vec2.scaleAndAdd(nodeForces[s], nodeForces[s], v12, forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[s], nodeForces[s], v12, forceFactor
+                );
                 // 节点2受到的力
-                vec2.scaleAndAdd(nodeForces[t], nodeForces[t], v12, -forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[t], nodeForces[t], v12, -forceFactor
+                );
             }
             // 到质心的向心力
             for (var i = 0, l = filteredNodes.length; i < l; i++){
@@ -29863,7 +29871,7 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
             self.isDragstart = true;
         };
         
-        function onclick(param) {
+        function onclick() {
         }
 
         /**
@@ -30042,12 +30050,13 @@ define('echarts/util/mapData/params',['require'],function(require) {
             }
         },
         '南海诸岛' : {
-            textCoord : [126, 24.5],
+            textCoord : [126, 25],
             getPath : function(leftTop, scale) {
                 // scale.x : width  = 10.51 : 64
                 var pList = [
                     [
-                        [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]
+                        [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]
@@ -30080,7 +30089,8 @@ define('echarts/util/mapData/params',['require'],function(require) {
                         [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]
+                        [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]
                     ]
                 ];
                 var str = '';
@@ -30094,7 +30104,7 @@ define('echarts/util/mapData/params',['require'],function(require) {
                            + ' ';
                     for (var j = 1, k = pList[i].length; j < k; j++) {
                         str += 'L ' 
-                              + ((pList[i][j][0] * scale + left).toFixed(2) - 0) 
+                              + ((pList[i][j][0] * scale + left).toFixed(2) - 0)
                               + ' ' 
                               + ((pList[i][j][1] * scale + top).toFixed(2) - 0)
                               + ' ';
@@ -30346,7 +30356,7 @@ define('echarts/util/mapData/params',['require'],function(require) {
     return {
         decode : decode,
         params : mapParams
-    }
+    };
 });
 /**
  * 地图文本位置修正
@@ -30410,10 +30420,10 @@ define('echarts/util/projection/normal',[],function() {
     
     function parseSrcSize(json, specialArea) {
         specialArea = specialArea || {};
-        convertor_parse.xmin = 360;
-        convertor_parse.xmax = -360;
-        convertor_parse.ymin = 180;
-        convertor_parse.ymax = -180;
+        convertorParse.xmin = 360;
+        convertorParse.xmax = -360;
+        convertorParse.ymin = 180;
+        convertorParse.ymax = -180;
 
         var shapes = json.features;
         var geometries;
@@ -30424,14 +30434,14 @@ define('echarts/util/projection/normal',[],function() {
                 continue;
             }
             if (shape.type == 'Feature') {
-                convertor_parse[shape.geometry.type](
+                convertorParse[shape.geometry.type](
                     shape.geometry.coordinates
                 );
             } 
-            else if (shape.type = 'GeometryCollection') {
+            else if (shape.type == 'GeometryCollection') {
                 geometries = shape.geometries;
                 for (var j = 0, len2 = geometries.length; j < len2; j++) {
-                    convertor_parse[geometries[j].type](
+                    convertorParse[geometries[j].type](
                         geometries[j].coordinates
                     );
                 }
@@ -30439,10 +30449,10 @@ define('echarts/util/projection/normal',[],function() {
         }
 
         json.srcSize = {
-            left : convertor_parse.xmin.toFixed(4)*1,
-            top : convertor_parse.ymin.toFixed(4)*1,
-            width : (convertor_parse.xmax - convertor_parse.xmin).toFixed(4)*1,
-            height : (convertor_parse.ymax - convertor_parse.ymin).toFixed(4)*1
+            left : convertorParse.xmin.toFixed(4)*1,
+            top : convertorParse.ymin.toFixed(4)*1,
+            width : (convertorParse.xmax - convertorParse.xmin).toFixed(4)*1,
+            height : (convertorParse.ymax - convertorParse.ymin).toFixed(4)*1
         };
 
         return json;
@@ -30479,7 +30489,7 @@ define('echarts/util/projection/normal',[],function() {
             var point;
             for (var i = 0, len = coordinates.length; i < len; i++) {
                 point = convertor.makePoint(coordinates[i]);
-                if (i == 0) {
+                if (i === 0) {
                     str = 'M' + point.join(',');
                 } else {
                     str = str + 'L' + point.join(',');
@@ -30517,7 +30527,7 @@ define('echarts/util/projection/normal',[],function() {
         }
     };
     
-    var convertor_parse = {
+    var convertorParse = {
         'formatPoint' : convertor.formatPoint,
         'makePoint' : function(p) {
             var self = this;
@@ -30592,7 +30602,7 @@ define('echarts/util/projection/normal',[],function() {
             if (shape.type == 'Feature') {
                 pushApath(shape.geometry, shape);
             } 
-            else if (shape.type = 'GeometryCollection') {
+            else if (shape.type == 'GeometryCollection') {
                 geometries = shape.geometries;
                 for (var j = 0, len2 = geometries.length; j < len2; j++) {
                     val = geometries[j];
@@ -30670,7 +30680,7 @@ define('echarts/util/projection/normal',[],function() {
  * @author Kener (@Kener-林峰, linzhifeng@baidu.com)
  *
  */
-define('echarts/chart/map',['require','../component/base','./calculableBase','../config','../util/ecData','zrender/config','zrender/tool/util','zrender/tool/area','zrender/tool/event','../util/mapData/params','../util/mapData/textFixed','../util/mapData/geoCoord','../util/projection/normal','../util/projection/normal','../util/projection/normal','../util/projection/normal','../chart'],function(require) {
+define('echarts/chart/map',['require','../component/base','./calculableBase','../config','../util/ecData','zrender/config','zrender/tool/util','zrender/tool/event','../util/mapData/params','../util/mapData/textFixed','../util/mapData/geoCoord','../util/projection/normal','../util/projection/normal','../util/projection/normal','../util/projection/normal','../chart'],function(require) {
     /**
      * 构造函数
      * @param {Object} messageCenter echart消息中心
@@ -30691,7 +30701,6 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
 
         var zrConfig = require('zrender/config');
         var zrUtil = require('zrender/tool/util');
-        var zrArea = require('zrender/tool/area');
         var zrEvent = require('zrender/tool/event');
 
         var self = this;
@@ -30824,7 +30833,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                     // 已经缓存了则直接用
                     _mapDataCallback(mt, valueData[mt], mapSeries[mt])(
                         _mapDataMap[mt].mapData
-                    )
+                    );
                 }
                 else if (_mapParams[mt.replace(/\|.*/, '')].getGeoJson) {
                     // 特殊区域
@@ -30890,8 +30899,8 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                             },
                             id: features.id,
                             properties: features.properties,
-                            type: features.type,
-                        }
+                            type: features.type
+                        };
                     }
                     break;
                 }
@@ -30901,7 +30910,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                 'features':[
                     features
                 ]
-            }
+            };
         }
         
         /**
@@ -30983,7 +30992,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                         mapType, mapData, 
                         area, _specialArea[mapType][area], 
                         position
-                    ))
+                    ));
                 }
                 
             }
@@ -31013,7 +31022,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                     position : position,
                     textX : textPosition[0],
                     textY : textPosition[1]
-                })
+                });
                 
             }
             
@@ -31070,7 +31079,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                     x : xScale,
                     y : yScale
                 }
-            }
+            };
             
             //console.log('**',areaName, transform)
             var pathArray = normalProjection.geoJson2Path(
@@ -31145,10 +31154,9 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
             //y = isNaN(cusY) ? padding : cusY;
             y = self.parsePercent(cusY, zrHeight);
             y = isNaN(y) ? padding : y;
-            
             if (typeof width == 'undefined') {
                 width = isNaN(cusX) 
-                        ? zrWidth
+                        ? zrWidth - 2 * padding
                         : zrWidth - x - 2 * padding;
             }
             else {
@@ -31157,7 +31165,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
             
             if (typeof height == 'undefined') {
                 height = isNaN(cusY) 
-                         ? zrHeight
+                         ? zrHeight - 2 * padding
                          : zrHeight - y - 2 * padding;
             }
             else {
@@ -31494,9 +31502,9 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                 }
                 else if (typeof formatter == 'string') {
                     formatter = formatter.replace('{a}','{a0}')
-                                         .replace('{b}','{b0}')
+                                         .replace('{b}','{b0}');
                     formatter = formatter.replace('{a0}', name)
-                                         .replace('{b0}', value)
+                                         .replace('{b0}', value);
     
                     return formatter;
                 }
@@ -31512,7 +31520,6 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
             var top;
             var width;
             var height;
-            var geoAndPos;
             for (var mapType in _mapDataMap) {
                 transform = _mapDataMap[mapType].transform;
                 if (!transform || !_roamMap[mapType]) {
@@ -31599,7 +31606,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                 setTimeout(function(){
                     zr.on(zrConfig.EVENT.MOUSEMOVE, _onmousemove);
                     zr.on(zrConfig.EVENT.MOUSEUP, _onmouseup);
-                },50)
+                },50);
             }
             
         }

build/echarts-original.js

@@ -12645,7 +12645,7 @@ define(
                 require('zrender/shape').get('image').brush(ctx, {
                     style : style
                 });                
-            },100)
+            },100);
         }
 
         Icon.prototype =  {
@@ -21068,10 +21068,10 @@ define('echarts/component/toolbox',['require','./base','../config','zrender/conf
                         d.innerHTML = '';
                         document.body.removeChild(d);
                         d = null;
-                    }
+                    };
                     _d = null;
                 }
-            }, 500)
+            }, 500);
             
             /*
             function _saveImageForIE() {
@@ -29227,7 +29227,7 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
                                 || window.msRequestAnimationFrame
                                 || window.mozRequestAnimationFrame
                                 || window.webkitRequestAnimationFrame
-                                || function(func){setTimeout(func, 16)};
+                                || function(func){setTimeout(func, 16);};
     /**
      * 构造函数
      * @param {Object} messageCenter echart消息中心
@@ -29717,9 +29717,13 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
                     var forceFactor = 1 * (w1 + w2) * k2 / d;
 
                     //节点1受到的力
-                    vec2.scaleAndAdd(nodeForces[i], nodeForces[i], v12, -forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[i], nodeForces[i], v12, -forceFactor
+                    );
                     //节点2受到的力
-                    vec2.scaleAndAdd(nodeForces[j], nodeForces[j], v12, forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[j], nodeForces[j], v12, forceFactor
+                    );
                 }
             }
             // 计算节点之间引力
@@ -29739,9 +29743,13 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
 
                 var forceFactor = w * d2 / k / Math.sqrt(d2);
                 // 节点1受到的力
-                vec2.scaleAndAdd(nodeForces[s], nodeForces[s], v12, forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[s], nodeForces[s], v12, forceFactor
+                );
                 // 节点2受到的力
-                vec2.scaleAndAdd(nodeForces[t], nodeForces[t], v12, -forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[t], nodeForces[t], v12, -forceFactor
+                );
             }
             // 到质心的向心力
             for (var i = 0, l = filteredNodes.length; i < l; i++){
@@ -29863,7 +29871,7 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
             self.isDragstart = true;
         };
         
-        function onclick(param) {
+        function onclick() {
         }
 
         /**

build/echarts-plain-original-map.js

@@ -13052,7 +13052,7 @@ define(
                 require('zrender/shape').get('image').brush(ctx, {
                     style : style
                 });                
-            },100)
+            },100);
         }
 
         Icon.prototype =  {
@@ -21475,10 +21475,10 @@ define('echarts/component/toolbox',['require','./base','../config','zrender/conf
                         d.innerHTML = '';
                         document.body.removeChild(d);
                         d = null;
-                    }
+                    };
                     _d = null;
                 }
-            }, 500)
+            }, 500);
             
             /*
             function _saveImageForIE() {
@@ -29634,7 +29634,7 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
                                 || window.msRequestAnimationFrame
                                 || window.mozRequestAnimationFrame
                                 || window.webkitRequestAnimationFrame
-                                || function(func){setTimeout(func, 16)};
+                                || function(func){setTimeout(func, 16);};
     /**
      * 构造函数
      * @param {Object} messageCenter echart消息中心
@@ -30124,9 +30124,13 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
                     var forceFactor = 1 * (w1 + w2) * k2 / d;
 
                     //节点1受到的力
-                    vec2.scaleAndAdd(nodeForces[i], nodeForces[i], v12, -forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[i], nodeForces[i], v12, -forceFactor
+                    );
                     //节点2受到的力
-                    vec2.scaleAndAdd(nodeForces[j], nodeForces[j], v12, forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[j], nodeForces[j], v12, forceFactor
+                    );
                 }
             }
             // 计算节点之间引力
@@ -30146,9 +30150,13 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
 
                 var forceFactor = w * d2 / k / Math.sqrt(d2);
                 // 节点1受到的力
-                vec2.scaleAndAdd(nodeForces[s], nodeForces[s], v12, forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[s], nodeForces[s], v12, forceFactor
+                );
                 // 节点2受到的力
-                vec2.scaleAndAdd(nodeForces[t], nodeForces[t], v12, -forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[t], nodeForces[t], v12, -forceFactor
+                );
             }
             // 到质心的向心力
             for (var i = 0, l = filteredNodes.length; i < l; i++){
@@ -30270,7 +30278,7 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
             self.isDragstart = true;
         };
         
-        function onclick(param) {
+        function onclick() {
         }
 
         /**
@@ -30449,12 +30457,13 @@ define('echarts/util/mapData/params',['require'],function(require) {
             }
         },
         '南海诸岛' : {
-            textCoord : [126, 24.5],
+            textCoord : [126, 25],
             getPath : function(leftTop, scale) {
                 // scale.x : width  = 10.51 : 64
                 var pList = [
                     [
-                        [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]
+                        [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]
@@ -30487,7 +30496,8 @@ define('echarts/util/mapData/params',['require'],function(require) {
                         [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]
+                        [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]
                     ]
                 ];
                 var str = '';
@@ -30501,7 +30511,7 @@ define('echarts/util/mapData/params',['require'],function(require) {
                            + ' ';
                     for (var j = 1, k = pList[i].length; j < k; j++) {
                         str += 'L ' 
-                              + ((pList[i][j][0] * scale + left).toFixed(2) - 0) 
+                              + ((pList[i][j][0] * scale + left).toFixed(2) - 0)
                               + ' ' 
                               + ((pList[i][j][1] * scale + top).toFixed(2) - 0)
                               + ' ';
@@ -30753,7 +30763,7 @@ define('echarts/util/mapData/params',['require'],function(require) {
     return {
         decode : decode,
         params : mapParams
-    }
+    };
 });
 /**
  * 地图文本位置修正
@@ -30817,10 +30827,10 @@ define('echarts/util/projection/normal',[],function() {
     
     function parseSrcSize(json, specialArea) {
         specialArea = specialArea || {};
-        convertor_parse.xmin = 360;
-        convertor_parse.xmax = -360;
-        convertor_parse.ymin = 180;
-        convertor_parse.ymax = -180;
+        convertorParse.xmin = 360;
+        convertorParse.xmax = -360;
+        convertorParse.ymin = 180;
+        convertorParse.ymax = -180;
 
         var shapes = json.features;
         var geometries;
@@ -30831,14 +30841,14 @@ define('echarts/util/projection/normal',[],function() {
                 continue;
             }
             if (shape.type == 'Feature') {
-                convertor_parse[shape.geometry.type](
+                convertorParse[shape.geometry.type](
                     shape.geometry.coordinates
                 );
             } 
-            else if (shape.type = 'GeometryCollection') {
+            else if (shape.type == 'GeometryCollection') {
                 geometries = shape.geometries;
                 for (var j = 0, len2 = geometries.length; j < len2; j++) {
-                    convertor_parse[geometries[j].type](
+                    convertorParse[geometries[j].type](
                         geometries[j].coordinates
                     );
                 }
@@ -30846,10 +30856,10 @@ define('echarts/util/projection/normal',[],function() {
         }
 
         json.srcSize = {
-            left : convertor_parse.xmin.toFixed(4)*1,
-            top : convertor_parse.ymin.toFixed(4)*1,
-            width : (convertor_parse.xmax - convertor_parse.xmin).toFixed(4)*1,
-            height : (convertor_parse.ymax - convertor_parse.ymin).toFixed(4)*1
+            left : convertorParse.xmin.toFixed(4)*1,
+            top : convertorParse.ymin.toFixed(4)*1,
+            width : (convertorParse.xmax - convertorParse.xmin).toFixed(4)*1,
+            height : (convertorParse.ymax - convertorParse.ymin).toFixed(4)*1
         };
 
         return json;
@@ -30886,7 +30896,7 @@ define('echarts/util/projection/normal',[],function() {
             var point;
             for (var i = 0, len = coordinates.length; i < len; i++) {
                 point = convertor.makePoint(coordinates[i]);
-                if (i == 0) {
+                if (i === 0) {
                     str = 'M' + point.join(',');
                 } else {
                     str = str + 'L' + point.join(',');
@@ -30924,7 +30934,7 @@ define('echarts/util/projection/normal',[],function() {
         }
     };
     
-    var convertor_parse = {
+    var convertorParse = {
         'formatPoint' : convertor.formatPoint,
         'makePoint' : function(p) {
             var self = this;
@@ -30999,7 +31009,7 @@ define('echarts/util/projection/normal',[],function() {
             if (shape.type == 'Feature') {
                 pushApath(shape.geometry, shape);
             } 
-            else if (shape.type = 'GeometryCollection') {
+            else if (shape.type == 'GeometryCollection') {
                 geometries = shape.geometries;
                 for (var j = 0, len2 = geometries.length; j < len2; j++) {
                     val = geometries[j];
@@ -31077,7 +31087,7 @@ define('echarts/util/projection/normal',[],function() {
  * @author Kener (@Kener-林峰, linzhifeng@baidu.com)
  *
  */
-define('echarts/chart/map',['require','../component/base','./calculableBase','../config','../util/ecData','zrender/config','zrender/tool/util','zrender/tool/area','zrender/tool/event','../util/mapData/params','../util/mapData/textFixed','../util/mapData/geoCoord','../util/projection/normal','../util/projection/normal','../util/projection/normal','../util/projection/normal','../chart'],function(require) {
+define('echarts/chart/map',['require','../component/base','./calculableBase','../config','../util/ecData','zrender/config','zrender/tool/util','zrender/tool/event','../util/mapData/params','../util/mapData/textFixed','../util/mapData/geoCoord','../util/projection/normal','../util/projection/normal','../util/projection/normal','../util/projection/normal','../chart'],function(require) {
     /**
      * 构造函数
      * @param {Object} messageCenter echart消息中心
@@ -31098,7 +31108,6 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
 
         var zrConfig = require('zrender/config');
         var zrUtil = require('zrender/tool/util');
-        var zrArea = require('zrender/tool/area');
         var zrEvent = require('zrender/tool/event');
 
         var self = this;
@@ -31231,7 +31240,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                     // 已经缓存了则直接用
                     _mapDataCallback(mt, valueData[mt], mapSeries[mt])(
                         _mapDataMap[mt].mapData
-                    )
+                    );
                 }
                 else if (_mapParams[mt.replace(/\|.*/, '')].getGeoJson) {
                     // 特殊区域
@@ -31297,8 +31306,8 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                             },
                             id: features.id,
                             properties: features.properties,
-                            type: features.type,
-                        }
+                            type: features.type
+                        };
                     }
                     break;
                 }
@@ -31308,7 +31317,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                 'features':[
                     features
                 ]
-            }
+            };
         }
         
         /**
@@ -31390,7 +31399,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                         mapType, mapData, 
                         area, _specialArea[mapType][area], 
                         position
-                    ))
+                    ));
                 }
                 
             }
@@ -31420,7 +31429,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                     position : position,
                     textX : textPosition[0],
                     textY : textPosition[1]
-                })
+                });
                 
             }
             
@@ -31477,7 +31486,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                     x : xScale,
                     y : yScale
                 }
-            }
+            };
             
             //console.log('**',areaName, transform)
             var pathArray = normalProjection.geoJson2Path(
@@ -31552,10 +31561,9 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
             //y = isNaN(cusY) ? padding : cusY;
             y = self.parsePercent(cusY, zrHeight);
             y = isNaN(y) ? padding : y;
-            
             if (typeof width == 'undefined') {
                 width = isNaN(cusX) 
-                        ? zrWidth
+                        ? zrWidth - 2 * padding
                         : zrWidth - x - 2 * padding;
             }
             else {
@@ -31564,7 +31572,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
             
             if (typeof height == 'undefined') {
                 height = isNaN(cusY) 
-                         ? zrHeight
+                         ? zrHeight - 2 * padding
                          : zrHeight - y - 2 * padding;
             }
             else {
@@ -31901,9 +31909,9 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                 }
                 else if (typeof formatter == 'string') {
                     formatter = formatter.replace('{a}','{a0}')
-                                         .replace('{b}','{b0}')
+                                         .replace('{b}','{b0}');
                     formatter = formatter.replace('{a0}', name)
-                                         .replace('{b0}', value)
+                                         .replace('{b0}', value);
     
                     return formatter;
                 }
@@ -31919,7 +31927,6 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
             var top;
             var width;
             var height;
-            var geoAndPos;
             for (var mapType in _mapDataMap) {
                 transform = _mapDataMap[mapType].transform;
                 if (!transform || !_roamMap[mapType]) {
@@ -32006,7 +32013,7 @@ define('echarts/chart/map',['require','../component/base','./calculableBase','..
                 setTimeout(function(){
                     zr.on(zrConfig.EVENT.MOUSEMOVE, _onmousemove);
                     zr.on(zrConfig.EVENT.MOUSEUP, _onmouseup);
-                },50)
+                },50);
             }
             
         }

build/echarts-plain-original.js

@@ -13052,7 +13052,7 @@ define(
                 require('zrender/shape').get('image').brush(ctx, {
                     style : style
                 });                
-            },100)
+            },100);
         }
 
         Icon.prototype =  {
@@ -21475,10 +21475,10 @@ define('echarts/component/toolbox',['require','./base','../config','zrender/conf
                         d.innerHTML = '';
                         document.body.removeChild(d);
                         d = null;
-                    }
+                    };
                     _d = null;
                 }
-            }, 500)
+            }, 500);
             
             /*
             function _saveImageForIE() {
@@ -29634,7 +29634,7 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
                                 || window.msRequestAnimationFrame
                                 || window.mozRequestAnimationFrame
                                 || window.webkitRequestAnimationFrame
-                                || function(func){setTimeout(func, 16)};
+                                || function(func){setTimeout(func, 16);};
     /**
      * 构造函数
      * @param {Object} messageCenter echart消息中心
@@ -30124,9 +30124,13 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
                     var forceFactor = 1 * (w1 + w2) * k2 / d;
 
                     //节点1受到的力
-                    vec2.scaleAndAdd(nodeForces[i], nodeForces[i], v12, -forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[i], nodeForces[i], v12, -forceFactor
+                    );
                     //节点2受到的力
-                    vec2.scaleAndAdd(nodeForces[j], nodeForces[j], v12, forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[j], nodeForces[j], v12, forceFactor
+                    );
                 }
             }
             // 计算节点之间引力
@@ -30146,9 +30150,13 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
 
                 var forceFactor = w * d2 / k / Math.sqrt(d2);
                 // 节点1受到的力
-                vec2.scaleAndAdd(nodeForces[s], nodeForces[s], v12, forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[s], nodeForces[s], v12, forceFactor
+                );
                 // 节点2受到的力
-                vec2.scaleAndAdd(nodeForces[t], nodeForces[t], v12, -forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[t], nodeForces[t], v12, -forceFactor
+                );
             }
             // 到质心的向心力
             for (var i = 0, l = filteredNodes.length; i < l; i++){
@@ -30270,7 +30278,7 @@ define('echarts/chart/force',['require','../component/base','./calculableBase','
             self.isDragstart = true;
         };
         
-        function onclick(param) {
+        function onclick() {
         }
 
         /**

doc/asset/js/echartsExample.js

@@ -66,7 +66,7 @@ function needMap() {
 }
 
 var echarts;
-var developMode = false;
+var developMode = true;
 
 if (developMode) {
     // for develop

doc/example.html

@@ -304,7 +304,7 @@
             <div class="span6">
                 <h1>地图</h1>
                 <section class="slider">
-                    <div class="flexslider thumb3">
+                    <div class="flexslider thumb4">
                         <ul class="slides">
                             <li data-thumb="asset/img/example/cache.png">
                               <a href="example/map1.html"><img src="asset/img/example/cache.png"></a>
@@ -314,10 +314,30 @@
                               <a href="example/map2.html"><img src="asset/img/example/cache.png"></a>
                               <p>地域选择器</p>
                             </li><!--/li-->
+                            <li data-thumb="asset/img/example/cache.png">
+                              <a href="example/map4.html"><img src="asset/img/example/cache.png"></a>
+                              <p>标准世界地图</p>
+                            </li><!--/li-->
+                            <li data-thumb="asset/img/example/cache.png">
+                              <a href="example/map5.html"><img src="asset/img/example/cache.png"></a>
+                              <p>世界地图选择器</p>
+                            </li><!--/li-->
                             <li data-thumb="asset/img/example/cache.png">
                               <a href="example/map3.html"><img src="asset/img/example/cache.png"></a>
                               <p>全国34个省市自治区</p>
                             </li><!--/li-->
+                            <li data-thumb="asset/img/example/cache.png">
+                              <a href="example/map6.html"><img src="asset/img/example/cache.png"></a>
+                              <p>自定义扩展-香港</p>
+                            </li><!--/li-->
+                            <li data-thumb="asset/img/example/cache.png">
+                              <a href="example/map7.html"><img src="asset/img/example/cache.png"></a>
+                              <p>自定义扩展-美国</p>
+                            </li><!--/li-->
+                            <li data-thumb="asset/img/example/cache.png">
+                              <a href="example/map8.html"><img src="asset/img/example/cache.png"></a>
+                              <p>mapType支持子区域模式</p>
+                            </li><!--/li-->
                             <li data-thumb="asset/img/example/cache.png">
                               <a href="example/mix3.html"><img src="asset/img/example/cache.png"></a>
                               <p>地图与饼图混搭，地图同时作为地域选择器</p>
@@ -433,6 +453,12 @@
             </div>
         </div>
         <hr>
+        <h3>专题<a name="topic"></a></h3>
+        <ul>
+            <li><a href="example/topic/10-me-china/index.html" target="_blank">中国经济十年时空漫游（2002-2011）</a> by 于博（新华社） · 吴楚茵（南方都市报） · 林峰（百度）</li>
+            <li><a href="example/topic/24-population-china/index.html" target="_blank">中国人口流动大潮（1987-2011）</a> by 孟立昕（腾讯）· 王飞宇（证券时报） · 颜冬（视觉中国） · 林峰（百度）</li>
+        </ul>
+        <hr>
         <footer>
           <p class="pull-right"><a href="#">Back to top</a></p>
           <p>&copy; 2013 ECOM-FE &middot; <a href="https://github.com/ecomfe/echarts/blob/master/LICENSE.txt" target="_blank">Terms</a> &middot; <a href="changelog.html" target="_blank">Changelog</a></p>
@@ -474,6 +500,7 @@
               if (list.length > 0) {
                   list[0].firstChild.alt = 'ECharts';
                   for (var j = 1, k = list.length - 1; j < k; j++) {
+                      list[j].target = '_blank';
                       href = list[j].href.slice(list[j].href.lastIndexOf('/') + 1, -5);
                       src = list[j].firstChild.src.replace(
                           'cache', href

doc/example/map7.html

@@ -78,14 +78,14 @@ require('echarts/util/mapData/params').params.USA = {
     },
     specialArea : {
         Alaska : {              // 把阿拉斯加移到美国主大陆左下方
-            left : -131,        // 安放位置起始点为西经113
-            top : 31,           // 北纬31度
+            left : -127,        // 安放位置起始点为西经113
+            top : 30,           // 北纬31度
             width : 15,         // 区间大小宽高不大于15度
             height : 15
         },
         Hawaii : {
-            left : -112,        // 夏威夷
-            top : 29,
+            left : -110,        // 夏威夷
+            top : 28,
             width : 5,
             height : 5
         },

src/chart/force.js

@@ -12,7 +12,7 @@ define(function(require) {
                                 || window.msRequestAnimationFrame
                                 || window.mozRequestAnimationFrame
                                 || window.webkitRequestAnimationFrame
-                                || function(func){setTimeout(func, 16)};
+                                || function(func){setTimeout(func, 16);};
     /**
      * 构造函数
      * @param {Object} messageCenter echart消息中心
@@ -502,9 +502,13 @@ define(function(require) {
                     var forceFactor = 1 * (w1 + w2) * k2 / d;
 
                     //节点1受到的力
-                    vec2.scaleAndAdd(nodeForces[i], nodeForces[i], v12, -forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[i], nodeForces[i], v12, -forceFactor
+                    );
                     //节点2受到的力
-                    vec2.scaleAndAdd(nodeForces[j], nodeForces[j], v12, forceFactor);
+                    vec2.scaleAndAdd(
+                        nodeForces[j], nodeForces[j], v12, forceFactor
+                    );
                 }
             }
             // 计算节点之间引力
@@ -524,9 +528,13 @@ define(function(require) {
 
                 var forceFactor = w * d2 / k / Math.sqrt(d2);
                 // 节点1受到的力
-                vec2.scaleAndAdd(nodeForces[s], nodeForces[s], v12, forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[s], nodeForces[s], v12, forceFactor
+                );
                 // 节点2受到的力
-                vec2.scaleAndAdd(nodeForces[t], nodeForces[t], v12, -forceFactor);
+                vec2.scaleAndAdd(
+                    nodeForces[t], nodeForces[t], v12, -forceFactor
+                );
             }
             // 到质心的向心力
             for (var i = 0, l = filteredNodes.length; i < l; i++){
@@ -648,7 +656,7 @@ define(function(require) {
             self.isDragstart = true;
         };
         
-        function onclick(param) {
+        function onclick() {
         }
 
         /**

src/chart/map.js

@@ -26,7 +26,6 @@ define(function(require) {
 
         var zrConfig = require('zrender/config');
         var zrUtil = require('zrender/tool/util');
-        var zrArea = require('zrender/tool/area');
         var zrEvent = require('zrender/tool/event');
 
         var self = this;
@@ -159,7 +158,7 @@ define(function(require) {
                     // 已经缓存了则直接用
                     _mapDataCallback(mt, valueData[mt], mapSeries[mt])(
                         _mapDataMap[mt].mapData
-                    )
+                    );
                 }
                 else if (_mapParams[mt.replace(/\|.*/, '')].getGeoJson) {
                     // 特殊区域
@@ -225,8 +224,8 @@ define(function(require) {
                             },
                             id: features.id,
                             properties: features.properties,
-                            type: features.type,
-                        }
+                            type: features.type
+                        };
                     }
                     break;
                 }
@@ -236,7 +235,7 @@ define(function(require) {
                 'features':[
                     features
                 ]
-            }
+            };
         }
         
         /**
@@ -318,7 +317,7 @@ define(function(require) {
                         mapType, mapData, 
                         area, _specialArea[mapType][area], 
                         position
-                    ))
+                    ));
                 }
                 
             }
@@ -348,7 +347,7 @@ define(function(require) {
                     position : position,
                     textX : textPosition[0],
                     textY : textPosition[1]
-                })
+                });
                 
             }
             
@@ -405,7 +404,7 @@ define(function(require) {
                     x : xScale,
                     y : yScale
                 }
-            }
+            };
             
             //console.log('**',areaName, transform)
             var pathArray = normalProjection.geoJson2Path(
@@ -480,10 +479,9 @@ define(function(require) {
             //y = isNaN(cusY) ? padding : cusY;
             y = self.parsePercent(cusY, zrHeight);
             y = isNaN(y) ? padding : y;
-            
             if (typeof width == 'undefined') {
                 width = isNaN(cusX) 
-                        ? zrWidth
+                        ? zrWidth - 2 * padding
                         : zrWidth - x - 2 * padding;
             }
             else {
@@ -492,7 +490,7 @@ define(function(require) {
             
             if (typeof height == 'undefined') {
                 height = isNaN(cusY) 
-                         ? zrHeight
+                         ? zrHeight - 2 * padding
                          : zrHeight - y - 2 * padding;
             }
             else {
@@ -829,9 +827,9 @@ define(function(require) {
                 }
                 else if (typeof formatter == 'string') {
                     formatter = formatter.replace('{a}','{a0}')
-                                         .replace('{b}','{b0}')
+                                         .replace('{b}','{b0}');
                     formatter = formatter.replace('{a0}', name)
-                                         .replace('{b0}', value)
+                                         .replace('{b0}', value);
     
                     return formatter;
                 }
@@ -847,7 +845,6 @@ define(function(require) {
             var top;
             var width;
             var height;
-            var geoAndPos;
             for (var mapType in _mapDataMap) {
                 transform = _mapDataMap[mapType].transform;
                 if (!transform || !_roamMap[mapType]) {
@@ -934,7 +931,7 @@ define(function(require) {
                 setTimeout(function(){
                     zr.on(zrConfig.EVENT.MOUSEMOVE, _onmousemove);
                     zr.on(zrConfig.EVENT.MOUSEUP, _onmouseup);
-                },50)
+                },50);
             }
             
         }

src/component/toolbox.js

@@ -705,10 +705,10 @@ define(function (require) {
                         d.innerHTML = '';
                         document.body.removeChild(d);
                         d = null;
-                    }
+                    };
                     _d = null;
                 }
-            }, 500)
+            }, 500);
             
             /*
             function _saveImageForIE() {

src/util/mapData/params.js

@@ -85,7 +85,8 @@ define(function(require) {
                 // scale.x : width  = 10.51 : 64
                 var pList = [
                     [
-                        [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]
+                        [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]
@@ -118,7 +119,8 @@ define(function(require) {
                         [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]
+                        [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]
                     ]
                 ];
                 var str = '';
@@ -132,7 +134,7 @@ define(function(require) {
                            + ' ';
                     for (var j = 1, k = pList[i].length; j < k; j++) {
                         str += 'L ' 
-                              + ((pList[i][j][0] * scale + left).toFixed(2) - 0) 
+                              + ((pList[i][j][0] * scale + left).toFixed(2) - 0)
                               + ' ' 
                               + ((pList[i][j][1] * scale + top).toFixed(2) - 0)
                               + ' ';
@@ -384,5 +386,5 @@ define(function(require) {
     return {
         decode : decode,
         params : mapParams
-    }
+    };
 });
\ No newline at end of file

src/util/mapData/rawData/encode.js

@@ -8,7 +8,7 @@ glob('geoJson/*.json', {}, function(err, files) {
         var output = '../' + file.replace('.json', '.js');
         var rawStr = fs.readFileSync(file, 'utf8');
         var json = JSON.parse(rawStr);
-        console.log(output)
+        console.log(output);
         // Meta tag
         json.UTF8Encoding = true;
         var features = json.features;
@@ -75,7 +75,8 @@ function encode(val, prev){
     // Delta
     val = val - prev;
 
-    if (((val << 1) ^ (val >> 15)) + 64 === 8232) { //WTF, 8232 will get syntax error in js code
+    if (((val << 1) ^ (val >> 15)) + 64 === 8232) { 
+        //WTF, 8232 will get syntax error in js code
         val--;
     }
     // ZigZag

src/util/projection/mercator.js

@@ -19,7 +19,7 @@ define(function() {
                     )) / radians) / 360;
             return [
                 scale * x + translate[0],
-                scale * Math.max(-.5, Math.min(.5, y)) + translate[1]
+                scale * Math.max(-0.5, Math.min(0.5, y)) + translate[1]
             ];
         }
 
@@ -50,7 +50,7 @@ define(function() {
         };
 
         return mercator;
-    };
+    }
 
     return _mercator;
 }); 
\ No newline at end of file

src/util/projection/normal.js

@@ -18,10 +18,10 @@ define(function() {
     
     function parseSrcSize(json, specialArea) {
         specialArea = specialArea || {};
-        convertor_parse.xmin = 360;
-        convertor_parse.xmax = -360;
-        convertor_parse.ymin = 180;
-        convertor_parse.ymax = -180;
+        convertorParse.xmin = 360;
+        convertorParse.xmax = -360;
+        convertorParse.ymin = 180;
+        convertorParse.ymax = -180;
 
         var shapes = json.features;
         var geometries;
@@ -32,14 +32,14 @@ define(function() {
                 continue;
             }
             if (shape.type == 'Feature') {
-                convertor_parse[shape.geometry.type](
+                convertorParse[shape.geometry.type](
                     shape.geometry.coordinates
                 );
             } 
-            else if (shape.type = 'GeometryCollection') {
+            else if (shape.type == 'GeometryCollection') {
                 geometries = shape.geometries;
                 for (var j = 0, len2 = geometries.length; j < len2; j++) {
-                    convertor_parse[geometries[j].type](
+                    convertorParse[geometries[j].type](
                         geometries[j].coordinates
                     );
                 }
@@ -47,10 +47,10 @@ define(function() {
         }
 
         json.srcSize = {
-            left : convertor_parse.xmin.toFixed(4)*1,
-            top : convertor_parse.ymin.toFixed(4)*1,
-            width : (convertor_parse.xmax - convertor_parse.xmin).toFixed(4)*1,
-            height : (convertor_parse.ymax - convertor_parse.ymin).toFixed(4)*1
+            left : convertorParse.xmin.toFixed(4)*1,
+            top : convertorParse.ymin.toFixed(4)*1,
+            width : (convertorParse.xmax - convertorParse.xmin).toFixed(4)*1,
+            height : (convertorParse.ymax - convertorParse.ymin).toFixed(4)*1
         };
 
         return json;
@@ -87,7 +87,7 @@ define(function() {
             var point;
             for (var i = 0, len = coordinates.length; i < len; i++) {
                 point = convertor.makePoint(coordinates[i]);
-                if (i == 0) {
+                if (i === 0) {
                     str = 'M' + point.join(',');
                 } else {
                     str = str + 'L' + point.join(',');
@@ -125,7 +125,7 @@ define(function() {
         }
     };
     
-    var convertor_parse = {
+    var convertorParse = {
         'formatPoint' : convertor.formatPoint,
         'makePoint' : function(p) {
             var self = this;
@@ -200,7 +200,7 @@ define(function() {
             if (shape.type == 'Feature') {
                 pushApath(shape.geometry, shape);
             } 
-            else if (shape.type = 'GeometryCollection') {
+            else if (shape.type == 'GeometryCollection') {
                 geometries = shape.geometries;
                 for (var j = 0, len2 = geometries.length; j < len2; j++) {
                     val = geometries[j];

src/util/shape/icon.js

@@ -397,7 +397,7 @@ define(
                 require('zrender/shape').get('image').brush(ctx, {
                     style : style
                 });                
-            },100)
+            },100);
         }
 
         Icon.prototype =  {