Skip to content

Commit 6691c6f

Browse files
luoxiao-supermapluoxiao-supermap
committed
[feature]合并l7分支
2 parents 56ed32e + a02b970 commit 6691c6f

File tree

369 files changed

+3742118
-19
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+3742118
-19
lines changed

‎build/jsdocs/template/config.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,10 @@
414414
"WebSymbol": {
415415
"name": "Web符号",
416416
"name_en": "WebSymbol"
417+
},
418+
"L7": {
419+
"name": "L7",
420+
"name_en": "L7"
417421
}
418422
}
419423
},
@@ -505,6 +509,10 @@
505509
"Constant": {
506510
"name": "常量",
507511
"name_en": "Constant"
512+
},
513+
"MapExtend": {
514+
"name": "地图扩展",
515+
"name_en": "MapExtend"
508516
}
509517
}
510518
}

‎build/jsdocs/template/publish.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,8 @@ var whiteLists = {
620620
'TimeFlowControl',
621621
'WebMachineLearning',
622622
'WebMap',
623-
'WKTFormat'
623+
'WKTFormat',
624+
'L7Layer'
624625
],
625626
maplibregl:[
626627
'KnowledgeGraphService',
@@ -654,7 +655,8 @@ var whiteLists = {
654655
'GraticuleLayer',
655656
'HeatMapLayer',
656657
'MapvLayer',
657-
'ThreeLayer'
658+
'ThreeLayer',
659+
'L7Layer'
658660
],
659661
openlayers: [
660662
'KnowledgeGraphService',
@@ -965,7 +967,7 @@ exports.publish = function (taffyData, opts, tutorials) {
965967
}
966968
function delBaseType(name) {
967969
const linkNames = getDeledLinkName(name);
968-
return linkNames && !Boolean(baseTypes.find((item) => linkNames === item));
970+
return linkNames && !baseTypes.find((item) => linkNames === item);
969971
}
970972
function setMap(type) {
971973
if (!linkToMap.has(type)) {

‎build/webpack.config.mapboxgl.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ module.exports = {
3030
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
3131
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
3232
'@turf/turf': "function(){try{return turf}catch(e){return {}}}()",
33-
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()'
33+
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
34+
'@supermap/mapboxgl-l7-render': 'function(){try{return L7}catch(e){return {}}}()'
3435
})
3536
],
3637

‎build/webpack.config.maplibregl.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ module.exports = {
2929
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
3030
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
3131
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
32-
'xml-js': 'function(){try{return convert}catch(e){return {}}}()'
32+
'xml-js': 'function(){try{return convert}catch(e){return {}}}()',
33+
'@supermap/maplibregl-l7-render': 'function(){try{return L7}catch(e){return {}}}()'
3334
}),
3435

3536
module: {

‎dist/mapboxgl/include-mapboxgl.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@
6262
inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-4/mapbox-gl-enhance.css');
6363
inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-4/mapbox-gl-enhance.js');
6464
}
65+
if (inArray(includes, 'L7')) {
66+
inputScript(libsurl+ '/mapboxgl-l7-render/index.js');
67+
}
68+
if (inArray(includes, 'g2')) {
69+
inputScript('https://cdnjs.cloudflare.com/ajax/libs/antv-g2/4.2.8/g2.min.js');
70+
}
6571
if (inArray(includes, 'g6')) {
6672
inputScript(libsurl + '/antv/g6/4.3.2/g6.min.js');
6773
}

‎dist/maplibregl/include-maplibregl.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,19 @@
5050

5151
//加载类库资源文件
5252
function load(config) {
53-
var libsurl = config.libsurl;
53+
var libsurl = '../../web/libs';
5454
var includes = (targetScript.getAttribute('include') || '').split(',');
5555
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5656
if (!inArray(excludes, 'maplibregl')) {
5757
inputCSS(libsurl + '/maplibre-gl-js/3.1.0/maplibre-gl.css');
5858
inputScript(libsurl + '/maplibre-gl-js/3.1.0/maplibre-gl.js');
5959
}
60+
if (inArray(includes, 'L7')) {
61+
inputScript(libsurl + '/maplibregl-l7-render/index.js');
62+
}
63+
if (inArray(includes, 'g2')) {
64+
inputScript('https://cdnjs.cloudflare.com/ajax/libs/antv-g2/4.2.8/g2.min.js');
65+
}
6066
if (inArray(includes, 'turf')) {
6167
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
6268
}
@@ -86,7 +92,7 @@
8692
inputScript(libsurl + '/maplibre-echartsLayer/EchartsLayer.min.js');
8793
}
8894
if (inArray(includes, 'three')) {
89-
inputScript(libsurl+ '/three/0.150.1/three.min.js');
95+
inputScript(libsurl + '/three/0.150.1/three.min.js');
9096
}
9197
if (inArray(includes, 'three@0.121.1')) {
9298
inputScript(libsurl + '/three/0.121.1/build/three.js');
@@ -193,5 +199,5 @@
193199
window.server = document.location.toString().match(/file:\/\//)
194200
? 'http://localhost:8090'
195201
: document.location.protocol + '//' + document.location.host;
196-
window.exampleWebSymbolBasePath = "../../dist/maplibregl/resources/symbols";
202+
window.exampleWebSymbolBasePath = '../../dist/maplibregl/resources/symbols';
197203
})();

‎examples/data/0290a972-eedd-42f6-b69e-50a35e8a0824.json‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)