restore

Author: MaxNumerique

internal_stores/model/surfaces.js

@@ -8,14 +8,11 @@ export function useModelSurfacesStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
 
-  function modelSurfacesStyle(id) {
-    return dataStyleStore.getStyle(id).surfaces
-  }
   function modelSurfaceStyle(id, surface_id) {
-    if (!modelSurfacesStyle(id)[surface_id]) {
-      modelSurfacesStyle(id)[surface_id] = {}
+    if (!dataStyleStore.getStyle(id).surfaces[surface_id]) {
+      dataStyleStore.getStyle(id).surfaces[surface_id] = {}
     }
-    return modelSurfacesStyle(id)[surface_id]
+    return dataStyleStore.getStyle(id).surfaces[surface_id]
   }
 
   function modelSurfaceVisibility(id, surface_id) {
@@ -77,7 +74,7 @@ export function useModelSurfacesStyle() {
   }
 
   function applyModelSurfacesStyle(id) {
-    const style = modelSurfacesStyle(id)
+    const style = dataStyleStore.getStyle(id).surfaces
     const surface_ids = dataBaseStore.getSurfacesUuids(id)
 
     if (!surface_ids || surface_ids.length === 0) {

stores/data_style.js

@@ -14,44 +14,37 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
     dataStyleState.styles[id] = getDefaultStyle(geode_object)
   }
 
-  // useDataStyleStore: setVisibility
-  function setVisibility(payloadOrId, visibility) {
-    const id =
-      typeof payloadOrId === "string"
-        ? payloadOrId
-        : (payloadOrId?.id ?? payloadOrId?.data_id ?? payloadOrId?.model_id)
-    if (!id) return Promise.resolve([])
-
-    const visible =
-      typeof visibility === "boolean"
-        ? visibility
-        : payloadOrId?.visible != null
-          ? !!payloadOrId.visible
-          : true
-
+  function setVisibility(id, visibility) {
     const meta = dataBaseStore.itemMetaDatas(id)
-    const object_type = meta?.object_type
-    if (!object_type) return Promise.resolve([])
-
+    if (!meta) {
+      console.warn("[DataStyle] setVisibility skipped: unknown id", id)
+      return Promise.resolve([])
+    }
+    const object_type = meta.object_type
     if (object_type === "mesh") {
       return Promise.all([meshStyleStore.setMeshVisibility(id, visibility)])
     } else if (object_type === "model") {
       return Promise.all([modelStyleStore.setModelVisibility(id, visibility)])
     }
+    throw new Error("Unknown object_type")
+  }
+
+  function applyDefaultStyle(id) {
+    const { object_type } = dataBaseStore.itemMetaDatas(id)
+    if (object_type === "mesh") {
+      return meshStyleStore.applyMeshStyle(id)
+    } else if (object_type === "model") {
+      return modelStyleStore.applyModelStyle(id)
+    }
     return Promise.resolve([])
   }
 
   function setModelEdgesVisibility(id, visibility) {
-    modelStyleStore.setModelMeshComponentVisibility(
-      id,
-      "Edge",
-      null,
-      visibility,
-    )
+    return modelStyleStore.setModelEdgesVisibility(id, visibility)
   }
 
   function modelEdgesVisibility(id) {
-    return modelStyleStore.modelMeshComponentVisibility(id, "Edge", null)
+    return modelStyleStore.modelEdgesVisibility(id)
   }
 
   function exportStores() {
@@ -84,17 +77,15 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
 
   return {
     ...dataStyleState,
+    ...meshStyleStore,
+    ...modelStyleStore,
     addDataStyle,
     applyDefaultStyle,
     setVisibility,
     setModelEdgesVisibility,
     modelEdgesVisibility,
     exportStores,
     importStores,
-    ...meshStyleStore,
-    ...modelStyleStore,
-    addDataStyle,
-    applyDefaultStyle,
-    setVisibility,
+    applyAllStylesFromState,
   }
 })

stores/hybrid_viewer.js

@@ -199,99 +199,14 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
   }
 
   function exportStores() {
-    const cam =
-      Object.keys(camera_options).length > 0
-        ? { ...camera_options }
-        : (() => {
-            if (!genericRenderWindow.value || status.value !== Status.CREATED) {
-              return undefined
-            }
-            const renderer = genericRenderWindow.value.getRenderer()
-            const camera = renderer.getActiveCamera()
-            return {
-              focal_point: camera.getFocalPoint(),
-              view_up: camera.getViewUp(),
-              position: camera.getPosition(),
-              view_angle: camera.getViewAngle(),
-              clipping_range: camera.getClippingRange(),
-              distance: camera.getDistance(),
-              // Ajouts pour style et zoom corrects
-              parallel_projection:
-                typeof camera.getParallelProjection === "function"
-                  ? camera.getParallelProjection()
-                  : undefined,
-              parallel_scale:
-                typeof camera.getParallelScale === "function"
-                  ? camera.getParallelScale()
-                  : undefined,
-              roll:
-                typeof camera.getRoll === "function"
-                  ? camera.getRoll()
-                  : undefined,
-            }
-          })()
-    return { zScale: zScale.value, camera_options: cam }
+    return { zScale: zScale.value }
   }
 
   async function importStores(snapshot) {
     const z_scale = snapshot?.zScale
     if (z_scale != null) {
       await setZScaling(z_scale)
     }
-
-    const cam = snapshot?.camera_options
-    if (cam && genericRenderWindow.value && status.value === Status.CREATED) {
-      const renderer = genericRenderWindow.value.getRenderer()
-      const camera = renderer.getActiveCamera()
-
-      // Appliquer après que la scène soit prête (évite les reset ultérieurs)
-      await new Promise((resolve) => requestAnimationFrame(resolve))
-
-      // Mode de projection et zoom
-      if (
-        cam.parallel_projection !== undefined &&
-        typeof camera.setParallelProjection === "function"
-      ) {
-        camera.setParallelProjection(!!cam.parallel_projection)
-      }
-
-      // Pose / orientation
-      if (cam.focal_point) camera.setFocalPoint(...cam.focal_point)
-      if (cam.view_up) camera.setViewUp(...cam.view_up)
-      if (cam.position) camera.setPosition(...cam.position)
-
-      // Zoom selon le mode
-      if (
-        typeof camera.getParallelProjection === "function" &&
-        camera.getParallelProjection() &&
-        cam.parallel_scale !== undefined &&
-        typeof camera.setParallelScale === "function"
-      ) {
-        camera.setParallelScale(cam.parallel_scale)
-      } else if (cam.view_angle != null) {
-        camera.setViewAngle(cam.view_angle)
-      }
-
-      // Roll (si dispo)
-      if (cam.roll != null && typeof camera.setRoll === "function") {
-        camera.setRoll(cam.roll)
-      }
-
-      // Clipping et rendu
-      if (cam.clipping_range) camera.setClippingRange(...cam.clipping_range)
-      if (typeof camera.modified === "function") camera.modified()
-      renderer.resetCameraClippingRange()
-      genericRenderWindow.value.getRenderWindow().render()
-
-      // Sync côté viewer distant (si schéma présent)
-      const schema = viewer_schemas?.opengeodeweb_viewer?.viewer?.update_camera
-      if (schema) {
-        await viewer_call({
-          schema,
-          params: { camera_options: cam },
-        })
-      }
-    }
   }
 
   return {