@equinor/esv-intersection 4.0.0 → 4.1.0

package/src/control/ZoomPanHandler.ts

@@ -34,7 +34,10 @@ export class ZoomPanHandler {
   constructor(
     elm: HTMLElement,
     onRescale: RescaleFunction,
-    options: ZoomAndPanOptions = { maxZoomLevel: DEFAULT_MAX_ZOOM_LEVEL, minZoomLevel: DEFAULT_MIN_ZOOM_LEVEL },
+    options: ZoomAndPanOptions = {
+      maxZoomLevel: DEFAULT_MAX_ZOOM_LEVEL,
+      minZoomLevel: DEFAULT_MIN_ZOOM_LEVEL,
+    },
   ) {
     this.container = select(elm);
     this.options = options;
@@ -180,7 +183,14 @@ export class ZoomPanHandler {
    * Update translate extent (pan limits)
    */
   updateTranslateExtent(): void {
-    const { width, xSpan, zFactor, enableTranslateExtent, translateBoundsX, translateBoundsY } = this;
+    const {
+      width,
+      xSpan,
+      zFactor,
+      enableTranslateExtent,
+      translateBoundsX,
+      translateBoundsY,
+    } = this;
 
     let x1 = -Infinity;
     let y1 = -Infinity;
@@ -206,7 +216,19 @@ export class ZoomPanHandler {
    * Create an event object from current state
    */
   currentStateAsEvent(): OnRescaleEvent {
-    const { scaleX, scaleY, xBounds, yBounds, zFactor, viewportRatio, currentTransform, xRatio, yRatio, width, height } = this;
+    const {
+      scaleX,
+      scaleY,
+      xBounds,
+      yBounds,
+      zFactor,
+      viewportRatio,
+      currentTransform,
+      xRatio,
+      yRatio,
+      width,
+      height,
+    } = this;
 
     return {
       xScale: scaleX.copy(),
@@ -236,7 +258,9 @@ export class ZoomPanHandler {
    * Initialized handler
    */
   init(): void {
-    this.zoom = zoom<HTMLElement, unknown>().scaleExtent([this.options.minZoomLevel, this.options.maxZoomLevel]).on('zoom', this.onZoom);
+    this.zoom = zoom<HTMLElement, unknown>()
+      .scaleExtent([this.options.minZoomLevel, this.options.maxZoomLevel])
+      .on('zoom', this.onZoom);
     this.container.call(this.zoom);
   }
 
@@ -287,8 +311,14 @@ export class ZoomPanHandler {
    * @param  duration - duration of transition
    * @returns  a merge of filter and payload
    */
-  setViewport(cx?: number, cy?: number, displ?: number, duration?: number): void {
-    const { zoom, container, calculateTransform, scaleX, scaleY, isXInverted } = this;
+  setViewport(
+    cx?: number,
+    cy?: number,
+    displ?: number,
+    duration?: number,
+  ): void {
+    const { zoom, container, calculateTransform, scaleX, scaleY, isXInverted } =
+      this;
 
     if (cx == null || displ == null || isNaN(cx) || isNaN(displ)) {
       const xd = scaleX.domain() as [number, number];
@@ -334,7 +364,10 @@ export class ZoomPanHandler {
   /**
    * Set bounds
    */
-  setTranslateBounds(xBounds: [number, number], yBounds: [number, number]): void {
+  setTranslateBounds(
+    xBounds: [number, number],
+    yBounds: [number, number],
+  ): void {
     this.translateBoundsX = xBounds;
     this.translateBoundsY = yBounds;
 
@@ -348,8 +381,18 @@ export class ZoomPanHandler {
   adjustToSize(): void;
   adjustToSize(autoAdjust: boolean): void;
   adjustToSize(width: number, height: number, force: boolean): void;
-  adjustToSize(widthOrAutoAdjust?: unknown, height?: number, force = false): void {
-    const { width: oldWidth, height: oldHeight, scaleX, scaleY, recalculateZoomTransform } = this;
+  adjustToSize(
+    widthOrAutoAdjust?: unknown,
+    height?: number,
+    force = false,
+  ): void {
+    const {
+      width: oldWidth,
+      height: oldHeight,
+      scaleX,
+      scaleY,
+      recalculateZoomTransform,
+    } = this;
 
     let w = 0;
     let h = 0;
@@ -360,7 +403,8 @@ export class ZoomPanHandler {
     } else {
       const containerEl = this.container.node();
       if (containerEl) {
-        const { width: containerWidth, height: containerHeight } = containerEl.getBoundingClientRect();
+        const { width: containerWidth, height: containerHeight } =
+          containerEl.getBoundingClientRect();
         w = containerWidth;
         h = containerHeight;
       }
@@ -389,7 +433,16 @@ export class ZoomPanHandler {
    * @returns  New transformation matrix
    */
   calculateTransform(dx0: number, dx1: number, dy: number): ZoomTransform {
-    const { scaleX, xSpan, xBounds, yBounds, zFactor, viewportRatio: ratio, isXInverted, isYInverted } = this;
+    const {
+      scaleX,
+      xSpan,
+      xBounds,
+      yBounds,
+      zFactor,
+      viewportRatio: ratio,
+      isXInverted,
+      isYInverted,
+    } = this;
 
     const [rx1, rx2] = scaleX.range() as [number, number];
     const displ = Math.abs(dx1 - dx0);
@@ -398,8 +451,11 @@ export class ZoomPanHandler {
 
     const dy0 = dy - (isYInverted ? -displ : displ) / zFactor / ratio / 2;
 
-    const tx = (xBounds[0] - dx0) / (isXInverted ? -unitsPerPixels : unitsPerPixels);
-    const ty = (yBounds[0] - dy0) / ((isYInverted ? -unitsPerPixels : unitsPerPixels) / zFactor);
+    const tx =
+      (xBounds[0] - dx0) / (isXInverted ? -unitsPerPixels : unitsPerPixels);
+    const ty =
+      (yBounds[0] - dy0) /
+      ((isYInverted ? -unitsPerPixels : unitsPerPixels) / zFactor);
 
     return zoomIdentity.translate(tx, ty).scale(k);
   }
@@ -408,7 +464,13 @@ export class ZoomPanHandler {
    * Recalcualate the transform
    */
   recalculateZoomTransform(): void {
-    const { scaleX, scaleY, container, calculateTransform, updateTranslateExtent } = this;
+    const {
+      scaleX,
+      scaleY,
+      container,
+      calculateTransform,
+      updateTranslateExtent,
+    } = this;
 
     const [dx0, dx1] = scaleX.domain() as [number, number];
     const [dy0, dy1] = scaleY.domain() as [number, number];

package/src/control/overlay.ts

@@ -10,11 +10,15 @@ export class Overlay<T> {
 
   constructor(caller: T, container: HTMLElement) {
     const con = select(container);
-    this.elm = con.append('div').attr('id', 'overlay').style('z-index', '11').style('position', 'absolute');
+    this.elm = con
+      .append('div')
+      .attr('id', 'overlay')
+      .style('z-index', '11')
+      .style('position', 'absolute');
     this.source = this.elm.node() ?? undefined;
 
     const { elm } = this;
-    elm.on('resize', (event) => {
+    elm.on('resize', event => {
       const { width, height } = event.detail;
       elm.style('width', `${width}px`).style('height', `${height}px`);
 
@@ -39,7 +43,7 @@ export class Overlay<T> {
       });
     });
 
-    elm.on('mousemove', (event) => {
+    elm.on('mousemove', event => {
       if (!this.enabled) {
         return;
       }
@@ -83,8 +87,15 @@ export class Overlay<T> {
     });
   }
 
-  create(key: string, callbacks?: OverlayCallbacks<T>): HTMLElement | undefined {
-    const newElm = this.elm.append('div').style('position', 'relative').style('pointer-events', 'none').node();
+  create(
+    key: string,
+    callbacks?: OverlayCallbacks<T>,
+  ): HTMLElement | undefined {
+    const newElm = this.elm
+      .append('div')
+      .style('position', 'relative')
+      .style('pointer-events', 'none')
+      .node();
 
     if (newElm != null) {
       this.elements[key] = newElm;
@@ -119,4 +130,5 @@ export class Overlay<T> {
   }
 }
 
-export const overlay = <T>(caller: T, container: HTMLElement): Overlay<T> => new Overlay<T>(caller, container);
+export const overlay = <T>(caller: T, container: HTMLElement): Overlay<T> =>
+  new Overlay<T>(caller, container);

package/src/datautils/colortable.ts

@@ -1,11 +1,16 @@
 import { scaleLinear } from 'd3-scale';
 import { color } from 'd3-color';
 
-export function createColorTable(colorMap: string[], size: number): [number, number, number][] {
+export function createColorTable(
+  colorMap: string[],
+  size: number,
+): [number, number, number][] {
   const colorDomain = colorMap.map((_v, i) => (i * size) / colorMap.length);
   const colorScale = scaleLinear<string>().domain(colorDomain).range(colorMap);
 
-  const table = Array.from(new Array(size).keys()).map<[number, number, number]>((i) => {
+  const table = Array.from(new Array(size).keys()).map<
+    [number, number, number]
+  >(i => {
     const rgb = color(colorScale(i))?.rgb();
     return rgb != null ? [rgb.r, rgb.g, rgb.b] : [0, 0, 0];
   });

package/src/datautils/findsample.ts

@@ -38,7 +38,12 @@ export function findIndexOfSample(data: number[][], pos: number): number {
   for (let i = a; i < b; i++) {
     const v1 = data[i]?.[0];
     const v2 = data[i + 1]?.[0];
-    if (v1 != null && v2 != null && Math.min(v1, v2) <= pos && pos <= Math.max(v1, v2)) {
+    if (
+      v1 != null &&
+      v2 != null &&
+      Math.min(v1, v2) <= pos &&
+      pos <= Math.max(v1, v2)
+    ) {
       index = i;
       break;
     }
@@ -47,7 +52,12 @@ export function findIndexOfSample(data: number[][], pos: number): number {
   return index;
 }
 
-export function findSampleAtPos(data: number[][], pos: number, topLimit = 0, bottomLimit = 0): number {
+export function findSampleAtPos(
+  data: number[][],
+  pos: number,
+  topLimit = 0,
+  bottomLimit = 0,
+): number {
   let y = 0;
   const index = findIndexOfSample(data, pos);
   if (index !== -1) {

package/src/datautils/picks.ts

@@ -87,24 +87,43 @@ function getEntryPicks(formationPicks: PairedPickAndUnit[]): Annotation[] {
     .map((p: PairedPickAndUnit) => mapPick(p.entryPick, 'strat-picks'));
 }
 
-function getFilteredExitPicks(formationPicks: PairedPickAndUnit[]): Annotation[] {
+function getFilteredExitPicks(
+  formationPicks: PairedPickAndUnit[],
+): Annotation[] {
   if (!formationPicks) {
     return [];
   }
 
   return (
     formationPicks
-      .filter((d: PairedPickAndUnit) => formationPicks.findIndex((p: PairedPickAndUnit) => Math.abs(p.entryPick.md - d.exitPick.md) < 0.5) === -1)
+      .filter(
+        (d: PairedPickAndUnit) =>
+          formationPicks.findIndex(
+            (p: PairedPickAndUnit) =>
+              Math.abs(p.entryPick.md - d.exitPick.md) < 0.5,
+          ) === -1,
+      )
       .map((p: PairedPickAndUnit) => mapPick(p.exitPick, 'strat-picks'))
       // Remove duplicates from unitpicks filling in gaps in formation
-      .filter((obj: Annotation, i: number, array: Annotation[]) => i === array.findIndex((v: Annotation) => v.title === obj.title && v.md === obj.md))
+      .filter(
+        (obj: Annotation, i: number, array: Annotation[]) =>
+          i ===
+          array.findIndex(
+            (v: Annotation) => v.title === obj.title && v.md === obj.md,
+          ),
+      )
   );
 }
 
-export const getPicksData = (picksData: { unitPicks: PairedPickAndUnit[]; nonUnitPicks: PickWithId[] }): Annotation[] =>
-  [...getReferencePicks(picksData.nonUnitPicks), ...getEntryPicks(picksData.unitPicks), ...getFilteredExitPicks(picksData.unitPicks)].sort(
-    (a, b) => a.md! - b.md!,
-  );
+export const getPicksData = (picksData: {
+  unitPicks: PairedPickAndUnit[];
+  nonUnitPicks: PickWithId[];
+}): Annotation[] =>
+  [
+    ...getReferencePicks(picksData.nonUnitPicks),
+    ...getEntryPicks(picksData.unitPicks),
+    ...getFilteredExitPicks(picksData.unitPicks),
+  ].sort((a, b) => a.md! - b.md!);
 
 /**
  * @param {Unit} u
@@ -134,7 +153,11 @@ const unitDto = (u: Unit): UnitDto => ({
  * @param {number} arr.from
  * @returns {[number, number][]}
  */
-function findGaps(from: number, to: number, arr: { from: number; to: number; itm: PairedPickAndUnit }[]): [number, number][] {
+function findGaps(
+  from: number,
+  to: number,
+  arr: { from: number; to: number; itm: PairedPickAndUnit }[],
+): [number, number][] {
   if (arr.length === 0) {
     return [[from, to]];
   }
@@ -166,12 +189,20 @@ const transformStratColumn = (units: Unit[]): UnitDto[] => units.map(unitDto);
  * @param {Pick[]} picks picks
  * @param {Unit[]} stratColumn strat column
  */
-function joinPicksAndStratColumn(picks: Pick[], stratColumn: Unit[]): { joined: PickAndUnit[]; nonUnitPicks: PickWithId[] } {
+function joinPicksAndStratColumn(
+  picks: Pick[],
+  stratColumn: Unit[],
+): { joined: PickAndUnit[]; nonUnitPicks: PickWithId[] } {
   const transformed = transformStratColumn(stratColumn);
   const nonUnitPicks: PickWithId[] = [];
   const joined: PickAndUnit[] = [];
   picks.forEach((p: Pick) => {
-    const matches = transformed.filter((u: UnitDto) => p.pickIdentifier?.search(new RegExp(`(${u.topSurface}|${u.baseSurface})`, 'i')) !== -1);
+    const matches = transformed.filter(
+      (u: UnitDto) =>
+        p.pickIdentifier?.search(
+          new RegExp(`(${u.topSurface}|${u.baseSurface})`, 'i'),
+        ) !== -1,
+    );
     if (matches.length > 0) {
       matches.forEach((u: UnitDto) =>
         joined.push({
@@ -203,7 +234,12 @@ function pairJoinedPicks(joined: PickAndUnit[]): PairedPickAndUnit[] {
 
   const sorted = joined
     .filter((d: PickAndUnit) => d.level)
-    .sort((a: PickAndUnit, b: PickAndUnit) => a.unitName.localeCompare(b.unitName) || a.md - b.md || a.ageTop - b.ageTop);
+    .sort(
+      (a: PickAndUnit, b: PickAndUnit) =>
+        a.unitName.localeCompare(b.unitName) ||
+        a.md - b.md ||
+        a.ageTop - b.ageTop,
+    );
 
   while (sorted.length > 0) {
     current = sorted.shift()!;
@@ -225,7 +261,9 @@ function pairJoinedPicks(joined: PickAndUnit[]): PairedPickAndUnit[] {
     let top: PickAndUnit | undefined;
     let base: PickAndUnit | undefined;
 
-    const pairWith = sorted.find((p: PickAndUnit) => p.identifier === pairWithName);
+    const pairWith = sorted.find(
+      (p: PickAndUnit) => p.identifier === pairWithName,
+    );
     if (!pairWith) {
       console.warn(`Unable to find ${pairWithName} pick for ${name}`);
       if (isTop) {
@@ -237,7 +275,9 @@ function pairJoinedPicks(joined: PickAndUnit[]): PairedPickAndUnit[] {
         if (base) {
           console.warn(`Using ${base.identifier} as base for ${name}`);
         } else {
-          console.warn(`Unable to find a base pick for ${name} pick at ${top.md}, ignored`);
+          console.warn(
+            `Unable to find a base pick for ${name} pick at ${top.md}, ignored`,
+          );
           continue;
         }
       } else if (isBase) {
@@ -249,7 +289,9 @@ function pairJoinedPicks(joined: PickAndUnit[]): PairedPickAndUnit[] {
         if (top) {
           console.warn(`Using ${top.identifier} as top for ${name}`);
         } else {
-          console.warn(`Unable to find a top pick for ${name} pick at ${base.md}, ignored`);
+          console.warn(
+            `Unable to find a top pick for ${name} pick at ${base.md}, ignored`,
+          );
           continue;
         }
       } else {
@@ -290,7 +332,10 @@ function pairJoinedPicks(joined: PickAndUnit[]): PairedPickAndUnit[] {
  * @param {Pick[]} picks picks
  * @param {Unit[]} stratColumn strat column
  */
-export function transformFormationData(picks: Pick[], stratColumn: Unit[]): { unitPicks: PairedPickAndUnit[]; nonUnitPicks: PickWithId[] } {
+export function transformFormationData(
+  picks: Pick[],
+  stratColumn: Unit[],
+): { unitPicks: PairedPickAndUnit[]; nonUnitPicks: PickWithId[] } {
   const { joined, nonUnitPicks } = joinPicksAndStratColumn(picks, stratColumn);
   const pairs = pairJoinedPicks(joined);
 
@@ -305,7 +350,10 @@ export function transformFormationData(picks: Pick[], stratColumn: Unit[]): { un
   while (itemstack.length > 0) {
     const first = itemstack.pop()!;
     const group: PairedPickAndUnit[] = [];
-    while (itemstack.length > 0 && itemstack[itemstack.length - 1]?.level! > first.level) {
+    while (
+      itemstack.length > 0 &&
+      itemstack[itemstack.length - 1]?.level! > first.level
+    ) {
       group.push(itemstack.pop()!);
     }
     group.reverse();
@@ -313,11 +361,11 @@ export function transformFormationData(picks: Pick[], stratColumn: Unit[]): { un
     const arr: { from: number; to: number; itm: PairedPickAndUnit }[] = [];
     group.forEach((itm: PairedPickAndUnit) => {
       const gaps = findGaps(itm.mdEntry, itm.mdExit, arr);
-      arr.push(...gaps.map((g) => ({ from: g[0], to: g[1], itm })));
+      arr.push(...gaps.map(g => ({ from: g[0], to: g[1], itm })));
     });
     arr.sort((a, b) => a.from - b.from);
     unitPicks.push(
-      ...arr.map((d) => ({
+      ...arr.map(d => ({
         from: d.from,
         to: d.to,
         ...d.itm,