@equinor/esv-intersection 3.0.3 → 3.0.6

package/src/layers/CalloutCanvasLayer.ts

@@ -74,7 +74,7 @@ export class CalloutCanvasLayer<T extends Annotation[]> extends CanvasLayer<T> {
     this.render();
   }
 
-  onUpdate(event: OnUpdateEvent<T>): void {
+  override onUpdate(event: OnUpdateEvent<T>): void {
     super.onUpdate(event);
 
     this.callouts = undefined;
@@ -82,7 +82,7 @@ export class CalloutCanvasLayer<T extends Annotation[]> extends CanvasLayer<T> {
     this.render();
   }
 
-  onRescale(event: OnRescaleEvent): void {
+  override onRescale(event: OnRescaleEvent): void {
     super.onRescale(event);
     const isPanning = this.rescaleEvent && this.rescaleEvent.xRatio === event.xRatio;
     this.rescaleEvent = event;

package/src/layers/CustomDisplayObjects/ComplexRope.ts

@@ -19,10 +19,9 @@ export class ComplexRope extends Mesh {
   /**
    * @param texture - The texture to use on the rope.
    * @param segments - An array of segments with points and diaeter to construct this rope.
-   * @param {number} textureScale - Optional. Adjust interval of repeated texture
    */
-  constructor(texture: Texture, segments: ComplexRopeSegment[], textureScale = 0) {
-    const ropeGeometry = new ComplexRopeGeometry(segments, textureScale);
+  constructor(texture: Texture, segments: ComplexRopeSegment[]) {
+    const ropeGeometry = new ComplexRopeGeometry(segments);
     const meshMaterial = new MeshMaterial(texture);
 
     // attempt to set UV wrapping, will fail on non-power of two textures
@@ -33,7 +32,7 @@ export class ComplexRope extends Mesh {
     this.autoUpdate = true;
   }
 
-  _render(renderer: Renderer): void {
+  override _render(renderer: Renderer): void {
     const geometry: ComplexRopeGeometry = this.geometry as ComplexRopeGeometry;
 
     if (this.autoUpdate) {

package/src/layers/CustomDisplayObjects/ComplexRopeGeometry.ts

@@ -9,22 +9,16 @@ export class ComplexRopeGeometry extends MeshGeometry {
   /** An array of segments with points and diameter that determine the rope. */
   private segments: ComplexRopeSegment[];
 
-  /** Rope texture scale. */
-  private readonly textureScale: number; // TODO unused?
-
   /**
    * @param segments - An array of segments with points and diameter to construct this rope.
-   * @param textureScale - scaling factor for repeated texture. To create a tiling rope
-   *     set baseTexture.wrapMode to PIXI.WRAP_MODES.REPEAT and use a power of two texture.
    */
-  constructor(segments: ComplexRopeSegment[], textureScale = 0) {
+  constructor(segments: ComplexRopeSegment[]) {
     const pointCount = sum(segments, (segment) => segment.points.length);
 
     // eslint-disable-next-line no-magic-numbers
     super(new Float32Array(pointCount * 4), new Float32Array(pointCount * 4), new Uint16Array((pointCount - 1) * 6));
 
     this.segments = segments;
-    this.textureScale = textureScale;
 
     this.build();
   }

package/src/layers/CustomDisplayObjects/FixedWidthSimpleRope.ts

@@ -29,7 +29,7 @@ export class FixedWidthSimpleRope extends Mesh {
     this.autoUpdate = true;
   }
 
-  _render(renderer: Renderer): void {
+  override _render(renderer: Renderer): void {
     const geometry: RopeGeometry = this.geometry as RopeGeometry;
 
     if (this.autoUpdate) {

package/src/layers/CustomDisplayObjects/UniformTextureStretchRope.ts

@@ -24,7 +24,7 @@ export class UniformTextureStretchRope extends Mesh {
     this.autoUpdate = true;
   }
 
-  _render(renderer: Renderer): void {
+  override _render(renderer: Renderer): void {
     const geometry: UniformTextureStretchRopeGeometry = this.geometry as UniformTextureStretchRopeGeometry;
 
     // TODO: Possible optimiztion here

package/src/layers/GeomodelCanvasLayer.ts

@@ -30,13 +30,13 @@ export class GeomodelCanvasLayer<T extends SurfaceData> extends CanvasLayer<T> {
     this.updatePaths = this.updatePaths.bind(this);
   }
 
-  onUpdate(event: OnUpdateEvent<T>): void {
+  override onUpdate(event: OnUpdateEvent<T>): void {
     super.onUpdate(event);
     this.updatePaths();
     this.render();
   }
 
-  onRescale(event: OnRescaleEvent): void {
+  override onRescale(event: OnRescaleEvent): void {
     this.rescaleEvent = event;
     this.setTransform(this.rescaleEvent);
     this.render();

package/src/layers/GeomodelLabelsLayer.ts

@@ -48,11 +48,11 @@ export class GeomodelLabelsLayer<T extends SurfaceData> extends CanvasLayer<T> {
     this.generateSurfacesWithAvgDepth = this.generateSurfacesWithAvgDepth.bind(this);
   }
 
-  get options(): GeomodelLayerLabelsOptions<T> {
+  override get options(): GeomodelLayerLabelsOptions<T> {
     return this._options;
   }
 
-  setData(data: T): void {
+  override setData(data: T): void {
     super.setData(data);
     this.areasWithAvgTopDepth = null;
   }
@@ -90,16 +90,16 @@ export class GeomodelLabelsLayer<T extends SurfaceData> extends CanvasLayer<T> {
     }, []);
   }
 
-  onMount(event: OnMountEvent): void {
+  override onMount(event: OnMountEvent): void {
     super.onMount(event);
   }
 
-  onUpdate(event: OnUpdateEvent<T>): void {
+  override onUpdate(event: OnUpdateEvent<T>): void {
     super.onUpdate(event);
     this.render();
   }
 
-  onRescale(event: OnRescaleEvent): void {
+  override onRescale(event: OnRescaleEvent): void {
     this.rescaleEvent = event;
     this.updateXFlipped();
     this.resetTransform();
@@ -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;
@@ -196,7 +192,7 @@ export class GeomodelLabelsLayer<T extends SurfaceData> extends CanvasLayer<T> {
     }
 
     // Find edge where to draw
-    let startPos;
+    let startPos: number;
     const portionOfLabelLengthUsedForPosCalc = 0.07;
     if (isLabelsOnLeftSide) {
       startPos = isXFlipped ? Math.min(surfaceAreaLeftEdge, leftEdge) : Math.max(surfaceAreaLeftEdge, leftEdge);
@@ -305,7 +301,7 @@ export class GeomodelLabelsLayer<T extends SurfaceData> extends CanvasLayer<T> {
     const [surfaceAreaLeftEdge, surfaceAreaRightEdge] = this.getSurfacesAreaEdges();
 
     // Find edge where to draw
-    let startPos;
+    let startPos: number;
     const steps = 5;
     if (isLabelsOnLeftSide) {
       startPos = isXFlipped ? Math.max(surfaceAreaRightEdge, rightEdge) : Math.min(surfaceAreaRightEdge, rightEdge);
@@ -462,7 +458,7 @@ export class GeomodelLabelsLayer<T extends SurfaceData> extends CanvasLayer<T> {
   ): number {
     const angles: number[] = [];
     const tmpVec = Vector2.zero.mutable;
-    let vecAtEnd;
+    let vecAtEnd: Vector2;
     for (let i = 0; i <= count; i++) {
       const x = offset + i * step;
       const topY = findSampleAtPos(top, x, topLimit, bottomLimit);

package/src/layers/GeomodelLayerV2.ts

@@ -9,7 +9,7 @@ const DEFAULT_Y_BOTTOM = 10000;
 export class GeomodelLayerV2<T extends SurfaceData> extends PixiLayer<T> {
   private isPreRendered: boolean = false;
 
-  onRescale(event: OnRescaleEvent): void {
+  override onRescale(event: OnRescaleEvent): void {
     super.onRescale(event);
 
     if (!this.isPreRendered) {
@@ -20,7 +20,7 @@ export class GeomodelLayerV2<T extends SurfaceData> extends PixiLayer<T> {
     this.render();
   }
 
-  onUpdate(event: OnUpdateEvent<T>): void {
+  override onUpdate(event: OnUpdateEvent<T>): void {
     super.onUpdate(event);
 
     this.isPreRendered = false;
@@ -94,11 +94,12 @@ export class GeomodelLayerV2<T extends SurfaceData> extends PixiLayer<T> {
 
     let penDown = false;
     for (let i = 0; i < d.length; i++) {
-      if (d[i][1]) {
+      const lineData = d[i];
+      if (lineData && lineData[1] && lineData[0]) {
         if (penDown) {
-          g.lineTo(d[i][0], d[i][1]);
+          g.lineTo(lineData[0], lineData[1]);
         } else {
-          g.moveTo(d[i][0], d[i][1]);
+          g.moveTo(lineData[0], lineData[1]);
           penDown = true;
         }
       } else {

package/src/layers/GridLayer.ts

@@ -41,12 +41,12 @@ export class GridLayer<T> extends CanvasLayer<T> {
     this.render = this.render.bind(this);
   }
 
-  onUpdate(event: OnGridLayerUpdateEvent<T>): void {
+  override onUpdate(event: OnGridLayerUpdateEvent<T>): void {
     super.onUpdate(event);
     this.render(event);
   }
 
-  onRescale(event: OnRescaleEvent): void {
+  override onRescale(event: OnRescaleEvent): void {
     super.onRescale(event);
     this.render(event);
   }

package/src/layers/ImageCanvasLayer.ts

@@ -17,20 +17,20 @@ export type OnImageLayerRescaleEvent<T> = OnImageLayerUpdateEvent<T> & OnRescale
 export class ImageLayer<T> extends CanvasLayer<T> {
   img: HTMLImageElement;
 
-  onMount(event: OnMountEvent): void {
+  override onMount(event: OnMountEvent): void {
     super.onMount(event);
     const img = document.createElement('img');
     this.img = img;
     this.isLoading = true;
   }
 
-  onUpdate(event: OnImageLayerUpdateEvent<T>): void {
+  override onUpdate(event: OnImageLayerUpdateEvent<T>): void {
     super.onUpdate(event);
     this.img.src = event.url;
     this.render(event);
   }
 
-  onRescale(event: OnImageLayerRescaleEvent<T>): void {
+  override onRescale(event: OnImageLayerRescaleEvent<T>): void {
     super.onRescale(event);
     this.setTransform(event);
     this.render(event);

package/src/layers/ReferenceLineLayer.ts

@@ -45,17 +45,17 @@ export class ReferenceLineLayer extends CanvasLayer<ReferenceLine[]> {
   yScale: ScaleLinear<number, number, never> | null = null;
   xScale: ScaleLinear<number, number, never> | null = null;
 
-  onMount(event: OnMountEvent) {
+  override onMount(event: OnMountEvent) {
     super.onMount(event);
   }
 
-  onUpdate(event: OnUpdateEvent<ReferenceLine[]>) {
+  override onUpdate(event: OnUpdateEvent<ReferenceLine[]>) {
     super.onUpdate(event);
     this.clearCanvas();
     this.render();
   }
 
-  onRescale(event: OnRescaleEvent) {
+  override onRescale(event: OnRescaleEvent) {
     super.onRescale(event);
     this.yScale = event.yScale;
     this.xScale = event.xScale;

package/src/layers/SchematicLayer.ts

@@ -176,7 +176,7 @@ export class SchematicLayer<T extends SchematicData> extends PixiLayer<T> {
     };
   }
 
-  public onUnmount(event?: OnUnmountEvent): void {
+  public override onUnmount(event?: OnUnmountEvent): void {
     super.onUnmount(event);
     this.scalingFactors = null;
     this.cementTextureCache = null;
@@ -188,7 +188,7 @@ export class SchematicLayer<T extends SchematicData> extends PixiLayer<T> {
     this.internalLayerVisibility = null;
   }
 
-  public onUpdate(event: OnUpdateEvent<T>): void {
+  public override onUpdate(event: OnUpdateEvent<T>): void {
     super.onUpdate(event);
     this.clearLayer();
     this.preRender();
@@ -718,9 +718,7 @@ export class SchematicLayer<T extends SchematicData> extends PixiLayer<T> {
     if (intervals.length === 0) {
       return null;
     }
-    const { exaggerationFactor } = this.options as SchematicLayerOptions<T>;
-
-    const rope = new ComplexRope(texture, intervals, exaggerationFactor);
+    const rope = new ComplexRope(texture, intervals);
 
     this.addChild(rope);
 

package/src/layers/SeismicCanvasLayer.ts

@@ -14,11 +14,11 @@ export type SeismicCanvasData = {
 };
 
 export class SeismicCanvasLayer extends CanvasLayer<SeismicCanvasData> {
-  onMount(event: OnMountEvent): void {
+  override onMount(event: OnMountEvent): void {
     super.onMount(event);
   }
 
-  onUpdate(event: OnUpdateEvent<SeismicCanvasData>): void {
+  override onUpdate(event: OnUpdateEvent<SeismicCanvasData>): void {
     super.onUpdate(event);
 
     this.clearCanvas();
@@ -26,7 +26,7 @@ export class SeismicCanvasLayer extends CanvasLayer<SeismicCanvasData> {
     this.render();
   }
 
-  onRescale(event: OnRescaleEvent): void {
+  override onRescale(event: OnRescaleEvent): void {
     super.onRescale(event);
     this.setTransform(event);
     this.render();

package/src/layers/WellborePathLayer.ts

@@ -40,12 +40,12 @@ export class WellborepathLayer<T extends [number, number][]> extends SVGLayer<T>
     this.render = this.render.bind(this);
   }
 
-  onUpdate(event: OnUpdateEvent<T>): void {
+  override onUpdate(event: OnUpdateEvent<T>): void {
     super.onUpdate(event);
     this.render();
   }
 
-  onRescale(event: OnRescaleEvent): void {
+  override onRescale(event: OnRescaleEvent): void {
     super.onRescale(event);
     if (!this.elm) {
       return;

package/src/layers/base/CanvasLayer.ts

@@ -25,7 +25,7 @@ export abstract class CanvasLayer<T> extends Layer<T> {
     }
   }
 
-  setVisibility(visible: boolean): void {
+  override setVisibility(visible: boolean): void {
     super.setVisibility(visible);
     if (this.canvas) {
       this.updateStyle(visible);
@@ -42,13 +42,13 @@ export abstract class CanvasLayer<T> extends Layer<T> {
     );
   }
 
-  onMount(event: OnMountEvent): void {
+  override onMount(event: OnMountEvent): void {
     super.onMount(event);
     const { elm } = event;
     const width = event.width || parseInt(elm.getAttribute('width'), 10) || DEFAULT_LAYER_WIDTH;
     const height = event.height || parseInt(elm.getAttribute('height'), 10) || DEFAULT_LAYER_HEIGHT;
     this.elm = elm;
-    let canvas;
+    let canvas: HTMLCanvasElement;
     if (!this.canvas) {
       canvas = document.createElement('canvas');
       this.canvas = canvas;
@@ -62,13 +62,13 @@ export abstract class CanvasLayer<T> extends Layer<T> {
     this.ctx = this.canvas.getContext('2d');
   }
 
-  onUnmount(): void {
+  override onUnmount(): void {
     super.onUnmount();
     this.canvas.remove();
     this.canvas = null;
   }
 
-  onResize(event: OnResizeEvent): void {
+  override onResize(event: OnResizeEvent): void {
     const { ctx } = this;
     const { width, height } = event;
 
@@ -76,7 +76,7 @@ export abstract class CanvasLayer<T> extends Layer<T> {
     ctx.canvas.setAttribute('height', `${height}px`);
   }
 
-  onUpdate(event: OnUpdateEvent<T>): void {
+  override onUpdate(event: OnUpdateEvent<T>): void {
     super.onUpdate(event);
   }
 

package/src/layers/base/HTMLLayer.ts

@@ -6,7 +6,7 @@ import { DEFAULT_LAYER_HEIGHT, DEFAULT_LAYER_WIDTH } from '../../constants';
 export abstract class HTMLLayer<T> extends Layer<T> {
   elm: Selection<HTMLElement, unknown, null, undefined>;
 
-  onMount(event: OnMountEvent): void {
+  override onMount(event: OnMountEvent): void {
     super.onMount(event);
     const { elm } = event;
     const width = event.width || parseInt(elm.getAttribute('width'), 10) || DEFAULT_LAYER_WIDTH;
@@ -28,13 +28,13 @@ export abstract class HTMLLayer<T> extends Layer<T> {
       .style('z-index', this.order);
   }
 
-  onUnmount(): void {
+  override onUnmount(): void {
     super.onUnmount();
     this.elm.remove();
     this.elm = null;
   }
 
-  onResize(event: OnResizeEvent): void {
+  override onResize(event: OnResizeEvent): void {
     if (!this.elm) {
       return;
     }
@@ -42,7 +42,7 @@ export abstract class HTMLLayer<T> extends Layer<T> {
     this.elm.style('height', `${event.height}px`).style('width', `${event.width}px`);
   }
 
-  setVisibility(visible: boolean): void {
+  override setVisibility(visible: boolean): void {
     super.setVisibility(visible);
     if (this.elm) {
       this.elm.attr('visibility', visible ? 'visible' : 'hidden');

package/src/layers/base/PixiLayer.ts

@@ -92,7 +92,7 @@ export abstract class PixiLayer<T> extends Layer<T> {
     });
   }
 
-  onMount(event: OnMountEvent) {
+  override onMount(event: OnMountEvent) {
     super.onMount(event);
 
     this.pixiViewContainer = this.element.querySelector('#webgl-layer');
@@ -110,7 +110,7 @@ export abstract class PixiLayer<T> extends Layer<T> {
     }
   }
 
-  onUnmount(event?: OnUnmountEvent) {
+  override onUnmount(event?: OnUnmountEvent) {
     super.onUnmount(event);
 
     this.clearLayer();
@@ -120,12 +120,12 @@ export abstract class PixiLayer<T> extends Layer<T> {
     this.pixiViewContainer = undefined;
   }
 
-  onResize(event: OnResizeEvent): void {
+  override onResize(event: OnResizeEvent): void {
     super.onResize(event);
     this.ctx.renderer.resize(event.width, event.height);
   }
 
-  onRescale(event: OnRescaleEvent): void {
+  override onRescale(event: OnRescaleEvent): void {
     super.onRescale(event);
 
     const flippedX = event.xBounds[0] > event.xBounds[1];
@@ -159,7 +159,7 @@ export abstract class PixiLayer<T> extends Layer<T> {
     this.pixiViewContainer.setAttribute('style', styles);
   }
 
-  setVisibility(visible: boolean, layerId?: string): void {
+  override setVisibility(visible: boolean, layerId?: string): void {
     super.setVisibility(visible, layerId);
     if (this.pixiViewContainer) {
       this.updateStyle(visible);

package/src/layers/base/SVGLayer.ts

@@ -6,7 +6,7 @@ import { DEFAULT_LAYER_HEIGHT, DEFAULT_LAYER_WIDTH } from '../../constants';
 export abstract class SVGLayer<T> extends Layer<T> {
   elm: Selection<SVGElement, unknown, null, undefined>;
 
-  onMount(event: OnMountEvent): void {
+  override onMount(event: OnMountEvent): void {
     super.onMount(event);
     const { elm } = event;
     const width = event.width || parseInt(elm.getAttribute('width'), 10) || DEFAULT_LAYER_WIDTH;
@@ -21,13 +21,13 @@ export abstract class SVGLayer<T> extends Layer<T> {
     this.elm.style('position', 'absolute').style('pointer-events', interactive).style('opacity', this.opacity).style('z-index', this.order);
   }
 
-  onUnmount(): void {
+  override onUnmount(): void {
     super.onUnmount();
     this.elm.remove();
     this.elm = null;
   }
 
-  onResize(event: OnResizeEvent): void {
+  override onResize(event: OnResizeEvent): void {
     if (!this.elm) {
       return;
     }
@@ -35,7 +35,7 @@ export abstract class SVGLayer<T> extends Layer<T> {
     this.elm.attr('height', event.height).attr('width', event.width);
   }
 
-  setVisibility(visible: boolean): void {
+  override setVisibility(visible: boolean): void {
     super.setVisibility(visible);
     if (this.elm) {
       this.elm.attr('visibility', visible ? 'visible' : 'hidden');

package/src/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "declarationDir": "../dist",
+    "emitDeclarationOnly": true,
+    "rootDir": "."
+  },
+  "include": ["."]
+}

package/src/vendor/pixi-dashed-line/index.ts

@@ -57,9 +57,6 @@ export class DashLine {
   /** desired scale of line */
   scale = 1;
 
-  // sanity check to ensure the lineStyle is still in use
-  private activeTexture: PIXI.Texture;
-
   private start: PIXI.Point;
 
   private dashSize: number;
@@ -106,7 +103,6 @@ export class DashLine {
         texture,
         alignment: options.alignment,
       });
-      this.activeTexture = texture;
     } else {
       this.graphics.lineStyle({
         width: options.width * options.scale,
@@ -359,7 +355,7 @@ export class DashLine {
   }
 
   // creates or uses cached texture
-  private static getTexture(options: DashLineOptions, dashSize: number): PIXI.Texture {
+  private static getTexture(options: DashLineOptions, dashSize: number): PIXI.Texture | undefined {
     const key = options.dash.toString();
     if (DashLine.dashTextureCache[key]) {
       return DashLine.dashTextureCache[key];
@@ -370,7 +366,7 @@ export class DashLine {
     const context = canvas.getContext('2d');
     if (!context) {
       console.warn('Did not get context from canvas');
-      return;
+      return undefined;
     }
     context.strokeStyle = 'white';
     context.globalAlpha = options.alpha;