Skip to content

Commit d375fb4

Browse files
luoxiao-supermapluoxiao-supermap
committed
2 parents 4bb578f + fd67acb commit d375fb4

File tree

24 files changed

+4013
-772
lines changed

24 files changed

+4013
-772
lines changed

‎build/jsdocs/mapboxgl/docs.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
"src/common/security/KeyServiceParameter",
6666
"src/common/components/templates/TemplateBase",
6767
"src/mapboxgl/core/Util",
68-
"src/mapboxgl/overlay/L7/l7-render"
68+
"src/mapboxgl/overlay/L7/l7-render",
69+
"src/mapboxgl/mapping/utils"
6970
]
7071
},
7172
"plugins": ["plugins/markdown","../plugins/usage", "../plugins/moduleCategories"],

‎build/jsdocs/template/config.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,10 @@
418418
"L7": {
419419
"name": "L7",
420420
"name_en": "L7"
421+
},
422+
"Video": {
423+
"name": "Video",
424+
"name_en": "Video"
421425
}
422426
}
423427
},

‎build/webpack.config.base.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,33 @@ function compareDependencies(pkgName, dependenciesToCompare, rootDependencies =
1616
});
1717
}
1818

19+
function checkRootDependencies(dependenciesToCompare, rootDependencies = pkg.dependencies) {
20+
const clientDepsList = Object.values(dependenciesToCompare);
21+
const clientNames = Object.keys(dependenciesToCompare);
22+
Object.keys(rootDependencies).forEach(name => {
23+
if (rootDependencies[name].includes('file:src/')){
24+
return;
25+
}
26+
if (!clientDepsList.some(deps => Object.keys(deps).some(item => item === name))) {
27+
console.log(chalk.red(`ERROR: The dependency ${name} version can not match in (${clientNames.join('|')}) package.json!\n`));
28+
}
29+
});
30+
}
31+
1932
const packageToClients = ['common', 'classic', 'leaflet', 'openlayers', 'mapboxgl', 'maplibregl'];
20-
packageToClients.forEach(client => {
33+
34+
const clientDepencies = packageToClients.reduce((list, client) => {
2135
// eslint-disable-next-line import/no-dynamic-require
2236
const clientPkg = require(`../src/${client}/package.json`);
23-
compareDependencies(clientPkg.name, clientPkg.dependencies);
24-
});
37+
list[clientPkg.name] = clientPkg.dependencies;
38+
return list;
39+
}, {});
40+
41+
for (const clientName in clientDepencies) {
42+
compareDependencies(clientName, clientDepencies[clientName]);
43+
}
44+
45+
checkRootDependencies(clientDepencies);
2546

2647
//包版本(ES6或者ES5)
2748
let moduleVersion = process.env.moduleVersion || 'es5';

‎build/webpack.config.mapboxgl.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ const libName = 'mapboxgl';
44
//产品包名
55
const productName = 'iclient-mapboxgl';
66
//复制文件
7-
const CopyPlugin = require("copy-webpack-plugin");
7+
const CopyPlugin = require('copy-webpack-plugin');
88

99
module.exports = {
1010
target: configBase.target,
1111
mode: configBase.mode,
1212
//页面入口文件配置
13-
entry: [...configBase.entry, `${__dirname}/../src/mapboxgl/namespace.js`, `${__dirname}/../src/mapboxgl/css/index.js`],
13+
entry: [
14+
...configBase.entry,
15+
`${__dirname}/../src/mapboxgl/namespace.js`,
16+
`${__dirname}/../src/mapboxgl/css/index.js`
17+
],
1418
//入口文件输出配置
1519
output: configBase.output(libName, productName),
1620
//是否启用压缩
@@ -29,9 +33,10 @@ module.exports = {
2933
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
3034
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
3135
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
32-
'@turf/turf': "function(){try{return turf}catch(e){return {}}}()",
36+
'@turf/turf': 'function(){try{return turf}catch(e){return {}}}()',
3337
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
34-
'./L7/l7-render': 'function(){try{return L7}catch(e){return {}}}()'
38+
'./L7/l7-render': 'function(){try{return L7}catch(e){return {}}}()',
39+
'@antv/g2': 'function(){try{return G2}catch(e){return {}}}()'
3540
})
3641
],
3742

@@ -60,8 +65,8 @@ module.exports = {
6065
]
6166
]
6267
}
63-
}
64-
configBase.moduleVersion === "es6" && (babelConfig.include = /FGBLayer|flatgeobuf/);
68+
};
69+
configBase.moduleVersion === 'es6' && (babelConfig.include = /FGBLayer|flatgeobuf/);
6570
moduleRules.push(babelConfig);
6671
moduleRules.push(configBase.module.rules.css);
6772
return moduleRules;

