Skip to content

Commit 43b3d7e

Browse files
songyumengsongyumeng
committed
fix mapbox 例子
1 parent 031cb26 commit 43b3d7e

File tree

8 files changed

+218
-169
lines changed

8 files changed

+218
-169
lines changed

‎dist/iclient9-mapboxgl.js‎

Lines changed: 162 additions & 140 deletions
Large diffs are not rendered by default.

‎dist/iclient9-mapboxgl.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/include-mapboxgl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
inputScript("http://iclient.supermapol.com/libs/echartsLayer/EchartsLayer.js");
4444
}
4545
if (!inArray(excludes, 'iclient9-mapboxgl')) {
46-
inputScript("../../dist/iclient9-mapboxgl.min.js");
46+
inputScript("../../dist/iclient9-mapboxgl.js");
4747
}
4848
if(inArray(includes,'proj4')){
4949
inputScript("https://cdn.bootcss.com/proj4js/2.4.3/proj4.js");

‎examples/leaflet/02_getGridCellInfos.html‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<script type="text/javascript">
1111
var host = window.isLocal ? document.location.protocol + "//" + document.location.host : "http://support.supermap.com.cn:8090";
1212
var map, marker,
13-
baseUrl = host + "/iserver/services/map-world/rest/maps/世界地图_Day",
14-
url = host + "/iserver/services/data-world/rest/data";
13+
baseUrl = host + "/iserver/services/map-world/rest/maps/世界地图_Day",
14+
url = host + "/iserver/services/data-world/rest/data";
1515
map = L.map('map', {
1616
preferCanvas: true,
1717
crs: L.CRS.EPSG4326,
@@ -22,28 +22,33 @@
2222
L.supermap.tiledMapLayer(baseUrl, {noWrap: true}).addTo(map);
2323

2424
map.on("click", function (evt) {
25+
var x = evt.latlng.lng;
26+
var y = evt.latlng.lat;
27+
if (x < -180.0 || x > 180.0 || y < -90 || y > 90) {
28+
return;
29+
}
2530
var getGridCellInfosParam = new SuperMap.GetGridCellInfosParameters({
2631
dataSourceName: "World",
2732
datasetName: "WorldEarth",
28-
X: evt.latlng.lng,
29-
Y: evt.latlng.lat
33+
X: x,
34+
Y: y
3035
});
3136
L.supermap
32-
.gridCellInfosService(url)
33-
.getGridCellInfos(getGridCellInfosParam, function (serviceResult) {
34-
if (!serviceResult.result) {
35-
return;
36-
}
37-
if (marker) {
38-
marker.setLatLng(evt.latlng);
39-
} else {
40-
marker = L.marker(evt.latlng).addTo(map);
41-
}
42-
var innerHTML = "栅格查询结果: " + "<br>" + "column: " + serviceResult.result.column + "<br>";
43-
innerHTML += "row: " + serviceResult.result.row + "<br>";
44-
innerHTML += "value: " + serviceResult.result.value + "<br>";
45-
marker.bindPopup(innerHTML).openPopup(marker.getLatLng());
46-
});
37+
.gridCellInfosService(url)
38+
.getGridCellInfos(getGridCellInfosParam, function (serviceResult) {
39+
if (!serviceResult.result) {
40+
return;
41+
}
42+
if (marker) {
43+
marker.setLatLng(evt.latlng);
44+
} else {
45+
marker = L.marker(evt.latlng).addTo(map);
46+
}
47+
var innerHTML = "栅格查询结果: " + "<br>" + "column: " + serviceResult.result.column + "<br>";
48+
innerHTML += "row: " + serviceResult.result.row + "<br>";
49+
innerHTML += "value: " + serviceResult.result.value + "<br>";
50+
marker.bindPopup(innerHTML).openPopup(marker.getLatLng());
51+
});
4752
});
4853
</script>
4954
</body>

‎examples/leaflet/mapVLayerPoint.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
});
7878
}
7979

80-
var configControl = L.control({position: 'topright'});
80+
var configControl = L.control({position: 'bottomleft'});
8181
configControl.onAdd = function () {
8282
return configDiv;
8383
};

‎examples/leaflet/turf_transformation.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
maxZoom: 18,
2121
zoom: 6
2222
}),
23-
info = L.control({position: 'topright'});
23+
info = L.control({position: 'topleft'});
2424
info.onAdd = function () {
2525
var popup = L.DomUtil.create('div');
2626
popup.className = "menu";

‎src/mapboxgl/control/Logo.js‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,20 @@ export class Logo {
9090
};
9191

9292
_extend(dest) {
93-
for (var index = 0; index < arguments.length; index++) {
94-
for (var j = 0; j < arguments[index].length; j++) {
95-
dest[j] = src[j];
93+
for (var index = 0; index < Object.getOwnPropertyNames(arguments).length; index++) {
94+
var arg = Object.getOwnPropertyNames(arguments)[index];
95+
if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
96+
continue;
97+
}
98+
var obj = arguments[arg];
99+
if (obj) {
100+
for (var j = 0; j < Object.getOwnPropertyNames(obj).length; j++) {
101+
var key = Object.getOwnPropertyNames(obj)[j];
102+
if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
103+
continue;
104+
}
105+
dest[key] = obj[key];
106+
}
96107
}
97108
}
98109
return dest;

‎src/mapboxgl/overlay/RankTheme3DLayer.js‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,20 @@ export class RankTheme3DLayer {
373373
}
374374

375375
_extend(dest) {
376-
for (var index = 0; index < arguments.length; index++) {
377-
for (var j = 0; j < arguments[index].length; j++) {
378-
dest[j] = src[j];
376+
for (var index = 0; index < Object.getOwnPropertyNames(arguments).length; index++) {
377+
var arg = Object.getOwnPropertyNames(arguments)[index];
378+
if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
379+
continue;
380+
}
381+
var obj = arguments[arg];
382+
if (obj) {
383+
for (var j = 0; j < Object.getOwnPropertyNames(obj).length; j++) {
384+
var key = Object.getOwnPropertyNames(obj)[j];
385+
if (arg == "caller" || arg == "callee" || arg == "length" || arg == "arguments") {
386+
continue;
387+
}
388+
dest[key] = obj[key];
389+
}
379390
}
380391
}
381392
return dest;

0 commit comments

Comments
 (0)