Merge pull request #728 from biigle/annotation-deletion-bug

Remove null (gap) to prevent validation errors

Author: mzur

app/VideoAnnotation.php

@@ -105,7 +105,8 @@ public function validatePoints(array $points = [])
             throw new Exception('The number of key frames does not match the number of annotation coordinates.');
         }
 
-        array_map([$this, 'parent::validatePoints'], $this->points);
+        // Gaps are represented as empty arrays
+        array_map(function ($point) { if (count($point)) { parent::validatePoints($point); } }, $this->points);
     }
 
     /**

resources/assets/js/videos/models/Annotation.vue

@@ -282,6 +282,16 @@ export default Vue.extend({
                 this.frames.splice(index, 1);
                 this.points.splice(index, 1);
 
+                // Remove "null" elements of adjacent gaps to
+                // avoid multiple consecutive "null"s.
+                if (index === 0 && this.frames[0] === null) {
+                    this.frames.splice(0, 1);
+                    this.points.splice(0, 1);
+                } else if (this.frames[index - 1] === null) {
+                    this.frames.splice(index - 1, 1);
+                    this.points.splice(index - 1, 1);
+                }
+
                 return VideoAnnotationApi.update({id: this.id}, {
                     frames: this.frames,
                     points: this.points

tests/php/VideoAnnotationTest.php

@@ -49,6 +49,14 @@ public function testValidatePointsFramesMismatch()
         $this->model->validatePoints();
     }
 
+    public function testValidatePointsWithGap()
+    {
+        $this->expectNotToPerformAssertions();
+        $this->model->points = [[10, 10], [], [20, 20]];
+        $this->model->frames = [0.0, null, 1.0];
+        $this->model->validatePoints();
+    }
+
     public function testValidatePointsPoint()
     {
         $this->model->shape_id = Shape::pointId();