‎examples-test/leaflet/01_layersLegend.js

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
var commonTools = require('../base/commonTools');
2+
module.exports = {
3+
after: function (browser) {
4+
console.log('Closing down...');
5+
browser.end();
6+
},
7+
leaflet_01_layersLegend: function (browser) {
8+
var type = 'leaflet';
9+
var exampleName = '01_layersLegend';
10+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
11+
/*check element exist*/
12+
// browser.waitForElementPresent('.leaflet-popup-content', 10000);
13+
/*check the info showing in leaflet-popup is equal to our expectation*/
14+
browser.elements('css selector', '.panel.panel-primary', function (result) {
15+
console.log('----Hope number of panel to be 2, actual is ' + result.value.length);
16+
});
17+
browser.waitForElementVisible('#mapLegend>div');
18+
browser.expect.elements('#layersList label').count.to.equal(9);
19+
browser.click('.panel.panel-primary #layersList input');
20+
browser.click('.btn.btn-default');
21+
browser.waitForElementVisible('#mapLegend>div');
22+
browser.pause(1000);
23+
browser.expect.elements('#mapLegend>div').count.to.equal(4);
24+
browser.expect.element('#mapLegend div:nth-child(1)').text.to.equal('CoordsysLabel@Jingjin');
25+
browser.expect.element('#mapLegend div:nth-child(3)').text.to.equal('Landuse_R@Jingjin#1');
26+
browser.expect
27+
.elements(
28+
'img[src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAa0lEQVR4XmNgoAWYsXz3f0IYXQ9WAFOMC4DkInMbwBhdLwogxiAYwGsY3QyCeQsZo5sBBtgMErETgWN0QLRB6JrR+UQbhA4oNohir8EANkNAgGSDcAGSDaKai6hmEC5AP4PQswE+jG4GxQAAXHqikucMHGcAAAAASUVORK5CYII="]'
29+
)
30+
.count.to.equal(0);
31+
//测试版权点击的正确性
32+
//commonTools.verifyCopyrightOfLeaflet(browser);
33+
// browser.pause(1000);
34+
// browser.end();
35+
}
36+
};

‎examples/leaflet/01_layersLegend.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
max-height: 40vh;
1313
overflow: auto;
1414
font-size: 12px;
15+
text-wrap: nowrap;
1516
}
1617

1718
#layersList label {
@@ -63,7 +64,6 @@ <h5 class='panel-title text-center'>
6364
<div class="panel-body" id="mapLegend"></div>
6465
</div>
6566
</div>
66-
</div>
6767

