Merge branch 'master' of https://git.oschina.net/isupermap/iClient9

zhurc · zhurc · commit 80629dfde968 · 2017-07-17T14:17:04.000+08:00
diff --git a/examples/mapboxgl/echarts_linesAirline.html b/examples/mapboxgl/echarts_linesAirline.html
@@ -54,18 +54,19 @@
     });
     map.addControl(new mapboxgl.NavigationControl(), 'top-left');
 
-    $.get('../data/flights.json', function (data) {
-        function getAirportCoord(idx) {
-            return [data.airports[idx][3], data.airports[idx][4]];
-        }
+    map.on('load', function () {
+        $.get('../data/flights.json', function (data) {
+            function getAirportCoord(idx) {
+                return [data.airports[idx][3], data.airports[idx][4]];
+            }
+
+            var routes = data.routes.map(function (airline) {
+                return [
+                    getAirportCoord(airline[1]),
+                    getAirportCoord(airline[2])
+                ];
+            });
 
-        var routes = data.routes.map(function (airline) {
-            return [
-                getAirportCoord(airline[1]),
-                getAirportCoord(airline[2])
-            ];
-        });
-        map.on('load', function () {
             var echartslayer = new EchartsLayer(map);
             echartslayer.chart.setOption(option = {
                 title: {
@@ -103,8 +104,9 @@
                     blendMode: 'lighter'
                 }]
             });
-        })
+        });
     });
+
 </script>
 
 </body>
diff --git a/examples/mapboxgl/echarts_scatterWeibo.html b/examples/mapboxgl/echarts_scatterWeibo.html
@@ -55,28 +55,28 @@
     });
     map.addControl(new mapboxgl.NavigationControl(), 'top-left');
 
-    $.get('../data/weibo.json', function (weiboData) {
-        weiboData = weiboData.map(function (serieData, idx) {
-            var px = serieData[0] / 1000;
-            var py = serieData[1] / 1000;
-            var res = [
-                [px, py]
-            ];
+    map.on('load', function () {
+        $.get('../data/weibo.json', function (weiboData) {
+            weiboData = weiboData.map(function (serieData, idx) {
+                var px = serieData[0] / 1000;
+                var py = serieData[1] / 1000;
+                var res = [
+                    [px, py]
+                ];
 
-            for (var i = 2; i < serieData.length; i += 2) {
-                var dx = serieData[i] / 1000;
-                var dy = serieData[i + 1] / 1000;
-                var x = px + dx;
-                var y = py + dy;
-                res.push([x.toFixed(2), y.toFixed(2), 1]);
+                for (var i = 2; i < serieData.length; i += 2) {
+                    var dx = serieData[i] / 1000;
+                    var dy = serieData[i + 1] / 1000;
+                    var x = px + dx;
+                    var y = py + dy;
+                    res.push([x.toFixed(2), y.toFixed(2), 1]);
 
-                px = x;
-                py = y;
-            }
-            return res;
-        });
+                    px = x;
+                    py = y;
+                }
+                return res;
+            });
 
-        map.on('load', function () {
             var echartslayer = new EchartsLayer(map);
             echartslayer.chart.setOption(option = {
 
@@ -165,8 +165,9 @@
                     data: weiboData[2]
                 }]
             });
-        })
+        });
     });
+
 </script>
 
 </body>
