Skip to content

Commit f411b8a

Browse files
xilanhuaweidapaoxilanhuaweidapao
committed
update include-maplibregl
1 parent 862947d commit f411b8a

File tree

2 files changed

+54
-55
lines changed

2 files changed

+54
-55
lines changed

‎dist/maplibregl/include-maplibregl.js‎

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -49,131 +49,132 @@
4949
}
5050

5151
//加载类库资源文件
52-
function load({ libsurl }) {
52+
function load(config) {
53+
var libsurl = config.libsurl;
5354
var includes = (targetScript.getAttribute('include') || '').split(',');
5455
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
55-
inputCSS(`${libsurl}/maplibre-gl-js/3.1.0/maplibre-gl.css`);
56-
inputScript(`${libsurl}/maplibre-gl-js/3.1.0/maplibre-gl.js`);
56+
inputCSS(libsurl + '/maplibre-gl-js/3.1.0/maplibre-gl.css');
57+
inputScript(libsurl + '/maplibre-gl-js/3.1.0/maplibre-gl.js');
5758
if (inArray(includes, 'turf')) {
58-
inputScript(`${libsurl}/turf/6.5.0/turf.min.js`);
59+
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
5960
}
6061
if (inArray(includes, 'draw')) {
61-
inputCSS(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.css`);
62-
inputScript(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.js`);
62+
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.css');
63+
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.js');
6364
}
6465

6566
if (inArray(includes, 'mapboxgl-draw-rectangle-drag')) {
66-
inputScript(`${libsurl}/mapboxgl-draw-rectangle-drag/1.0.1/mapboxgl-draw-rectangle-drag.browser.js`);
67+
inputScript(libsurl + '/mapboxgl-draw-rectangle-drag/1.0.1/mapboxgl-draw-rectangle-drag.browser.js');
6768
}
6869
if (inArray(includes, 'compare')) {
69-
inputCSS(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css`);
70-
inputScript(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js`);
70+
inputCSS(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css');
71+
inputScript(libsurl + '/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js');
7172
}
7273
if (inArray(includes, 'mapv')) {
73-
inputScript(`${libsurl}/mapv/2.0.62/mapv.min.js`);
74+
inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
7475
}
7576
if (inArray(includes, 'echarts')) {
76-
inputScript(`${libsurl}/echarts/4.9.0/echarts.min.js`);
77-
inputScript(`${libsurl}/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js`);
78-
inputScript(`${libsurl}/echartsLayer/EchartsLayer.min.js`);
77+
inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');
78+
inputScript(libsurl + '/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js');
79+
inputScript(libsurl + '/echartsLayer/EchartsLayer.min.js');
7980
}
8081
if (inArray(includes, 'echarts-vue')) {
81-
inputScript(`${libsurl}/echarts/4.9.0/echarts.min.js`);
82-
inputScript(`${libsurl}/vue-echarts/4.1.0/vue-echarts.min.js`);
83-
inputScript(`${libsurl}/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js`);
84-
inputScript(`${libsurl}/echartsLayer/EchartsLayer.min.js`);
82+
inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');
83+
inputScript(libsurl + '/vue-echarts/4.1.0/vue-echarts.min.js');
84+
inputScript(libsurl + '/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js');
85+
inputScript(libsurl + '/echartsLayer/EchartsLayer.min.js');
8586
}
8687
if (inArray(includes, 'three')) {
87-
inputScript(`${libsurl}/three/0.150.1/three.min.js`);
88+
inputScript(libsurl+ '/three/0.150.1/three.min.js');
8889
}
8990
if (inArray(includes, 'three@0.121.1')) {
90-
inputScript(`${libsurl}/three/0.121.1/build/three.js`);
91+
inputScript(libsurl + '/three/0.121.1/build/three.js');
9192
}
9293
if (inArray(includes, 'xlsx')) {
93-
inputScript(`${libsurl}/xlsx/0.19.3/xlsx.core.min.js`);
94+
inputScript(libsurl + '/xlsx/0.19.3/xlsx.core.min.js');
9495
}
9596
if (inArray(includes, 'proj4')) {
96-
inputScript(`${libsurl}/proj4/2.9.0/proj4.min.js`);
97+
inputScript(libsurl + '/proj4/2.9.0/proj4.min.js');
9798
}
9899
if (inArray(includes, 'shapefile')) {
99-
inputScript(`${libsurl}/shapefile/shapefile.js`);
100+
inputScript(libsurl + '/shapefile/shapefile.js');
100101
}
101102
if (inArray(includes, 'ant-design-vue')) {
102-
inputCSS(`${libsurl}/ant-design-vue/1.7.8/antd.min.css`);
103-
inputScript(`${libsurl}/ant-design-vue/1.7.8/antd.min.js`);
103+
inputCSS(libsurl + '/ant-design-vue/1.7.8/antd.min.css');
104+
inputScript(libsurl + '/ant-design-vue/1.7.8/antd.min.js');
104105
}
105106
if (inArray(includes, 'antd')) {
106-
inputCSS(`${libsurl}/antd/3.25.3/antd.min.css`);
107-
inputScript(`${libsurl}/moment/2.29.4/moment.min.js`);
108-
inputScript(`${libsurl}/antd/3.25.3/antd.min.js`);
107+
inputCSS(libsurl + '/antd/3.25.3/antd.min.css');
108+
inputScript(libsurl + '/moment/2.29.4/moment.min.js');
109+
inputScript(libsurl + '/antd/3.25.3/antd.min.js');
109110
}
110111
if (inArray(includes, 'deck')) {
111-
inputScript(`${libsurl}/deck.gl/5.1.3/deck.gl.min.js`);
112+
inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');
112113
}
113114
if (inArray(includes, 'jsonsql')) {
114-
inputScript(`${libsurl}/jsonsql/jsonsql.js`);
115+
inputScript(libsurl + '/jsonsql/jsonsql.js');
115116
}
116117
if (inArray(includes, 'geostats')) {
117-
inputScript(`${libsurl}/geostats/geostats.js`);
118+
inputScript(libsurl + '/geostats/geostats.js');
118119
}
119120
if (inArray(includes, 'canvg')) {
120-
inputScript(`${libsurl}/canvg/3.0.10/umd.min.js`);
121+
inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
121122
}
122123
if (inArray(includes, 'convert')) {
123-
inputScript(`${libsurl}/xml-js/1.6.8/xml-js.min.js`);
124+
inputScript(libsurl + '/xml-js/1.6.8/xml-js.min.js');
124125
}
125126
if (inArray(includes, 'LegacyJSONLoader')) {
126-
inputScript(`${libsurl}/three/0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js`);
127+
inputScript(libsurl + '/three/0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js');
127128
}
128129
if (inArray(includes, 'OBJLoader')) {
129-
inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/OBJLoader.js`);
130+
inputScript(libsurl + '/three/0.129.0/examples/js/loaders/OBJLoader.js');
130131
}
131132

132133
if (inArray(includes, 'three92')) {
133-
inputScript(`${libsurl}/three/92/three.min.js`);
134+
inputScript(libsurl + '/three/92/three.min.js');
134135
}
135136
if (inArray(includes, 'LoaderSupport')) {
136-
inputScript(`${libsurl}/three/plugins/loaders/LoaderCommons.js`);
137-
inputScript(`${libsurl}/three/plugins/loaders/LoaderBuilder.js`);
138-
inputScript(`${libsurl}/three/plugins/loaders/LoaderWorkerSupport.js`);
137+
inputScript(libsurl + '/three/plugins/loaders/LoaderCommons.js');
138+
inputScript(libsurl + '/three/plugins/loaders/LoaderBuilder.js');
139+
inputScript(libsurl + '/three/plugins/loaders/LoaderWorkerSupport.js');
139140
}
140141
if (inArray(includes, 'OBJLoader2')) {
141-
inputScript(`${libsurl}/three-wtm/1.0.0/three-wtm.js`);
142-
inputScript(`${libsurl}/wwobjloader2/4.0.0/wwobjloader2.js`);
142+
inputScript(libsurl + '/three-wtm/1.0.0/three-wtm.js');
143+
inputScript(libsurl + '/wwobjloader2/4.0.0/wwobjloader2.js');
143144
}
144145
if (inArray(includes, 'MTLLoader')) {
145-
inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/MTLLoader.js`);
146+
inputScript(libsurl + '/three/0.129.0/examples/js/loaders/MTLLoader.js');
146147
}
147148
if (inArray(includes, 'GLTFLoader')) {
148-
inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/GLTFLoader.js`);
149+
inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');
149150
}
150151
if (inArray(includes, 'echarts-gl')) {
151-
inputScript(`${libsurl}/echarts-gl/1.1.2-fix/echarts-gl.min.js`);
152+
inputScript(libsurl + '/echarts-gl/1.1.2-fix/echarts-gl.min.js');
152153
}
153154
if (inArray(includes, 'mapbox-print-pdf')) {
154-
inputScript(`${libsurl}/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js`);
155+
inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');
155156
}
156157
if (inArray(includes, 'moment')) {
157-
inputScript(`${libsurl}/moment/2.29.4/moment.min.js`);
158+
inputScript(libsurl + '/moment/2.29.4/moment.min.js');
158159
}
159160
if (inArray(includes, 'lodash')) {
160-
inputScript(`${libsurl}/lodash/4.17.21/lodash.min.js`);
161+
inputScript(libsurl + '/lodash/4.17.21/lodash.min.js');
161162
}
162163
if (inArray(includes, 'tensorflow')) {
163-
inputScript(`${libsurl}/tensorflow/3.9.0/tf.min.js`);
164+
inputScript(libsurl + '/tensorflow/3.9.0/tf.min.js');
164165
}
165166
if (inArray(includes, 'videojs')) {
166-
inputCSS(`${libsurl}/video-js/7.10.2/video-js.min.css`);
167-
inputScript(`${libsurl}/video-js/7.10.2/video.min.js`);
167+
inputCSS(libsurl + 'video-js/7.10.2/video-js.min.css');
168+
inputScript(libsurl + '/video-js/7.10.2/video.min.js');
168169
}
169170
if (inArray(includes, 'FGB')) {
170-
inputScript(`${libsurl}/flatgeobuf-geojson/3.23.1/flatgeobuf-geojson.min.js`);
171+
inputScript(libsurl + '/flatgeobuf-geojson/3.23.1/flatgeobuf-geojson.min.js');
171172
}
172173
if (inArray(includes, 'g6')) {
173174
inputScript(libsurl + '/antv/g6/4.3.2/g6.min.js');
174175
}
175176
if (inArray(includes, 'turf')) {
176-
inputScript(`${libsurl}/turf/6.5.0/turf.min.js`);
177+
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
177178
}
178179
if (!inArray(excludes, 'iclient-maplibregl')) {
179180
if (supportES6()) {

‎examples/mapboxgl/mapvForceEdgeBuilding.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@
170170
draw: 'simple'
171171
};
172172

173-
//mapboxgl.supermap.MapvLayer 构造函数的第一个 map 参数将在下个版本遗弃
174-
var mapVLinelayer = new mapboxgl.supermap.MapvLayer('', dataSet, options);
173+
var mapVLinelayer = new mapboxgl.supermap.MapvLayer(dataSet, options);
175174
map.addLayer(mapVLinelayer);
176175

177176
var dataSet = new mapv.DataSet(timeData);
@@ -192,8 +191,7 @@
192191
draw: 'simple'
193192
};
194193

195-
//mapboxgl.supermap.MapvLayer 构造函数的第一个 map 参数将在下个版本遗弃
196-
var mapVAnimationLinelayer = new mapboxgl.supermap.MapvLayer('', dataSet, options);
194+
var mapVAnimationLinelayer = new mapboxgl.supermap.MapvLayer(dataSet, options);
197195

198196
map.addLayer(mapVAnimationLinelayer);
199197
});

0 commit comments

Comments
 (0)