[update]leaflet三方库升级 review by xiongjj

YOUYOUNG · YOUYOUNG · commit cda5d5752139 · 2021-09-24T15:00:33.000+08:00
diff --git a/dist/leaflet/include-leaflet.js b/dist/leaflet/include-leaflet.js
@@ -65,17 +65,18 @@
             inputScript('https://cdn.bootcdn.net/ajax/libs/leaflet.heat/0.2.0/leaflet-heat.js');
         }
         if (inArray(includes, 'leaflet.markercluster')) {
-            inputCSS('https://cdn.bootcdn.net/ajax/libs/leaflet.markercluster/1.4.1/MarkerCluster.Default.css');
-            inputCSS('https://cdn.bootcdn.net/ajax/libs/leaflet.markercluster/1.4.1/MarkerCluster.css');
-            inputScript('https://cdn.bootcdn.net/ajax/libs/leaflet.markercluster/1.4.1/leaflet.markercluster.js');
+            inputCSS('https://cdn.jsdelivr.net/npm/leaflet.markercluster@1.5.1/dist/MarkerCluster.Default.css');
+            inputCSS('https://cdn.jsdelivr.net/npm/leaflet.markercluster@1.5.1/dist/MarkerCluster.css');
+            inputScript('https://cdn.jsdelivr.net/npm/leaflet.markercluster@1.5.1/dist/leaflet.markercluster.js');
         }
         if (inArray(includes, 'leaflet.draw')) {
             inputCSS('https://cdn.bootcdn.net/ajax/libs/leaflet.draw/1.0.4/leaflet.draw.css');
             inputScript('https://cdn.bootcdn.net/ajax/libs/leaflet.draw/1.0.4/leaflet.draw.js');
         }
         if (inArray(includes, 'leaflet-geoman')) {
-            inputCSS('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.css');
-            inputScript('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.min.js');
+            inputCSS('https://cdn.jsdelivr.net/npm/@skyraptor/leaflet-geoman-free@2.11.3/dist/leaflet-geoman.css');
+            inputScript('https://cdn.jsdelivr.net/npm/@skyraptor/leaflet-geoman-free@2.11.3/dist/leaflet-geoman.min.js');
+            
         }
         if (inArray(includes, 'leaflet.miniMap')) {
             inputCSS('https://cdn.bootcdn.net/ajax/libs/leaflet-minimap/3.6.1/Control.MiniMap.min.css');
@@ -98,12 +99,10 @@
         }
         // 本地
         if (inArray(includes, 'leaflet.sidebyside')) {
-            inputScript(
-                'https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js'
-            );
+            inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js');
         }
         if (inArray(includes, 'd3')) {
-            inputScript('https://cdn.bootcdn.net/ajax/libs/d3/6.1.1/d3.min.js');
+            inputScript('https://cdn.jsdelivr.net/npm/d3@7.0.3/dist/d3.min.js');
         }
         if (inArray(includes, 'd3-hexbin')) {
             inputScript('https://d3js.org/d3-hexbin.v0.2.min.js');
@@ -123,10 +122,8 @@
         }
         if (inArray(includes, 'pixi')) {
             inputScript('https://cdn.bootcdn.net/ajax/libs/pixi.js/4.8.7/pixi.js');
-            inputScript('https://cdn.jsdelivr.net/npm/leaflet-pixi-overlay@1.8.1/L.PixiOverlay.min.js');
-            inputScript(
-                'https://iclient.supermap.io/web/libs/leaflet/plugins/Leaflet.PixiOverlay/1.8.1/MarkerContainer.js'
-            );
+            inputScript('https://cdn.jsdelivr.net/npm/leaflet-pixi-overlay@1.8.2/L.PixiOverlay.min.js');
+            inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/Leaflet.PixiOverlay/MarkerContainer.js');
             inputScript('https://iclient.supermap.io/web/libs/bezier-easing/2.1.0/bezier-easing.js');
         }
         if (inArray(includes, 'tensorflow')) {
@@ -169,7 +166,7 @@
             inputScript('../../dist/leaflet/iclient-leaflet-vue.min.js');
         }
         if (inArray(includes, 'leaflet-mapbox-gl')) {
-            inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl-leaflet@0.0.14/leaflet-mapbox-gl.js');
+            inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl-leaflet@0.0.15/leaflet-mapbox-gl.min.js');
         }
     }
 
@@ -178,4 +175,4 @@
     window.server = document.location.toString().match(/file:\/\//)
         ? 'http://localhost:8090'
         : document.location.protocol + '//' + document.location.host;
-})();
+})();

