Skip to content

Commit ad59027

Browse files
luoxiao-supermapluoxiao-supermap
committed
[fix]maplibre mapbox leaflet classic插件升级 review by qiw
1 parent 6ff9871 commit ad59027

20 files changed

+698
-644
lines changed

‎dist/classic/include-classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
6565
}
6666
if (inArray(includes, 'echarts')) {
67-
inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');
67+
inputScript(libsurl + '/echarts/5.5.0/echarts.min.js');
6868
}
6969
if (inArray(includes, 'nanoscroller')) {
7070
inputCSS(libsurl + '/iclient8c/examples/css/nanoscroller.css');

‎dist/leaflet/include-leaflet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
9595
}
9696
if (inArray(includes, 'echarts')) {
97-
inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
97+
inputScript(libsurl + '/echarts/5.5.0/echarts.min.js');
9898
}
9999
if (inArray(includes, 'elasticsearch')) {
100100
inputScript(libsurl + '/elasticsearch/16.7.3/elasticsearch.min.js');

‎dist/mapboxgl/include-mapboxgl.js

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,21 @@
7575
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
7676
}
7777
if (inArray(includes, 'draw')) {
78-
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.css');
79-
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.js');
78+
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.3/mapbox-gl-draw.min.css');
79+
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.3/mapbox-gl-draw.min.js');
8080
}
81-
8281
if (inArray(includes, 'mapboxgl-draw-rectangle-drag')) {
8382
inputScript(libsurl + '/mapboxgl-draw-rectangle-drag/1.0.1/mapboxgl-draw-rectangle-drag.browser.js');
8483
}
8584
if (inArray(includes, 'compare')) {
86-
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css');
87-
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js');
85+
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.1/mapbox-gl-compare.css');
86+
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.1/mapbox-gl-compare.js');
8887
}
8988
if (inArray(includes, 'mapv')) {
9089
inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
9190
}
9291
if (inArray(includes, 'echarts')) {
93-
inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
92+
inputScript(libsurl + '/echarts/5.5.0/echarts.min.js');
9493
inputScript(libsurl + '/echartsLayer/EchartsLayer.min.js');
9594
}
9695
if (inArray(includes, 'echarts-vue')) {
@@ -109,7 +108,7 @@
109108
inputScript(libsurl + '/xlsx/0.19.3/xlsx.core.min.js');
110109
}
111110
if (inArray(includes, 'proj4')) {
112-
inputScript(libsurl + '/proj4/2.9.0/proj4.min.js');
111+
inputScript(libsurl + '/proj4/2.11.0/proj4.min.js');
113112
}
114113
if (inArray(includes, 'shapefile')) {
115114
inputScript(libsurl + '/shapefile/shapefile.js');
@@ -127,17 +126,14 @@
127126
inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');
128127
}
129128
if (inArray(includes, 'jsonsql')) {
130-
inputScript(libsurl + '/jsonsql/jsonsql.js');
129+
inputScript(libsurl + '/jsonsql/0.2.5/jsonsql.min.js');
131130
}
132131
if (inArray(includes, 'geostats')) {
133132
inputScript(libsurl + '/geostats/geostats.js');
134133
}
135134
if (inArray(includes, 'canvg')) {
136135
inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
137136
}
138-
if (inArray(includes, 'convert')) {
139-
inputScript(libsurl + '/xml-js/1.6.8/xml-js.min.js');
140-
}
141137
if (inArray(includes, 'XMLParser')) {
142138
inputScript(libsurl + '/fast-xml-parser/4.2.7/fxparser.min.js');
143139
}
@@ -167,13 +163,13 @@
167163
inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');
168164
}
169165
if (inArray(includes, 'echarts-gl')) {
170-
inputScript(libsurl + '/echarts-gl/2.0.8/echarts-gl.min.js');
166+
inputScript(libsurl + '/echarts-gl/2.0.9/echarts-gl.min.js');
171167
}
172168
if (inArray(includes, 'mapbox-print-pdf')) {
173169
inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');
174170
}
175171
if (inArray(includes, 'moment')) {
176-
inputScript(libsurl + '/moment/2.29.4/moment.min.js');
172+
inputScript(libsurl + '/moment/2.30.1/moment.min.js');
177173
}
178174
if (inArray(includes, 'lodash')) {
179175
inputScript(libsurl + '/lodash/4.17.21/lodash.min.js');
@@ -215,7 +211,7 @@
215211
inputScript(libsurl + '/vue-cesium/2.1.4/index.umd.min.js');
216212
}
217213
if (inArray(includes, 'snap')) {
218-
inputScript(libsurl + '/mapbox-gl-draw-snap-mode/0.2.0/mapbox-gl-draw-snap-mode.js');
214+
inputScript(libsurl + '/mapbox-gl-draw-snap-mode/0.2.1/mapbox-gl-draw-snap-mode.js');
219215
}
220216
if (inArray(includes, 'ugcwasm')) {
221217
inputScript(libsurl + '/ugcwasm/1.0.0/UGCWasmAll.js');

‎dist/maplibregl/include-maplibregl.js

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
var includes = (targetScript.getAttribute('include') || '').split(',');
5656
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5757
if (!inArray(excludes, 'maplibregl')) {
58-
inputCSS(libsurl + '/maplibre-gl-js/3.1.0/maplibre-gl.css');
59-
inputScript(libsurl + '/maplibre-gl-js/3.1.0/maplibre-gl.js');
58+
inputCSS(libsurl + '/maplibre-gl-js/4.3.2/maplibre-gl.min..css');
59+
inputScript(libsurl + '/maplibre-gl-js/4.3.2/maplibre-gl.min.js');
6060
}
6161
if (inArray(includes, 'L7')) {
6262
inputScript(libsurl + '/maplibregl-l7-render/0.0.1/maplibregl-l7-render.js');
@@ -68,22 +68,21 @@
6868
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
6969
}
7070
if (inArray(includes, 'draw')) {
71-
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.css');
72-
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.js');
71+
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.3/mapbox-gl-draw.min.css');
72+
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.3/mapbox-gl-draw.min.js');
7373
}
74-
7574
if (inArray(includes, 'mapboxgl-draw-rectangle-drag')) {
7675
inputScript(libsurl + '/mapboxgl-draw-rectangle-drag/1.0.1/mapboxgl-draw-rectangle-drag.browser.js');
7776
}
7877
if (inArray(includes, 'compare')) {
79-
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css');
80-
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js');
78+
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.1/mapbox-gl-compare.css');
79+
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.1/mapbox-gl-compare.js');
8180
}
8281
if (inArray(includes, 'mapv')) {
8382
inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
8483
}
8584
if (inArray(includes, 'echarts')) {
86-
inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
85+
inputScript(libsurl + '/echarts/5.5.0/echarts.min.js');
8786
inputScript(libsurl + '/maplibre-echartsLayer/EchartsLayer.min.js');
8887
}
8988
if (inArray(includes, 'echarts-vue')) {
@@ -102,7 +101,7 @@
102101
inputScript(libsurl + '/xlsx/0.19.3/xlsx.core.min.js');
103102
}
104103
if (inArray(includes, 'proj4')) {
105-
inputScript(libsurl + '/proj4/2.9.0/proj4.min.js');
104+
inputScript(libsurl + '/proj4/2.11.0/proj4.min.js');
106105
}
107106
if (inArray(includes, 'shapefile')) {
108107
inputScript(libsurl + '/shapefile/shapefile.js');
@@ -120,17 +119,14 @@
120119
inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');
121120
}
122121
if (inArray(includes, 'jsonsql')) {
123-
inputScript(libsurl + '/jsonsql/jsonsql.js');
122+
inputScript(libsurl + '/jsonsql/0.2.5/jsonsql.min.js');
124123
}
125124
if (inArray(includes, 'geostats')) {
126125
inputScript(libsurl + '/geostats/geostats.js');
127126
}
128127
if (inArray(includes, 'canvg')) {
129128
inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
130129
}
131-
if (inArray(includes, 'convert')) {
132-
inputScript(libsurl + '/xml-js/1.6.8/xml-js.min.js');
133-
}
134130
if (inArray(includes, 'LegacyJSONLoader')) {
135131
inputScript(libsurl + '/three/0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js');
136132
}
@@ -157,13 +153,13 @@
157153
inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');
158154
}
159155
if (inArray(includes, 'echarts-gl')) {
160-
inputScript(libsurl + '/echarts-gl/2.0.8/echarts-gl.min.js');
156+
inputScript(libsurl + '/echarts-gl/2.0.9/echarts-gl.min.js');
161157
}
162158
if (inArray(includes, 'mapbox-print-pdf')) {
163159
inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');
164160
}
165161
if (inArray(includes, 'moment')) {
166-
inputScript(libsurl + '/moment/2.29.4/moment.min.js');
162+
inputScript(libsurl + '/moment/2.30.1/moment.min.js');
167163
}
168164
if (inArray(includes, 'lodash')) {
169165
inputScript(libsurl + '/lodash/4.17.21/lodash.min.js');
@@ -182,7 +178,7 @@
182178
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
183179
}
184180
if (inArray(includes, 'snap')) {
185-
inputScript(libsurl + '/mapbox-gl-draw-snap-mode/0.2.0/mapbox-gl-draw-snap-mode.js');
181+
inputScript(libsurl + '/mapbox-gl-draw-snap-mode/0.2.1/mapbox-gl-draw-snap-mode.js');
186182
}
187183
if (inArray(includes, 'ugcwasm')) {
188184
inputScript(libsurl + '/ugcwasm/1.0.0/UGCWasmAll.js');

‎dist/ol/include-ol.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
7878
}
7979
if (inArray(includes, 'echarts')) {
80-
inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
80+
inputScript(libsurl + '/echarts/5.5.0/echarts.min.js');
8181
}
8282
if (inArray(includes, 'proj4')) {
83-
inputScript(libsurl + '/proj4/2.9.0/proj4.min.js');
83+
inputScript(libsurl + '/proj4/2.11.0/proj4.min.js');
8484
}
8585
if (inArray(includes, 'ol3-echarts')) {
8686
inputScript(libsurl + '/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js');
@@ -105,7 +105,7 @@
105105
inputScript(libsurl + '/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.js');
106106
}
107107
if (inArray(includes, 'jsonsql')) {
108-
inputScript(libsurl + '/jsonsql/jsonsql.js');
108+
inputScript(libsurl + '/jsonsql/0.2.5/jsonsql.min.js');
109109
}
110110
if (inArray(includes, 'geostats')) {
111111
inputScript(libsurl + '/geostats/geostats.js');

‎dist/openlayers/include-openlayers.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
7878
}
7979
if (inArray(includes, 'echarts')) {
80-
inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
80+
inputScript(libsurl + '/echarts/5.5.0/echarts.min.js');
8181
}
8282
if (inArray(includes, 'proj4')) {
83-
inputScript(libsurl + '/proj4/2.9.0/proj4.min.js');
83+
inputScript(libsurl + '/proj4/2.11.0/proj4.min.js');
8484
}
8585
if (inArray(includes, 'ol3-echarts')) {
8686
inputScript(libsurl + '/openlayers/ol3-echarts/2.0.6/ol3Echarts.min.js');
@@ -105,7 +105,7 @@
105105
inputScript(libsurl + '/openlayers/plugins/ol-layerswitcher/3.8.3/ol-layerswitcher.js');
106106
}
107107
if (inArray(includes, 'jsonsql')) {
108-
inputScript(libsurl + '/jsonsql/jsonsql.js');
108+
inputScript(libsurl + '/jsonsql/0.2.5/jsonsql.min.js');
109109
}
110110
if (inArray(includes, 'geostats')) {
111111
inputScript(libsurl + '/geostats/geostats.js');

‎examples/js/include-web.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
var ca = document.cookie.split(';');
3838
for (var i = 0; i < ca.length; i++) {
3939
var c = ca[i];
40-
while (c.charAt(0) === ' ') c = c.substring(1);
41-
if (c.indexOf(name) !== -1) return c.substring(name.length, c.length);
40+
while (c.charAt(0) === ' ') {c = c.substring(1);}
41+
if (c.indexOf(name) !== -1) {return c.substring(name.length, c.length);}
4242
}
4343
return "";
4444
}
@@ -121,8 +121,8 @@
121121
inputScript(libsurl + '/papaparse/papaparse.min.js');
122122
}
123123
if (inArray(includes, 'moment')) {
124-
inputScript(libsurl + '/moment/2.29.4/moment.min.js');
125-
inputScript(libsurl + '/moment/2.29.4/zh-cn.min.js');
124+
inputScript(libsurl + '/moment/2.30.1/moment.min.js');
125+
inputScript(libsurl + '/moment/2.30.1/zh-cn.js');
126126
}
127127
if (inArray(includes, 'bootstrap-datetimepicker')) {
128128
inputCSS(libsurl + '/bootstrap-datetimepicker/bootstrap-datetimepicker.min.css');

‎examples/maplibregl/02_editFeatures.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,17 @@ <h5 class='panel-title text-center' data-i18n="resources.text_editSingle"></h5><
7474
"features": []
7575
};
7676

77-
map.loadImage('../img/marker-icon.png', function (error, image) {
78-
if (error) throw error;
79-
map.addImage('positionPoint', image);
80-
});
81-
82-
initFeature();
77+
map.on('load', async () => {
78+
// maplibre-gl v3版本用法：
79+
// map.loadImage('../img/marker-icon.png', function (error, image) {
80+
// if (error) throw error;
81+
// map.addImage('positionPoint', image);
82+
// });
83+
// maplibre-gl v4版本用法：
84+
const image = await map.loadImage('../img/marker-icon.png');
85+
map.addImage('positionPoint', image.data);
86+
initFeature();
87+
});
8388

8489
function initFeature() {
8590

0 commit comments

Comments
 (0)