880 Data Provider Framework in Intersection Module #948

jorgenherje · 2025-04-30T13:28:55Z

Apply data provider framework to Intersection Module

This is a first version only supporting 1 view using the EsvIntersection-component.

Made settings and providers for new functionality. Adjustments to existing SeismicLayer to perform async generating seismic image.

Fixes made compared to old version:

Corrected incorrect resampling of polyline: Now it resamples per polyline section, and ensures last point being added. Thereby there is no cutoff
Ensures extensionLength is only used for wellbores.

Adjustment/fixes in back-end:

Adjust/move endpoints in back-end. Move end-points and utils in form surface router to well router for correct placement
Remove unused/unnecessary endpoint
Fix error message in surface endpoint (print error text)

Closes: #880

- Fixes after rebase - WIP

- Make correct viewport - Fix correct viewport for `handleFitInViewClick`, make use of bounds instead of referenceSystem, as bounds include extensionLength

Change: Remove conditional rendering for ViewportWrapper Note: Does not explain why context issue occurs

- Sort available settings arrays for options ordered alphabetically - Make use of TimeOrIntervalSetting for formatting of label in Dropdown

- Handle inf, nan, MAX_VALUE etc to ensure valid bounds and viewport

- Undo incorrect package update - Update autogen code - Add adjusted preview code done in original module code

...ction/DataProviderFramework/customDataProviderImplementations/RealizationSurfacesProvider.ts

...aProviderFramework/customDataProviderImplementations/SurfacesPerRealizationValuesProvider.ts

onRescale did not ensure that image was generated. Update to ensure preRender logic is run and image is generated async when needed

Adjust naming for consistency

Anders2303

Nice work. Found some various smaller issues, but overall everything looks good.

I'll take a look at the running instance tomorrow to check the UX

frontend/src/modules/Intersection/DataProviderFramework/boundingBoxes/makeGridBoundingBox.ts

frontend/src/modules/Intersection/DataProviderFramework/boundingBoxes/makeSeismicBoundingBox.ts

...aProviderFramework/customDataProviderImplementations/SurfacesPerRealizationValuesProvider.ts

...nd/src/modules/Intersection/DataProviderFramework/visualization/createGridLayerItemsMaker.ts

...nd/src/modules/_shared/DataProviderFramework/settings/implementations/SliderNumberSettig.tsx

frontend/src/modules/_shared/DataProviderFramework/visualization/VisualizationAssembler.ts

frontend/src/modules/_shared/Intersection/intersectionPolylineUtils.ts

...d/src/modules/_shared/DataProviderFramework/settings/implementations/IntersectionSetting.tsx

...d/src/modules/_shared/DataProviderFramework/settings/SettingRegistry/_registerAllSettings.ts

frontend/src/modules/Intersection/view/components/viewportWrapper.tsx

Anders2303 · 2025-05-20T08:24:59Z

Found duplicate well-picks on No 34/4-D-3 AH

jorgenherje · 2025-05-20T12:54:19Z

Found duplicate well-picks on No 34/4-D-3 AH

Updated the DrilledWellborePicksSetting to have unique pickIdentifiers in the options. Then no duplicates exist among options. Thereafter we find all elements with matching the selected pickIdentifiers among the availableValues in handleChange function, to ensure all picks are selected and provided to the user.

Refactor code in DataProvidersWrapper: - Refactor into utility functions - Add states for reference stability

…ule-layer-framework-NEW

- Create new viewport when changing intersection or extension length - Handle vertical scale/zFactor when creating viewport.

…ule-layer-framework-NEW

- Move calculation of viewport into wrapper - Refocus view when changing intersection/extension - Introduce fit in view mode - Do not reset/refocus view when adding layers etc unless fit in view mode is on

To prevent duplicate div refs

jorgenherje added the enhancement New feature or request label Apr 30, 2025

jorgenherje self-assigned this Apr 30, 2025

jorgenherje force-pushed the 880-intersection-module-layer-framework-NEW branch 4 times, most recently from 6aef083 to b58963c Compare May 8, 2025 14:02

jorgenherje added 19 commits May 12, 2025 13:57

Remove old Intersection module

5b78189

New Intersection Module - WIP

810ae91

WIP - and fix after rebase

371bfa3

- Fixes after rebase - WIP

Fix prev settings/storedData issue in provider

e1d0962

Adjust color scales and utilize value ranges for grid and seismic

3f24ebd

Adjust viewport code, and remove duplicate layerMaker-code

6e2f68b

Fix linting/formatting issues

11016c8

Adjust calc of boundingBox, bounds and viewport

a1c3243

- Make correct viewport - Fix correct viewport for `handleFitInViewClick`, make use of bounds instead of referenceSystem, as bounds include extensionLength

Minor adjustment of maker functions - utilise isLoading

fecf69e

Fix WebGL context issue

e4f461b

Change: Remove conditional rendering for ViewportWrapper Note: Does not explain why context issue occurs

Adjust filename and import order

cad7f06

Adjust boundingBox methods for layers

9bd1cad

Rename module from IntersectionNew to Intersection

d3c0803

Fix typing of utility functions

2421d32

Ensure invalid/error for fetch if polyline has less than two points

55b800f

Sort available settings alphabetically and adjust time/interval setting

b1ac2a5

- Sort available settings arrays for options ordered alphabetically - Make use of TimeOrIntervalSetting for formatting of label in Dropdown

Ensure valid viewport and bounds values

635ba0c

- Handle inf, nan, MAX_VALUE etc to ensure valid bounds and viewport

Rename IntersectionExtensionLength -> WellboreExtensionLength

76bce44

Adjust seismic colorScale to be symmetric around 0

aea27cd

jorgenherje force-pushed the 880-intersection-module-layer-framework-NEW branch from b58963c to b4fd8c9 Compare May 12, 2025 12:12

Adjust after rebase

dcdc748

- Undo incorrect package update - Update autogen code - Add adjusted preview code done in original module code

jorgenherje force-pushed the 880-intersection-module-layer-framework-NEW branch from b4fd8c9 to dcdc748 Compare May 12, 2025 12:19

jorgenherje added 2 commits May 16, 2025 11:27

Merge branch 'main' into 880-intersection-module-layer-framework-NEW

ea580c3

Adjust after merge

d4034da

jorgenherje added 2 commits May 16, 2025 12:09

Fix import path after merge

1c3e504

Revert incorrect formatting in package and package-lock files

1a49bda

jorgenherje marked this pull request as ready for review May 16, 2025 10:53

jorgenherje requested review from rubenthoms and Anders2303 May 16, 2025 10:53

HansKallekleiv requested changes May 19, 2025

View reviewed changes

...ction/DataProviderFramework/customDataProviderImplementations/RealizationSurfacesProvider.ts Outdated Show resolved Hide resolved

...aProviderFramework/customDataProviderImplementations/SurfacesPerRealizationValuesProvider.ts Outdated Show resolved Hide resolved

jorgenherje added 4 commits May 19, 2025 12:04

Make SeismicLayer generate image async in onRescale handler

5af705f

onRescale did not ensure that image was generated. Update to ensure preRender logic is run and image is generated async when needed

Fix incorrect folder name for utils

30573e2

Add boundingbox for surfaces uncertainties

9db75a2

Adjust naming for consistency

Review feedback: Filter surface names on selected attribute

c96f321

Anders2303 requested changes May 19, 2025

View reviewed changes

Anders2303 requested changes May 20, 2025

View reviewed changes

Anders2303 and others added 2 commits May 20, 2025 13:59

Added observation number to well pick endpoints

1608617

Generate api after update of end-point

12126a8

jorgenherje mentioned this pull request May 20, 2025

ESV Intersection layers: layers bleed out of the rendering area. #994

Open

First step of fixes based on review

6a18dbd

Anders2303 mentioned this pull request May 21, 2025

Well log viewer - Implement Data Provider Framework #936

Open

jorgenherje mentioned this pull request May 21, 2025

[DPF]: Possible improvements #883

Open

1 task

jorgenherje added 8 commits May 21, 2025 14:09

Second step of fixes based on review

eaba538

Refactor code in DataProvidersWrapper: - Refactor into utility functions - Add states for reference stability

Merge remote-tracking branch 'equinor/main' into 880-intersection-mod…

1c417ed

…ule-layer-framework-NEW

Use new useVisualizationAssemblerProduct hook

bf4f0a9

Handle verticalScale in handleFitInViewClick function

734627e

Fixes based on review

9429e93

Update viewport when changing intersection and extension length

32fdc43

- Create new viewport when changing intersection or extension length - Handle vertical scale/zFactor when creating viewport.

Merge remote-tracking branch 'equinor/main' into 880-intersection-mod…

143ad1b

…ule-layer-framework-NEW

Improve viewport and fit in view functionality

5d1fca8

- Move calculation of viewport into wrapper - Refocus view when changing intersection/extension - Introduce fit in view mode - Do not reset/refocus view when adding layers etc unless fit in view mode is on

jorgenherje requested a review from Anders2303 May 27, 2025 08:38

Move ColorLegends into viewportwrapper

9ff4a6d

To prevent duplicate div refs

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

880 Data Provider Framework in Intersection Module #948

880 Data Provider Framework in Intersection Module #948

jorgenherje commented Apr 30, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Anders2303 left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Anders2303 commented May 20, 2025

Uh oh!

jorgenherje commented May 20, 2025

Uh oh!

Uh oh!

880 Data Provider Framework in Intersection Module #948

Are you sure you want to change the base?

880 Data Provider Framework in Intersection Module #948

Conversation

jorgenherje commented Apr 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Anders2303 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Anders2303 commented May 20, 2025

Uh oh!

jorgenherje commented May 20, 2025

Uh oh!

Uh oh!

jorgenherje commented Apr 30, 2025 •

edited

Loading