@equinor/esv-intersection 1.4.4 → 1.6.0

package/dist/interfaces.d.ts

@@ -156,6 +156,8 @@ export interface ReferenceSystemOptions {
     curveInterpolator?: Interpolator;
     trajectoryInterpolator?: Interpolator;
     curtainInterpolator?: Interpolator;
+    approxT?: boolean;
+    quickT?: boolean;
 }
 export declare type BoundingBox = {
     x: number;

package/dist/layers/CasingLayer.d.ts

@@ -1,10 +1,20 @@
 import { Point, Texture } from 'pixi.js';
 import { WellboreBaseComponentLayer } from './WellboreBaseComponentLayer';
 import { CasingLayerOptions, Casing } from '..';
+export interface CasingRenderObject {
+    pathPoints: number[][];
+    polygon: Point[];
+    leftPath: Point[];
+    rightPath: Point[];
+    radius: number;
+    diameter: number;
+    casingWallWidth: number;
+}
 export declare class CasingLayer extends WellboreBaseComponentLayer {
     constructor(id?: string, options?: CasingLayerOptions);
     render(): void;
-    drawCasing: (casing: Casing) => void;
+    prepareCasingRenderObject: (casing: Casing) => CasingRenderObject;
+    drawCasing: (zippedRenderObject: [Casing, CasingRenderObject]) => void;
     drawShoe(casingEnd: number, casingRadius: number): void;
     generateShoe: (casingEnd: number, casingRadius: number, length: number, width: number) => Point[];
     createTexture(diameter: number): Texture;

package/dist/layers/GeomodelCanvasLayer.d.ts

@@ -14,6 +14,7 @@ export declare class GeomodelCanvasLayer extends CanvasLayer {
     onMount(event: OnMountEvent): void;
     onUpdate(event: OnUpdateEvent): void;
     onRescale(event: OnRescaleEvent): void;
+    updatePaths(): void;
     render(): void;
     colorToCSSColor(color: number | string): string;
     generateSurfaceAreasPaths(): void;

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

@@ -0,0 +1,23 @@
+import { Vector } from 'curve-interpolator/dist/src/interfaces';
+declare type fx = (n: number) => Vector;
+export declare class ArcLength {
+    /**
+     * Calculate using an adaptive bisect method
+     * @param {Number} func Curve function returning [x,y]
+     * @param {Number} minLimit Min limit
+     * @param {Number} maxLimit Max limit
+     * @param {Number} tolerance Result tolerance
+     * @param {Number} minDepth Min recursive depth before accepting solution
+     * @param {Number} maxDepth Max recursive depth
+     */
+    static bisect(func: fx, minLimit?: number, maxLimit?: number, tolerance?: number, minDepth?: number, maxDepth?: number): number;
+    /**
+     * Calculate using trapezoid method
+     * @param {Number} func Curve function returning [x,y]
+     * @param {Number} minLimit Min limit
+     * @param {Number} maxLimit Max limit
+     * @param {Number} segments Number of segments
+     */
+    static trapezoid(func: fx, minLimit?: number, maxLimit?: number, segments?: number): number;
+}
+export {};

package/dist/utils/binary-search.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Find index where value[index] =< searchValue and value[index+1] >= searchValue using binary search
+ * @param {Number} values Array of sorted values
+ * @param {Number} searchValue Value to search for
+ */
+export declare class BinarySearch {
+    static search(values: number[], searchValue: number): number;
+}

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

@@ -0,0 +1,34 @@
+declare type fx = (n: number) => number;
+export declare class RootFinder {
+    /**
+     * Find root using newthons method
+     * @param {Number} func f(x)
+     * @param {Number} precision Accuracy of result
+     * @param {Number} maxIterations Max number of iterations to use
+     * @param {Number} start Starting position
+     * @param {Number} minLimit Min limit of result
+     * @param {Number} maxLimit Max limit of result
+     */
+    static newton(func: fx, precision?: number, maxIterations?: number, start?: number, minLimit?: number, maxLimit?: number): number;
+    /**
+     * Find root using bisect method
+     * @param {Number} func f(x)
+     * @param {Number} precision Accuracy of result
+     * @param {Number} maxIterations Max number of iterations to use
+     * @param {Number} start Starting position
+     * @param {Number} minLimit Min limit of result
+     * @param {Number} maxLimit Max limit of result
+     */
+    static bisect(func: fx, precision?: number, maxIterations?: number, start?: number, minLimit?: number, maxLimit?: number): number;
+    /**
+     * Find root by trying available methods
+     * @param {Number} func f(x)
+     * @param {Number} precision Accuracy of result
+     * @param {Number} maxIterations Max number of iterations to use
+     * @param {Number} start Starting position
+     * @param {Number} minLimit Min limit of result
+     * @param {Number} maxLimit Max limit of result
+     */
+    static findRoot(func: fx, precision?: number, maxIterations?: number, start?: number, minLimit?: number, maxLimit?: number): number;
+}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/esv-intersection",
-  "version": "1.4.4",
+  "version": "1.6.0",
   "description": "Intersection component package with testing and automatic documentation.",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -15,7 +15,7 @@
     "prepub": "npm run build",
     "pub": "npm publish --access=public",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx src",
-    "test": "jest",
+    "test": "tsc --project tsconfig.test.json && jest",
     "test:watch": "jest --watchAll",
     "predocs": "rimraf docs_out",
     "docs": "typedoc --out docs_out src",
@@ -40,19 +40,25 @@
   },
   "homepage": "https://github.com/equinor/esv-intersection#readme",
   "devDependencies": {
-    "@storybook/addon-docs": "^6.1.20",
-    "@storybook/addon-storysource": "^6.1.20",
-    "@storybook/html": "^6.1.20",
-    "@types/jest": "^26.0.20",
+    "@babel/core": "^7.16.7",
+    "@babel/preset-env": "^7.16.8",
+    "@babel/preset-typescript": "^7.16.7",
+    "@storybook/addon-docs": "^6.4.18",
+    "@storybook/addon-storysource": "^6.4.18",
+    "@storybook/html": "^6.4.18",
+    "@types/d3": "^7.1.0",
+    "@types/jest": "^27.4.0",
+    "@types/mock-raf": "^1.0.2",
     "@typescript-eslint/eslint-plugin": "^4.15.2",
     "@typescript-eslint/parser": "^4.15.2",
-    "awesome-typescript-loader": "^5.2.1",
+    "babel-jest": "^27.4.6",
     "copyfiles": "^2.4.1",
     "eslint": "^7.20.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-prettier": "^3.3.1",
-    "jest": "^26.6.3",
+    "jest": "^27.4.7",
     "jest-canvas-mock": "^2.3.1",
+    "mock-raf": "^1.0.1",
     "pixi.js": "^5.3.8",
     "prettier": "^2.2.1",
     "rimraf": "^3.0.2",
@@ -61,16 +67,12 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.30.0",
-    "storybook-dark-mode": "^1.0.4",
-    "ts-jest": "^26.5.2",
+    "storybook-dark-mode": "^1.0.8",
     "tslib": "^2.1.0",
     "typedoc": "^0.20.28",
     "typescript": "^4.2.2"
   },
   "jest": {
-    "transform": {
-      ".(ts|tsx)": "ts-jest"
-    },
     "setupFiles": [
       "jest-canvas-mock"
     ],
@@ -79,7 +81,9 @@
       "ts",
       "tsx",
       "js"
-    ]
+    ],
+    "testEnvironment": "jsdom",
+    "transformIgnorePatterns": ["/node_modules/(?!d3)"]
   },
   "peerDependencies": {
     "pixi.js": "^5.2.1"
@@ -87,13 +91,12 @@
   "dependencies": {
     "@equinor/videx-math": "^1.0.12",
     "@equinor/videx-vector2": "^1.0.44",
-    "@types/d3": "^5.7.2",
     "curve-interpolator": "2.0.8",
-    "d3-array": "^2.11.0",
-    "d3-axis": "^1.0.12",
-    "d3-scale": "^3.2.1",
-    "d3-selection": "^1.4.1",
-    "d3-shape": "^1.3.7",
-    "d3-zoom": "^1.8.3"
+    "d3-array": "^3.1.1",
+    "d3-axis": "^3.0.0",
+    "d3-scale": "^4.0.2",
+    "d3-selection": "^3.0.0",
+    "d3-shape": "^3.1.0",
+    "d3-zoom": "^3.0.0"
   }
 }

