Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to new subsurface viewer version #810

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,055 changes: 1,083 additions & 972 deletions frontend/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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",
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/framework/WorkbenchServices.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from "react";

import { Point2D, Point3D } from "@webviz/subsurface-viewer";

import { isEqual } from "lodash";

import { EnsembleIdent } from "./EnsembleIdent";
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useId } 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";
Expand Down Expand Up @@ -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()}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/modules/3DViewer/view/utils/layers.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/modules/3DViewer/view/view.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Loading