@geode/opengeodeweb-front 10.35.0-rc.2 → 10.35.0-rc.4

package/internal/stores/hybrid_viewer/viewport.ts

@@ -1,11 +1,10 @@
-import type { Vector3, ViewStreamLike } from "./vtk_types";
 import { centerCameraOnPosition, useHybridViewerCamera } from "./camera";
 import { Status } from "@ogw_front/utils/status";
+import type { ViewStreamLike } from "./vtk_types";
 import { WHEEL_TIME_OUT_MS } from "./constants";
 import { useHybridViewerCore } from "./core";
 import { useHybridViewerHighlight } from "./highlight";
 import { useViewerStore } from "@ogw_front/stores/viewer";
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 type ContainerRef = Ref<{ $el: HTMLElement } | undefined>;
 
@@ -44,37 +43,26 @@ async function resize(width: number, height: number): Promise<void> {
   await remoteRender();
 }
 
-function performClickPicking(event: MouseEvent, containerElement: HTMLElement): void {
+async function performClickPicking(
+  event: MouseEvent,
+  containerElement: HTMLElement,
+): Promise<void> {
   const { genericRenderWindow } = useHybridViewerCore();
   const { syncRemoteCamera } = useHybridViewerCamera();
   const viewerStore = useViewerStore();
   const rect = containerElement.getBoundingClientRect();
-  const schema = viewer_schemas.opengeodeweb_viewer.viewer.get_point_position;
-  const params = {
-    x: Math.round(event.clientX - rect.left),
-    y: Math.round(rect.height - (event.clientY - rect.top)),
-  };
-  void viewerStore.request(
-    {
-      schema,
-      params,
-    },
-    {
-      response_function: (response: unknown) => {
-        // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the get_point_position schema.
-        const { x, y, z } = response as { x: number; y: number; z: number };
-        const pickedPos: Vector3 = [x, y, z];
-        if (!genericRenderWindow.value || !pickedPos.some((val) => val !== 0)) {
-          return;
-        }
-        const renderer = genericRenderWindow.value.getRenderer();
-        const camera = renderer.getActiveCamera();
-        centerCameraOnPosition(camera, pickedPos);
-        genericRenderWindow.value.getRenderWindow().render();
-        syncRemoteCamera();
-      },
-    },
+  const pickedPos = await viewerStore.pick_world_position(
+    event.clientX - rect.left,
+    rect.height - (event.clientY - rect.top),
   );
+  if (!genericRenderWindow.value || !pickedPos.some((val) => val !== 0)) {
+    return;
+  }
+  const renderer = genericRenderWindow.value.getRenderer();
+  const camera = renderer.getActiveCamera();
+  centerCameraOnPosition(camera, pickedPos);
+  genericRenderWindow.value.getRenderWindow().render();
+  syncRemoteCamera();
 }
 
 function setContainer(container: ContainerRef | undefined): void {
@@ -114,7 +102,7 @@ function setContainer(container: ContainerRef | undefined): void {
         return;
       }
       if (event.button === 0 && is_picking.value) {
-        performClickPicking(event, containerElement);
+        void performClickPicking(event, containerElement);
         is_picking.value = false;
         return;
       }

package/internal/stores/hybrid_viewer/zoom_box.ts

@@ -0,0 +1,74 @@
+import type { CameraOptions, Vector3 } from "./vtk_types";
+import {
+  applyCameraOptions,
+  centerCameraOnPosition,
+  getCameraOptions,
+  useHybridViewerCamera,
+} from "./camera";
+import { requireRenderWindow, useHybridViewerCore } from "./core";
+import type { Position } from "@vueuse/core";
+import { useViewerStore } from "@ogw_front/stores/viewer";
+import { newInstance as vtkCamera } from "@kitware/vtk.js/Rendering/Core/Camera";
+
+interface ZoomBox {
+  start: Position;
+  end: Position;
+}
+
+interface Viewport {
+  width: number;
+  height: number;
+}
+
+function viewportShapedBox(start: Position, end: Position, { width, height }: Viewport): ZoomBox {
+  const deltaX = end.x - start.x;
+  const deltaY = end.y - start.y;
+  const aspect = Math.max(width, 1) / Math.max(height, 1);
+  const boxWidth = Math.max(Math.abs(deltaX), Math.abs(deltaY) * aspect);
+  return {
+    start,
+    end: {
+      x: start.x + (Math.sign(deltaX) || 1) * boxWidth,
+      y: start.y + (Math.sign(deltaY) || 1) * (boxWidth / aspect),
+    },
+  };
+}
+
+function computeZoomToBoxCamera(
+  camera: CameraOptions,
+  box: ZoomBox,
+  { width }: Viewport,
+  target: Vector3,
+): CameraOptions {
+  const zoomCamera = vtkCamera();
+  applyCameraOptions(zoomCamera, camera);
+  centerCameraOnPosition(zoomCamera, target);
+  // The box is viewport-shaped (see viewportShapedBox), so its width alone gives the zoom factor.
+  zoomCamera.dolly(width / Math.abs(box.end.x - box.start.x));
+  return getCameraOptions(zoomCamera);
+}
+
+const useHybridViewerZoomBox = createSharedComposable(() => {
+  const is_zoom_box_active = ref(false);
+
+  // Leaves the mode first so a second box cannot be drawn while the pick is pending. Request errors are reported by the viewer store.
+  async function zoomToBox(box: ZoomBox, viewport: Viewport): Promise<void> {
+    is_zoom_box_active.value = false;
+    const target = await useViewerStore().pick_world_position(
+      (box.start.x + box.end.x) / 2,
+      viewport.height - (box.start.y + box.end.y) / 2,
+    );
+    const { genericRenderWindow } = useHybridViewerCore();
+    const { setCamera } = useHybridViewerCamera();
+    const camera = requireRenderWindow(genericRenderWindow).getRenderer().getActiveCamera();
+    setCamera(computeZoomToBoxCamera(getCameraOptions(camera), box, viewport, target));
+  }
+
+  return {
+    is_zoom_box_active,
+    zoomToBox,
+  };
+});
+
+export { computeZoomToBoxCamera, useHybridViewerZoomBox, viewportShapedBox };
+export type { ZoomBox };

package/nuxt.config.ts

@@ -152,6 +152,7 @@ export default defineNuxtConfig({
         "@kitware/vtk.js/IO/XML/XMLPolyDataReader",
         "@kitware/vtk.js/Rendering/Core/Actor",
         "@kitware/vtk.js/Rendering/Core/AnnotatedCubeActor",
+        "@kitware/vtk.js/Rendering/Core/Camera",
         "@kitware/vtk.js/Rendering/Core/ColorTransferFunction",
         "@kitware/vtk.js/Rendering/Core/Mapper",
         "@kitware/vtk.js/Rendering/Misc/GenericRenderWindow",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.35.0-rc.2",
+  "version": "10.35.0-rc.4",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {