Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: Yuki-Zhao

examples-test/base/commonTools.js

@@ -3,6 +3,7 @@ var PNG = require('pngjs').PNG;
 var getPixels = require("get-pixels");
 var size = require('image-size');
 var n = 0; //截图次数
+var mapsize;
 
 var commonTools = ({
 
@@ -42,6 +43,7 @@ var commonTools = ({
         browser.pause(5000);
         browser.saveScreenshot(screenShotPath, function () {
             console.log('Screenshot has been saved , now start to get StdTile from Screenshot');
+            //dimensions 是整幅图 图片的大小
             size(screenShotPath, function (err, dimensions) {
                 var totalWidth = dimensions.width;
                 var totalHeight = dimensions.height;
@@ -53,6 +55,7 @@ var commonTools = ({
         });
         browser.pause(2000, function () {
             commonTools.deleteFolders('./examples-test/temp');
+            // commonTools.deleteFolders('./examples-test/output');
         })
     },
 

examples-test/openlayers/01_tiledMapLayer3857IT.js

@@ -1,11 +1,14 @@
 var commonTools = require('../base/commonTools');
 module.exports = {
     'openlayers_01_tiledMapLayer3857': function (browser) {
-        browser.windowMaximize();
+        // browser.windowMaximize();
+        browser.resizeWindow(1200, 800);
         var type = 'openlayers';
         var exampleName = '01_tiledMapLayer3857';
         commonTools.openExampleAndLoadMap(browser, type, exampleName);
         //测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
+        //运行一次得到基准图片
+        commonTools.getStdTile(browser, type, exampleName, 0, 0, 256, 256);
         commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 256, 256);
         browser.end();
     }

examples-test/openlayers/01_tiledMapLayer4326IT.js

@@ -1,11 +1,14 @@
 var commonTools = require('../base/commonTools');
 module.exports = {
     'openlayers_01_tiledMapLayer4326': function (browser) {
-        browser.windowMaximize();
+        // browser.windowMaximize();
+        browser.resizeWindow(1200, 800);
         var type = 'openlayers';
         var exampleName = '01_tiledMapLayer4326';
         commonTools.openExampleAndLoadMap(browser, type, exampleName);
         //测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
+        //运行一次得到基准图片
+        commonTools.getStdTile(browser, type, exampleName, 0, 0, 256, 256);
         commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 256, 256);
         browser.end();
     }

examples-test/openlayers/01_tiledMapLayerOverlappedIT.js

@@ -1,10 +1,13 @@
 var commonTools = require('../base/commonTools');
 module.exports = {
-    'openlayers_01_tiledMapLayerOverlapped': function (browser) {
-        browser.windowMaximize();
+    'openlayers_01_tiledMapLayerOverlapped': function(browser) {
+        // browser.windowMaximize();
+        browser.resizeWindow(1200, 800);
         var type = 'openlayers';
         var exampleName = '01_tiledMapLayerOverlapped';
         commonTools.openExampleAndLoadMap(browser, type, exampleName);
+        //运行一次得到基准图片
+        commonTools.getStdTile(browser, type, exampleName, 50, 50, 128, 128);
         //测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
         commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 50, 50, 128, 128);
         browser.end();

examples-test/openlayers/03_themeGraduatedSymbolIT.js

@@ -1,10 +1,13 @@
 var commonTools = require('../base/commonTools');
 module.exports = {
     'openlayers_03_themeGraduatedSymbol': function (browser) {
-        browser.windowMaximize();
+        // browser.windowMaximize();
+        browser.resizeWindow(1200, 800);
         var type = 'openlayers';
         var exampleName = '03_themeGraduatedSymbol';
         commonTools.openExampleAndLoadMap(browser, type, exampleName);
+        //运行一次得到基准图片
+        // commonTools.getStdTile(browser, type, exampleName, 0, 0, 256, 256);
         //测试过程中截取地图瓦片, 和已有的标准瓦片进行对比
         commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 0, 0, 256, 256);
         browser.end();