fix: View resets to default when adding/removing a layer. #1690 (#1691)

* fix: View resets to default when adding/removing a layer. #1690 - for some reason this has gone missing from the code at some point. * Code comment fixes. * Lint fix
equinor · Oct 13, 2023 · 5ec5d90 · 5ec5d90
1 parent a603666
commit 5ec5d90
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/typescript/packages/subsurface-viewer/src/SubsurfaceViewer.stories.tsx b/typescript/packages/subsurface-viewer/src/SubsurfaceViewer.stories.tsx
@@ -553,7 +553,7 @@ IsRenderedCallback.args = {
         viewports: [
             {
                 id: "view_1",
-                show3D: false,
+                show3D: true,
             },
         ],
     },

diff --git a/typescript/packages/subsurface-viewer/src/components/Map.tsx b/typescript/packages/subsurface-viewer/src/components/Map.tsx
@@ -589,6 +589,10 @@ const Map: React.FC<MapProps> = ({
 
     const bboxInitial: BoundingBox3D = [0, 0, 0, 1, 1, 1];
 
+    const isCameraPositionDefined =
+        typeof cameraPosition !== "undefined" &&
+        Object.keys(cameraPosition).length !== 0;
+
     // Deck.gl View's and viewStates as input to Deck.gl
     const [deckGLViews, setDeckGLViews] = useState<View[]>([]);
     const [viewStates, setViewStates] = useState<Record<string, ViewStateType>>(
@@ -602,6 +606,8 @@ const Map: React.FC<MapProps> = ({
 
     const [deckGLLayers, setDeckGLLayers] = useState<LayersList>([]);
 
+    const [viewStateChanged, setViewStateChanged] = useState<boolean>(false);
+
     const [viewPortMargins, setViewPortMargins] = useState<marginsType>({
         left: 0,
         right: 0,
@@ -647,6 +653,9 @@ const Map: React.FC<MapProps> = ({
     }, [triggerHome]);
 
     useEffect(() => {
+        if (viewStateChanged && !isCameraPositionDefined) {
+            return;
+        }
         const [Views, viewStates] = createViewsAndViewStates(
             views,
             viewPortMargins,
@@ -658,6 +667,7 @@ const Map: React.FC<MapProps> = ({
 
         setDeckGLViews(Views);
         setViewStates(viewStates);
+        setViewStateChanged(false);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         bounds,
@@ -1006,6 +1016,7 @@ const Map: React.FC<MapProps> = ({
             if (getCameraPosition) {
                 getCameraPosition(viewState);
             }
+            setViewStateChanged(true);
         },
         [getCameraPosition, viewStates, views?.viewports]
     );