fix mapbox 例子

songyumeng · songyumeng · commit 43b3d7e5200b · 2017-09-13T18:34:24.000+08:00
diff --git a/dist/iclient9-mapboxgl.js b/dist/iclient9-mapboxgl.js
diff --git a/dist/iclient9-mapboxgl.min.js b/dist/iclient9-mapboxgl.min.js
diff --git a/dist/include-mapboxgl.js b/dist/include-mapboxgl.js
@@ -43,7 +43,7 @@
             inputScript("http://iclient.supermapol.com/libs/echartsLayer/EchartsLayer.js");
         }
         if (!inArray(excludes, 'iclient9-mapboxgl')) {
-            inputScript("../../dist/iclient9-mapboxgl.min.js");
+            inputScript("../../dist/iclient9-mapboxgl.js");
         }
         if(inArray(includes,'proj4')){
             inputScript("https://cdn.bootcss.com/proj4js/2.4.3/proj4.js");
diff --git a/examples/leaflet/02_getGridCellInfos.html b/examples/leaflet/02_getGridCellInfos.html
@@ -10,8 +10,8 @@
 <script type="text/javascript">
     var host = window.isLocal ? document.location.protocol + "//" + document.location.host : "http://support.supermap.com.cn:8090";
     var map, marker,
-        baseUrl = host + "/iserver/services/map-world/rest/maps/世界地图_Day",
-        url = host + "/iserver/services/data-world/rest/data";
+            baseUrl = host + "/iserver/services/map-world/rest/maps/世界地图_Day",
+            url = host + "/iserver/services/data-world/rest/data";
     map = L.map('map', {
         preferCanvas: true,
         crs: L.CRS.EPSG4326,
@@ -22,28 +22,33 @@
     L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
 
     map.on("click", function (evt) {
+        var x = evt.latlng.lng;
+        var y = evt.latlng.lat;
+        if (x < -180.0 || x > 180.0 || y < -90 || y > 90) {
+            return;
+        }
         var getGridCellInfosParam = new SuperMap.GetGridCellInfosParameters({
             dataSourceName: "World",
             datasetName: "WorldEarth",
-            X: evt.latlng.lng,
-            Y: evt.latlng.lat
+            X: x,
+            Y: y
         });
         L.supermap
-            .gridCellInfosService(url)
-            .getGridCellInfos(getGridCellInfosParam, function (serviceResult) {
-                if (!serviceResult.result) {
-                    return;
-                }
-                if (marker) {
-                    marker.setLatLng(evt.latlng);
-                } else {
-                    marker = L.marker(evt.latlng).addTo(map);
-                }
-                var innerHTML = "栅格查询结果: " + "<br>" + "column: " + serviceResult.result.column + "<br>";
-                innerHTML += "row: " + serviceResult.result.row + "<br>";
-                innerHTML += "value: " + serviceResult.result.value + "<br>";
-                marker.bindPopup(innerHTML).openPopup(marker.getLatLng());
-            });
+                .gridCellInfosService(url)
+                .getGridCellInfos(getGridCellInfosParam, function (serviceResult) {
+                    if (!serviceResult.result) {
+                        return;
+                    }
+                    if (marker) {
+                        marker.setLatLng(evt.latlng);
+                    } else {
+                        marker = L.marker(evt.latlng).addTo(map);
+                    }
+                    var innerHTML = "栅格查询结果: " + "<br>" + "column: " + serviceResult.result.column + "<br>";
+                    innerHTML += "row: " + serviceResult.result.row + "<br>";
+                    innerHTML += "value: " + serviceResult.result.value + "<br>";
+                    marker.bindPopup(innerHTML).openPopup(marker.getLatLng());
+                });
     });
 </script>
 </body>
diff --git a/examples/leaflet/mapVLayerPoint.html b/examples/leaflet/mapVLayerPoint.html
@@ -77,7 +77,7 @@
                 });
             }
 
-            var configControl = L.control({position: 'topright'});
+            var configControl = L.control({position: 'bottomleft'});
             configControl.onAdd = function () {
                 return configDiv;
             };
diff --git a/examples/leaflet/turf_transformation.html b/examples/leaflet/turf_transformation.html
@@ -20,7 +20,7 @@
             maxZoom: 18,
             zoom: 6
         }),
-        info = L.control({position: 'topright'});
+        info = L.control({position: 'topleft'});
     info.onAdd = function () {
         var popup = L.DomUtil.create('div');
         popup.className = "menu";
diff --git a/src/mapboxgl/control/Logo.js b/src/mapboxgl/control/Logo.js
@@ -90,9 +90,20 @@ export class Logo {
     };
 
     _extend(dest) {
-        for (var index = 0; index < arguments.length; index++) {
-            for (var j = 0; j < arguments[index].length; j++) {
-                dest[j] = src[j];
+        for (var index = 0; index < Object.getOwnPropertyNames(arguments).length; index++) {
+            var arg = Object.getOwnPropertyNames(arguments)[index];
+            if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
+                continue;
+            }
+            var obj = arguments[arg];
+            if (obj) {
+                for (var j = 0; j < Object.getOwnPropertyNames(obj).length; j++) {
+                    var key = Object.getOwnPropertyNames(obj)[j];
+                    if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
+                        continue;
+                    }
+                    dest[key] = obj[key];
+                }
             }
         }
         return dest;
diff --git a/src/mapboxgl/overlay/RankTheme3DLayer.js b/src/mapboxgl/overlay/RankTheme3DLayer.js
@@ -373,9 +373,20 @@ export class RankTheme3DLayer {
     }
 
     _extend(dest) {
-        for (var index = 0; index < arguments.length; index++) {
-            for (var j = 0; j < arguments[index].length; j++) {
-                dest[j] = src[j];
+        for (var index = 0; index < Object.getOwnPropertyNames(arguments).length; index++) {
+            var arg = Object.getOwnPropertyNames(arguments)[index];
+            if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
+                continue;
+            }
+            var obj = arguments[arg];
+            if (obj) {
+                for (var j = 0; j < Object.getOwnPropertyNames(obj).length; j++) {
+                    var key = Object.getOwnPropertyNames(obj)[j];
+                    if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
+                        continue;
+                    }
+                    dest[key] = obj[key];
+                }
             }
         }
         return dest;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`inputScript("http://iclient.supermapol.com/libs/echartsLayer/EchartsLayer.js");`
`44`	`44`	`}`
`45`	`45`	`if (!inArray(excludes, 'iclient9-mapboxgl')) {`
`46`		`- inputScript("../../dist/iclient9-mapboxgl.min.js");`
	`46`	`+ inputScript("../../dist/iclient9-mapboxgl.js");`
`47`	`47`	`}`
`48`	`48`	`if(inArray(includes,'proj4')){`
`49`	`49`	`inputScript("https://cdn.bootcss.com/proj4js/2.4.3/proj4.js");`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`});`
`78`	`78`	`}`
`79`	`79`
`80`		`- var configControl = L.control({position: 'topright'});`
	`80`	`+ var configControl = L.control({position: 'bottomleft'});`
`81`	`81`	`configControl.onAdd = function () {`
`82`	`82`	`return configDiv;`
`83`	`83`	`};`