Fix line interaction #1716

MaibornWolff · Apr 22, 2021 · b293c1d · b293c1d
1 parent e8f9952
commit b293c1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/visualization/app/codeCharta/ui/codeMap/threeViewer/threeSceneService.spec.ts b/visualization/app/codeCharta/ui/codeMap/threeViewer/threeSceneService.spec.ts
@@ -382,17 +382,13 @@ describe("ThreeSceneService", () => {
 
 			expect(threeSceneService.labels.children[1]["geometry"].vertices[0]).toEqual(new Vector3(3, 3, 3))
 			expect(threeSceneService.labels.children[1]["geometry"].vertices[1]).toEqual(new Vector3(2, 2, 2))
-			expect(threeSceneService["highlightedLineIndex"]).toEqual(-1)
-			expect(threeSceneService["highlightedLine"]).toEqual(null)
 		})
 
 		it("should set endpoint to highlightedLabel if in reset mode", () => {
 			threeSceneService.resetLabel()
 
 			expect(threeSceneService.labels.children[1]["geometry"].vertices[0]).toEqual(new Vector3(3, 3, 3))
 			expect(threeSceneService.labels.children[1]["geometry"].vertices[1]).toEqual(new Vector3(1, 1, 1))
-			expect(threeSceneService["highlightedLineIndex"]).toEqual(-1)
-			expect(threeSceneService["highlightedLine"]).toEqual(null)
 			expect(threeSceneService["highlightedLabel"]).toEqual(null)
 		})
 	})

diff --git a/visualization/app/codeCharta/ui/codeMap/threeViewer/threeSceneService.ts b/visualization/app/codeCharta/ui/codeMap/threeViewer/threeSceneService.ts
@@ -178,8 +178,6 @@ export class ThreeSceneService implements CodeMapPreRenderServiceSubscriber, Map
 			this.highlightedLineIndex = this.getHoveredLabelLineIndex(labels, hoveredLabel)
 			this.highlightedLine = labels[this.highlightedLineIndex]
 
-			labels.splice(this.highlightedLineIndex, 1)
-
 			this.rayPoint = new Vector3()
 			this.rayPoint.subVectors(raycaster.ray.origin, hoveredLabel.position)
 
@@ -209,7 +207,6 @@ export class ThreeSceneService implements CodeMapPreRenderServiceSubscriber, Map
 			this.highlightedLabel.material.opacity = this.mapLabelColors.alpha
 
 			if (this.highlightedLineIndex > -1) {
-				this.labels.children.splice(this.highlightedLineIndex, 1)
 				this.toggleLineAnimation(true)
 			}
 
@@ -219,8 +216,8 @@ export class ThreeSceneService implements CodeMapPreRenderServiceSubscriber, Map
 
 	getHoveredLabelLineIndex(labels: Object3D[], label: any) {
 		const index = labels
-			.map(function (label) {
-				return label.uuid
+			.map(function (labelObject) {
+				return labelObject.uuid
 			})
 			.indexOf(label.uuid)
 
@@ -239,10 +236,7 @@ export class ThreeSceneService implements CodeMapPreRenderServiceSubscriber, Map
 
 		const newLineForHighlightedLabel = new Line(geometry, this.highlightedLine.material)
 
-		this.labels.children.splice(this.highlightedLineIndex, 0, newLineForHighlightedLabel)
-
-		this.highlightedLineIndex = -1
-		this.highlightedLine = null
+		this.labels.children.splice(this.highlightedLineIndex, 1, newLineForHighlightedLabel)
 	}
 
 	getLabelForHoveredNode(hoveredBuilding: CodeMapBuilding, labels: Object3D[]) {