change to dist version , add readme content

-Hello
\ No newline at end of file
+Leaflet地图扩展
+
+ECharts使用Leaflet地图扩展，以Leaflet地图为底图展示点、线等可视化。可替换Echarts的地图。
+
+引入
+再引入Leaflet和Echarts的基础上直接引入leaflet-echarts3.js文件
+
+<script src="../libs/echarts/dist/echarts.min.js"></script>
+<script src="../libs/leaflet/dist/leaflet.js"></script>
+<script src="../dist/leaflet-echarts3.min.js"></script>
+
+使用
+方法一：
+系统使用lmap模型来绘制地图，可将原来的geo模型替换为lmap
+option = {
+    lmap: {
+        mapOptions : function() {
+            return {
+              //Leaflet Map 的地图配置
+            };
+        }
+    }
+}
+
+var myChart = LeafletEcharts.initEcharts(document.getElementById("chart"));
+myChart.setOption(option);
+var map = myChart.getMap(); //获得Leaflet 地图对象
+方法二：
+var le = LeafletEcharts.initMap('map');
+var map = le.getMap(); //获得Leaflet 地图对象；
+.... //使用map进行常规的Map操作， 如添加控件，图层
+var myChart = le.getEcharts(); //获得Echarts实例
+... // 使用mychart 进行常规的echarts操作， 如setOptions();
+
+var myEchartLayer = le.getEchartLayer(); //获得Echart所在的Leaflet图层， 注意该方法必须再setOption之后调用 
+

