@geode/opengeodeweb-front 10.18.0-rc.3 → 10.18.0

package/app/components/Viewer/ObjectTree/Views/GlobalObjects.vue

@@ -137,11 +137,19 @@ function handleHoverLeave({ item }) {
       </template>
 
       <template #append="{ item }">
+        <v-btn
+          v-if="item.viewer_type"
+          icon="mdi-target"
+          size="medium"
+          variant="text"
+          v-tooltip="'Focus camera on object'"
+          @click.stop="hybridViewerStore.focusCameraOnObject(item.id)"
+        />
         <v-btn
           v-if="isModel(item)"
           icon="mdi-magnify-expand"
           size="medium"
-          class="ml-8"
+          class="ml-2"
           variant="text"
           v-tooltip="'Model\'s mesh components'"
           @click.stop="

package/app/components/Viewer/ObjectTree/Views/ModelComponents.vue

@@ -5,11 +5,13 @@ import FetchingData from "@ogw_front/components/FetchingData.vue";
 import ObjectTreeControls from "@ogw_front/components/Viewer/ObjectTree/Base/Controls.vue";
 import ObjectTreeItemLabel from "@ogw_front/components/Viewer/ObjectTree/Base/ItemLabel.vue";
 import { useHoverhighlight } from "@ogw_front/composables/hover_highlight";
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer";
 import { useModelComponents } from "@ogw_front/composables/model_components";
 import { useTreeviewStore } from "@ogw_front/stores/treeview";
 
 const { id } = defineProps({ id: { type: String, required: true } });
 const { onHoverEnter, onHoverLeave } = useHoverhighlight();
+const hybridViewerStore = useHybridViewerStore();
 const emit = defineEmits(["show-menu"]);
 
 const treeviewStore = useTreeviewStore();
@@ -150,6 +152,22 @@ function handleHoverLeave() {
           @contextmenu.prevent.stop="showContextMenu($event, item)"
         />
       </template>
+
+      <template #append="{ item }">
+        <v-btn
+          v-if="item.category || (item.children && item.children.length > 0)"
+          icon="mdi-target"
+          size="medium"
+          variant="text"
+          v-tooltip="'Focus camera on object'"
+          @click.stop="
+            hybridViewerStore.focusCameraOnObject(
+              id,
+              item.category ? [item.viewer_id] : item.children.map((child) => child.viewer_id),
+            )
+          "
+        />
+      </template>
     </CommonTreeView>
   </div>
 </template>

package/app/stores/hybrid_viewer.js

@@ -7,6 +7,7 @@ import {
   getCameraOptions,
   performCameraOrientation,
   performClickPicking,
+  performFocusCameraOnObject,
   performSetCamera,
 } from "@ogw_internal/stores/hybrid_viewer";
 import { newInstance as vtkActor } from "@kitware/vtk.js/Rendering/Core/Actor";
@@ -144,9 +145,13 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     syncRemoteCamera();
   }
 
-  function setCamera(new_camera_options) {
-    performSetCamera(new_camera_options, {
+  async function focusCameraOnObject(id, block_ids = []) {
+    await performFocusCameraOnObject(id, {
+      hybridDb,
+      viewerStore,
+      viewer_schemas,
       genericRenderWindow: genericRenderWindow.value,
+      block_ids,
       is_moving,
       imageStyle,
       syncRemoteCamera,
@@ -162,6 +167,15 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     });
   }
 
+  function setCamera(targetCameraOptions) {
+    performSetCamera(targetCameraOptions, {
+      genericRenderWindow: genericRenderWindow.value,
+      is_moving,
+      imageStyle,
+      syncRemoteCamera,
+    });
+  }
+
   function syncRemoteCamera() {
     const camera = genericRenderWindow.value.getRenderer().getActiveCamera();
     const options = getCameraOptions(camera);
@@ -217,6 +231,9 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
           is_moving.value = false;
           syncRemoteCamera();
         }
+        is_moving.value = false;
+        genericRenderWindow.value.getRenderer().resetCameraClippingRange();
+        syncRemoteCamera();
       },
     });
     useEventListener(container, "wheel", () => {
@@ -227,6 +244,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
       clearTimeout(wheelEventEndTimeout);
       wheelEventEndTimeout = setTimeout(() => {
         is_moving.value = false;
+        genericRenderWindow.value.getRenderer().resetCameraClippingRange();
         syncRemoteCamera();
       }, WHEEL_TIME_OUT_MS);
     });
@@ -294,6 +312,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
     remoteRender,
     resize,
     resetCamera,
+    focusCameraOnObject,
     setCameraOrientation,
     setContainer,
     zScale,

package/internal/stores/hybrid_viewer.js

@@ -235,6 +235,47 @@ function performCameraOrientation(orientation, options) {
   });
 }
 
+async function performFocusCameraOnObject(id, options) {
+  const {
+    hybridDb,
+    viewerStore,
+    viewer_schemas,
+    genericRenderWindow,
+    block_ids = [],
+    is_moving,
+    imageStyle,
+    syncRemoteCamera,
+  } = options;
+
+  if (!hybridDb[id]) {
+    return;
+  }
+
+  let bounds = [];
+  if (block_ids.length > 0) {
+    bounds = await viewerStore.request(viewer_schemas.opengeodeweb_viewer.model.get_blocks_bounds, {
+      id,
+      block_ids,
+    });
+  } else {
+    bounds = hybridDb[id].actor.getBounds();
+  }
+
+  const renderer = genericRenderWindow.getRenderer();
+  const camera = renderer.getActiveCamera();
+  const startOptions = getCameraOptions(camera);
+  renderer.resetCamera(bounds);
+  const targetOptions = getCameraOptions(camera);
+  applyCameraOptions(camera, startOptions);
+
+  performSetCamera(targetOptions, {
+    genericRenderWindow,
+    is_moving,
+    imageStyle,
+    syncRemoteCamera,
+  });
+}
+
 export {
   BACKGROUND_COLOR,
   ACTOR_COLOR,
@@ -250,5 +291,6 @@ export {
   getCameraOptions,
   performCameraOrientation,
   performClickPicking,
+  performFocusCameraOnObject,
   performSetCamera,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.18.0-rc.3",
+  "version": "10.18.0",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -34,8 +34,8 @@
     "build": ""
   },
   "dependencies": {
-    "@geode/opengeodeweb-back": "next",
-    "@geode/opengeodeweb-viewer": "next",
+    "@geode/opengeodeweb-back": "latest",
+    "@geode/opengeodeweb-viewer": "latest",
     "@google-cloud/run": "3.2.0",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",