Skip to content

Commit a028574

Browse files
authored
Upgrade to new subsurface viewer version (equinor#810)
1 parent 3b3a518 commit a028574

File tree

7 files changed

+1093
-979
lines changed

7 files changed

+1093
-979
lines changed

frontend/package-lock.json

+1,083-972
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@tanstack/react-query-devtools": "^5.4.2",
2929
"@types/geojson": "^7946.0.14",
3030
"@webviz/group-tree-plot": "^1.1.14",
31-
"@webviz/subsurface-viewer": "^0.25.2",
31+
"@webviz/subsurface-viewer": "^1.1.1",
3232
"@webviz/well-completions-plot": "^1.5.11",
3333
"animate.css": "^4.1.1",
3434
"axios": "^1.6.5",

frontend/src/framework/WorkbenchServices.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import React from "react";
22

3+
import { Point2D, Point3D } from "@webviz/subsurface-viewer";
4+
35
import { isEqual } from "lodash";
46

57
import { EnsembleIdent } from "./EnsembleIdent";
@@ -27,7 +29,7 @@ export type GlobalTopicDefinitions = {
2729
"global.syncValue.timeSeries": { vectorName: string };
2830
"global.syncValue.surface": { name: string; attribute: string };
2931
"global.syncValue.cameraPositionMap": {
30-
target: number[];
32+
target: Point2D | Point3D | undefined;
3133
zoom: number;
3234
rotationX: number;
3335
rotationOrbit: number;

frontend/src/modules/3DViewer/view/components/HoverUpdateWrapper.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22

3-
import { GeoJsonLayer } from "@deck.gl/layers/typed";
3+
import { GeoJsonLayer } from "@deck.gl/layers";
44
import { IntersectionReferenceSystem } from "@equinor/esv-intersection";
55
import { ViewContext } from "@framework/ModuleContext";
66
import { GlobalTopicDefinitions, WorkbenchServices, useSubscribedValue } from "@framework/WorkbenchServices";

frontend/src/modules/3DViewer/view/components/SubsurfaceViewerWrapper.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useId } from "react";
22

3-
import { Layer, PickingInfo } from "@deck.gl/core/typed";
4-
import { ColumnLayer, SolidPolygonLayer } from "@deck.gl/layers/typed";
3+
import { Layer, PickingInfo } from "@deck.gl/core";
4+
import { ColumnLayer, SolidPolygonLayer } from "@deck.gl/layers";
55
import { IntersectionPolyline, IntersectionPolylineWithoutId } from "@framework/userCreatedItems/IntersectionPolylines";
66
import { Button } from "@lib/components/Button";
77
import { HoldPressedIntervalCallbackButton } from "@lib/components/HoldPressedIntervalCallbackButton/holdPressedIntervalCallbackButton";
@@ -640,6 +640,7 @@ export function SubsurfaceViewerWrapper(props: SubsurfaceViewerWrapperProps): Re
640640
}}
641641
getTooltip={makeTooltip}
642642
verticalScale={verticalScale}
643+
pickingRadius={10}
643644
/>
644645
<div className="absolute bottom-0 right-0 z-30 bg-white bg-opacity-50 p-2 pointer-events-none">
645646
{makeHelperText()}

frontend/src/modules/3DViewer/view/utils/layers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { BoundingBox3d_api, WellboreTrajectory_api } from "@api";
2-
import { Layer } from "@deck.gl/core/typed";
2+
import { Layer } from "@deck.gl/core";
33
import { ColorScale } from "@lib/utils/ColorScale";
44
import { TGrid3DColoringMode } from "@webviz/subsurface-viewer";
55
import { AxesLayer, Grid3DLayer, WellsLayer } from "@webviz/subsurface-viewer/dist/layers";

frontend/src/modules/3DViewer/view/view.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22

3-
import { Layer } from "@deck.gl/core/typed";
3+
import { Layer } from "@deck.gl/core";
44
import { IntersectionReferenceSystem } from "@equinor/esv-intersection";
55
import { ModuleViewProps } from "@framework/Module";
66
import { useViewStatusWriter } from "@framework/StatusWriter";

0 commit comments

Comments
 (0)