@geode/opengeodeweb-front 10.0.2-rc.4 → 10.0.2-rc.5

package/app/stores/menu.js

@@ -1,44 +1,44 @@
 // PointSet components
-import PointSetPointsOptions from "@ogw_front/components/Viewer/PointSet/PointsOptions.vue"
+import PointSetPointsOptions from "@ogw_front/components/Viewer/PointSet/PointsOptions"
 
 // EdgedCurve components
-import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions.vue"
-import EdgedCurveEdgesOptions from "@ogw_front/components/Viewer/EdgedCurve/EdgesOptions.vue"
+import EdgedCurvePointsOptions from "@ogw_front/components/Viewer/EdgedCurve/PointsOptions"
+import EdgedCurveEdgesOptions from "@ogw_front/components/Viewer/EdgedCurve/EdgesOptions"
 
 // PolygonalSurface components
-import PolygonalSurfacePointsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PointsOptions.vue"
-import PolygonalSurfaceEdgesOptions from "@ogw_front/components/Viewer/PolygonalSurface/EdgesOptions.vue"
-import PolygonalSurfacePolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PolygonsOptions.vue"
+import PolygonalSurfacePointsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PointsOptions"
+import PolygonalSurfaceEdgesOptions from "@ogw_front/components/Viewer/PolygonalSurface/EdgesOptions"
+import PolygonalSurfacePolygonsOptions from "@ogw_front/components/Viewer/PolygonalSurface/PolygonsOptions"
 
 // TriangulatedSurface components
-import TriangulatedSurfacePointsOptions from "@ogw_front/components/Viewer/TriangulatedSurface/PointsOptions.vue"
-import TriangulatedSurfaceEdgesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/EdgesOptions.vue"
-import TriangulatedSurfaceTrianglesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/TrianglesOptions.vue"
+import TriangulatedSurfacePointsOptions from "@ogw_front/components/Viewer/TriangulatedSurface/PointsOptions"
+import TriangulatedSurfaceEdgesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/EdgesOptions"
+import TriangulatedSurfaceTrianglesOptions from "@ogw_front/components/Viewer/TriangulatedSurface/TrianglesOptions"
 
 // Grid 2D components
-import Grid2DPointsOptions from "@ogw_front/components/Viewer/Grid/2D/PointsOptions.vue"
-import Grid2DEdgesOptions from "@ogw_front/components/Viewer/Grid/2D/EdgesOptions.vue"
-import Grid2DCellsOptions from "@ogw_front/components/Viewer/Grid/2D/CellsOptions.vue"
+import Grid2DPointsOptions from "@ogw_front/components/Viewer/Grid/2D/PointsOptions"
+import Grid2DEdgesOptions from "@ogw_front/components/Viewer/Grid/2D/EdgesOptions"
+import Grid2DCellsOptions from "@ogw_front/components/Viewer/Grid/2D/CellsOptions"
 
 // Grid 3D components
-import Grid3DPointsOptions from "@ogw_front/components/Viewer/Grid/3D/PointsOptions.vue"
-import Grid3DEdgesOptions from "@ogw_front/components/Viewer/Grid/3D/EdgesOptions.vue"
-import Grid3DFacetsOptions from "@ogw_front/components/Viewer/Grid/3D/FacetsOptions.vue"
-import Grid3DCellsOptions from "@ogw_front/components/Viewer/Grid/3D/CellsOptions.vue"
+import Grid3DPointsOptions from "@ogw_front/components/Viewer/Grid/3D/PointsOptions"
+import Grid3DEdgesOptions from "@ogw_front/components/Viewer/Grid/3D/EdgesOptions"
+import Grid3DFacetsOptions from "@ogw_front/components/Viewer/Grid/3D/FacetsOptions"
+import Grid3DCellsOptions from "@ogw_front/components/Viewer/Grid/3D/CellsOptions"
 
 // Solid components
-import SolidPointsOptions from "@ogw_front/components/Viewer/Solid/PointsOptions.vue"
-import SolidEdgesOptions from "@ogw_front/components/Viewer/Solid/EdgesOptions.vue"
-import SolidPolygonsOptions from "@ogw_front/components/Viewer/Solid/PolygonsOptions.vue"
-import SolidPolyhedraOptions from "@ogw_front/components/Viewer/Solid/PolyhedraOptions.vue"
+import SolidPointsOptions from "@ogw_front/components/Viewer/Solid/PointsOptions"
+import SolidEdgesOptions from "@ogw_front/components/Viewer/Solid/EdgesOptions"
+import SolidPolygonsOptions from "@ogw_front/components/Viewer/Solid/PolygonsOptions"
+import SolidPolyhedraOptions from "@ogw_front/components/Viewer/Solid/PolyhedraOptions"
 
 // TetrahedralSolid components
-import TetrahedralSolidTrianglesOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TrianglesOptions.vue"
-import TetrahedralSolidTetrahedraOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TetrahedraOptions.vue"
+import TetrahedralSolidTrianglesOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TrianglesOptions"
+import TetrahedralSolidTetrahedraOptions from "@ogw_front/components/Viewer/TetrahedralSolid/TetrahedraOptions"
 
 // Model components
-import ModelEdgesOptions from "@ogw_front/components/Viewer/Generic/Model/EdgesOptions.vue"
-import ModelPointsOptions from "@ogw_front/components/Viewer/Generic/Model/PointsOptions.vue"
+import ModelEdgesOptions from "@ogw_front/components/Viewer/Generic/Model/EdgesOptions"
+import ModelPointsOptions from "@ogw_front/components/Viewer/Generic/Model/PointsOptions"
 
 const PointSet_menu = [PointSetPointsOptions]
 

package/app/stores/viewer.js

@@ -2,9 +2,10 @@ import _ from "lodash"
 import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
 import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
 import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
-import Status from "@ogw_front/utils/status.js"
-import { appMode } from "@ogw_front/utils/app_mode.js"
-import { viewer_call } from "../../internal/utils/viewer_call.js"
+import Status from "@ogw_front/utils/status"
+import { appMode } from "@ogw_front/utils/app_mode"
+import { viewer_call } from "../../internal/utils/viewer_call"
+import { useInfraStore } from "@ogw_front/stores/infra"
 
 export const useViewerStore = defineStore("viewer", {
   state: () => ({
@@ -35,13 +36,13 @@ export const useViewerStore = defineStore("viewer", {
       return this.default_local_port
     },
     base_url() {
-      const infra_store = useInfraStore()
-      let viewer_url = `${this.protocol}://${infra_store.domain_name}:${this.port}`
-      if (infra_store.app_mode == appMode.CLOUD) {
-        if (infra_store.ID == "") {
+      const infraStore = useInfraStore()
+      let viewer_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`
+      if (infraStore.app_mode == appMode.CLOUD) {
+        if (infraStore.ID == "") {
           throw new Error("ID must not be empty in cloud mode")
         }
-        viewer_url += `/${infra_store.ID}/viewer`
+        viewer_url += `/${infraStore.ID}/viewer`
       }
       viewer_url += "/ws"
       return viewer_url

package/app/utils/file_import_workflow.js

@@ -1,8 +1,12 @@
 // Third party imports
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
-import { useHybridViewerStore } from "../stores/hybrid_viewer"
 
 // Local imports
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useTreeviewStore } from "@ogw_front/stores/treeview"
 
 async function importWorkflow(files) {
   console.log("importWorkflow", { files })

package/app/utils/upload_file.js

@@ -1,8 +1,11 @@
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useFeedbackStore } from "@ogw_front/stores/feedback"
+
 export async function upload_file(
   { route, file },
   { request_error_function, response_function, response_error_function } = {},
 ) {
-  const feedback_store = useFeedbackStore()
+  const feedbackStore = useFeedbackStore()
   const geodeStore = useGeodeStore()
   if (!(file instanceof File)) {
     throw new Error("file must be a instance of File")
@@ -22,7 +25,7 @@ export async function upload_file(
     ...request_options,
     onRequestError({ error }) {
       geodeStore.stop_request()
-      feedback_store.add_error(error.code, route, error.message, error.stack)
+      feedbackStore.add_error(error.code, route, error.message, error.stack)
       if (request_error_function) {
         request_error_function(error)
       }
@@ -37,7 +40,7 @@ export async function upload_file(
     },
     onResponseError({ response }) {
       geodeStore.stop_request()
-      feedback_store.add_error(
+      feedbackStore.add_error(
         response.status,
         route,
         response._data.name,

package/internal/stores/mesh/cells.js

@@ -1,10 +1,14 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_cells_schemas = viewer_schemas.opengeodeweb_viewer.mesh.cells
 export function useMeshCellsStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshCellsStyle(id) {
     return dataStyleStore.getStyle(id).cells
@@ -15,7 +19,6 @@ export function useMeshCellsStyle() {
   }
   function setMeshCellsVisibility(id, visibility) {
     const cells_style = meshCellsStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.visibility,
       { id, visibility },
@@ -37,7 +40,6 @@ export function useMeshCellsStyle() {
   }
   function setMeshCellsColor(id, color) {
     const coloring_style = meshCellsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.color,
       { id, color },
@@ -59,7 +61,6 @@ export function useMeshCellsStyle() {
   }
   function setMeshCellsTextures(id, textures) {
     const coloring_style = meshCellsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.apply_textures,
       { id, textures },
@@ -78,7 +79,6 @@ export function useMeshCellsStyle() {
 
   function setMeshCellsVertexAttribute(id, vertex_attribute) {
     const coloring_style = meshCellsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.vertex_attribute,
       { id, ...vertex_attribute },
@@ -100,7 +100,6 @@ export function useMeshCellsStyle() {
   }
   function setMeshCellsCellAttribute(id, cell_attribute) {
     const coloring_style = meshCellsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_cells_schemas.cell_attribute,
       { id, ...cell_attribute },

package/internal/stores/mesh/edges.js

@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_edges_schemas = viewer_schemas.opengeodeweb_viewer.mesh.edges
 
 export function useMeshEdgesStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshEdgesStyle(id) {
     return dataStyleStore.getStyle(id).edges
@@ -15,7 +20,6 @@ export function useMeshEdgesStyle() {
     return meshEdgesStyle(id).visibility
   }
   function setMeshEdgesVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_edges_schemas.visibility,
       { id, visibility },
@@ -59,7 +63,6 @@ export function useMeshEdgesStyle() {
   }
   function setMeshEdgesColor(id, color) {
     const coloring_style = meshEdgesStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_edges_schemas.color,
       { id, color },
@@ -81,7 +84,6 @@ export function useMeshEdgesStyle() {
   }
   function setMeshEdgesWidth(id, width) {
     const edges_style = meshEdgesStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_edges_schemas.width,
       { id, width },

package/internal/stores/mesh/index.js

@@ -2,17 +2,21 @@
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 // Local imports
-import { useMeshPointsStyle } from "./points.js"
-import { useMeshEdgesStyle } from "./edges.js"
-import { useMeshCellsStyle } from "./cells.js"
-import { useMeshPolygonsStyle } from "./polygons.js"
-import { useMeshPolyhedraStyle } from "./polyhedra.js"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useMeshPointsStyle } from "./points"
+import { useMeshEdgesStyle } from "./edges"
+import { useMeshCellsStyle } from "./cells"
+import { useMeshPolygonsStyle } from "./polygons"
+import { useMeshPolyhedraStyle } from "./polyhedra"
 
 // Local constants
 const mesh_schemas = viewer_schemas.opengeodeweb_viewer.mesh
 
 export default function useMeshStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
   const meshPointsStyleStore = useMeshPointsStyle()
   const meshEdgesStyleStore = useMeshEdgesStyle()
   const meshCellsStyleStore = useMeshCellsStyle()
@@ -24,7 +28,6 @@ export default function useMeshStyle() {
     return dataStyleStore.getStyle(id).visibility
   }
   function setMeshVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_schemas.visibility,
       { id, visibility },

package/internal/stores/mesh/points.js

@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_points_schemas = viewer_schemas.opengeodeweb_viewer.mesh.points
 
 export function useMeshPointsStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshPointsStyle(id) {
     return dataStyleStore.getStyle(id).points
@@ -16,7 +21,6 @@ export function useMeshPointsStyle() {
   }
   function setMeshPointsVisibility(id, visibility) {
     const points_style = meshPointsStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_points_schemas.visibility,
       { id, visibility },
@@ -58,7 +62,6 @@ export function useMeshPointsStyle() {
   }
   function setMeshPointsColor(id, color) {
     const coloring_style = meshPointsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_points_schemas.color,
       { id, color },
@@ -79,7 +82,6 @@ export function useMeshPointsStyle() {
   }
   function setMeshPointsVertexAttribute(id, vertex_attribute) {
     const coloring_style = meshPointsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_points_schemas.vertex_attribute,
       { id, ...vertex_attribute },
@@ -100,7 +102,6 @@ export function useMeshPointsStyle() {
     return meshPointsStyle(id).size
   }
   function setMeshPointsSize(id, size) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_points_schemas.size,
       { id, size },

package/internal/stores/mesh/polygons.js

@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_polygons_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polygons
 
 export function useMeshPolygonsStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshPolygonsStyle(id) {
     return dataStyleStore.getStyle(id).polygons
@@ -16,7 +21,6 @@ export function useMeshPolygonsStyle() {
   }
   function setMeshPolygonsVisibility(id, visibility) {
     const polygons_style = meshPolygonsStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.visibility,
       { id, visibility },
@@ -38,7 +42,6 @@ export function useMeshPolygonsStyle() {
   }
   function setMeshPolygonsColor(id, color) {
     const coloring_style = meshPolygonsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.color,
       { id, color },
@@ -60,7 +63,6 @@ export function useMeshPolygonsStyle() {
   }
   function setMeshPolygonsTextures(id, textures) {
     const coloring_style = meshPolygonsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.apply_textures,
       { id, textures },
@@ -83,7 +85,6 @@ export function useMeshPolygonsStyle() {
 
   function setMeshPolygonsVertexAttribute(id, vertex_attribute) {
     const coloring_style = meshPolygonsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.vertex_attribute,
       { id, ...vertex_attribute },
@@ -105,7 +106,6 @@ export function useMeshPolygonsStyle() {
   }
   function setMeshPolygonsPolygonAttribute(id, polygon_attribute) {
     const coloring_style = meshPolygonsStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polygons_schemas.polygon_attribute,
       { id, ...polygon_attribute },

package/internal/stores/mesh/polyhedra.js

@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const mesh_polyhedra_schemas = viewer_schemas.opengeodeweb_viewer.mesh.polyhedra
 
 export function useMeshPolyhedraStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function meshPolyhedraStyle(id) {
     return dataStyleStore.getStyle(id).polyhedra
@@ -16,7 +21,6 @@ export function useMeshPolyhedraStyle() {
   }
   function setMeshPolyhedraVisibility(id, visibility) {
     const polyhedra_style = meshPolyhedraStyle(id)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polyhedra_schemas.visibility,
       { id, visibility },
@@ -59,7 +63,6 @@ export function useMeshPolyhedraStyle() {
   }
   function setMeshPolyhedraColor(id, color) {
     const coloring = meshPolyhedraStyle(id).coloring
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       mesh_polyhedra_schemas.color,
       { id, color },

package/internal/stores/model/blocks.js

@@ -1,12 +1,18 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_blocks_schemas = viewer_schemas.opengeodeweb_viewer.model.blocks
 
 export function useModelBlocksStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
 
   function modelBlocksStyle(id) {
     return dataStyleStore.getStyle(id).blocks
@@ -27,7 +33,6 @@ export function useModelBlocksStyle() {
   }
   function setModelBlocksVisibility(id, block_ids, visibility) {
     const blocks_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_blocks_schemas.visibility,
       { id, block_ids: blocks_flat_indexes, visibility },
@@ -56,7 +61,6 @@ export function useModelBlocksStyle() {
 
   function setModelBlocksColor(id, block_ids, color) {
     const blocks_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_blocks_schemas.color,
       { id, block_ids: blocks_flat_indexes, color },

package/internal/stores/model/corners.js

@@ -1,12 +1,18 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_corners_schemas = viewer_schemas.opengeodeweb_viewer.model.corners
 
 export function useModelCornersStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
 
   function modelCornersStyle(id) {
     return dataStyleStore.getStyle(id).corners
@@ -27,7 +33,6 @@ export function useModelCornersStyle() {
   }
   function setModelCornersVisibility(id, corner_ids, visibility) {
     const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_corners_schemas.visibility,
       { id, block_ids: corner_flat_indexes, visibility },
@@ -57,7 +62,6 @@ export function useModelCornersStyle() {
 
   function setModelCornersColor(id, corner_ids, color) {
     const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_corners_schemas.color,
       { id, block_ids: corner_flat_indexes, color },

package/internal/stores/model/edges.js

@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_edges_schemas = viewer_schemas.opengeodeweb_viewer.model.edges
 
 export function useModelEdgesStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function modelEdgesStyle(id) {
     return dataStyleStore.styles[id].edges
@@ -15,7 +20,6 @@ export function useModelEdgesStyle() {
   }
 
   function setModelEdgesVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_edges_schemas.visibility,
       { id, visibility },

package/internal/stores/model/index.js

@@ -2,12 +2,16 @@
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
 // Local imports
-import { useModelSurfacesStyle } from "./surfaces.js"
-import { useModelCornersStyle } from "./corners.js"
-import { useModelBlocksStyle } from "./blocks.js"
-import { useModelLinesStyle } from "./lines.js"
-import { useModelEdgesStyle } from "./edges.js"
-import { useModelPointsStyle } from "./points.js"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+import { useModelSurfacesStyle } from "./surfaces"
+import { useModelCornersStyle } from "./corners"
+import { useModelBlocksStyle } from "./blocks"
+import { useModelLinesStyle } from "./lines"
+import { useModelEdgesStyle } from "./edges"
+import { useModelPointsStyle } from "./points"
 
 // Local constants
 const model_schemas = viewer_schemas.opengeodeweb_viewer.model
@@ -22,12 +26,12 @@ export default function useModelStyle() {
   const modelPointsStyleStore = useModelPointsStyle()
   const modelSurfacesStyleStore = useModelSurfacesStyle()
   const hybridViewerStore = useHybridViewerStore()
+  const viewerStore = useViewerStore()
 
   function modelVisibility(id) {
     return dataStyleStore.getStyle(id).visibility
   }
   function setModelVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_schemas.visibility,
       { id, visibility },
@@ -82,7 +86,6 @@ export default function useModelStyle() {
     return dataStyleStore.getStyle(id).color
   }
   function setModelColor(id, color) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_schemas.color,
       { id, color },

package/internal/stores/model/lines.js

@@ -1,12 +1,18 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_lines_schemas = viewer_schemas.opengeodeweb_viewer.model.lines
 
 export function useModelLinesStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
 
   function modelLinesStyle(id) {
     return dataStyleStore.getStyle(id).lines
@@ -27,7 +33,6 @@ export function useModelLinesStyle() {
   }
   function setModelLinesVisibility(id, line_ids, visibility) {
     const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_lines_schemas.visibility,
       { id, block_ids: line_flat_indexes, visibility },
@@ -55,7 +60,6 @@ export function useModelLinesStyle() {
   }
   function setModelLinesColor(id, line_ids, color) {
     const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_lines_schemas.color,
       { id, block_ids: line_flat_indexes, color },

package/internal/stores/model/points.js

@@ -1,11 +1,16 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_points_schemas = viewer_schemas.opengeodeweb_viewer.model.points
 
 export function useModelPointsStyle() {
   const dataStyleStore = useDataStyleStore()
+  const viewerStore = useViewerStore()
 
   function modelPointsStyle(id) {
     return dataStyleStore.getStyle(id).points
@@ -14,7 +19,6 @@ export function useModelPointsStyle() {
     return modelPointsStyle(id).visibility
   }
   function setModelPointsVisibility(id, visibility) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_points_schemas.visibility,
       { id, visibility },
@@ -35,7 +39,6 @@ export function useModelPointsStyle() {
     return modelPointsStyle(id).size
   }
   function setModelPointsSize(id, size) {
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_points_schemas.size,
       { id, size },

package/internal/stores/model/surfaces.js

@@ -1,12 +1,18 @@
 // Third party imports
 import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
 
+// Local imports
+import { useDataBaseStore } from "@ogw_front/stores/data_base"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useViewerStore } from "@ogw_front/stores/viewer"
+
 // Local constants
 const model_surfaces_schemas = viewer_schemas.opengeodeweb_viewer.model.surfaces
 
 export function useModelSurfacesStyle() {
   const dataStyleStore = useDataStyleStore()
   const dataBaseStore = useDataBaseStore()
+  const viewerStore = useViewerStore()
 
   function modelSurfacesStyle(id) {
     return dataStyleStore.getStyle(id).surfaces
@@ -26,7 +32,6 @@ export function useModelSurfacesStyle() {
   }
   function setModelSurfacesVisibility(id, surface_ids, visibility) {
     const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_surfaces_schemas.visibility,
       { id, block_ids: surface_flat_indexes, visibility },
@@ -54,7 +59,6 @@ export function useModelSurfacesStyle() {
 
   function setModelSurfacesColor(id, surface_ids, color) {
     const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
-    const viewerStore = useViewerStore()
     return viewerStore.request(
       model_surfaces_schemas.color,
       { id, block_ids: surface_flat_indexes, color },