package/CHANGELOG.md

@@ -1,221 +0,0 @@
-# Changelog
-
-## New changes not yet released
-
-## v1.4.4
-- Add option to override interpolators in the IntersectionReferenceSystem
-- Update react-dev-utils to 11.0.4
-
-## v1.4.3
-- Add option to use a optional range for generating seismic image
-
-## v1.4.2
-
-- Improve wellborelayers textures
-- Update typescript to 4.2.2
-
-## v1.4.1
-
-- Matching surface name checks are now case insensitive
-- Bumped d3-array package
-
-## v1.4.0
-
-- added option to override arc division and tension in the reference system
-- removed group labels from being render in surface labels
-- pixi-layers skip render without referenceSystem
-- upgrade vulnerable packages
-- cleanup GeomodelLayerV2
-- cleanup render method on WellboreBaseComponentLayers
-
-## v1.3.1
-
-- fix skip render without referenceSystem in CalloutCanvasLayer
-
-## v1.3.0
-
-- fix CalloutCanvasLayer to always render on data update
-- fix position callout with displacement calculated from bottom
-- fix issue with missing labels in geomodel
-- fix onUnmount on PixiLayers
-- add export of interfaces AxisOptions, ControllerOptions, OverlayEvents and OverlayCallbacks
-- add destroy method to Controller
-
-## v1.2.1
-
-- improved surface and surface label rendering order
-- improved setting data on layer creation
-- added fallback for various rendering functions when webGL is not available
-
-## v1.2.0
-
-- deprecate GeomodelLayer (keeping api util next major release)
-- add support for inverse xBounds on several layers
-- add support for cement spanning multiple casings
-- fix issue in HighlightLayer storybook demo layer
-- use typescript types from curve-interpolator
-- add solid color casing option
-- compensate for zFactor in WellboreBaseComponentLayers
-- add calculateDisplacementFromBottom option to IntersectionReferenceSystem
-
-## v1.1.0
-
-- surface labels improvement
-- bugfix: well layers rendering artifacts
-- bugfix: fix distortion in GeomodelLayer and GeomodelLayerV2 lines when increasing zFactor
-
-## v1.0.0
-
-- bring package out of alpha
-- bugfix: corrected overlapping logic for WellboreItemShapeGenerator
-- minor refactoring
-
-## v0.9.6-alpha
-
-- improve validation on trajectoryAngle in IntersectionReferenceSystem
-- handle cases where a curve is vertical
-
-## v0.9.5-alpha
-
-- Added option to remove reference system when clearing data on layers
-- misc: added validation when missing data
-
-## v0.9.4-alpha
-
-- bugfix: use only extensionStart as offset
-- bump websocket-extensions version
-
-## v0.9.3-alpha
-
-- improve input validation on getExtendedTrajectory
-
-## v0.9.2-alpha
-
-- bugfix: correctly handle position when md or position is supplied in callout layer
-
-## v0.9.1-alpha
-
-- bugfix: corrected input validation on getExtendedTrajectory
-
-## v0.9.0-alpha
-
-- added method in the IntersectionReferenceSystem to get an extended trajectory
-- added option to pass in increment, which help specify distance between points on various layers like cement, casing, and holesize layers
-- fixed a bug with z-index on html layers
-- improved perfomance on cement layer
-- add posibility to pass in either a curve length (measured depth, md) or a set of coordinates to the callout layer
-- resolve vulnerability
-- misc bugfixes and improvements
-
-## v0.8.1-alpha
-
-- misc bugfixes
-
-## v0.8.0-alpha
-
-- added clearAllData method to controller and layer manager
-- reworked callout layer
-- improved geolabel layer label positioning
-- improved input validation
-- improved error handling
-- misc bugfixes
-
-## v0.7.1-alpha
-
-- improved documentation in the reference system
-- removed existing options when creating a reference system
-- added the option to pass in a trajectory angle in the reference system
-
-## v0.7.0-alpha
-
-- added cement layer
-- fixed issue with peer dependency
-- misc bugfixes
-
-## v0.6.4-alpha
-
-- set z-index for overlay and axis dynamically
-- misc bugfixes
-- improved documentation
-
-## v0.6.3-alpha
-
-- methods show/hide axis label
-- methods for flipping axes
-- getter for axis in layer manager and controller
-
-## v0.6.2-alpha
-
-- option to add offset in grid layer
-- toggle axis
-- set interactivity on layers, off by default
-- moved base layers to sub-folders
-
-## v0.6.1-alpha
-
-- Expose offset methods in the layer manager and controller
-- Allow flipping axis in canvas layer and flip domain in geo labels
-- Set zoom levels
-
-## v0.6.0-alpha
-
-- misc optimizations
-- improved value handling in IRS
-- allow for offset in IRS
-- allow for offset in axis
-
-## v0.5.0-alpha
-
-- Added HTML base layer
-- Added story featuring point highlighting based on md input
-
-## v0.4.0-alpha
-
-- Added event overlay
-- updated stories
-- bugfixes
-
-## v0.3.2-alpha
-
-- Basic completion layer
-- Pixi.js is now a peer dependency
-
-## v0.3.1-alpha
-
-- functioning defaults for layers
-- made setData and clearData available for layers
-- minor improvements
-
-## v0.3.0-alpha
-
-- added top level interface
-- renamed WebglLayer to PixiLayer
-- small fixes
-
-## v0.2.0-alpha
-
-Controls:
-
-- Layer manager
-- Reference system
-
-Custom Layers:
-
-- Geomodel label
-- Casing
-
-This release also features some miscellaneous improvements and optimizations
-
-## v0.1.3-alpha
-
-Made interfaces and zoom and pan handler available
-
-## v0.1.2-alpha
-
-Include actual files
-
-## v0.1.1-alpha
-
-Initial release
-
-Contains Base, SVG, Canvas, Wellborepath, Callout, Image, and WebGL layers