Skip to content

Commit ecc8473

Browse files
补充leaflet和openlayers下的VT。
1 parent 8c12da3 commit ecc8473

17 files changed

+166
-5
lines changed

examples-test/base/commonTools.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ var commonTools = ({
125125
array2.push(pixels.data[i]);
126126
}
127127
console.log('tile2 ( ' + tilePath2 + ' ) has pixels : ' + (array2.length / 4));
128-
var isEqual = commonTools.judgeTwoTilesByRgbaArrays(array1, array2);
128+
var isEqual = commonTools.judgeTwoTilesByRgbaArrays(browser, array1, array2);
129129
if (isEqual) {
130130
browser.assert.ok(isEqual, 'similarity of two pictures >= 0.94');
131131
} else {
@@ -140,7 +140,7 @@ var commonTools = ({
140140
* elements in one-dimensional RgbaArrays are [r1,g1,b1,a1,r2,g2,b2,a2,...,rn,gn,bn,an].
141141
* return : boolean
142142
* */
143-
judgeTwoTilesByRgbaArrays: function (RgbaArraysOfTile1, RgbaArraysOfTile2) {
143+
judgeTwoTilesByRgbaArrays: function (browser, RgbaArraysOfTile1, RgbaArraysOfTile2) {
144144
var isLengthEqual = (RgbaArraysOfTile1.length == RgbaArraysOfTile2.length);
145145
if (!isLengthEqual) {
146146
console.log('length are not equal');
@@ -152,10 +152,10 @@ var commonTools = ({
152152
console.log('different pixels count : ' + unEqualCount);
153153
var similarity = ((totalCount - unEqualCount) / totalCount).toFixed(5);
154154
if (similarity < 0.94) {
155-
console.log('similarity : ' + similarity + ' < 0.94');
155+
browser.assert.ok(similarity < 0.94, 'similarity : ' + similarity + ' < 0.94');
156156
return false;
157157
}
158-
console.log('similarity : ' + similarity + ' >= 0.94');
158+
browser.assert.ok(similarity >= 0.94, 'similarity : ' + similarity + ' >= 0.94');
159159
return true;
160160
},
161161

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
var commonTools = require('../base/commonTools');
2+
module.exports = {
3+
'leaflet_WMSLayer': function (browser) {
4+
var type = 'leaflet';
5+
var exampleName = 'WMSLayer';
6+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
7+
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
8+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 128, 128);
9+
browser.end();
10+
}
11+
};
12+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
var commonTools = require('../base/commonTools');
2+
module.exports = {
3+
'leaflet_WMTSLayer': function (browser) {
4+
var type = 'leaflet';
5+
var exampleName = 'WMTSLayer';
6+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
7+
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
8+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 128, 128);
9+
browser.end();
10+
}
11+
};
12+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
var commonTools = require('../base/commonTools');
2+
module.exports = {
3+
'leaflet_baiduLayer': function (browser) {
4+
var type = 'leaflet';
5+
var exampleName = 'baiduLayer';
6+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
7+
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
8+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 128, 128);
9+
browser.end();
10+
}
11+
};
12+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
var commonTools = require('../base/commonTools');
2+
module.exports = {
3+
'leaflet_cloudLayer': function (browser) {
4+
var type = 'leaflet';
5+
var exampleName = 'cloudLayer';
6+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
7+
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
8+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 128, 128);
9+
browser.end();
10+
}
11+
};
12+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
var commonTools = require('../base/commonTools');
2+
module.exports = {
3+
'leaflet_iPortalWebmap': function (browser) {
4+
var type = 'leaflet';
5+
var exampleName = 'iPortalWebmap';
6+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
7+
/*check elements exist*/
8+
browser.waitForElementPresent('.leaflet-layer', 10000);
9+
browser.waitForElementPresent('.leaflet-tile-container.leaflet-zoom-animated', 10000);
10+
browser.waitForElementPresent('.leaflet-tile-container.leaflet-zoom-animated img', 10000);
11+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane', 10000);
12+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane img', 10000);
13+
browser.pause(1000);
14+
browser.elements('class name', 'leaflet-layer', function (result) {
15+
this.assert.equal(result.value.length, 2, "expect Number of leaflet-layer to be 2, actual is " + result.value.length);
16+
});
17+
browser.elements('class name', 'leaflet-tile-container', function (result) {
18+
this.assert.equal(result.value.length, 2, "expect Number of leaflet-tile-container to be 2, actual is " + result.value.length);
19+
});
20+
browser.elements('class name', 'leaflet-marker-icon', function (result) {
21+
this.assert.ok(result.value.length > 0, "expect Number of marker to be greater than 0, actual is " + result.value.length);
22+
});
23+
browser.useXpath().click('//*[@id="map"]/div[1]/div[4]/img[22]', function () {
24+
this.waitForElementPresent('//*[@id="map"]/div[1]/div[6]/div/div[1]/div', 10000);
25+
var popupInfo = '届';
26+
browser.expect.element('//*[@id="map"]/div[1]/div[6]/div/div[1]/div').text.to.be.contain(popupInfo);
27+
});
28+
browser.pause(1000);
29+
browser.end();
30+
}
31+
};
7.05 KB
Loading
8.86 KB
Loading
2.15 KB
Loading
7.11 KB
Loading

0 commit comments

Comments
 (0)