Original file line number	Diff line number	Diff line change
`@@ -65,17 +65,18 @@`
`65`	`65`	`inputScript('https://cdn.bootcdn.net/ajax/libs/leaflet.heat/0.2.0/leaflet-heat.js');`
`66`	`66`	`}`
`67`	`67`	`if (inArray(includes, 'leaflet.markercluster')) {`
`68`		`- inputCSS('https://cdn.bootcdn.net/ajax/libs/leaflet.markercluster/1.4.1/MarkerCluster.Default.css');`
`69`		`- inputCSS('https://cdn.bootcdn.net/ajax/libs/leaflet.markercluster/1.4.1/MarkerCluster.css');`
`70`		`- inputScript('https://cdn.bootcdn.net/ajax/libs/leaflet.markercluster/1.4.1/leaflet.markercluster.js');`
	`68`	`+ inputCSS('https://cdn.jsdelivr.net/npm/leaflet.markercluster@1.5.1/dist/MarkerCluster.Default.css');`
	`69`	`+ inputCSS('https://cdn.jsdelivr.net/npm/leaflet.markercluster@1.5.1/dist/MarkerCluster.css');`
	`70`	`+ inputScript('https://cdn.jsdelivr.net/npm/leaflet.markercluster@1.5.1/dist/leaflet.markercluster.js');`
`71`	`71`	`}`
`72`	`72`	`if (inArray(includes, 'leaflet.draw')) {`
`73`	`73`	`inputCSS('https://cdn.bootcdn.net/ajax/libs/leaflet.draw/1.0.4/leaflet.draw.css');`
`74`	`74`	`inputScript('https://cdn.bootcdn.net/ajax/libs/leaflet.draw/1.0.4/leaflet.draw.js');`
`75`	`75`	`}`
`76`	`76`	`if (inArray(includes, 'leaflet-geoman')) {`
`77`		`- inputCSS('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.css');`
`78`		`- inputScript('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.min.js');`
	`77`	`+ inputCSS('https://cdn.jsdelivr.net/npm/@skyraptor/leaflet-geoman-free@2.11.3/dist/leaflet-geoman.css');`
	`78`	`+ inputScript('https://cdn.jsdelivr.net/npm/@skyraptor/leaflet-geoman-free@2.11.3/dist/leaflet-geoman.min.js');`
	`79`	`+`
`79`	`80`	`}`
`80`	`81`	`if (inArray(includes, 'leaflet.miniMap')) {`
`81`	`82`	`inputCSS('https://cdn.bootcdn.net/ajax/libs/leaflet-minimap/3.6.1/Control.MiniMap.min.css');`
`@@ -98,12 +99,10 @@`
`98`	`99`	`}`
`99`	`100`	`// 本地`
`100`	`101`	`if (inArray(includes, 'leaflet.sidebyside')) {`
`101`		`- inputScript(`
`102`		`- 'https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js'`
`103`		`- );`
	`102`	`+ inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js');`
`104`	`103`	`}`
`105`	`104`	`if (inArray(includes, 'd3')) {`
`106`		`- inputScript('https://cdn.bootcdn.net/ajax/libs/d3/6.1.1/d3.min.js');`
	`105`	`+ inputScript('https://cdn.jsdelivr.net/npm/d3@7.0.3/dist/d3.min.js');`
`107`	`106`	`}`
`108`	`107`	`if (inArray(includes, 'd3-hexbin')) {`
`109`	`108`	`inputScript('https://d3js.org/d3-hexbin.v0.2.min.js');`
`@@ -123,10 +122,8 @@`
`123`	`122`	`}`
`124`	`123`	`if (inArray(includes, 'pixi')) {`
`125`	`124`	`inputScript('https://cdn.bootcdn.net/ajax/libs/pixi.js/4.8.7/pixi.js');`
`126`		`- inputScript('https://cdn.jsdelivr.net/npm/leaflet-pixi-overlay@1.8.1/L.PixiOverlay.min.js');`
`127`		`- inputScript(`
`128`		`- 'https://iclient.supermap.io/web/libs/leaflet/plugins/Leaflet.PixiOverlay/1.8.1/MarkerContainer.js'`
`129`		`- );`
	`125`	`+ inputScript('https://cdn.jsdelivr.net/npm/leaflet-pixi-overlay@1.8.2/L.PixiOverlay.min.js');`
	`126`	`+ inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/Leaflet.PixiOverlay/MarkerContainer.js');`
`130`	`127`	`inputScript('https://iclient.supermap.io/web/libs/bezier-easing/2.1.0/bezier-easing.js');`
`131`	`128`	`}`
`132`	`129`	`if (inArray(includes, 'tensorflow')) {`
`@@ -169,7 +166,7 @@`
`169`	`166`	`inputScript('../../dist/leaflet/iclient-leaflet-vue.min.js');`
`170`	`167`	`}`
`171`	`168`	`if (inArray(includes, 'leaflet-mapbox-gl')) {`
`172`		`- inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl-leaflet@0.0.14/leaflet-mapbox-gl.js');`
	`169`	`+ inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl-leaflet@0.0.15/leaflet-mapbox-gl.min.js');`
`173`	`170`	`}`
`174`	`171`	`}`
`175`	`172`
`@@ -178,4 +175,4 @@`
`178`	`175`	`window.server = document.location.toString().match(/file:\/\//)`
`179`	`176`	`? 'http://localhost:8090'`
`180`	`177`	`: document.location.protocol + '//' + document.location.host;`
`181`		`-})();`
	`178`	`+})();`