@equinor/esv-intersection 3.0.0 → 3.0.3

package/dist/interfaces.d.ts

@@ -75,7 +75,7 @@ export interface Trajectory {
     points: number[][];
     offset: number;
 }
-export declare type BoundingBox = {
+export type BoundingBox = {
     x: number;
     y: number;
     width: number;

package/dist/layers/CalloutCanvasLayer.d.ts

@@ -2,11 +2,11 @@ import { ScaleLinear } from 'd3-scale';
 import { CanvasLayer } from './base/CanvasLayer';
 import { OnUpdateEvent, Annotation, OnRescaleEvent, BoundingBox } from '../interfaces';
 import { LayerOptions } from './base/Layer';
-export declare type Point = {
+export type Point = {
     x: number;
     y: number;
 };
-export declare type Callout = {
+export type Callout = {
     title: string;
     label: string;
     color: string;

package/dist/layers/CustomDisplayObjects/ComplexRope.d.ts

@@ -1,5 +1,5 @@
 import { Mesh, IPoint, Renderer, Texture } from 'pixi.js';
-export declare type ComplexRopeSegment = {
+export type ComplexRopeSegment = {
     points: IPoint[];
     diameter: number;
 };

package/dist/layers/GeomodelCanvasLayer.d.ts

@@ -2,7 +2,7 @@ import { SurfaceData, SurfaceLine } from '../datautils';
 import { OnUpdateEvent, OnRescaleEvent } from '../interfaces';
 import { LayerOptions } from './base';
 import { CanvasLayer } from './base/CanvasLayer';
-declare type SurfacePaths = {
+type SurfacePaths = {
     color: string;
     path: Path2D;
 };

package/dist/layers/ImageCanvasLayer.d.ts

@@ -10,7 +10,7 @@ export interface OnImageLayerUpdateEvent<T> extends OnUpdateEvent<T> {
     x?: number;
     y?: number;
 }
-export declare type OnImageLayerRescaleEvent<T> = OnImageLayerUpdateEvent<T> & OnRescaleEvent;
+export type OnImageLayerRescaleEvent<T> = OnImageLayerUpdateEvent<T> & OnRescaleEvent;
 export declare class ImageLayer<T> extends CanvasLayer<T> {
     img: HTMLImageElement;
     onMount(event: OnMountEvent): void;

package/dist/layers/ReferenceLineLayer.d.ts

@@ -1,8 +1,8 @@
 import { CanvasLayer, LayerOptions } from './base';
 import { OnUpdateEvent, OnRescaleEvent, OnMountEvent } from '../interfaces';
 import { ScaleLinear } from 'd3-scale';
-export declare type ReferenceLineType = 'wavy' | 'dashed' | 'solid';
-export declare type ReferenceLine = {
+export type ReferenceLineType = 'wavy' | 'dashed' | 'solid';
+export type ReferenceLine = {
     text?: string;
     lineType: ReferenceLineType;
     color: string;

package/dist/layers/SeismicCanvasLayer.d.ts

@@ -1,12 +1,12 @@
 import { CanvasLayer } from './base/CanvasLayer';
 import { OnUpdateEvent, OnMountEvent, OnRescaleEvent } from '../interfaces';
-export declare type SeismicCanvasDataOptions = {
+export type SeismicCanvasDataOptions = {
     x: number;
     y: number;
     width: number;
     height: number;
 };
-export declare type SeismicCanvasData = {
+export type SeismicCanvasData = {
     image: CanvasImageSource | OffscreenCanvas;
     options: SeismicCanvasDataOptions;
 };

package/dist/layers/schematicInterfaces.d.ts

@@ -2,7 +2,7 @@ export declare function assertNever(x: never): never;
 /**
  * The closure type of the outline
  */
-export declare type OutlineClosure = 'None' | 'TopAndBottom' | 'Top' | 'Bottom';
+export type OutlineClosure = 'None' | 'TopAndBottom' | 'Top' | 'Bottom';
 export interface HoleSize {
     kind: 'hole';
     id: string;
@@ -58,7 +58,7 @@ export interface CementPlug {
     referenceIds: string[];
 }
 export declare const isCementPlug: (item: PAndA) => item is CementSqueeze;
-export declare type PAndA = PAndASymbol | CementSqueeze | CementPlug;
+export type PAndA = PAndASymbol | CementSqueeze | CementPlug;
 interface BaseCompletion {
     id: string;
     diameter: number;
@@ -75,7 +75,7 @@ export interface CompletionSymbol extends BaseCompletion {
     kind: 'completionSymbol';
     symbolKey: string;
 }
-export declare type Completion = Tubing | Screen | CompletionSymbol;
+export type Completion = Tubing | Screen | CompletionSymbol;
 export declare const foldCompletion: <T>(fScreen: (obj: Screen) => T, fTubing: (obj: Tubing) => T, fSymbol: (obj: CompletionSymbol) => T) => (completion: Completion) => T;
 export interface Cement {
     kind: 'cement';
@@ -89,7 +89,7 @@ export interface Cement {
 /**
  * 'Open hole' and 'Open hole screen' are not included as they are not visualized and also not included in the ruleset
  */
-export declare type PerforationSubKind = 'Perforation' | 'Open hole gravel pack' | 'Open hole frac pack' | 'Cased hole frac pack' | 'Cased hole gravel pack' | 'Cased hole fracturation';
+export type PerforationSubKind = 'Perforation' | 'Open hole gravel pack' | 'Open hole frac pack' | 'Cased hole frac pack' | 'Cased hole gravel pack' | 'Cased hole fracturation';
 export interface Perforation {
     kind: 'perforation';
     subKind: PerforationSubKind;
@@ -118,6 +118,7 @@ export declare function isSubkindCasedHoleGravelPack(perf: Perforation): boolean
 export declare function isSubKindPerforation(perf: Perforation): boolean;
 export declare function isSubKindCasedHoleFracPack(perf: Perforation): boolean;
 export declare function isOpenHoleFracPack(perf: Perforation): boolean;
+export declare const isSubKindCasedHoleFracturation: (perf: Perforation) => boolean;
 export declare const intersect: (a: Perforation, b: Perforation) => boolean;
 export interface SchematicData {
     holeSizes: HoleSize[];

package/dist/utils/arc-length.d.ts

@@ -1,5 +1,5 @@
-import { Vector } from 'curve-interpolator/dist/src/interfaces';
-declare type fx = (n: number) => Vector;
+import { Vector } from 'curve-interpolator/dist/src/core/interfaces';
+type fx = (n: number) => Vector;
 export declare class ArcLength {
     /**
      * Calculate using an adaptive bisect method

package/dist/utils/root-finder.d.ts

@@ -1,4 +1,4 @@
-declare type fx = (n: number) => number;
+type fx = (n: number) => number;
 export declare class RootFinder {
     /**
      * Find root using newthons method

package/dist/vendor/pixi-dashed-line/index.d.ts

@@ -1,6 +1,6 @@
 import * as PIXI from 'pixi.js';
 /** Define the dash: [dash length, gap size, dash size, gap size, ...] */
-export declare type Dashes = number[];
+export type Dashes = number[];
 export interface DashLineOptions {
     dash?: Dashes;
     width?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/esv-intersection",
-  "version": "3.0.0",
+  "version": "3.0.3",
   "description": "Intersection component package with testing and automatic documentation.",
   "type": "module",
   "exports": {
@@ -47,29 +47,29 @@
   },
   "homepage": "https://github.com/equinor/esv-intersection#readme",
   "devDependencies": {
-    "@storybook/addon-storysource": "^7.0.0-beta.25",
-    "@storybook/html-vite": "^7.0.0-beta.25",
+    "@storybook/addon-storysource": "^7.0.2",
+    "@storybook/html-vite": "^7.0.2",
     "@types/d3": "^7.4.0",
     "@types/mock-raf": "^1.0.3",
-    "@typescript-eslint/eslint-plugin": "^5.48.1",
-    "@typescript-eslint/parser": "^5.48.1",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
     "copyfiles": "^2.4.1",
-    "eslint": "^8.31.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.37.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-storybook": "^0.6.10",
+    "eslint-plugin-storybook": "^0.6.11",
     "mock-raf": "^1.0.1",
-    "pixi.js": "^7.1.0",
-    "prettier": "^2.8.2",
-    "rimraf": "^3.0.2",
-    "storybook": "^7.0.0-beta.25",
-    "storybook-dark-mode": "^2.0.5",
-    "tslib": "^2.4.1",
-    "typedoc": "^0.23.24",
-    "typescript": "^4.9.4",
-    "vite": "^4.0.4",
-    "vite-plugin-dts": "^1.7.1",
-    "vitest": "^0.27.1",
+    "pixi.js": "^7.2.3",
+    "prettier": "^2.8.7",
+    "rimraf": "^5.0.0",
+    "storybook": "^7.0.2",
+    "storybook-dark-mode": "^3.0.0",
+    "tslib": "^2.5.0",
+    "typedoc": "^0.24.1",
+    "typescript": "^5.0.2",
+    "vite": "^4.2.1",
+    "vite-plugin-dts": "^2.1.0",
+    "vitest": "^0.30.0",
     "vitest-canvas-mock": "^0.2.2"
   },
   "peerDependencies": {
@@ -78,13 +78,12 @@
   "dependencies": {
     "@equinor/videx-math": "^1.1.0",
     "@equinor/videx-vector2": "^1.0.44",
-    "curve-interpolator": "3.0.1",
-    "d3-array": "^3.2.1",
+    "curve-interpolator": "3.1.1",
+    "d3-array": "^3.2.3",
     "d3-axis": "^3.0.0",
     "d3-scale": "^4.0.2",
     "d3-selection": "^3.0.0",
     "d3-shape": "^3.2.0",
-    "d3-zoom": "^3.0.0",
-    "jest-canvas-mock": "^2.4.0"
+    "d3-zoom": "^3.0.0"
   }
 }

package/src/control/ExtendedCurveInterpolator.ts

@@ -1,7 +1,7 @@
 import Vector2 from '@equinor/videx-vector2';
 import { clamp } from '@equinor/videx-math';
 import { CurveInterpolator } from 'curve-interpolator';
-import { Vector } from 'curve-interpolator/dist/src/interfaces';
+import { Vector } from 'curve-interpolator/dist/src/core/interfaces';
 import { CurveInterpolatorOptions } from 'curve-interpolator/dist/src/curve-interpolator';
 
 import { RootFinder } from '../utils/root-finder';

package/src/control/IntersectionReferenceSystem.ts

@@ -195,7 +195,7 @@ export class IntersectionReferenceSystem {
       return length + (displacementFromStart - this.displacement);
     }
 
-    const ls = this.interpolators.curtain.lookupPositions(displacementFromStart, 0, 1);
+    const ls = this.interpolators.curtain.getIntersectsAsPositions(displacementFromStart, 0, 1);
     if (ls && ls.length) {
       return ls[0] * length + this._offset;
     }

package/src/datautils/schematicShapeGenerator.ts

@@ -21,6 +21,7 @@ import {
   isSubKindCasedHoleFracPack,
   isSubkindCasedHoleGravelPack,
   PerforationSubKind,
+  isSubKindCasedHoleFracturation,
 } from '../layers/schematicInterfaces';
 import { ComplexRopeSegment } from '../layers/CustomDisplayObjects/ComplexRope';
 import { createNormals, offsetPoints } from '../utils/vectorUtils';
@@ -652,6 +653,8 @@ const drawFracLines = (
   const offsetX = 0;
   const offsetY = startAt === 'diameter' ? 0 : spikeLength;
 
+  ctx.globalAlpha = perforationOptions.packingOpacity;
+
   const fracLines = () => {
     for (let i = -1; i < amountOfSpikes; i++) {
       const bottom: [number, number] = [i * spikeWidth + offsetX + spikeWidth / 2, canvas.height / 2 - fracLineLength - offsetY - fracLineLength];
@@ -693,7 +696,6 @@ const drawFracLines = (
   ctx.strokeStyle = perforationOptions.yellow;
   ctx.lineWidth = 6;
   ctx.save();
-  ctx.globalAlpha = perforationOptions.packingOpacity;
   fracLines();
   ctx.restore();
   ctx.lineWidth = 1;
@@ -709,7 +711,7 @@ const drawSpikes = (
   extendedPerfShapeDiameter: number,
   perforationOptions: PerforationOptions,
 ) => {
-  const amountOfSpikes = 10;
+  const amountOfSpikes = 4;
   const spikeWidth = canvas.width / amountOfSpikes;
   ctx.strokeStyle = perforationOptions.outline;
 
@@ -717,11 +719,10 @@ const drawSpikes = (
 
   ctx.lineWidth = 1;
   const spikeLength = diameter / 2;
-  const offsetX = 0;
 
   // left spikes
   for (let i = 0; i <= amountOfSpikes; i++) {
-    const left: [number, number] = [i * spikeWidth + offsetX, canvas.height / 2 - diameter / 2];
+    const left: [number, number] = [i * spikeWidth, canvas.height / 2 - diameter / 2];
     const bottom: [number, number] = [left[0] - spikeWidth / 2, left[1] - spikeLength];
     const right: [number, number] = [left[0] - spikeWidth, left[1]];
 
@@ -737,7 +738,7 @@ const drawSpikes = (
 
   // right spikes
   for (let i = 0; i <= amountOfSpikes; i++) {
-    const left: [number, number] = [i * spikeWidth + offsetX, canvas.height / 2 + diameter / 2];
+    const left: [number, number] = [i * spikeWidth, canvas.height / 2 + diameter / 2];
     const bottom: [number, number] = [left[0] - spikeWidth / 2, left[1] + spikeLength];
     const right: [number, number] = [left[0] - spikeWidth, left[1]];
 
@@ -806,6 +807,10 @@ const createPerforationTexture = (canvas: HTMLCanvasElement) => {
   return texture;
 };
 
+const compareIntersectingPerforationsBy =
+  (targetPerf: Perforation, comparedPerforations: Perforation[]) => (compareFunc: (comparedPerf: Perforation) => boolean) =>
+    comparedPerforations.some((perf) => compareFunc(perf) && intersect(targetPerf, perf));
+
 /**
  * @Perforation
  * If a perforation does not overlap with another perforations of type with gravel,
@@ -821,6 +826,9 @@ const createPerforationTexture = (canvas: HTMLCanvasElement) => {
  *
  * Cased Hole Gravel Pack:
  * Yellow gravel. Makes perforations of type "Perforation" yellow if overlapping and perforation are open.
+ *
+ * Cased Hole Fracturation:
+ * Makes perforations of type "Perforation" yellow if overlapping and perforation are open.
  */
 const createSubkindPerforationTexture = {
   packing: () => errorTexture(),
@@ -833,32 +841,25 @@ const createSubkindPerforationTexture = {
   ): Texture => {
     const { canvas, ctx } = createPerforationCanvas(perfShape, perforationOptions);
 
-    const intersectionsWithCasedHoleGravel: boolean = otherPerforations.some(
-      (perf) => isSubkindCasedHoleGravelPack(perf) && intersect(perforation, perf),
-    );
+    const compareBy = compareIntersectingPerforationsBy(perforation, otherPerforations);
 
-    const intersectionsWithCasedHoleFracPack: boolean = otherPerforations.some(
-      (perf) => isSubKindCasedHoleFracPack(perf) && intersect(perforation, perf),
-    );
+    const intersectionsWithCasedHoleGravel: boolean = compareBy(isSubkindCasedHoleGravelPack);
 
-    const shouldDrawFracLines = intersectionsWithCasedHoleGravel || intersectionsWithCasedHoleFracPack;
+    const intersectsWithCasedHoleFracturation: boolean = compareBy(isSubKindCasedHoleFracturation);
 
-    if (shouldDrawFracLines) {
-      if (perforation.isOpen) {
-        ctx.fillStyle = perforationOptions.yellow;
-        ctx.strokeStyle = perforationOptions.yellow;
-      } else {
-        ctx.fillStyle = perforationOptions.grey;
-        ctx.strokeStyle = perforationOptions.grey;
-      }
+    const intersectionsWithCasedHoleFracPack: boolean = compareBy(isSubKindCasedHoleFracPack);
+
+    const intersectsWithPerforation = intersectionsWithCasedHoleGravel || intersectsWithCasedHoleFracturation || intersectionsWithCasedHoleFracPack;
+
+    const openPerforationSpikeColor = intersectsWithPerforation ? perforationOptions.yellow : perforationOptions.red;
+
+    ctx.globalAlpha = perforationOptions.packingOpacity;
+    if (perforation.isOpen) {
+      ctx.fillStyle = openPerforationSpikeColor;
+      ctx.strokeStyle = openPerforationSpikeColor;
     } else {
-      if (perforation.isOpen) {
-        ctx.fillStyle = perforationOptions.red;
-        ctx.strokeStyle = perforationOptions.red;
-      } else {
-        ctx.fillStyle = perforationOptions.grey;
-        ctx.strokeStyle = perforationOptions.grey;
-      }
+      ctx.fillStyle = perforationOptions.grey;
+      ctx.strokeStyle = perforationOptions.grey;
     }
 
     drawSpikes(canvas, ctx, perfShape.diameter, perforationOptions);

package/src/layers/GeomodelLabelsLayer.ts

@@ -577,11 +577,11 @@ export class GeomodelLabelsLayer<T extends SurfaceData> extends CanvasLayer<T> {
     const [dx1, dx2] = xScale.domain();
     const [dy1, dy2] = yScale.domain();
 
-    let top = referenceSystem.interpolators.curtain.lookup(dy1, 1, 0) as number[][];
+    let top = referenceSystem.interpolators.curtain.getIntersects(dy1, 1, 0) as number[][];
     if (top.length === 0) {
       top = [referenceSystem.interpolators.curtain.getPointAt(0.0) as number[]];
     }
-    let bottom = referenceSystem.interpolators.curtain.lookup(dy2, 1, 0) as number[][];
+    let bottom = referenceSystem.interpolators.curtain.getIntersects(dy2, 1, 0) as number[][];
     if (bottom.length === 0) {
       bottom = [referenceSystem.interpolators.curtain.getPointAt(1.0) as number[]];
     }

package/src/layers/SchematicLayer.ts

@@ -452,7 +452,7 @@ export class SchematicLayer<T extends SchematicData> extends PixiLayer<T> {
         });
       });
 
-      fracLines.forEach((perforation) => {
+      spikes.forEach((perforation) => {
         const perfShapes = this.createPerforationShape(perforation, casings, holeSizes);
         const thiccPerfShapes = perfShapes.map((ps) => ({ ...ps, diameter: ps.diameter * 3 }));
         const perfShapesByDiameter: { [key: number]: ComplexRopeSegment[] } = thiccPerfShapes.reduce(
@@ -467,13 +467,14 @@ export class SchematicLayer<T extends SchematicData> extends PixiLayer<T> {
         );
         Object.values(perfShapesByDiameter).forEach((perfShapesWithSameDiameter) => {
           perfShapesWithSameDiameter.forEach((perfShape) => {
-            const texture = createPerforationFracLineTexture(perforation, perfShape, perforationOptions);
+            const texture = createPerforationSpikeTexture(perforation, perforations, perfShape, perforationOptions);
             const rope = this.drawComplexRope([perfShape], texture);
             this.perforationRopeAndTextureReferences.push({ rope, texture });
           });
         });
       });
-      spikes.forEach((perforation) => {
+
+      fracLines.forEach((perforation) => {
         const perfShapes = this.createPerforationShape(perforation, casings, holeSizes);
         const thiccPerfShapes = perfShapes.map((ps) => ({ ...ps, diameter: ps.diameter * 3 }));
         const perfShapesByDiameter: { [key: number]: ComplexRopeSegment[] } = thiccPerfShapes.reduce(
@@ -488,7 +489,7 @@ export class SchematicLayer<T extends SchematicData> extends PixiLayer<T> {
         );
         Object.values(perfShapesByDiameter).forEach((perfShapesWithSameDiameter) => {
           perfShapesWithSameDiameter.forEach((perfShape) => {
-            const texture = createPerforationSpikeTexture(perforation, perforations, perfShape, perforationOptions);
+            const texture = createPerforationFracLineTexture(perforation, perfShape, perforationOptions);
             const rope = this.drawComplexRope([perfShape], texture);
             this.perforationRopeAndTextureReferences.push({ rope, texture });
           });

package/src/layers/schematicInterfaces.ts

@@ -303,6 +303,8 @@ export function isOpenHoleFracPack(perf: Perforation) {
   );
 }
 
+export const isSubKindCasedHoleFracturation = (perf: Perforation): boolean => perf.subKind === 'Cased hole fracturation';
+
 export const intersect = (a: Perforation, b: Perforation): boolean => {
   return a.start < b.end && a.end > b.start;
 };
@@ -405,7 +407,7 @@ export const defaultPerforationOptions: PerforationOptions = {
   transparent: 'rgba(255, 255, 255, 0)',
   spikeWidth: 50,
   spikeLength: 50,
-  packingOpacity: 0.5,
+  packingOpacity: 0.7,
   fracLineCurve: 10,
   fracLineLength: 25,
   scalingFactor: 25,

package/src/utils/arc-length.ts

@@ -1,5 +1,5 @@
 import Vector2 from '@equinor/videx-vector2';
-import { Vector } from 'curve-interpolator/dist/src/interfaces';
+import { Vector } from 'curve-interpolator/dist/src/core/interfaces';
 
 type fx = (n: number) => Vector;