fixed array operations

jasgnft · Jun 19, 2023 · 01f86fd · 01f86fd
1 parent a46df53
commit 01f86fd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/cvat-core/src/annotations-collection.ts b/cvat-core/src/annotations-collection.ts
@@ -703,12 +703,8 @@ export default class Collection {
                 continue;
             }
 
-            if (filter) {
-                if (filter.jobID) {
-                    if (object.jobID && (object.jobID !== filter.jobID)) {
-                        continue;
-                    }
-                }
+            if (object.jobID && object.jobID !== filter?.jobID) {
+                continue;
             }
 
             let objectType = null;

diff --git a/cvat-core/src/annotations.ts b/cvat-core/src/annotations.ts
@@ -30,25 +30,31 @@ function getCache(sessionType) {
 }
 
 function processGroundTruthAnnotations(rawAnnotations, groundTruthAnnotations) {
-    groundTruthAnnotations.shapes.forEach((annotation) => { annotation.is_gt = true; });
-    groundTruthAnnotations.tracks.forEach((annotation) => { annotation.is_gt = true; });
-    groundTruthAnnotations.tags.forEach((annotation) => { annotation.is_gt = true; });
+    const annotations = [].concat(
+        groundTruthAnnotations.shapes,
+        groundTruthAnnotations.tracks,
+        groundTruthAnnotations.tags,
+    );
+    annotations.forEach((annotation) => { annotation.is_gt = true; });
     const result = {
-        shapes: [...rawAnnotations.shapes, ...groundTruthAnnotations.shapes],
-        tracks: [...rawAnnotations.tracks, ...groundTruthAnnotations.tracks],
-        tags: [...rawAnnotations.tags, ...groundTruthAnnotations.tags],
+        shapes: rawAnnotations.shapes.slice(0).concat(groundTruthAnnotations.shapes.slice(0)),
+        tracks: rawAnnotations.tracks.slice(0).concat(groundTruthAnnotations.tracks.slice(0)),
+        tags: rawAnnotations.tags.slice(0).concat(groundTruthAnnotations.tags.slice(0)),
     };
     return result;
 }
 
 function addJobId(rawAnnotations, jobID) {
-    rawAnnotations.shapes.forEach((annotation) => { annotation.job_id = jobID; });
-    rawAnnotations.tracks.forEach((annotation) => { annotation.job_id = jobID; });
-    rawAnnotations.tags.forEach((annotation) => { annotation.job_id = jobID; });
+    const annotations = [].concat(
+        rawAnnotations.shapes,
+        rawAnnotations.tracks,
+        rawAnnotations.tags,
+    );
+    annotations.forEach((annotation) => { annotation.job_id = jobID; });
     const result = {
-        shapes: [...rawAnnotations.shapes],
-        tracks: [...rawAnnotations.tracks],
-        tags: [...rawAnnotations.tags],
+        shapes: rawAnnotations.shapes.slice(0),
+        tracks: rawAnnotations.tracks.slice(0),
+        tags: rawAnnotations.tags.slice(0),
     };
     return result;
 }