Skip to content

Commit 4686cb4

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
补充VT；优化以前的VT。
1 parent 8b56db1 commit 4686cb4

File tree

43 files changed

+315
-93
lines changed

Some content is hidden

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

43 files changed

+315
-93
lines changed

‎examples-test/base/commonTools.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ var commonTools = ({
2020
var exampleUrl = baseDir + '/examples/' + type + '/' + exampleName + '.html';
2121
browser.url(exampleUrl);
2222
browser.pause(2000);
23-
browser.expect.element('body').to.be.present.before(2000);
24-
browser.expect.element('#map').to.be.present.before(3000);
23+
browser.expect.element('body').to.be.present.before(5000);
24+
browser.expect.element('#map').to.be.present.before(5000);
2525
browser.pause(1000);
2626
},
2727

@@ -83,7 +83,7 @@ var commonTools = ({
8383
});
8484
browser.pause(5000, function () {
8585
console.log('start to compare two tiles');
86-
commonTools.isTwoTilesEqual(browser,tileStandardPath, tileTestPath);
86+
commonTools.isTwoTilesEqual(browser, tileStandardPath, tileTestPath);
8787
});
8888
},
8989

@@ -124,9 +124,9 @@ var commonTools = ({
124124
}
125125
console.log('tile2 ( ' + tilePath2 + ' ) has pixels : ' + (array2.length / 4));
126126
var isEqual = commonTools.judgeTwoTilesByRgbaArrays(array1, array2);
127-
if(isEqual){
127+
if (isEqual) {
128128
browser.assert.ok(isEqual, 'similarity of two pictures >= 0.94');
129-
}else{
129+
} else {
130130
browser.assert.ok(isEqual, 'similarity of two pictures < 0.94');
131131
}
132132
});

‎examples-test/leaflet/01_tiledMapLayer3857IT.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = {
55
var exampleName = '01_tiledMapLayer3857';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
8-
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 256, 256);
8+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 128, 128);
99
browser.end();
1010
}
1111
};

‎examples-test/leaflet/01_tiledMapLayer4326IT.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = {
55
var exampleName = '01_tiledMapLayer4326';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
8-
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 256, 256);
8+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, -180, 128, 128);
99
browser.end();
1010
}
1111
};

‎examples-test/leaflet/01_tiledMapLayerNonEarthIT.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = {
55
var exampleName = '01_tiledMapLayerNonEarth';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
8-
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 256, 256);
8+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 128, 128);
99
browser.end();
1010
}
1111
};

