fix ut

Author: xilanhuaweidapao

test/mapboxgl/mapping/VideoMapSpec.js

@@ -17,7 +17,7 @@ describe('mapboxgl_videoMap', () => {
       CV_64FC1: 'CV_64FC1',
       matFromImageData: function () {
         return {
-          delete: function () {}
+          delete: function () { }
         };
       },
       Size: function () {
@@ -26,22 +26,22 @@ describe('mapboxgl_videoMap', () => {
           height: 690
         };
       },
-      matFromArray: function () {},
+      matFromArray: function () { },
       Mat: function () {
         return {
-          inv: function () {},
-          delete: function () {},
+          inv: function () { },
+          delete: function () { },
           data64F: [200, 100],
           cols: 2,
           rows: 2,
           data: [1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4]
         };
       },
-      gemm: function () {},
-      Rodrigues: function () {},
-      projectPoints: function () {},
-      multiply: function () {},
-      subtract: function () {}
+      gemm: function () { },
+      Rodrigues: function () { },
+      projectPoints: function () { },
+      multiply: function () { },
+      subtract: function () { }
     };
   });
   afterEach(() => {
@@ -61,24 +61,22 @@ describe('mapboxgl_videoMap', () => {
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
   });
- 
+
   it('init videoMap', (done) => {
     var url = videoUrl;
-    var videoMap = new VideoMap({
-      src: url,
+    var videoMap = new VideoMap(url, {
+      fovX: 84,
+      fovY: 47,
+      centerX: 960,
+      centerY: 540,
+      pitch: -20,
+      roll: 0,
+      yaw: 2,
+      x: 11587478.810629973,
+      y: 3570800.195541344,
+      z: 154.50312
+    }, {
       opencv: cv,
-      videoParameters: {
-        fovX: 84,
-        fovY: 47,
-        centerX: 960,
-        centerY: 540,
-        pitch: -20,
-        roll: 0,
-        yaw: 2,
-        x: 11587478.810629973,
-        y: 3570800.195541344,
-        z: 154.50312
-      }
     });
     videoMap.on('load', function () {
       expect(videoMap.coordTransfer).not.toBe(null);
@@ -89,21 +87,19 @@ describe('mapboxgl_videoMap', () => {
 
   it('addlayer removelayer', (done) => {
     var url = videoUrl;
-    var videoMap = new VideoMap({
-      src: url,
+    var videoMap = new VideoMap(url, {
+      fovX: 84,
+      fovY: 47,
+      centerX: 960,
+      centerY: 540,
+      pitch: -20,
+      roll: 0,
+      yaw: 2,
+      x: 11587478.810629973,
+      y: 3570800.195541344,
+      z: 154.50312
+    }, {
       opencv: cv,
-      videoParameters: {
-        fovX: 84,
-        fovY: 47,
-        centerX: 960,
-        centerY: 540,
-        pitch: -20,
-        roll: 0,
-        yaw: 2,
-        x: 11587478.810629973,
-        y: 3570800.195541344,
-        z: 154.50312
-      }
     });
     videoMap.on('load', function () {
       videoMap.addLayer({
@@ -154,21 +150,19 @@ describe('mapboxgl_videoMap', () => {
 
   it('addSource removeSource', (done) => {
     var url = videoUrl;
-    var videoMap = new VideoMap({
-      src: url,
+    var videoMap = new VideoMap(url, {
+      fovX: 84,
+      fovY: 47,
+      centerX: 960,
+      centerY: 540,
+      pitch: -20,
+      roll: 0,
+      yaw: 2,
+      x: 11587478.810629973,
+      y: 3570800.195541344,
+      z: 154.50312
+    }, {
       opencv: cv,
-      videoParameters: {
-        fovX: 84,
-        fovY: 47,
-        centerX: 960,
-        centerY: 540,
-        pitch: -20,
-        roll: 0,
-        yaw: 2,
-        x: 11587478.810629973,
-        y: 3570800.195541344,
-        z: 154.50312
-      }
     });
     videoMap.on('load', function () {
       videoMap.addSource('test111', {

test/mapboxgl/overlay/VideoLayerSpec.js

@@ -127,27 +127,25 @@ describe('mapboxgl_VideoLayer', () => {
     var url = videoUrl;
     spyOn(cv, 'Size');
     spyOn(cv, 'warpPerspective');
-    var videoLayer = new VideoLayer({
-      url: url,
+    var videoLayer = new VideoLayer(url, {
+      fovX: 84,
+      fovY: 47,
+      centerX: 960,
+      centerY: 540,
+      pitch: -20,
+      roll: 0,
+      yaw: 2,
+      x: 11587478.810629973,
+      y: 3570800.195541344,
+      z: 154.50312
+    }, {
       opencv: cv,
       clipRegion: [
         [0, 0],
         [1920, 0],
         [1920, 900],
         [0, 900]
       ],
-      videoParameters: {
-        fovX: 84,
-        fovY: 47,
-        centerX: 960,
-        centerY: 540,
-        pitch: -20,
-        roll: 0,
-        yaw: 2,
-        x: 11587478.810629973,
-        y: 3570800.195541344,
-        z: 154.50312
-      },
       extent: [
         [116.14394400766855, 28.249134537249257],
         [116.143464581289, 28.252977295834056],
@@ -169,27 +167,25 @@ describe('mapboxgl_VideoLayer', () => {
 
   it('render moveLayer onRemove setVisibility', (done) => {
     var url = videoUrl;
-    var videoLayer = new VideoLayer({
-      url: url,
+    var videoLayer = new VideoLayer(url, {
+      fovX: 84,
+      fovY: 47,
+      centerX: 960,
+      centerY: 540,
+      pitch: -20,
+      roll: 0,
+      yaw: 2,
+      x: 11587478.810629973,
+      y: 3570800.195541344,
+      z: 154.50312
+    }, {
       opencv: cv,
       clipRegion: [
         [0, 0],
         [1920, 0],
         [1920, 900],
         [0, 900]
       ],
-      videoParameters: {
-        fovX: 84,
-        fovY: 47,
-        centerX: 960,
-        centerY: 540,
-        pitch: -20,
-        roll: 0,
-        yaw: 2,
-        x: 11587478.810629973,
-        y: 3570800.195541344,
-        z: 154.50312
-      },
       extent: [
         [116.14394400766855, 28.249134537249257],
         [116.143464581289, 28.252977295834056],