@@ -15,10 +15,18 @@
 }(this, function(L, echarts) {
 	var LeafletMap; //Leaflet Map 
 	var EchartInstance; //Echart Instance
+    var maps = {};
+    var MAP_ATTRIBUTE_KEY = '_lmap_';
+    var mapidBase = new Date() - 0;
 
     //define LMapModel
 	var LMapModel = echarts.extendComponentModel({
         type: 'lmap',
+
+        getLMap : function() {
+            return this.__lmap;
+        },
+        
 				
 		defaultOption: {
             mapOptions : {
@@ -41,19 +49,23 @@
 		includes:[L.Mixin.Events],
 		_echartsContainer:null,
 		_map:null,
-		_ec:null,
+		_api:null,
 		_ecModel:null,
         _resizing:false,
 		
-		initialize:function(ec, root) {
-            this._ec = ec;
-			this._echartsContainer= root ? root: ec.getDom();
+		initialize:function(api, root) {
+            this._api = api;
+			this._echartsContainer= root ? root: api.getDom();
 		},
 		
 		getMap: function() {
 			return this._map;
 		},
 
+        getOverLayer : function() {
+            return this.__overlayer;
+        },
+
         setModel:function(ecModel) {
             this._ecModel = ecModel;
         },
@@ -89,9 +101,10 @@
 			if (this._resizing == true)
             {
                 this._resizing = false;
-                this._ec.resize();
+                var ec = echarts.getInstanceByDom(this._api.getDom());
+                ec.resize();
             } else {
-                this._ec.dispatchAction({
+                this._api.dispatchAction({
                     type: 'mapMoveEnd'
                 });
             }
@@ -154,7 +167,6 @@
 	// For deciding which dimensions to use when creating list data
     LMapCoordSys.dimensions = LMapCoordSys.prototype.dimensions;
 	
-	var OverLayer;
 	LMapCoordSys.create = function (ecModel, api) {
         var lmapCoordSys;
 
@@ -163,15 +175,18 @@
                 throw new Error('Only one lmap component can exist');
             }
 
+            var root = api.getDom();
+            var key = root.getAttribute(MAP_ATTRIBUTE_KEY);
             var viewportRoot;
-            if (!LeafletMap) {
-                var root = api.getDom();
+
+            if (!key) {
+                
                 viewportRoot = api.getZr().painter.getViewportRoot();
                 if (typeof L === 'undefined') {
                     throw new Error('LMap api is not loaded');
                 }
-                var root = api.getDom();
-                 // Not support IE8
+
+                // Not support IE8
                 var lmapRoot = root.querySelector('.ec-extension-lmap');
                 if (lmapRoot) {
                     // Reset viewport left and top, which will be changed
@@ -186,33 +201,48 @@
                 lmapRoot.classList.add('ec-extension-lmap');
                 root.appendChild(lmapRoot);
                 var opts = lmapModel.get('mapOptions');
-                LeafletMap = lmapModel.__lmap = new L.map(lmapRoot, opts);
+                if (typeof opts == "function")
+                    opts = opts();
+                var lmap = lmapModel.__lmap = new L.map(lmapRoot, opts);
+
+                var mapid = 'map_' + mapidBase++;
+                maps[mapid] = lmap;
+                root.setAttribute && root.setAttribute(MAP_ATTRIBUTE_KEY, mapid);
+            } else {
+                lmapModel.__lmap = maps[key];
             }
 
-            if (!OverLayer)
+
+            if (!lmapModel.__overlayer)
             {
-                var overlayer = OverLayer = new L.EchartLayer(EchartInstance, viewportRoot);
-                LeafletMap.addLayer(overlayer);
+                var overlayer = lmapModel.__overlayer = new L.EchartLayer(api, viewportRoot);
+                lmapModel.__lmap.addLayer(overlayer);
+                lmapModel.__overlayer.setModel(lmapModel);
             }
-            OverLayer.setModel(lmapModel);
 
-			lmapCoordSys = new LMapCoordSys(LeafletMap, api);
+			lmapCoordSys = new LMapCoordSys(lmapModel.__lmap, api);
             lmapCoordSys.setMapOffset(lmapModel.__mapOffset || [0, 0]);
             lmapModel.coordinateSystem = lmapCoordSys;
 		});
 		
 		ecModel.eachComponent('geo', function (geoModel) {
+            var root = api.getDom();
+            var key = root.getAttribute(MAP_ATTRIBUTE_KEY);
+            if (!key)
+                throw new Error('Must Init LeafletMap First!');
+            
+            var leafletMap = geoModel.__lmap = maps[key];
 			if (!lmapCoordSys) {
-    		   lmapCoordSys = new LMapCoordSys(LeafletMap, api);
+    		   lmapCoordSys = new LMapCoordSys(leafletMap, api);
                lmapCoordSys.setMapOffset(geoModel.__mapOffset || [0, 0]);
             }
             
-            if (!OverLayer)
+            if (!geoModel.__overlayer)
             {
-                var overlayer = OverLayer = new L.EchartLayer(EchartInstance);
-                LeafletMap.addLayer(overlayer);
+                var overlayer = geoModel.__overlayer = new L.EchartLayer(api);
+                leafletMap.addLayer(overlayer);
+                overlayer.setModel(geoModel);
             }
-            OverLayer.setModel(geoModel);
 		});
 		
 		ecModel.eachSeries(function (seriesModel) {
@@ -240,35 +270,102 @@
         });
     });
 	
-	return {
+    function LEResult(ec, dom, map)
+    {
+        this._ec = ec;
+        this._dom = dom;
+        this._map = map;
+    }
+
+    LEResult.prototype.getMap = function() {
+        if (this._map)
+                return this._map;
+        var mapid = this._dom.getAttribute(MAP_ATTRIBUTE_KEY);    
+        return maps[mapid];
+    } 
+
+    LEResult.prototype.getEcharts = function() {
+        return this._ec;
+    }
+
+    LEResult.prototype.getEchartLayer = function() {
+        var ec = this.getEcharts();
+        var mapModel = ec.getModel().getComponent('lmap');
+        if (!mapModel)
+            mapModel = ec.getModel().getComponent('geo');
+        return mapModel.__overlayer;
+    } 
+
+    LEResult.prototype.setOption = function(option, notMerge, lazyUpdate) { 
+        this._ec.setOption(option,notMerge, lazyUpdate);
+    }
+
+   /* 
+   L.LeafletEcharts = L.Class.extend({
         //init leaflet map, return map
 		initMap : function(id, options) {
-			var map = LeafletMap = L.map(id, options);
-			var div =  document.createElement('div');
-			var size = map.getSize();
+			this.map = LeafletMap = L.map(id, options);
+            var mapid = 'map_' + mapidBase++;
+            maps[mapid] = this.map;
+			var div =  this.echartDom = document.createElement('div');
+			var size = this.map.getSize();
 			div.style.position = "absolute";
 			div.style.height = size.y + 'px';
 			div.style.width = size.x + 'px';
 			div.style.top = 0;
 			div.style.left = 0;
 			var ec = EchartInstance = echarts.init(div);
-			return map;
+            div.setAttribute && div.setAttribute(MAP_ATTRIBUTE_KEY, mapid);
+			return this.map;
 		},
         //get echart instance
 		getEcharts:function() {
-			return EchartInstance;
+            if (this.echartDom)
+			    return echarts.getInstanceByDom(this.echartDom); //EchartInstance;
+            else
+                return null;
 		},
         //get leaflet Layer for echart
         getEchartLayer:function() {
-            return OverLayer;
+            var ec = this.getEcharts();
+            var mapModel = ec.getModel().getComponent('lmap');
+            if (!mapModel)
+                mapModel = ec.getModel().getComponent('geo');
+            return mapModel.__overlayer;
         },
         getLMap:function() {
-            return LeafletMap;
+            if (this.map)
+                return this.map;
+            var mapid = this.echartDom.getAttribute(MAP_ATTRIBUTE_KEY);    
+            return maps[mapid];
         },
         initEcharts:function(dom) {
+            this.echartDom = dom;
             var ec = EchartInstance = echarts.init(dom);
             return ec;
         }
-	};
+    }); */
+	return {
+        initMap : function(id, options) {
+			var map = L.map(id, options);
+            var mapid = 'map_' + mapidBase++;
+            maps[mapid] = map;
+			var div =  document.createElement('div');
+			var size = map.getSize();
+			div.style.position = "absolute";
+			div.style.height = size.y + 'px';
+			div.style.width = size.x + 'px';
+			div.style.top = 0;
+			div.style.left = 0;
+			var ec =  echarts.init(div);
+            div.setAttribute && div.setAttribute(MAP_ATTRIBUTE_KEY, mapid);
+			return new LEResult(ec, div, map);
+		},
+        initEcharts:function(dom) {
+            var ec = echarts.init(dom);
+            return new LEResult(ec, dom);
+        },
+        version: "1.0.0"
+    };
 
 }));
\ No newline at end of file

-!function(e,t){"function"==typeof define&&define.amd?define(["leaflet"],t):"object"==typeof module&&module.exports?module.exports=t(require("leaflet"),require("echarts")):"undefined"!=typeof e&&e.L&&e.echarts&&(LeafletEcharts=t(L,echarts))}(this,function(e,t){function n(e,t){this._lmap=e,this.dimensions=["lng","lat"],this._mapOffset=[0,0],this._api=t}var i,a;t.extendComponentModel({type:"lmap",defaultOption:{mapOptions:{center:[37.550339,104.114129],zoom:5}}}),t.extendComponentView({type:"lmap",render:function(e,t,n){}});e.EchartLayer=e.Class.extend({includes:[e.Mixin.Events],_echartsContainer:null,_map:null,_ec:null,_ecModel:null,_resizing:!1,initialize:function(e,t){this._ec=e,this._echartsContainer=t?t:e.getDom()},getMap:function(){return this._map},setModel:function(e){this._ecModel=e},onAdd:function(e){this._map=e;e.getSize();e.getPanes().overlayPane.appendChild(this._echartsContainer),e.on("moveend",this._moveend,this),e.on("resize",this._resize,this)},_resize:function(){var e=this._map._getMapPanePos();this._mapOffset=[-parseInt(e.x)||0,-parseInt(e.y)||0],this._echartsContainer.style.left=this._mapOffset[0]+"px",this._echartsContainer.style.top=this._mapOffset[1]+"px";var t=this._map.getSize();this._echartsContainer.style.height=t.y+"px",this._echartsContainer.style.width=t.x+"px",this._resizing=!0},_moveend:function(){var e=this._map._getMapPanePos();this._mapOffset=[-parseInt(e.x)||0,-parseInt(e.y)||0],this._echartsContainer.style.left=this._mapOffset[0]+"px",this._echartsContainer.style.top=this._mapOffset[1]+"px",1==this._resizing?(this._resizing=!1,this._ec.resize()):this._ec.dispatchAction({type:"mapMoveEnd"})},onRemove:function(e){e.getPanes().overlayPane.removeChild(this._root),e.off("viewreset",this._viewreset,this),e.off("resize",this._resize,this)}}),n.prototype.dimensions=["lng","lat"],n.prototype.setMapOffset=function(e){this._mapOffset=e},n.prototype.getLMap=function(){return this._lmap},n.prototype.dataToPoint=function(t){var n=new e.latLng(t[1],t[0]),i=this._lmap.latLngToContainerPoint(n),a=this._mapOffset;return[i.x-a[0],i.y-a[1]]},n.prototype.pointToData=function(e){var t=this._mapOffset,e=this._lmap.containerPointToLatLng({x:e[0]+t[0],y:e[1]+t[1]});return[e.lat,e.lng]},n.prototype.getViewRect=function(){var e=this._api;return new t.graphic.BoundingRect(0,0,e.getWidth(),e.getHeight())},n.prototype.getRoamTransform=function(){return t.matrix.create()},n.dimensions=n.prototype.dimensions;var o;return n.create=function(t,s){var r;t.eachComponent("lmap",function(t){if(r)throw new Error("Only one lmap component can exist");var p;if(!i){var h=s.getDom();if(p=s.getZr().painter.getViewportRoot(),"undefined"==typeof e)throw new Error("LMap api is not loaded");var h=s.getDom(),f=h.querySelector(".ec-extension-lmap");f&&(p.style.left="0px",p.style.top="0px",h.removeChild(f)),f=document.createElement("div"),f.style.cssText="width:100%;height:100%",f.classList.add("ec-extension-lmap"),h.appendChild(f);var c=t.get("mapOptions");i=t.__lmap=new e.map(f,c)}if(!o){var l=o=new e.EchartLayer(a,p);i.addLayer(l)}o.setModel(t),r=new n(i,s),r.setMapOffset(t.__mapOffset||[0,0]),t.coordinateSystem=r}),t.eachComponent("geo",function(t){if(r||(r=new n(i,s),r.setMapOffset(t.__mapOffset||[0,0])),!o){var p=o=new e.EchartLayer(a);i.addLayer(p)}o.setModel(t)}),t.eachSeries(function(e){var t=e.get("coordinateSystem");"geo"!==t&&"lmap"!==t||(e.coordinateSystem=r)})},t.registerCoordinateSystem("lmap",n),t.registerAction({type:"mapMoveEnd",event:"mapMoveEnd",update:"updateLayout"},function(e,t){t.eachComponent("lmap",function(e){})}),{initMap:function(n,o){var s=i=e.map(n,o),r=document.createElement("div"),p=s.getSize();r.style.position="absolute",r.style.height=p.y+"px",r.style.width=p.x+"px",r.style.top=0,r.style.left=0;a=t.init(r);return s},getEcharts:function(){return a},getEchartLayer:function(){return o},getLMap:function(){return i},initEcharts:function(e){var n=a=t.init(e);return n}}});
\ No newline at end of file
+!function(t,e){"function"==typeof define&&define.amd?define(["leaflet"],e):"object"==typeof module&&module.exports?module.exports=e(require("leaflet"),require("echarts")):"undefined"!=typeof t&&t.L&&t.echarts&&(LeafletEcharts=e(L,echarts))}(this,function(t,e){function n(t,e){this._lmap=t,this.dimensions=["lng","lat"],this._mapOffset=[0,0],this._api=e}function i(t,e,n){this._ec=t,this._dom=e,this._map=n}var a={},o="_lmap_",r=new Date-0;e.extendComponentModel({type:"lmap",getLMap:function(){return this.__lmap},defaultOption:{mapOptions:{center:[37.550339,104.114129],zoom:5}}}),e.extendComponentView({type:"lmap",render:function(t,e,n){}});return t.EchartLayer=t.Class.extend({includes:[t.Mixin.Events],_echartsContainer:null,_map:null,_api:null,_ecModel:null,_resizing:!1,initialize:function(t,e){this._api=t,this._echartsContainer=e?e:t.getDom()},getMap:function(){return this._map},getOverLayer:function(){return this.__overlayer},setModel:function(t){this._ecModel=t},onAdd:function(t){this._map=t;t.getSize();t.getPanes().overlayPane.appendChild(this._echartsContainer),t.on("moveend",this._moveend,this),t.on("resize",this._resize,this)},_resize:function(){var t=this._map._getMapPanePos();this._mapOffset=[-parseInt(t.x)||0,-parseInt(t.y)||0],this._echartsContainer.style.left=this._mapOffset[0]+"px",this._echartsContainer.style.top=this._mapOffset[1]+"px";var e=this._map.getSize();this._echartsContainer.style.height=e.y+"px",this._echartsContainer.style.width=e.x+"px",this._resizing=!0},_moveend:function(){var t=this._map._getMapPanePos();if(this._mapOffset=[-parseInt(t.x)||0,-parseInt(t.y)||0],this._echartsContainer.style.left=this._mapOffset[0]+"px",this._echartsContainer.style.top=this._mapOffset[1]+"px",1==this._resizing){this._resizing=!1;var n=e.getInstanceByDom(this._api.getDom());n.resize()}else this._api.dispatchAction({type:"mapMoveEnd"})},onRemove:function(t){t.getPanes().overlayPane.removeChild(this._root),t.off("viewreset",this._viewreset,this),t.off("resize",this._resize,this)}}),n.prototype.dimensions=["lng","lat"],n.prototype.setMapOffset=function(t){this._mapOffset=t},n.prototype.getLMap=function(){return this._lmap},n.prototype.dataToPoint=function(e){var n=new t.latLng(e[1],e[0]),i=this._lmap.latLngToContainerPoint(n),a=this._mapOffset;return[i.x-a[0],i.y-a[1]]},n.prototype.pointToData=function(t){var e=this._mapOffset,t=this._lmap.containerPointToLatLng({x:t[0]+e[0],y:t[1]+e[1]});return[t.lat,t.lng]},n.prototype.getViewRect=function(){var t=this._api;return new e.graphic.BoundingRect(0,0,t.getWidth(),t.getHeight())},n.prototype.getRoamTransform=function(){return e.matrix.create()},n.dimensions=n.prototype.dimensions,n.create=function(e,i){var s;e.eachComponent("lmap",function(e){if(s)throw new Error("Only one lmap component can exist");var p,h=i.getDom(),l=h.getAttribute(o);if(l)e.__lmap=a[l];else{if(p=i.getZr().painter.getViewportRoot(),"undefined"==typeof t)throw new Error("LMap api is not loaded");var f=h.querySelector(".ec-extension-lmap");f&&(p.style.left="0px",p.style.top="0px",h.removeChild(f)),f=document.createElement("div"),f.style.cssText="width:100%;height:100%",f.classList.add("ec-extension-lmap"),h.appendChild(f);var m=e.get("mapOptions");"function"==typeof m&&(m=m());var _=e.__lmap=new t.map(f,m),c="map_"+r++;a[c]=_,h.setAttribute&&h.setAttribute(o,c)}if(!e.__overlayer){var u=e.__overlayer=new t.EchartLayer(i,p);e.__lmap.addLayer(u),e.__overlayer.setModel(e)}s=new n(e.__lmap,i),s.setMapOffset(e.__mapOffset||[0,0]),e.coordinateSystem=s}),e.eachComponent("geo",function(e){var r=i.getDom(),p=r.getAttribute(o);if(!p)throw new Error("Must Init LeafletMap First!");var h=e.__lmap=a[p];if(s||(s=new n(h,i),s.setMapOffset(e.__mapOffset||[0,0])),!e.__overlayer){var l=e.__overlayer=new t.EchartLayer(i);h.addLayer(l),l.setModel(e)}}),e.eachSeries(function(t){var e=t.get("coordinateSystem");"geo"!==e&&"lmap"!==e||(t.coordinateSystem=s)})},e.registerCoordinateSystem("lmap",n),e.registerAction({type:"mapMoveEnd",event:"mapMoveEnd",update:"updateLayout"},function(t,e){e.eachComponent("lmap",function(t){})}),i.prototype.getMap=function(){if(this._map)return this._map;var t=this._dom.getAttribute(o);return a[t]},i.prototype.getEcharts=function(){return this._ec},i.prototype.getEchartLayer=function(){var t=this.getEcharts(),e=t.getModel().getComponent("lmap");return e||(e=t.getModel().getComponent("geo")),e.__overlayer},i.prototype.setOption=function(t,e,n){this._ec.setOption(t,e,n)},{initMap:function(n,s){var p=t.map(n,s),h="map_"+r++;a[h]=p;var l=document.createElement("div"),f=p.getSize();l.style.position="absolute",l.style.height=f.y+"px",l.style.width=f.x+"px",l.style.top=0,l.style.left=0;var m=e.init(l);return l.setAttribute&&l.setAttribute(o,h),new i(m,l,p)},initEcharts:function(t){var n=e.init(t);return new i(n,t)},version:"1.0.0"}});
\ No newline at end of file

@@ -19,7 +19,7 @@
 <script src="../libs/echarts/dist/echarts.min.js"></script>
 <script src="../libs/leaflet/dist/leaflet.js"></script>
 <script src="../libs/jquery/dist/jquery.min.js"></script>
-<script src="../src/leaflet-echarts3.js"></script>
+<script src="../dist/leaflet-echarts3.min.js"></script>
 <script>
     
     var echarts = LeafletEcharts.initEcharts(document.getElementById("map"));//('map');

@@ -18,7 +18,7 @@
 <script src="../libs/echarts/dist/echarts.min.js"></script>
 <script src="../libs/leaflet/dist/leaflet.js"></script>
 <script src="../libs/jquery/dist/jquery.min.js"></script>
-<script src="../src/leaflet-echarts3.js"></script>
+<script src="../dist/leaflet-echarts3.min.js"></script>
 <script>
   
     var le = LeafletEcharts.initMap('map');

@@ -66,7 +66,7 @@
     <script src="../libs/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="../libs/echarts/dist/echarts.min.js"></script>
     <script src="../libs/leaflet/dist/leaflet.js"></script>
-    <script src="../src/leaflet-echarts3.js"></script>
+    <script src="../dist/leaflet-echarts3.min.js"></script>
     <script>
         var data1 = [
             {name: '海门', value: 9},

@@ -18,7 +18,7 @@
 <script src="../libs/echarts/dist/echarts.min.js"></script>
 <script src="../libs/leaflet/dist/leaflet.js"></script>
 <script src="../libs/jquery/dist/jquery.min.js"></script>
-<script src="../src/leaflet-echarts3.js"></script>
+<script src="../dist/leaflet-echarts3.min.js"></script>
 <script>
     var le = LeafletEcharts.initMap('map')
     var map = le.getMap();