[feature]合并l7分支

SuperMap · Apr 25, 2024 · 6691c6f · 6691c6f
2 parents 56ed32e + a02b970
commit 6691c6f
Show file tree

Hide file tree

Showing 369 changed files with 3,742,118 additions and 19 deletions.
diff --git a/build/jsdocs/template/config.json b/build/jsdocs/template/config.json
@@ -414,6 +414,10 @@
       "WebSymbol": {
         "name": "Web符号",
         "name_en": "WebSymbol"
+      },
+      "L7": {
+        "name": "L7",
+        "name_en": "L7"
       }
     }
   },
@@ -505,6 +509,10 @@
       "Constant": {
         "name": "常量",
         "name_en": "Constant"
+      },
+      "MapExtend": {
+        "name": "地图扩展",
+        "name_en": "MapExtend"
       }
     }
   }

diff --git a/build/jsdocs/template/publish.js b/build/jsdocs/template/publish.js
@@ -620,7 +620,8 @@ var whiteLists = {
     'TimeFlowControl',
     'WebMachineLearning',
     'WebMap',
-    'WKTFormat'
+    'WKTFormat',
+    'L7Layer'
   ],
   maplibregl:[
     'KnowledgeGraphService',
@@ -654,7 +655,8 @@ var whiteLists = {
     'GraticuleLayer',
     'HeatMapLayer',
     'MapvLayer',
-    'ThreeLayer'
+    'ThreeLayer',
+    'L7Layer'
   ],
   openlayers: [
     'KnowledgeGraphService',
@@ -965,7 +967,7 @@ exports.publish = function (taffyData, opts, tutorials) {
   }
   function delBaseType(name) {
     const linkNames = getDeledLinkName(name);
-    return linkNames && !Boolean(baseTypes.find((item) => linkNames === item));
+    return linkNames && !baseTypes.find((item) => linkNames === item);
   }
   function setMap(type) {
     if (!linkToMap.has(type)) {

diff --git a/build/webpack.config.mapboxgl.js b/build/webpack.config.mapboxgl.js
@@ -30,7 +30,8 @@ module.exports = {
       xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
       canvg: 'function(){try{return canvg}catch(e){return {}}}()',
       '@turf/turf': "function(){try{return turf}catch(e){return {}}}()",
-      jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()'
+      jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
+      '@supermap/mapboxgl-l7-render': 'function(){try{return L7}catch(e){return {}}}()'
     })
   ],
 

diff --git a/build/webpack.config.maplibregl.js b/build/webpack.config.maplibregl.js
@@ -29,7 +29,8 @@ module.exports = {
     xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
     canvg: 'function(){try{return canvg}catch(e){return {}}}()',
     jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
-    'xml-js': 'function(){try{return convert}catch(e){return {}}}()'
+    'xml-js': 'function(){try{return convert}catch(e){return {}}}()',
+    '@supermap/maplibregl-l7-render': 'function(){try{return L7}catch(e){return {}}}()'
   }),
 
   module: {

diff --git a/dist/mapboxgl/include-mapboxgl.js b/dist/mapboxgl/include-mapboxgl.js
@@ -62,6 +62,12 @@
       inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-4/mapbox-gl-enhance.css');
       inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-4/mapbox-gl-enhance.js');
     }
+    if (inArray(includes, 'L7')) {
+      inputScript(libsurl+ '/mapboxgl-l7-render/index.js');
+    }
+    if (inArray(includes, 'g2')) {
+      inputScript('https://cdnjs.cloudflare.com/ajax/libs/antv-g2/4.2.8/g2.min.js');
+    }
     if (inArray(includes, 'g6')) {
       inputScript(libsurl + '/antv/g6/4.3.2/g6.min.js');
     }

diff --git a/dist/maplibregl/include-maplibregl.js b/dist/maplibregl/include-maplibregl.js
@@ -50,13 +50,19 @@
 
   //加载类库资源文件
   function load(config) {
-    var libsurl = config.libsurl;
+    var libsurl = '../../web/libs';
     var includes = (targetScript.getAttribute('include') || '').split(',');
     var excludes = (targetScript.getAttribute('exclude') || '').split(',');
     if (!inArray(excludes, 'maplibregl')) {
       inputCSS(libsurl + '/maplibre-gl-js/3.1.0/maplibre-gl.css');
       inputScript(libsurl + '/maplibre-gl-js/3.1.0/maplibre-gl.js');
     }
+    if (inArray(includes, 'L7')) {
+      inputScript(libsurl + '/maplibregl-l7-render/index.js');
+    }
+    if (inArray(includes, 'g2')) {
+      inputScript('https://cdnjs.cloudflare.com/ajax/libs/antv-g2/4.2.8/g2.min.js');
+    }
     if (inArray(includes, 'turf')) {
       inputScript(libsurl + '/turf/6.5.0/turf.min.js');
     }
@@ -86,7 +92,7 @@
       inputScript(libsurl + '/maplibre-echartsLayer/EchartsLayer.min.js');
     }
     if (inArray(includes, 'three')) {
-      inputScript(libsurl+ '/three/0.150.1/three.min.js');
+      inputScript(libsurl + '/three/0.150.1/three.min.js');
     }
     if (inArray(includes, '[email protected]')) {
       inputScript(libsurl + '/three/0.121.1/build/three.js');
@@ -193,5 +199,5 @@
   window.server = document.location.toString().match(/file:\/\//)
     ? 'http://localhost:8090'
     : document.location.protocol + '//' + document.location.host;
-  window.exampleWebSymbolBasePath =  "../../dist/maplibregl/resources/symbols";
+  window.exampleWebSymbolBasePath = '../../dist/maplibregl/resources/symbols';
 })();
diff --git a/examples/data/0290a972-eedd-42f6-b69e-50a35e8a0824.json b/examples/data/0290a972-eedd-42f6-b69e-50a35e8a0824.json