fix ut

Author: xilanhuaweidapao

src/common/iServer/VideoFeature.js

@@ -63,8 +63,8 @@ export class VideoFeature {
   destroy() {
     if (this.geometry && this.geometry.destroy) {
       this.geometry.destroy();
-      this.geometry = null;
     }
+    this.geometry = null;
     this.name = null;
     this.videoParameters = null;
     this.cameraLocation = null;

src/mapboxgl/mapping/utils/VideoMapUtil.js

@@ -22,16 +22,6 @@ export const transformCoordReverse = ({
   return [(coord[0] - originCoordsLeftTop.lng) / perWidth, (originCoordsLeftTop.lat - coord[1]) / perHeight];
 };
 
-export const validLnglat = (lnglat) => {
-  if (!lnglat) {
-    return false;
-  }
-  if (lnglat[0] < -90 || lnglat[1] > 90 || lnglat[0] > 90 || lnglat[1] < -90) {
-    return false;
-  }
-  return true;
-};
-
 export const fovXToFx = (fovX, videoWidth) => {
   return videoWidth / (2 * Math.tan(fovX / 2 * Math.PI / 180));
 }

test/common/util/GeometryAnalysisSpec.js

@@ -58,6 +58,64 @@ describe('GeometryAnalysis', () => {
     expect(result).toBeTruthy();
   });
 
+
+  it('isIdentical multilinestring', () => {
+    const line1 = {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "coordinates": [[
+          [
+            67.99609375000006,
+            67.69489448648969
+          ],
+          [
+            89.26562499999926,
+            63.72666005814014
+          ]
+        ], [
+          [
+            57.80078124999906,
+            65.82307382870485
+          ],
+          [
+            93.1328124999992,
+            59.201303359951794
+          ]
+        ]],
+        "type": "MultiLineString"
+      }
+    };
+    const line2 = {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "coordinates": [[
+          [
+            67.99609375000006,
+            67.69489448648969
+          ],
+          [
+            89.26562499999926,
+            63.72666005814014
+          ]
+        ], [
+          [
+            57.80078124999906,
+            65.82307382870485
+          ],
+          [
+            93.1328124999992,
+            59.201303359951794
+          ]
+        ]],
+        "type": "MultiLineString"
+      }
+    };
+    const result = instance.isIdentical(line1, line2);
+    expect(result).toBeTruthy();
+  });
+
   it('hasTouch', () => {
     const polygon1 = {
       type: 'Feature',
@@ -346,7 +404,7 @@ describe('GeometryAnalysis', () => {
     const result = instance.computeGeodesicArea(polygon, 4326);
     expect(result).toBe(6.578677712850164);
   });
-  
+
   it('computeGeodesicDistance', () => {
     var xArray = [120, 125];
     var yArray = [30, 30];

test/leaflet/services/EditVideoFeatureSpec.js

@@ -60,4 +60,65 @@ describe('leaflet_EditVideoFeature', () => {
       done();
     });
   })
+
+  it('toGeoJSONFeature', done => {
+    const geometry1 = {
+      type: 'Feature',
+      geometry: {
+        type: 'Polygon',
+        coordinates: [
+          [
+            [116.75, 39.75],
+            [117.25, 39.75],
+            [117.25, 40.75],
+            [116.75, 40.75],
+            [116.75, 39.75]
+          ]
+        ]
+      }
+    };
+
+    var videoFeature = new VideoFeature({
+      id: 1,
+      name: 'newTest.mp4',
+      geometry: geometry1,
+      address: 'http://localhost:9876/iserver/services/video/restjsr/hls/stream/test/index.m3u8'
+    });
+
+    var transFeature = videoFeature.toGeoJSONFeature();
+    expect(transFeature.type).toBe('Feature');
+    expect(transFeature.id).toBe(1);
+    expect(transFeature.geometry).toEqual(geometry1);
+    done();
+  })
+
+  it('destroy', done => {
+    const geometry = {
+      type: 'Feature',
+      geometry: {
+        type: 'Polygon',
+        coordinates: [
+          [
+            [116.75, 39.75],
+            [117.25, 39.75],
+            [117.25, 40.75],
+            [116.75, 40.75],
+            [116.75, 39.75]
+          ]
+        ]
+      }
+    };
+
+    var videoFeature = new VideoFeature({
+      id: 1,
+      name: 'newTest.mp4',
+      geometry: geometry,
+      address: 'http://localhost:9876/iserver/services/video/restjsr/hls/stream/test/index.m3u8'
+    });
+    expect(videoFeature.geometry).toEqual(geometry);
+    videoFeature.destroy();
+    expect(videoFeature.name).toBeNull();
+    expect(videoFeature.geometry).toBeNull();
+    done();
+  })
 });

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,7 +61,7 @@ describe('mapboxgl_videoMap', () => {
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
   });
- 
+
   it('init videoMap', (done) => {
     var url = videoUrl;
     var videoMap = new VideoMap({
@@ -201,4 +201,28 @@ describe('mapboxgl_videoMap', () => {
       done();
     });
   });
+
+  it('destroy', (done) => {
+    var videoMap = new VideoMap({
+      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
+      }
+    });
+    setTimeout(() => {
+      videoMap.videoMapLayer = null;
+      videoMap.destroy();
+      expect(videoMap.map).toBeNull();
+      done();
+    }, 2000);
+  });
 });