Skip to content

Commit 9893ce4

Browse files
yaoxiaoni1yaoxiaoni1
committed
leaflet 插件升级及三方依赖库升级 review by zhurc
1 parent 7d27b2d commit 9893ce4

File tree

8 files changed

+339
-167
lines changed

8 files changed

+339
-167
lines changed

‎dist/iclient9-leaflet.js‎

Lines changed: 174 additions & 88 deletions
Large diffs are not rendered by default.

‎dist/iclient9-leaflet.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-leaflet.js‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@
3636
var includes = (targetScript.getAttribute('include') || "").split(",");
3737
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
3838
if (!inArray(excludes, 'leaflet')) {
39-
inputCSS("http://cdn.bootcss.com/leaflet/1.2.0/leaflet.css");
40-
inputScript("http://cdn.bootcss.com/leaflet/1.2.0/leaflet-src.js");
39+
inputCSS("https://cdn.bootcss.com/leaflet/1.3.1/leaflet.css");
40+
inputScript("https://cdn.bootcss.com/leaflet/1.3.1/leaflet.js");
4141
}
4242
if (inArray(includes, 'mapv')) {
4343
inputScript("http://mapv.baidu.com/build/mapv.min.js");
4444
}
4545
if (inArray(includes, 'turf')) {
46-
inputScript("https://cdn.bootcss.com/Turf.js/4.6.1/turf.min.js");
46+
inputScript("https://cdn.bootcss.com/Turf.js/5.1.6/turf.js");
4747
}
4848
if (inArray(includes, 'echarts')) {
49-
inputScript("http://cdn.bootcss.com/echarts/4.0.4/echarts.min.js");
49+
inputScript("https://cdn.bootcss.com/echarts/4.1.0/echarts.min.js");
5050
}
5151
if (inArray(includes, 'd3')) {
52-
inputScript("https://cdn.bootcss.com/d3/4.10.2/d3.min.js");
52+
inputScript("http://iclient.supermap.io/web/libs/d3/5.5.0/d3.min.js");
5353
}
5454
if (inArray(includes, 'd3-hexbin')) {
5555
inputScript("https://d3js.org/d3-hexbin.v0.2.min.js");
@@ -58,13 +58,13 @@
5858
inputScript("http://iclient.supermap.io/libs/leaflet/plugins/leaflet.d3Layer/leaflet-d3Layer.min.js");
5959
}
6060
if (inArray(includes, 'elasticsearch')) {
61-
inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");
61+
inputScript("http://cdn.bootcss.com/elasticsearch/15.0.0/elasticsearch.min.js");
6262
}
6363
if (inArray(includes, 'deck')) {
6464
inputScript("http://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.js");
6565
}
6666
if (!inArray(excludes, 'iclient9-leaflet')) {
67-
inputScript("../../dist/iclient9-leaflet.min.js");
67+
inputScript("../../dist/iclient9-leaflet.js");
6868
}
6969
if (inArray(includes, 'iclient9-leaflet-css')) {
7070
inputCSS("../../dist/iclient9-leaflet.min.css");
@@ -73,34 +73,35 @@
7373
inputScript("http://cdn.bootcss.com/leaflet.heat/0.2.0/leaflet-heat.js");
7474
}
7575
if (inArray(includes, 'osmbuildings')) {
76-
inputScript("http://iclient.supermap.io/libs/osmbuildings/OSMBuildings-Leaflet.js");
76+
inputScript("http://iclient.supermap.io/web/libs/osmbuildings/OSMBuildings-Leaflet.js");
7777
}
7878
if (inArray(includes, 'leaflet.markercluster')) {
79-
inputCSS("http://cdn.bootcss.com/leaflet.markercluster/1.0.3/MarkerCluster.Default.css");
80-
inputCSS("http://cdn.bootcss.com/leaflet.markercluster/1.0.3/MarkerCluster.css");
81-
inputScript("http://cdn.bootcss.com/leaflet.markercluster/1.0.3/leaflet.markercluster.js");
79+
inputCSS("https://cdn.bootcss.com/leaflet.markercluster/1.3.0/MarkerCluster.Default.css");
80+
inputCSS("https://cdn.bootcss.com/leaflet.markercluster/1.3.0/MarkerCluster.css");
81+
inputScript("https://cdn.bootcss.com/leaflet.markercluster/1.3.0/leaflet.markercluster.js");
8282
}
8383
if (inArray(includes, 'leaflet-icon-pulse')) {
8484
inputCSS("http://iclient.supermap.io/libs/leaflet/plugins/leaflet-icon-pulse/L.Icon.Pulse.css");
8585
inputScript("http://iclient.supermap.io/libs/leaflet/plugins/leaflet-icon-pulse/L.Icon.Pulse.js");
8686
}
8787
if (inArray(includes, 'leaflet.draw')) {
88-
inputCSS("http://cdn.bootcss.com/leaflet.draw/0.4.12/leaflet.draw.css");
89-
inputScript("http://cdn.bootcss.com/leaflet.draw/0.4.12/leaflet.draw.js");
88+
inputCSS("http://cdn.bootcss.com/leaflet.draw/1.0.2/leaflet.draw.css");
89+
inputScript("http://cdn.bootcss.com/leaflet.draw/1.0.2/leaflet.draw.js");
9090
}
9191
if (inArray(includes, 'leaflet.pm')) {
92-
inputCSS("http://cdn.bootcss.com/leaflet.pm/0.16.0/leaflet.pm.min.css");
93-
inputScript("http://cdn.bootcss.com/leaflet.pm/0.16.0/leaflet.pm.min.js");
92+
inputCSS("http://iclient.supermap.io/web/libs/leaflet/plugins/leaflet.pm/0.25.0/leaflet.pm.min.css");
93+
inputScript("http://iclient.supermap.io/web/libs/leaflet/plugins/leaflet.pm/0.25.0/leaflet.pm.min.js");
9494
}
9595
if (inArray(includes, 'leaflet.miniMap')) {
96-
inputCSS("http://iclient.supermap.io/libs/leaflet/plugins/leaflet-miniMap/dist/Control.MiniMap.min.css");
97-
inputScript("http://iclient.supermap.io/libs/leaflet/plugins/leaflet-miniMap/dist/Control.MiniMap.min.js");
96+
inputCSS("http://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-miniMap/3.6.1/dist/Control.MiniMap.min.css");
97+
inputScript("http://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-miniMap/3.6.1/dist/Control.MiniMap.min.js");
9898
}
9999
if (inArray(includes, 'leaflet.sidebyside')) {
100100
inputScript("http://iclient.supermap.io/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js");
101101
}
102102
}
103103