6868
<script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
6969
<script type="text/javascript" src="../../dist/leaflet/include-leaflet.js"></script>
@@ -89,12 +89,12 @@ <h5 class='panel-title text-center'>
8989
layerGroup.innerHTML = layer.name;
9090
layerGroup.className = 'layer-group';
9191
layerGroup.setAttribute('data-toggle', 'collapse');
92-
layerGroup.setAttribute('data-target', '#' + layer.name);
92+
layerGroup.setAttribute('data-target', '#' + layer.name.replace(/#/g, '_'));
9393
groupWrapper.appendChild(layerGroup);
9494

9595
parentDom.appendChild(groupWrapper);
9696
var collapse = document.createElement('div');
97-
collapse.id = layer.name;
97+
collapse.id = layer.name.replace(/#/g, '_');
9898
collapse.className = 'collapse';
9999
collapse.style.paddingLeft = '18px';
100100
groupWrapper.appendChild(collapse);

‎examples/mapboxgl/01_layersLegend.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
max-height: 40vh;
1313
overflow: auto;
1414
font-size: 12px;
15+
text-wrap: nowrap;
1516
}
1617

1718
#layersList label {
@@ -110,12 +111,12 @@ <h5 class='panel-title text-center'>
110111
layerGroup.innerHTML = layer.name;
111112
layerGroup.className = 'layer-group';
112113
layerGroup.setAttribute('data-toggle', 'collapse');
113-
layerGroup.setAttribute('data-target', '#' + layer.name);
114+
layerGroup.setAttribute('data-target', '#' + layer.name.replace(/#/g, '_'));
114115
groupWrapper.appendChild(layerGroup);
115116

116117
parentDom.appendChild(groupWrapper);
117118
var collapse = document.createElement('div');
118-
collapse.id = layer.name;
119+
collapse.id = layer.name.replace(/#/g, '_');
119120
collapse.className = 'collapse';
120121
collapse.style.paddingLeft = '18px';
121122
groupWrapper.appendChild(collapse);

‎examples/maplibregl/01_layersLegend.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
max-height: 40vh;
1414
overflow: auto;
1515
font-size: 12px;
16+
text-wrap: nowrap;
1617
}
1718

1819
#layersList label {
@@ -111,12 +112,12 @@ <h5 class='panel-title text-center'>
111112
layerGroup.innerHTML = layer.name;
112113
layerGroup.className = 'layer-group';
113114
layerGroup.setAttribute('data-toggle', 'collapse');
114-
layerGroup.setAttribute('data-target', '#' + layer.name);
115+
layerGroup.setAttribute('data-target', '#' + layer.name.replace(/#/g, '_'));
115116
groupWrapper.appendChild(layerGroup);
116117

117118
parentDom.appendChild(groupWrapper);
118119
var collapse = document.createElement('div');
119-
collapse.id = layer.name;
120+
collapse.id = layer.name.replace(/#/g, '_');
120121
collapse.className = 'collapse';
121122
collapse.style.paddingLeft = '18px';
122123
groupWrapper.appendChild(collapse);

‎examples/openlayers/01_layersLegend.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
max-height: 40vh;
1414
overflow: auto;
1515
font-size: 12px;
16+
text-wrap: nowrap;
1617
}
1718

1819
#layersList label {
@@ -114,12 +115,12 @@ <h5 class='panel-title text-center'>
114115
layerGroup.innerHTML = layer.name;
115116
layerGroup.className = 'layer-group';
116117
layerGroup.setAttribute('data-toggle', 'collapse');
117-
layerGroup.setAttribute('data-target', '#' + layer.name);
118+
layerGroup.setAttribute('data-target', '#' + layer.name.replace(/#/g, '_'));
118119
groupWrapper.appendChild(layerGroup);
119120

120121
parentDom.appendChild(groupWrapper);
121122
var collapse = document.createElement('div');
122-
collapse.id = layer.name;
123+
collapse.id = layer.name.replace(/#/g, '_');
123124
collapse.className = 'collapse';
124125
collapse.style.paddingLeft = '18px';
125126
groupWrapper.appendChild(collapse);

‎package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@
7373
"@babel/preset-env": "^7.23.8",
7474
"@babel/traverse": "^7.23.7",
7575
"@babel/types": "^7.23.6",
76+
"@elastic/elasticsearch": "^5.6.22",
7677
"@geoman-io/leaflet-geoman-free": "^2.14.2",
78+
"@sinonjs/text-encoding": "^0.7.2",
7779
"@supermap/babel-plugin-import": "^0.0.1",
80+
"@tensorflow/tfjs": "^3.9.0",
7881
"babel-eslint": "^10.1.0",
7982
"babel-loader": "^8.1.0",
8083
"babel-plugin-istanbul": "^6.0.0",
@@ -88,6 +91,7 @@
8891
"clean-css-cli": "^4.3.0",
8992
"commander": "^9.0.0",
9093
"copy-webpack-plugin": "^9.1.0",
94+
"core-js": "^3.30.2",
9195
"cross-env": "^7.0.2",
9296
"css-loader": "^6.7.1",
9397
"elasticsearch": "16.7.3",
@@ -116,34 +120,36 @@
116120
"open": "^8.4.0",
117121
"pngjs": "^6.0.0",
118122
"pre-commit": "^1.2.2",
123+
"process": "^0.11.10",
119124
"request": "^2.88.0",
120125
"selenium-server": "3.141.59",
121126
"serve-index": "^1.9.1",
122127
"shelljs": "^0.8.4",
123128
"style-loader": "^2.0.0",
124129
"uglify-es": "^3.3.9",
130+
"util": "^0.12.4",
125131
"watchify": "^3.11.1",
126132
"webpack": "^5.1.3",
127133
"webpack-cli": "4.2.0",
128134
"webpack-dev-middleware": "^4.0.2",
129135
"webpack-node-externals": "^2.5.2"
130136
},
131137
"dependencies": {
138+
"@antv/g2": "^4.2.11",
132139
"@antv/g6": "^4.8.14",
133-
"@elastic/elasticsearch": "^5.6.22",
140+
"@mapbox/mapbox-gl-style-spec": "^14.3.0",
134141
"@mapbox/vector-tile": "1.3.1",
135-
"@sinonjs/text-encoding": "^0.7.2",
136142
"@supermap/iclient-common": "file:src/common",
137143
"@supermap/tile-decryptor": "^0.0.2",
138-
"@tensorflow/tfjs": "^3.9.0",
144+
"@turf/center": "^6.5.0",
139145
"@turf/turf": "6.5.0",
140146
"canvg": "3.0.10",
141-
"core-js": "^3.30.2",
142147
"echarts": "5.4.3",
143148
"fast-xml-parser": "^4.2.7",
144149
"fetch-ie8": "1.5.0",
145150
"fetch-jsonp": "1.1.3",
146151
"flatgeobuf": "3.23.1",
152+
"flv.js": "^1.6.2",
147153
"insert-css": "^2.0.0",
148154
"jsonsql": "0.2.5",
149155
"leaflet": "1.9.4",
@@ -158,14 +164,11 @@
158164
"node-forge": "^1.3.1",
159165
"ol": "6.14.1",
160166
"pbf": "3.2.1",
161-
"process": "^0.11.10",
162167
"proj4": "2.9.0",
163168
"promise-polyfill": "8.2.3",
164169
"rbush": "^2.0.2",
165170
"three": "0.150.1",
166171
"urijs": "^1.19.11",
167-
"util": "^0.12.4",
168-
"flv.js": "^1.6.2",
169172
"video.js": "^7.10.2",
170173
"videojs-flvjs-es6": "^1.0.1",
171174
"xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy