chore: upgrade to newest subsurface-viewer version

equinor · Nov 18, 2024 · 04579cf · 04579cf
1 parent 74164ca
commit 04579cf
Show file tree

Hide file tree

Showing 7 changed files with 2,628 additions and 951 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -19,6 +19,8 @@
         "test:ct:ui": "playwright test -c playwright.ct.config.ts --ui"
     },
     "dependencies": {
+        "@equinor/eds-core-react": "^0.42.0",
+        "@equinor/eds-icons": "^0.21.0",
         "@equinor/esv-intersection": "^3.0.10",
         "@headlessui/react": "^1.7.8",
         "@mui/base": "^5.0.0-beta.3",
@@ -28,7 +30,7 @@
         "@tanstack/react-query-devtools": "^5.4.2",
         "@types/geojson": "^7946.0.14",
         "@webviz/group-tree-plot": "^1.1.14",
-        "@webviz/subsurface-viewer": "^0.25.2",
+        "@webviz/subsurface-viewer": "^1.1.1",
         "@webviz/well-completions-plot": "^1.5.11",
         "animate.css": "^4.1.1",
         "axios": "^1.6.5",

diff --git a/frontend/src/framework/WorkbenchServices.ts b/frontend/src/framework/WorkbenchServices.ts
@@ -1,5 +1,7 @@
 import React from "react";
 
+import { Point2D, Point3D } from "@webviz/subsurface-viewer";
+
 import { isEqual } from "lodash";
 
 import { EnsembleIdent } from "./EnsembleIdent";
@@ -27,7 +29,7 @@ export type GlobalTopicDefinitions = {
     "global.syncValue.timeSeries": { vectorName: string };
     "global.syncValue.surface": { name: string; attribute: string };
     "global.syncValue.cameraPositionMap": {
-        target: number[];
+        target: Point2D | Point3D | undefined;
         zoom: number;
         rotationX: number;
         rotationOrbit: number;

diff --git a/frontend/src/modules/3DViewer/view/components/HoverUpdateWrapper.tsx b/frontend/src/modules/3DViewer/view/components/HoverUpdateWrapper.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { GeoJsonLayer } from "@deck.gl/layers/typed";
+import { GeoJsonLayer } from "@deck.gl/layers";
 import { IntersectionReferenceSystem } from "@equinor/esv-intersection";
 import { ViewContext } from "@framework/ModuleContext";
 import { GlobalTopicDefinitions, WorkbenchServices, useSubscribedValue } from "@framework/WorkbenchServices";

diff --git a/frontend/src/modules/3DViewer/view/components/SubsurfaceViewerWrapper.tsx b/frontend/src/modules/3DViewer/view/components/SubsurfaceViewerWrapper.tsx
@@ -1,7 +1,7 @@
-import React, { useId } from "react";
+import React from "react";
 
-import { Layer, PickingInfo } from "@deck.gl/core/typed";
-import { ColumnLayer, SolidPolygonLayer } from "@deck.gl/layers/typed";
+import { Layer, PickingInfo } from "@deck.gl/core";
+import { ColumnLayer, SolidPolygonLayer } from "@deck.gl/layers";
 import { IntersectionPolyline, IntersectionPolylineWithoutId } from "@framework/userCreatedItems/IntersectionPolylines";
 import { Button } from "@lib/components/Button";
 import { HoldPressedIntervalCallbackButton } from "@lib/components/HoldPressedIntervalCallbackButton/holdPressedIntervalCallbackButton";
@@ -640,6 +640,7 @@ export function SubsurfaceViewerWrapper(props: SubsurfaceViewerWrapperProps): Re
                 }}
                 getTooltip={makeTooltip}
                 verticalScale={verticalScale}
+                pickingRadius={10}
             />
             <div className="absolute bottom-0 right-0 z-30 bg-white bg-opacity-50 p-2 pointer-events-none">
                 {makeHelperText()}

diff --git a/frontend/src/modules/3DViewer/view/utils/layers.ts b/frontend/src/modules/3DViewer/view/utils/layers.ts
@@ -1,5 +1,5 @@
 import { BoundingBox3d_api, WellboreTrajectory_api } from "@api";
-import { Layer } from "@deck.gl/core/typed";
+import { Layer } from "@deck.gl/core";
 import { ColorScale } from "@lib/utils/ColorScale";
 import { TGrid3DColoringMode } from "@webviz/subsurface-viewer";
 import { AxesLayer, Grid3DLayer, WellsLayer } from "@webviz/subsurface-viewer/dist/layers";

diff --git a/frontend/src/modules/3DViewer/view/view.tsx b/frontend/src/modules/3DViewer/view/view.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Layer } from "@deck.gl/core/typed";
+import { Layer } from "@deck.gl/core";
 import { IntersectionReferenceSystem } from "@equinor/esv-intersection";
 import { ModuleViewProps } from "@framework/Module";
 import { useViewStatusWriter } from "@framework/StatusWriter";