[fix]分端 leaflet引用mapbox; 图片路径修改 review by songym

YOUYOUNG · YOUYOUNG · commit e67c6360c210 · 2021-06-29T09:36:14.000+08:00
diff --git a/dist/leaflet/include-leaflet.js b/dist/leaflet/include-leaflet.js
@@ -1,7 +1,7 @@
 /* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-(function() {
+(function () {
     var r = new RegExp('(^|(.*?\\/))(include-leaflet.js)(\\?|$)'),
         s = document.getElementsByTagName('script'),
         targetScript;
@@ -57,6 +57,10 @@
             inputCSS('https://cdn.jsdelivr.net/npm/leaflet@1.7.1/dist/leaflet.css');
             inputScript('https://cdn.jsdelivr.net/npm/leaflet@1.7.1/dist/leaflet.js');
         }
+        if (inArray(includes, 'mapbox-gl-enhance')) {
+            inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.css');
+            inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.js');
+        }
         if (inArray(includes, 'leaflet.heat')) {
             inputScript('https://cdn.bootcdn.net/ajax/libs/leaflet.heat/0.2.0/leaflet-heat.js');
         }
@@ -126,7 +130,7 @@
             inputScript('https://iclient.supermap.io/web/libs/bezier-easing/2.1.0/bezier-easing.js');
         }
         if (inArray(includes, 'tensorflow')) {
-          inputScript('https://cdn.jsdelivr.net/npm/@tensorflow/tfjs@3.5.0/dist/tf.min.js');
+            inputScript('https://cdn.jsdelivr.net/npm/@tensorflow/tfjs@3.5.0/dist/tf.min.js');
         }
 
         // iclient
@@ -167,7 +171,6 @@
         if (inArray(includes, 'leaflet-mapbox-gl')) {
             inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl-leaflet@0.0.14/leaflet-mapbox-gl.js');
         }
-        
     }
 
     load();
diff --git a/examples/img/blueCar.png b/examples/img/blueCar.png
diff --git a/examples/img/redCar.png b/examples/img/redCar.png
diff --git a/examples/leaflet/echartsAnimatorCar.html b/examples/leaflet/echartsAnimatorCar.html
@@ -52,9 +52,9 @@
                         symbolSize: 30,
                         symbol: function () {
                             if ((Math.round(Math.random() * 2) % 2)) {
-                                return 'image://../classic/images/blueCar.png'
+                                return 'image://../img/blueCar.png'
                             } else {
-                                return 'image://../classic/images/redCar.png'
+                                return 'image://../img/redCar.png'
                             }
                         }()
                     },
diff --git a/examples/leaflet/mvt_mapboxgl.html b/examples/leaflet/mvt_mapboxgl.html
@@ -16,14 +16,8 @@
 
     <body style="margin: 0; overflow: hidden; background: #fff; width: 100%; height: 100%; position: absolute; top: 0">
         <div id="map" style="margin: 0 auto; width: 100%; height: 100%"></div>
-        <!-- 叠加非3857的地图，请使用mapbox-gl-enhance -->
-        <script
-            type="text/javascript"
-            include="mapbox-gl-enhance"
-            src="../../dist/mapboxgl/include-mapboxgl.js"
-        ></script>
-        <!-- 需引入三方插件 mapbox-gl-leaflet https://github.com/mapbox/mapbox-gl-leaflet -->
-        <script type="text/javascript" include="leaflet-mapbox-gl" src="../../dist/leaflet/include-leaflet.js"></script>
+        <!-- 叠加非3857的地图，请使用mapbox-gl-enhance, 需引入三方插件 mapbox-gl-leaflet https://github.com/mapbox/mapbox-gl-leaflet -->
+        <script type="text/javascript" include="leaflet-mapbox-gl,mapbox-gl-enhance" src="../../dist/leaflet/include-leaflet.js"></script>
 
         <script type="text/javascript">
             var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
diff --git a/examples/mapboxgl/echartsAnimatorCar.html b/examples/mapboxgl/echartsAnimatorCar.html
@@ -70,9 +70,9 @@
                 symbolSize: 30,
                 symbol: function () {
                     if ((Math.round(Math.random() * 2) % 2)) {
-                        return 'image://../classic/images/blueCar.png'
+                        return 'image://../img/blueCar.png'
                     } else {
-                        return 'image://../classic/images/redCar.png'
+                        return 'image://../img/redCar.png'
                     }
                 }()
             };
diff --git a/examples/openlayers/echartsAnimatorCar.html b/examples/openlayers/echartsAnimatorCar.html
@@ -74,9 +74,9 @@
                         symbolSize: 30,
                         symbol: function () {
                             if ((Math.round(Math.random() * 2) % 2)) {
-                                return 'image://../classic/images/blueCar.png'
+                                return 'image://../img/blueCar.png'
                             } else {
-                                return 'image://../classic/images/redCar.png'
+                                return 'image://../img/redCar.png'
                             }
                         }()
                     },

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.`
`2`	`2`	`* This program are made available under the terms of the Apache License, Version 2.0`
`3`	`3`	`* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/`
`4`		`-(function() {`
	`4`	`+(function () {`
`5`	`5`	`var r = new RegExp('(^\|(.*?\\/))(include-leaflet.js)(\\?\|$)'),`
`6`	`6`	`s = document.getElementsByTagName('script'),`
`7`	`7`	`targetScript;`
`@@ -57,6 +57,10 @@`
`57`	`57`	`inputCSS('https://cdn.jsdelivr.net/npm/leaflet@1.7.1/dist/leaflet.css');`
`58`	`58`	`inputScript('https://cdn.jsdelivr.net/npm/leaflet@1.7.1/dist/leaflet.js');`
`59`	`59`	`}`
	`60`	`+ if (inArray(includes, 'mapbox-gl-enhance')) {`
	`61`	`+ inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.css');`
	`62`	`+ inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.js');`
	`63`	`+ }`
`60`	`64`	`if (inArray(includes, 'leaflet.heat')) {`
`61`	`65`	`inputScript('https://cdn.bootcdn.net/ajax/libs/leaflet.heat/0.2.0/leaflet-heat.js');`
`62`	`66`	`}`
`@@ -126,7 +130,7 @@`
`126`	`130`	`inputScript('https://iclient.supermap.io/web/libs/bezier-easing/2.1.0/bezier-easing.js');`
`127`	`131`	`}`
`128`	`132`	`if (inArray(includes, 'tensorflow')) {`
`129`		`- inputScript('https://cdn.jsdelivr.net/npm/@tensorflow/tfjs@3.5.0/dist/tf.min.js');`
	`133`	`+ inputScript('https://cdn.jsdelivr.net/npm/@tensorflow/tfjs@3.5.0/dist/tf.min.js');`
`130`	`134`	`}`
`131`	`135`
`132`	`136`	`// iclient`
`@@ -167,7 +171,6 @@`
`167`	`171`	`if (inArray(includes, 'leaflet-mapbox-gl')) {`
`168`	`172`	`inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl-leaflet@0.0.14/leaflet-mapbox-gl.js');`
`169`	`173`	`}`
`170`		`-`
`171`	`174`	`}`
`172`	`175`
`173`	`176`	`load();`