104+
104105
load();
105106
window.isLocal = false;
106107
window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;

‎examples/leaflet/turf_classificationAnalysis.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ <h5 class='panel-title text-center'>` + resources.text_classificationAnalysis +
168168
},
169169

170170
nearestAnalyze: function (sourcePoints, pointLnglat) {
171-
turfLayer.process("Classification.nearest", {
171+
turfLayer.process("Classification.nearestPoint", {
172172
"targetPoint": [pointLnglat.lng, pointLnglat.lat],
173173
"points": sourcePoints
174174
}, function (result) {

‎examples/leaflet/turf_gridAnalysis.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <h5 class='panel-title text-center'>` + resources.text_createGrid + `</h5></div>
6262
<p></p>
6363
<div class='input-group'>
6464
<span class='input-group-addon'>` + resources.text_unitGridSize + `<span title='` + resources.text_requiredField + `' style='color: red;'> * </span></span>
65-
<input id='cellSize' type='text' class='form-control' value='50'/>
65+
<input id='cellSide' type='text' class='form-control' value='50'/>
6666
</div>
6767
<p></p>
6868
<div class='input-group'>
@@ -298,20 +298,20 @@ <h5 class='panel-title text-center'>` + resources.text_createGrid + `</h5></div>
298298
},
299299

300300
createHexGrid: function () {
301-
var cellDiameter = $("#cellSize").val();
301+
var cellSide = $("#cellSide").val();
302302
var units = $("#units option:selected").val();
303303
var triangles = $("#triangles").get(0).checked;
304304

305305
turfLayer.process("Grids.hexGrid", {
306306
"bbox": bbox,
307-
"cellDiameter": cellDiameter,
307+
"cellSide": cellSide,
308308
"units": units,
309309
"triangles": triangles
310310
});
311311
},
312312

313313
createPointGrid: function () {
314-
var cellSide = $("#cellSize").val();
314+
var cellSide = $("#cellSide").val();
315315
var units = $("#units option:selected").val();
316316
var iscentered = $('#iscentered').get(0).checked;
317317
var isbboxIsMask = $('#isbboxIsMask').get(0).checked;
@@ -326,24 +326,24 @@ <h5 class='panel-title text-center'>` + resources.text_createGrid + `</h5></div>
326326
},
327327

328328
createSquareGrid: function () {
329-
var cellSize = $("#cellSize").val();
329+
var cellSide = $("#cellSide").val();
330330
var units = $("#units option:selected").val();
331331
var completelyWithin = $("#completelyWithin").get(0).checked;
332332

333333
turfLayer.process("Grids.squareGrid", {
334334
"bbox": bbox,
335-
"cellSize": cellSize,
335+
"cellSide": cellSide,
336336
"units": units,
337337
"completelyWithin": completelyWithin
338338
});
339339
},
340340

341341
createTriangleGrid: function () {
342-
var cellSize = $("#cellSize").val();
342+
var cellSide = $("#cellSide").val();
343343
var units = $("#units option:selected").val();
344344
turfLayer.process("Grids.triangleGrid", {
345345
"bbox": bbox,
346-
"cellSize": cellSize,
346+
"cellSide": cellSide,
347347
"units": units
348348
});
349349
}

‎examples/leaflet/turf_measurement.html‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
radius, steps, point;
2121

2222
var map = L.map('map', {
23-
preferCanvas: true,
2423
crs: L.CRS.EPSG4326,
2524
center: {lon: 116.383572, lat: 39.914714},
2625
maxZoom: 18,
@@ -58,7 +57,7 @@ <h5 class='panel-title text-center'>` + resources.text_Jingshen + `</h5>
5857
<option value='midpoint'>midpoint</option>
5958
<option value='square'>square</option>
6059
<option value='greatCircle'>greatCircle</option>
61-
<option value='bezier'>bezier</option>
60+
<option value='bezierSpline'>bezierSpline</option>
6261
<option value='buffer'>buffer</option>
6362
<option value='circle'>circle</option>
6463
</select>
@@ -257,7 +256,7 @@ <h5 class='panel-title text-center'>` + resources.text_Jingshen + `</h5>
257256

258257
$('#calc').val(resources.text_getScenicSpotCenter);
259258
}
260-
else if (choose === 'bezier') {
259+
else if (choose === 'bezierSpline') {
261260
$('.panel-heading>h5').text(resources.text_bezier);
262261
setDefaultCenter(40.676116230453765, 116.55439124389999, 12);
263262
clearControl();
@@ -339,7 +338,7 @@ <h5 class='panel-title text-center'>` + resources.text_Jingshen + `</h5>
339338
"greatCircle": greatCircle,
340339
"square": square,
341340
"center": center,
342-
"bezier": bezier,
341+
"bezierSpline": bezierSpline,
343342
"buffer": buffer,
344343
"circle": circle,
345344
};
@@ -552,7 +551,6 @@ <h5 class='panel-title text-center'>` + resources.text_Jingshen + `</h5>
552551
//清空当前图层
553552
function removeLayer() {
554553
map.eachLayer(function (layer) {
555-
556554
if (layer !== baseLayer) {
557555
layer.removeFrom(map);
558556
}
@@ -796,13 +794,13 @@ <h5 class='panel-title text-center'>` + resources.text_Jingshen + `</h5>
796794
});
797795
}
798796

799-
//turf bezier
800-
function bezier() {
797+
//turf bezierSpline
798+
function bezierSpline() {
801799
if (coordinate) {
802800
turfLayer.process("Helper.lineString", {
803801
"coordinates": coordinate,
804802
}, function (line) {
805-
resultLayer.process("Transformation.bezier", {
803+
resultLayer.process("Transformation.bezierSpline", {
806804
"line": line,
807805
"resolution": 10000,
808806
"sharpness": 0.85
@@ -825,7 +823,7 @@ <h5 class='panel-title text-center'>` + resources.text_Jingshen + `</h5>
825823
resultLayer.process("Transformation.buffer", {
826824
"geojson": point,
827825
"radius": radius,
828-
"steps": steps,
826+
"steps": parseFloat(steps),
829827
"units": unit,
830828
});
831829
});
@@ -853,7 +851,7 @@ <h5 class='panel-title text-center'>` + resources.text_Jingshen + `</h5>
853851
resultLayer.process("Transformation.circle", {
854852
"center": point,
855853
"radius": radius,
856-
"steps": steps,
854+
"steps": parseFloat(steps),
857855
"units": unit,
858856
"properties": {},
859857
});

0 commit comments

Comments
 (0)