Skip to content

Commit e7dcb4a

Browse files
luoxiao-supermapluoxiao-supermap
committed
[update] 更新leaflet mapbox 三方插件库 review by songym
1 parent d65ab52 commit e7dcb4a

37 files changed

+34161
-22847
lines changed

‎build/jsdocs/template/typeLinkExt.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var olapi = "https://openlayers.org/en/v6.1.1/apidoc/";
2-
var lfapi = "https://leafletjs.com/reference-1.6.0.html";
2+
var lfapi = "https://leafletjs.com/reference-1.7.1.html";
33
var mbglapi = "https://www.mapbox.com/mapbox-gl-js/api/";
44
var mapv = "https://github.com/huiyan-fe/mapv/blob/master/src/";
55
var classicapi="https://iclient.supermap.io/web/libs/iclient8c/apidoc/files/SuperMap"

‎dist/classic/include-classic.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
inputScript("https://iclient.supermap.io/web/libs/iclient8c/libs/SuperMap.Include.js");
6060
}
6161
if (inArray(includes, 'mapv')) {
62-
inputScript("https://cdn.jsdelivr.net/npm/mapv@2.0.43/build/mapv.min.js");
62+
inputScript("https://cdn.jsdelivr.net/npm/mapv@2.0.56/build/mapv.min.js");
6363
}
6464
if (inArray(includes, 'echarts')) {
65-
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
65+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
6666
}
6767
if (inArray(includes, 'nanoscroller')) {
6868
inputCSS("https://iclient.supermap.io/web/libs/iclient8c/examples/css/nanoscroller.css");

‎dist/leaflet/include-leaflet.js‎

Lines changed: 60 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/* Copyright© 2000 - 2020 SuperMap Software Co.Ltd. All rights reserved.
22
* This program are made available under the terms of the Apache License, Version 2.0
33
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
4-
(function () {
5-
var r = new RegExp("(^|(.*?\\/))(include-leaflet\.js)(\\?|$)"),
6-
s = document.getElementsByTagName('script'), targetScript;
4+
(function() {
5+
var r = new RegExp('(^|(.*?\\/))(include-leaflet.js)(\\?|$)'),
6+
s = document.getElementsByTagName('script'),
7+
targetScript;
78
for (var i = 0; i < s.length; i++) {
89
var src = s[i].getAttribute('src');
910
if (src) {
@@ -37,7 +38,7 @@
3738
function supportES6() {
3839
var code = "'use strict'; class Foo {}; class Bar extends Foo {};";
3940
try {
40-
(new Function(code))();
41+
new Function(code)();
4142
} catch (err) {
4243
return false;
4344
}
@@ -49,115 +50,122 @@
4950

5051
//加载类库资源文件
5152
function load() {
52-
var includes = (targetScript.getAttribute('include') || "").split(",");
53-
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
53+
var includes = (targetScript.getAttribute('include') || '').split(',');
54+
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5455
// 在线
5556
if (!inArray(excludes, 'leaflet')) {
56-
inputCSS('https://cdn.bootcss.com/leaflet/1.6.0/leaflet.css');
57-
inputScript('https://cdn.bootcss.com/leaflet/1.6.0/leaflet.js');
57+
inputCSS('https://cdn.bootcss.com/leaflet/1.7.1/leaflet.css');
58+
inputScript('https://cdn.bootcss.com/leaflet/1.7.1/leaflet.js');
5859
}
5960
if (inArray(includes, 'leaflet.heat')) {
60-
inputScript("https://cdn.bootcss.com/leaflet.heat/0.2.0/leaflet-heat.js");
61+
inputScript('https://cdn.bootcss.com/leaflet.heat/0.2.0/leaflet-heat.js');
6162
}
6263
if (inArray(includes, 'leaflet.markercluster')) {
63-
inputCSS("https://cdn.bootcss.com/leaflet.markercluster/1.4.1/MarkerCluster.Default.css");
64-
inputCSS("https://cdn.bootcss.com/leaflet.markercluster/1.4.1/MarkerCluster.css");
65-
inputScript("https://cdn.bootcss.com/leaflet.markercluster/1.4.1/leaflet.markercluster.js");
64+
inputCSS('https://cdn.bootcss.com/leaflet.markercluster/1.4.1/MarkerCluster.Default.css');
65+
inputCSS('https://cdn.bootcss.com/leaflet.markercluster/1.4.1/MarkerCluster.css');
66+
inputScript('https://cdn.bootcss.com/leaflet.markercluster/1.4.1/leaflet.markercluster.js');
6667
}
6768
if (inArray(includes, 'leaflet.draw')) {
68-
inputCSS("https://cdn.bootcss.com/leaflet.draw/1.0.4/leaflet.draw.css");
69-
inputScript("https://cdn.bootcss.com/leaflet.draw/1.0.4/leaflet.draw.js");
69+
inputCSS('https://cdn.bootcss.com/leaflet.draw/1.0.4/leaflet.draw.css');
70+
inputScript('https://cdn.bootcss.com/leaflet.draw/1.0.4/leaflet.draw.js');
7071
}
7172
if (inArray(includes, 'leaflet-geoman')) {
72-
inputCSS('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.3.0/dist/leaflet-geoman.css');
73-
inputScript('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.3.0/dist/leaflet-geoman.min.js');
73+
inputCSS('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.css');
74+
inputScript('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.min.js');
7475
}
7576
if (inArray(includes, 'leaflet.miniMap')) {
76-
inputCSS("https://cdn.bootcss.com/leaflet-minimap/3.6.1/Control.MiniMap.min.css");
77-
inputScript("https://cdn.bootcss.com/leaflet-minimap/3.6.1/Control.MiniMap.min.js");
77+
inputCSS('https://cdn.bootcss.com/leaflet-minimap/3.6.1/Control.MiniMap.min.css');
78+
inputScript('https://cdn.bootcss.com/leaflet-minimap/3.6.1/Control.MiniMap.min.js');
7879
}
7980
if (inArray(includes, 'mapv')) {
80-
inputScript("https://cdn.jsdelivr.net/npm/mapv@2.0.43/build/mapv.min.js");
81+
inputScript('https://cdn.jsdelivr.net/npm/mapv@2.0.56/build/mapv.min.js');
8182
}
8283
if (inArray(includes, 'turf')) {
83-
inputScript("https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js");
84+
inputScript('https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js');
8485
}
8586
if (inArray(includes, 'echarts')) {
86-
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
87+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
8788
}
8889
if (inArray(includes, 'elasticsearch')) {
89-
inputScript('https://cdn.bootcss.com/elasticsearch/16.5.0/elasticsearch.js');
90+
inputScript('https://cdn.bootcss.com/elasticsearch/16.7.1/elasticsearch.js');
9091
}
9192
if (inArray(includes, 'xlsx')) {
92-
inputScript('https://cdn.jsdelivr.net/npm/xlsx@0.15.4/dist/xlsx.core.min.js');
93+
inputScript('https://cdn.jsdelivr.net/npm/xlsx@0.16.7/dist/xlsx.core.min.js');
9394
}
9495
// 本地
9596
if (inArray(includes, 'leaflet.sidebyside')) {
96-
inputScript("https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js");
97+
inputScript(
98+
'https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js'
99+
);
97100
}
98101
if (inArray(includes, 'd3')) {
99-
inputScript('https://cdn.bootcss.com/d3/5.14.2/d3.min.js');
102+
inputScript('https://cdn.bootcss.com/d3/6.1.1/d3.min.js');
100103
}
101104
if (inArray(includes, 'd3-hexbin')) {
102-
inputScript("https://d3js.org/d3-hexbin.v0.2.min.js");
105+
inputScript('https://d3js.org/d3-hexbin.v0.2.min.js');
103106
}
104107
if (inArray(includes, 'd3Layer')) {
105-
inputScript("https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet.d3Layer/leaflet-d3Layer.js");
108+
inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet.d3Layer/leaflet-d3Layer.js');
106109
}
107110
if (inArray(includes, 'osmbuildings')) {
108-
inputScript("https://iclient.supermap.io/web/libs/osmbuildings/OSMBuildings-Leaflet.js");
111+
inputScript('https://iclient.supermap.io/web/libs/osmbuildings/OSMBuildings-Leaflet.js');
109112
}
110113
if (inArray(includes, 'leaflet-icon-pulse')) {
111-
inputCSS("https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-icon-pulse/L.Icon.Pulse.css");
112-
inputScript("https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-icon-pulse/L.Icon.Pulse.js");
114+
inputCSS('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-icon-pulse/L.Icon.Pulse.css');
115+
inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-icon-pulse/L.Icon.Pulse.js');
113116
}
114117
if (inArray(includes, 'deck')) {
115-
inputScript("https://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.min.js");
118+
inputScript('https://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.min.js');
116119
}
117120
if (inArray(includes, 'pixi')) {
118121
inputScript('https://cdn.bootcss.com/pixi.js/4.8.7/pixi.js');
119122
inputScript('https://cdn.jsdelivr.net/npm/leaflet-pixi-overlay@1.8.1/L.PixiOverlay.min.js');
120-
inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/Leaflet.PixiOverlay/1.8.1/MarkerContainer.js');
123+
inputScript(
124+
'https://iclient.supermap.io/web/libs/leaflet/plugins/Leaflet.PixiOverlay/1.8.1/MarkerContainer.js'
125+
);
121126
inputScript('https://iclient.supermap.io/web/libs/bezier-easing/2.1.0/bezier-easing.js');
122-
}
127+
}
123128

124129
// iclient
125130
if (!inArray(excludes, 'iclient-leaflet')) {
126-
if (supportES6()) {
127-
inputScript("../../dist/leaflet/iclient-leaflet-es6.min.js");
128-
} else {
129-
inputScript("../../dist/leaflet/iclient-leaflet.min.js");
130-
}
131+
if (supportES6()) {
132+
inputScript('../../dist/leaflet/iclient-leaflet-es6.min.js');
133+
} else {
134+
inputScript('../../dist/leaflet/iclient-leaflet.min.js');
135+
}
131136
}
132137
if (inArray(includes, 'iclient-leaflet-css')) {
133-
inputCSS("../../dist/leaflet/iclient-leaflet.min.css");
138+
inputCSS('../../dist/leaflet/iclient-leaflet.min.css');
134139
}
135140
if (inArray(includes, 'iclient-plot-leaflet')) {
136-
inputCSS("https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.0/iclient-plot-leaflet.css");
141+
inputCSS('https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.0/iclient-plot-leaflet.css');
137142
if (supportES6()) {
138-
inputScript("https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.0/iclient-plot-leaflet-es6.min.js");
143+
inputScript(
144+
'https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.0/iclient-plot-leaflet-es6.min.js'
145+
);
139146
} else {
140-
inputScript("https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.0/iclient-plot-leaflet.min.js");
147+
inputScript('https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.0/iclient-plot-leaflet.min.js');
141148
}
142149
}
143150
if (inArray(includes, 'ant-design-vue')) {
144-
inputCSS("https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.css");
145-
inputScript("https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.js");
151+
inputCSS('https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.css');
152+
inputScript('https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.js');
146153
}
147154
if (inArray(includes, 'echarts-vue')) {
148-
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
149-
inputScript("https://cdn.jsdelivr.net/npm/vue-echarts@4.0.4/dist/vue-echarts.min.js");
150-
inputScript("https://iclient.supermap.io/web/libs/echarts-liquidfill/echarts-liquidfill.min.js");
151-
inputScript("https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js");
155+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
156+
inputScript('https://cdn.jsdelivr.net/npm/vue-echarts@4.1.0/dist/vue-echarts.min.js');
157+
inputScript('https://cdn.jsdelivr.net/npm/echarts-liquidfill@2.0.6/dist/echarts-liquidfill.min.js');
158+
inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');
152159
}
153160
if (inArray(includes, 'iclient-leaflet-vue')) {
154-
inputCSS("../../dist/leaflet/iclient-leaflet-vue.css");
155-
inputScript("../../dist/leaflet/iclient-leaflet-vue.min.js");
161+
inputCSS('../../dist/leaflet/iclient-leaflet-vue.css');
162+
inputScript('../../dist/leaflet/iclient-leaflet-vue.min.js');
156163
}
157164
}
158165

159-
160166
load();
161167
window.isLocal = false;
162-
window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;
168+
window.server = document.location.toString().match(/file:\/\//)
169+
? 'http://localhost:8090'
170+
: document.location.protocol + '//' + document.location.host;
163171
})();

0 commit comments

Comments
 (0)