‎examples-test/leaflet/03_themeDotDensityIT.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ module.exports = {
55
var exampleName = '03_themeDotDensity';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-pane.leaflet-map-pane').to.be.present.before(5000);
9-
browser.expect.element('.leaflet-pane.leaflet-tile-pane').to.be.present.before(5000);
10-
browser.expect.element('.leaflet-layer').to.be.present.before(5000);
8+
browser.expect.element('.leaflet-pane.leaflet-map-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-tile-pane').to.be.present.before(10000);
10+
browser.expect.element('.leaflet-layer').to.be.present.before(10000);
1111
browser.elements('class name', 'leaflet-layer', function (result) {
1212
this.assert.equal(result.value.length, 2, "expect Number of leaflet-layer to be 2, actual is " + result.value.length);
1313
});

‎examples-test/leaflet/03_themeGraphIT.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ module.exports = {
55
var exampleName = '03_themeGraph';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-pane.leaflet-map-pane').to.be.present.before(5000);
9-
browser.expect.element('.leaflet-pane.leaflet-tile-pane').to.be.present.before(5000);
10-
browser.expect.element('.leaflet-layer').to.be.present.before(5000);
8+
browser.expect.element('.leaflet-pane.leaflet-map-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-tile-pane').to.be.present.before(10000);
10+
browser.expect.element('.leaflet-layer').to.be.present.before(10000);
1111
browser.elements('class name', 'leaflet-layer', function (result) {
1212
this.assert.equal(result.value.length, 2, "expect Number of leaflet-layer to be 2, actual is " + result.value.length);
1313
});

‎examples-test/leaflet/04_bufferAnalystServiceIT.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ module.exports = {
55
var exampleName = '04_bufferAnalystService';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-pane.leaflet-overlay-pane').to.be.present.before(5000);
9-
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg').to.be.present.before(5000);
10-
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg g').to.be.present.before(5000);
11-
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg g path').to.be.present.before(5000);
8+
browser.expect.element('.leaflet-pane.leaflet-overlay-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg').to.be.present.before(10000);
10+
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg g').to.be.present.before(10000);
11+
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg g path').to.be.present.before(10000);
1212
browser.elements('tag name', 'path', function (result) {
1313
this.assert.equal(result.value.length, 2, "expect Number of bufferAnalystServices path to be 2, actual is " + result.value.length);
1414
});

‎examples-test/leaflet/04_bufferAnalystService_geometryIT.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ module.exports = {
55
var exampleName = '04_bufferAnalystService_geometry';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-pane.leaflet-overlay-pane').to.be.present.before(5000);
9-
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg').to.be.present.before(5000);
10-
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg g').to.be.present.before(5000);
11-
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg g path').to.be.present.before(5000);
8+
browser.expect.element('.leaflet-pane.leaflet-overlay-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg').to.be.present.before(10000);
10+
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg g').to.be.present.before(10000);
11+
browser.expect.element('.leaflet-pane.leaflet-overlay-pane svg g path').to.be.present.before(10000);
1212
browser.elements('tag name', 'path', function (result) {
1313
this.assert.equal(result.value.length, 35, "expect Number of bufferAnalystServices(geometry) path to be 35, actual is " + result.value.length);
1414
});
15-
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(5000);
16-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(5000);
15+
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(10000);
16+
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
1717
browser.pause(1000);
1818
browser.end();
1919
}

‎examples-test/leaflet/04_densityKernelAnalystServiceIT.js‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
var commonTools = require('../base/commonTools');
2+
module.exports = {
3+
'leaflet_04_densityKernelAnalystService': function (browser) {
4+
var type = 'leaflet';
5+
var exampleName = '04_densityKernelAnalystService';
6+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
7+
/*check elements exist*/
8+
browser.expect.element('.leaflet-pane.leaflet-map-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-tile-pane').to.be.present.before(10000);
10+
browser.expect.element('.leaflet-layer').to.be.present.before(10000);
11+
browser.waitForElementPresent('.leaflet-layer', 20000, function () {
12+
browser.pause(5000);
13+
browser.elements('class name', 'leaflet-layer', function (result) {
14+
browser.assert.equal(result.value.length, 2, "expect Number of leaflet-layer to be 2, actual is " + result.value.length);
15+
});
16+
browser.elements('class name', 'leaflet-tile-container', function (result) {
17+
browser.assert.equal(result.value.length, 2, "expect Number of leaflet-tile-container to be 2, actual is " + result.value.length);
18+
});
19+
}, 'element .leaflet-layer present in 20000ms');
20+
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
21+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 32, 32, 128, 128);
22+
browser.pause(1000);
23+
browser.end();
24+
}
25+
};

‎examples-test/leaflet/04_generateSpatialDataServiceIT.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ module.exports = {
1515
browser.elements('class name', 'leaflet-tile-container', function (result) {
1616
this.assert.equal(result.value.length, 2, "expect Number of leaflet-tile-container to be 2, actual is " + result.value.length);
1717
});
18-
//commonTools.getStdTile(browser,type,exampleName,0,0,256,256);
1918
//测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
20-
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 256, 256);
19+
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 128, 128);
2120
browser.pause(1000);
2221
browser.end();
2322
}

0 commit comments

Comments
 (0)