Resolved performance bottleneck in merge function (#999)

bsekachev · nmanovic · commit 2e8af445db0c · 2019-12-24T16:05:35.000+03:00
diff --git a/cvat/apps/engine/static/engine/js/shapeMerger.js b/cvat/apps/engine/static/engine/js/shapeMerger.js
@@ -135,7 +135,6 @@ class ShapeMergerModel extends Listener {
                 object.shapes.push(
                     Object.assign(shapeDict[frame].interpolation.position,
                         {
-                            z_order: this._collectionModel.zOrder(frame).max,
                             frame: frame,
                             attributes: shapeAttributes
                         }
@@ -150,7 +149,7 @@ class ShapeMergerModel extends Listener {
                     let copy = Object.assign({}, object.shapes[object.shapes.length - 1]);
                     copy.outside = true;
                     copy.frame += 1;
-                    copy.z_order =  this._collectionModel.zOrder(frame).max;
+                    copy.z_order = 0;
                     copy.attributes = [];
                     object.shapes.push(copy);
                 }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ class ShapeMergerModel extends Listener {`
`135`	`135`	`object.shapes.push(`
`136`	`136`	`Object.assign(shapeDict[frame].interpolation.position,`
`137`	`137`	`{`
`138`		`- z_order: this._collectionModel.zOrder(frame).max,`
`139`	`138`	`frame: frame,`
`140`	`139`	`attributes: shapeAttributes`
`141`	`140`	`}`
`@@ -150,7 +149,7 @@ class ShapeMergerModel extends Listener {`
`150`	`149`	`let copy = Object.assign({}, object.shapes[object.shapes.length - 1]);`
`151`	`150`	`copy.outside = true;`
`152`	`151`	`copy.frame += 1;`
`153`		`- copy.z_order = this._collectionModel.zOrder(frame).max;`
	`152`	`+ copy.z_order = 0;`
`154`	`153`	`copy.attributes = [];`
`155`	`154`	`object.shapes.push(copy);`
`156`	`155`	`}`