HARP-11817: Fixes labels placed outside of frustum (#1816)

Signed-off-by: Frauke Fritz <frauke.fritz@here.com>
heremaps · Sep 4, 2020 · 66a1eb8 · 66a1eb8
1 parent 59ff471
commit 66a1eb8
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/@here/harp-mapview/lib/text/TextElementsRenderer.ts b/@here/harp-mapview/lib/text/TextElementsRenderer.ts
@@ -1737,7 +1737,9 @@ export class TextElementsRenderer {
             this.m_tmpVector3
         );
         // Only process labels frustum-clipped labels
-        if (this.m_screenProjector.project(worldPosition, tempScreenPosition) === undefined) {
+        if (
+            this.m_screenProjector.projectOnScreen(worldPosition, tempScreenPosition) === undefined
+        ) {
             return false;
         }
         // Add this POI as a point label.
@@ -1791,7 +1793,9 @@ export class TextElementsRenderer {
             for (let pointIndex = 0; pointIndex < path.length; ++pointIndex) {
                 const point = path[pointIndex];
                 // Only process labels frustum-clipped labels
-                if (this.m_screenProjector.project(point, tempScreenPosition) !== undefined) {
+                if (
+                    this.m_screenProjector.projectOnScreen(point, tempScreenPosition) !== undefined
+                ) {
                     // Find a suitable location for the lineMarker to be placed at.
                     let tooClose = false;
                     for (let j = 0; j < shieldGroup.length; j += 2) {
@@ -1832,7 +1836,9 @@ export class TextElementsRenderer {
             for (let pointIndex = 0; pointIndex < path.length; ++pointIndex) {
                 const point = path[pointIndex];
                 // Only process labels frustum-clipped labels
-                if (this.m_screenProjector.project(point, tempScreenPosition) !== undefined) {
+                if (
+                    this.m_screenProjector.projectOnScreen(point, tempScreenPosition) !== undefined
+                ) {
                     this.addPointLabel(
                         labelState,
                         point,

diff --git a/@here/harp-mapview/test/TextElementsRendererTest.ts b/@here/harp-mapview/test/TextElementsRendererTest.ts
@@ -577,6 +577,25 @@ const tests: TestCase[] = [
             }
         ],
         frameTimes: FADE_2_CYCLES
+    },
+    {
+        name: "Poi only fades in, if its inside frustum",
+        tiles: [
+            {
+                labels: [
+                    [
+                        poiBuilder("outside frustum marker").withPosition(
+                            (WORLD_SCALE * (4 * DEF_TEXT_WIDTH_HEIGHT)) / SCREEN_WIDTH,
+                            (WORLD_SCALE * (4 * DEF_TEXT_WIDTH_HEIGHT)) / SCREEN_HEIGHT,
+                            WORLD_SCALE * 10
+                        ),
+                        fadedOut(FADE_2_CYCLES.length)
+                    ]
+                ],
+                frames: firstNFrames(FADE_2_CYCLES, FADE_IN.length)
+            }
+        ],
+        frameTimes: FADE_2_CYCLES
     }
 ];
 
@@ -612,7 +631,10 @@ describe("TextElementsRenderer", function() {
             return [];
         }
         return inputElements.map((inputElement: InputTextElement) => {
-            expect(frameStates(inputElement).length).equal(frameCount);
+            expect(frameStates(inputElement).length).equal(
+                frameCount,
+                "frameStates of inputElement equals frameCount"
+            );
             // Only used to identify some text elements for testing purposes.
             const dummyUserData = {};
             const element = builder(inputElement)
@@ -637,10 +659,16 @@ describe("TextElementsRenderer", function() {
         // frame states to an array.
         test.tiles.forEach((tile: InputTile, tileIndex: number) => {
             if (tile.frames !== undefined) {
-                expect(tile.frames.length).equal(test.frameTimes.length);
+                expect(tile.frames.length).equal(
+                    test.frameTimes.length,
+                    "frames length is the same"
+                );
             }
             if (tile.terrainFrames !== undefined) {
-                expect(tile.terrainFrames.length).equal(test.frameTimes.length);
+                expect(tile.terrainFrames.length).equal(
+                    test.frameTimes.length,
+                    "terrainFrames length is the same"
+                );
                 enableElevation = true;
             }
             const labels = buildLabels(tile.labels, elementFrameStates, test.frameTimes.length);