新增maplibregl overlay

Author: xilanhuaweidapao

dist/maplibregl/include-maplibregl.js

@@ -52,14 +52,122 @@
   function load({ libsurl }) {
     var includes = (targetScript.getAttribute('include') || '').split(',');
     var excludes = (targetScript.getAttribute('exclude') || '').split(',');
-    inputCSS('https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.css');
-    inputScript('https://unpkg.com/maplibre-gl@latest/dist/maplibre-gl.js');
+    inputCSS('https://unpkg.com/maplibre-gl@2.4.0/dist/maplibre-gl.css');
+    inputScript('https://unpkg.com/maplibre-gl@2.4.0/dist/maplibre-gl.js');
+    if (inArray(includes, 'turf')) {
+      inputScript(`${libsurl}/turf/6.5.0/turf.min.js`);
+    }
     if (inArray(includes, 'draw')) {
       inputCSS(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.css`);
       inputScript(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-draw/1.4.1/mapbox-gl-draw.min.js`);
     }
+
     if (inArray(includes, 'mapboxgl-draw-rectangle-drag')) {
       inputScript(`${libsurl}/mapboxgl-draw-rectangle-drag/1.0.1/mapboxgl-draw-rectangle-drag.browser.js`);
+  }
+    if (inArray(includes, 'compare')) {
+      inputCSS(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css`);
+      inputScript(`${libsurl}/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js`);
+    }
+    if (inArray(includes, 'mapv')) {
+      inputScript(`${libsurl}/mapv/2.0.62/mapv.min.js`);
+    }
+    if (inArray(includes, 'echarts')) {
+      inputScript(`${libsurl}/echarts/4.9.0/echarts.min.js`);
+      inputScript(`${libsurl}/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js`);
+      inputScript(`${libsurl}/echartsLayer/EchartsLayer.min.js`);
+    }
+    if (inArray(includes, 'echarts-vue')) {
+      inputScript(`${libsurl}/echarts/4.9.0/echarts.min.js`);
+      inputScript(`${libsurl}/vue-echarts/4.1.0/vue-echarts.min.js`);
+      inputScript(`${libsurl}/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js`);
+      inputScript(`${libsurl}/echartsLayer/EchartsLayer.min.js`);
+    }
+    if (inArray(includes, 'three')) {
+      inputScript(`${libsurl}/three/0.150.1/three.min.js`);
+    }
+    if (inArray(includes, 'three@0.121.1')) {
+      inputScript(`${libsurl}/three/0.121.1/build/three.js`);
+    }
+    if (inArray(includes, 'xlsx')) {
+      inputScript(`${libsurl}/xlsx/0.19.3/xlsx.core.min.js`);
+    }
+    if (inArray(includes, 'proj4')) {
+      inputScript(`${libsurl}/proj4/2.9.0/proj4.min.js`);
+    }
+    if (inArray(includes, 'shapefile')) {
+      inputScript(`${libsurl}/shapefile/shapefile.js`);
+    }
+    if (inArray(includes, 'ant-design-vue')) {
+      inputCSS(`${libsurl}/ant-design-vue/1.7.8/antd.min.css`);
+      inputScript(`${libsurl}/ant-design-vue/1.7.8/antd.min.js`);
+    }
+    if (inArray(includes, 'antd')) {
+      inputCSS(`${libsurl}/antd/3.25.3/antd.min.css`);
+      inputScript(`${libsurl}/moment/2.29.4/moment.min.js`);
+      inputScript(`${libsurl}/antd/3.25.3/antd.min.js`);
+    }
+    if (inArray(includes, 'deck')) {
+      inputScript(`${libsurl}/deck.gl/5.1.3/deck.gl.min.js`);
+    }
+    if (inArray(includes, 'jsonsql')) {
+      inputScript(`${libsurl}/jsonsql/jsonsql.js`);
+    }
+    if (inArray(includes, 'geostats')) {
+      inputScript(`${libsurl}/geostats/geostats.js`);
+    }
+    if (inArray(includes, 'canvg')) {
+      inputScript(`${libsurl}/canvg/3.0.10/umd.min.js`);
+    }
+    if (inArray(includes, 'convert')) {
+      inputScript(`${libsurl}/xml-js/1.6.8/xml-js.min.js`);
+    }
+    if (inArray(includes, 'LegacyJSONLoader')) {
+      inputScript(`${libsurl}/three/0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js`);
+    }
+    if (inArray(includes, 'OBJLoader')) {
+      inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/OBJLoader.js`);
+    }
+
+    if (inArray(includes, 'three92')) {
+      inputScript(`${libsurl}/three/92/three.min.js`);
+    }
+    if (inArray(includes, 'LoaderSupport')) {
+      inputScript(`${libsurl}/three/plugins/loaders/LoaderCommons.js`);
+      inputScript(`${libsurl}/three/plugins/loaders/LoaderBuilder.js`);
+      inputScript(`${libsurl}/three/plugins/loaders/LoaderWorkerSupport.js`);
+    }
+    if (inArray(includes, 'OBJLoader2')) {
+      inputScript(`${libsurl}/three-wtm/1.0.0/three-wtm.js`);
+      inputScript(`${libsurl}/wwobjloader2/4.0.0/wwobjloader2.js`);
+    }
+    if (inArray(includes, 'MTLLoader')) {
+      inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/MTLLoader.js`);
+    }
+    if (inArray(includes, 'GLTFLoader')) {
+      inputScript(`${libsurl}/three/0.129.0/examples/js/loaders/GLTFLoader.js`);
+    }
+    if (inArray(includes, 'echarts-gl')) {
+      inputScript(`${libsurl}/echarts-gl/1.1.2-fix/echarts-gl.min.js`);
+    }
+    if (inArray(includes, 'mapbox-print-pdf')) {
+      inputScript(`${libsurl}/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js`);
+    }
+    if (inArray(includes, 'moment')) {
+      inputScript(`${libsurl}/moment/2.29.4/moment.min.js`);
+    }
+    if (inArray(includes, 'lodash')) {
+      inputScript(`${libsurl}/lodash/4.17.21/lodash.min.js`);
+    }
+    if (inArray(includes, 'tensorflow')) {
+      inputScript(`${libsurl}/tensorflow/3.9.0/tf.min.js`);
+    }
+    if (inArray(includes, 'videojs')) {
+      inputCSS(`${libsurl}/video-js/7.10.2/video-js.min.css`);
+      inputScript(`${libsurl}/video-js/7.10.2/video.min.js`);
+    }
+    if (inArray(includes, 'FGB')) {
+      inputScript(`${libsurl}/flatgeobuf-geojson/3.23.1/flatgeobuf-geojson.min.js`);
     }
     if (!inArray(excludes, 'iclient-maplibregl')) {
       if (supportES6()) {
@@ -68,12 +176,6 @@
         inputScript('../../dist/maplibregl/iclient-maplibregl.min.js');
       }
     }
-    if (inArray(includes, 'turf')) {
-      inputScript(`${libsurl}/turf/6.5.0/turf.min.js`);
-    }
-    if (!inArray(excludes, 'iclient-maplibregl-css')) {
-      inputCSS('../../dist/maplibregl/iclient-maplibregl.min.css');
-    }
   }
 
   load({

examples/mapboxgl/fgb_all_load.html

@@ -33,7 +33,7 @@
         " Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span>";
       var host = window.isLocal ? window.server : 'https://iserver.supermap.io';
       var baseUrl = host + '/iserver/services/map-china400/rest/maps/China/zxyTileImage.png?z={z}&x={x}&y={y}';
-      var fgbUrl = 'https://iclient.supermap.io/minio/fgb/roads.fgb';
+      var fgbUrl = 'https://iclient.supermap.io/minio/fgb/waterways.fgb';
 
       var map = new mapboxgl.Map({
         container: 'map',

examples/mapboxgl/mapvLayerHoneycomb.html

@@ -62,7 +62,9 @@
             });
             map.addControl(new mapboxgl.NavigationControl(), 'top-left');
             map.addControl(new mapboxgl.supermap.LogoControl({ link: "https://iclient.supermap.io" }), 'bottom-right');
-            loadData();
+            map.on('load', function() {
+              loadData();
+            });
 
             function loadData() {
                 var randomCount = 1000;

examples/mapboxgl/threejsLayer_bird.html

@@ -85,7 +85,9 @@
     });
     map.addControl(new mapboxgl.NavigationControl(), 'top-left');
 
-    loaderModels();
+    map.on('load', () => {
+      loaderModels();
+    });
 
     function loaderModels() {
         threeLayer = new mapboxgl.supermap.ThreeLayer('three');
@@ -157,10 +159,9 @@
             });
         }
 
-        threeLayer.addTo(map);
+        // threeLayer.addTo(map);
+        map.addLayer(threeLayer);
     }
-
-
 </script>
 </body>
 </html>