Fix issues where groups had labels and where last label was not rende…

…red (#594)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/esv-intersection",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Intersection component package with testing and automatic documentation.",
   "type": "module",
   "exports": {

src/datautils/interfaces.ts

@@ -53,7 +53,7 @@ export interface SurfaceLine {
  */
 export interface SurfaceArea {
   id?: string;
-  label: string;
+  label?: string;
   color: number | string; // Color is passed to pixi.js and accepts both CSS color strings and hex color value
   data: number[][];
   exclude?: boolean;

src/datautils/surfacedata.ts

@@ -102,7 +102,6 @@ function generateGroupAreas(groups: MappedGroup[], trajectory: number[][]): Surf
     const next: MappedGroup | null = i + 1 < groups.length ? groups[i + 1] : null;
     return {
       id: g.id,
-      label: g.label,
       color: convertColor(g.color),
       data: trajectory.map((p: number[], j: number) => [p[0], g.top[j], next ? next.top[j] : null]),
     };

src/layers/GeomodelLabelsLayer.ts

@@ -142,10 +142,6 @@ export class GeomodelLabelsLayer<T extends SurfaceData> extends CanvasLayer<T> {
         return acc;
       }, null);
 
-      if (!topmostSurfaceNotDrawnYet) {
-        return;
-      }
-
       this.drawAreaLabel(s, topmostSurfaceNotDrawnYet, array, i);
     });
   }
@@ -154,7 +150,7 @@ export class GeomodelLabelsLayer<T extends SurfaceData> extends CanvasLayer<T> {
     this.data.lines.filter((surfaceLine: SurfaceLine) => surfaceLine.label).forEach((surfaceLine: SurfaceLine) => this.drawLineLabel(surfaceLine));
   }
 
-  drawAreaLabel = (surfaceArea: SurfaceArea, nextSurfaceArea: SurfaceArea, surfaces: SurfaceArea[], i: number): void => {
+  drawAreaLabel = (surfaceArea: SurfaceArea, nextSurfaceArea: SurfaceArea | null, surfaces: SurfaceArea[], i: number): void => {
     const { data } = surfaceArea;
     const { ctx, maxFontSizeInWorldCoordinates, isXFlipped } = this;
     const { xScale, yScale, xRatio, yRatio, zFactor } = this.rescaleEvent;