@geode/opengeodeweb-front 10.41.0 → 10.42.0-rc.1

package/internal/stores/data_style/model/edges/width.ts

@@ -0,0 +1,56 @@
+// Third party imports
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
+
+// Local imports
+import {
+  EDGES_COMPONENT_TYPES,
+  useModelComponentEdgesStyle,
+} from "@ogw_internal/stores/data_style/model/edges/component";
+import { useModelEdgesCommonStyle } from "./common";
+import { useViewerStore } from "@ogw_front/stores/viewer";
+
+// Local constants
+const schema = viewer_schemas.opengeodeweb_viewer.model.edges.width;
+
+export function useModelEdgesWidthStyle(): {
+  modelEdgesWidth: (id: string) => number | undefined;
+  setModelEdgesWidth: (id: string, width: number) => Promise<unknown>;
+} {
+  const viewerStore = useViewerStore();
+  const modelEdgesCommonStyle = useModelEdgesCommonStyle();
+  const componentsEdgesStyles = EDGES_COMPONENT_TYPES.map((type) =>
+    useModelComponentEdgesStyle(type),
+  );
+
+  function modelEdgesWidth(id: string): number | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- edges style values are dynamically typed at runtime.
+    return modelEdgesCommonStyle.modelEdgesStyle(id).width as number | undefined;
+  }
+
+  async function setModelEdgesWidth(id: string, width: number): Promise<unknown> {
+    const params = { id, width };
+    const result = await viewerStore.request(
+      {
+        schema,
+        params,
+      },
+      {
+        response_function: async () => {
+          const [mutateResult] = await Promise.all([
+            modelEdgesCommonStyle.mutateModelEdgesStyle(id, { width }),
+            ...componentsEdgesStyles.map(async (edgesStyle) => {
+              await edgesStyle.mutateStyledEdges(id, { width });
+            }),
+          ]);
+          return mutateResult;
+        },
+      },
+    );
+    return result;
+  }
+
+  return {
+    modelEdgesWidth,
+    setModelEdgesWidth,
+  };
+}

package/internal/stores/data_style/model/index.ts

@@ -61,11 +61,13 @@ function useModelStyle(): UseModelStyleReturn {
       modelPointsStyle.applyModelPointsStyle(modelId),
       modelEdgesStyle.applyModelEdgesStyle(modelId),
     ]);
-    // Components points come after the model points, which override every component
+    // Components points and edges come after the model ones, which override every component
     await Promise.all([
       modelSurfacesStyle.applyModelSurfacesPointsStyle(modelId),
       modelLinesStyle.applyModelLinesPointsStyle(modelId),
       modelBlocksStyle.applyModelBlocksPointsStyle(modelId),
+      modelSurfacesStyle.applyModelSurfacesEdgesStyle(modelId),
+      modelBlocksStyle.applyModelBlocksEdgesStyle(modelId),
     ]);
     return results;
   }

package/internal/stores/data_style/model/points/component.ts

@@ -1,4 +1,9 @@
 // oxlint-disable eslint/max-lines
+import {
+  type AttributeState,
+  type AttributeStoredConfig,
+  groupBy,
+} from "@ogw_internal/stores/data_style/model/component_style";
 import {
   DEFAULT_NO_DATA_COLOR,
   POINTS_DEFAULT_COLOR,
@@ -34,29 +39,6 @@ type PointsRequestSchema =
   | PointsSchemas["color"]
   | PointsSchemas["attribute"]["vertex"]["attribute"];
 
-function groupBy(componentIds: string[], key: (componentId: string) => string): string[][] {
-  const groups: Record<string, string[]> = {};
-  for (const componentId of componentIds) {
-    const groupKey = key(componentId);
-    groups[groupKey] ??= [];
-    groups[groupKey].push(componentId);
-  }
-  return Object.values(groups);
-}
-
-interface AttributeStoredConfig {
-  minimum: number | undefined;
-  maximum: number | undefined;
-  colorMap: string | undefined;
-  no_data_color: RGBAColor;
-}
-
-interface AttributeState {
-  name?: string;
-  item?: number;
-  storedConfigs?: Record<string, { lastItem: number } & Record<string, AttributeStoredConfig>>;
-}
-
 interface PointsStyle {
   visibility?: boolean;
   size?: number;

package/internal/stores/data_style/model/surfaces/edges.ts

@@ -0,0 +1,51 @@
+import {
+  type ModelComponentEdgesStyle,
+  useModelComponentEdgesStyle,
+} from "@ogw_internal/stores/data_style/model/edges/component";
+
+interface UseModelSurfacesEdgesStyleReturn {
+  modelSurfaceEdgesVisibility: ModelComponentEdgesStyle["visibility"];
+  modelSurfaceEdgesWidth: ModelComponentEdgesStyle["width"];
+  modelSurfaceEdgesColor: ModelComponentEdgesStyle["color"];
+  modelSurfaceEdgesActiveColoring: ModelComponentEdgesStyle["activeColoring"];
+  modelSurfaceEdgesVertexAttributeName: ModelComponentEdgesStyle["vertexAttributeName"];
+  modelSurfaceEdgesVertexAttributeItem: ModelComponentEdgesStyle["vertexAttributeItem"];
+  modelSurfaceEdgesVertexAttributeRange: ModelComponentEdgesStyle["vertexAttributeRange"];
+  modelSurfaceEdgesVertexAttributeColorMap: ModelComponentEdgesStyle["vertexAttributeColorMap"];
+  modelSurfaceEdgesVertexAttributeNoDataColor: ModelComponentEdgesStyle["vertexAttributeNoDataColor"];
+  setModelSurfacesEdgesVisibility: ModelComponentEdgesStyle["setVisibility"];
+  setModelSurfacesEdgesWidth: ModelComponentEdgesStyle["setWidth"];
+  setModelSurfacesEdgesColor: ModelComponentEdgesStyle["setColor"];
+  setModelSurfacesEdgesActiveColoring: ModelComponentEdgesStyle["setActiveColoring"];
+  setModelSurfacesEdgesVertexAttributeName: ModelComponentEdgesStyle["setVertexAttributeName"];
+  setModelSurfacesEdgesVertexAttributeItem: ModelComponentEdgesStyle["setVertexAttributeItem"];
+  setModelSurfacesEdgesVertexAttributeRange: ModelComponentEdgesStyle["setVertexAttributeRange"];
+  setModelSurfacesEdgesVertexAttributeColorMap: ModelComponentEdgesStyle["setVertexAttributeColorMap"];
+  setModelSurfacesEdgesVertexAttributeNoDataColor: ModelComponentEdgesStyle["setVertexAttributeNoDataColor"];
+  applyModelSurfacesEdgesStyle: ModelComponentEdgesStyle["applyEdgesStyle"];
+}
+
+export function useModelSurfacesEdgesStyle(): UseModelSurfacesEdgesStyleReturn {
+  const edges = useModelComponentEdgesStyle("Surface");
+  return {
+    modelSurfaceEdgesVisibility: edges.visibility,
+    modelSurfaceEdgesWidth: edges.width,
+    modelSurfaceEdgesColor: edges.color,
+    modelSurfaceEdgesActiveColoring: edges.activeColoring,
+    modelSurfaceEdgesVertexAttributeName: edges.vertexAttributeName,
+    modelSurfaceEdgesVertexAttributeItem: edges.vertexAttributeItem,
+    modelSurfaceEdgesVertexAttributeRange: edges.vertexAttributeRange,
+    modelSurfaceEdgesVertexAttributeColorMap: edges.vertexAttributeColorMap,
+    modelSurfaceEdgesVertexAttributeNoDataColor: edges.vertexAttributeNoDataColor,
+    setModelSurfacesEdgesVisibility: edges.setVisibility,
+    setModelSurfacesEdgesWidth: edges.setWidth,
+    setModelSurfacesEdgesColor: edges.setColor,
+    setModelSurfacesEdgesActiveColoring: edges.setActiveColoring,
+    setModelSurfacesEdgesVertexAttributeName: edges.setVertexAttributeName,
+    setModelSurfacesEdgesVertexAttributeItem: edges.setVertexAttributeItem,
+    setModelSurfacesEdgesVertexAttributeRange: edges.setVertexAttributeRange,
+    setModelSurfacesEdgesVertexAttributeColorMap: edges.setVertexAttributeColorMap,
+    setModelSurfacesEdgesVertexAttributeNoDataColor: edges.setVertexAttributeNoDataColor,
+    applyModelSurfacesEdgesStyle: edges.applyEdgesStyle,
+  };
+}

package/internal/stores/data_style/model/surfaces/index.ts

@@ -4,6 +4,7 @@ import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useModelSurfacesColor } from "./color";
 import { useModelSurfacesCommonStyle } from "./common";
+import { useModelSurfacesEdgesStyle } from "./edges";
 import { useModelSurfacesPointsStyle } from "./points";
 import { useModelSurfacesVisibility } from "./visibility";
 
@@ -30,6 +31,7 @@ type UseModelSurfacesStyleReturn = ReturnType<typeof useModelSurfacesCommonStyle
   ReturnType<typeof useModelSurfacesVisibility> &
   ReturnType<typeof useModelSurfacesColor> &
   ReturnType<typeof useModelSurfacesPointsStyle> &
+  ReturnType<typeof useModelSurfacesEdgesStyle> &
   ReturnType<typeof useModelSurfacesVertexAttribute> &
   ReturnType<typeof useModelSurfacesPolygonAttribute> & {
     applyModelSurfacesStyle: (modelId: string) => Promise<void>;
@@ -45,6 +47,7 @@ export function useModelSurfacesStyle(): UseModelSurfacesStyleReturn {
   const modelSurfacesVertexAttribute = useModelSurfacesVertexAttribute();
   const modelSurfacesPolygonAttribute = useModelSurfacesPolygonAttribute();
   const modelSurfacesPointsStyle = useModelSurfacesPointsStyle();
+  const modelSurfacesEdgesStyle = useModelSurfacesEdgesStyle();
 
   async function applyModelSurfacesVisibilityStyle(
     modelId: string,
@@ -268,5 +271,6 @@ export function useModelSurfacesStyle(): UseModelSurfacesStyleReturn {
     ...modelSurfacesVertexAttribute,
     ...modelSurfacesPolygonAttribute,
     ...modelSurfacesPointsStyle,
+    ...modelSurfacesEdgesStyle,
   };
 }

package/internal/stores/hybrid_viewer/scene.ts

@@ -1,15 +1,35 @@
+import { ACTOR_COLOR, RGB_MAX } from "./constants";
 import type { HybridDb, vtkActor as VtkActorInstance } from "./vtk_types";
 import { requireRenderWindow, useHybridViewerCore } from "./core";
-import { ACTOR_COLOR } from "./constants";
+import viewer_schemas, {
+  type ViewerSetBackgroundColorParams,
+} from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 import { base64ToArrayBuffer } from "./base64";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useViewerStore } from "@ogw_front/stores/viewer";
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 import { newInstance as vtkActor } from "@kitware/vtk.js/Rendering/Core/Actor";
 import { newInstance as vtkMapper } from "@kitware/vtk.js/Rendering/Core/Mapper";
 import type vtkPolyData from "@kitware/vtk.js/Common/DataModel/PolyData";
 import { newInstance as vtkXMLPolyDataReader } from "@kitware/vtk.js/IO/XML/XMLPolyDataReader";
 
+async function setBackgroundColor(color: ViewerSetBackgroundColorParams["color"]): Promise<void> {
+  const { genericRenderWindow, remoteRender } = useHybridViewerCore();
+  const renderer = requireRenderWindow(genericRenderWindow).getRenderer();
+  renderer.setBackground([color.r / RGB_MAX, color.g / RGB_MAX, color.b / RGB_MAX]);
+  const renderWindow = requireRenderWindow(genericRenderWindow).getRenderWindow();
+  renderWindow.render();
+  const viewerStore = useViewerStore();
+  const schema = viewer_schemas.opengeodeweb_viewer.viewer.set_background_color;
+  const params = {
+    color,
+  };
+  await viewerStore.request({
+    schema,
+    params,
+  });
+  await remoteRender();
+}
+
 // Shared via createSharedComposable (rather than merged into the parent hybridViewer store) so sibling slices, e.g. camera.ts and ruler.ts, can read hybridDb/setZScaling directly without importing the parent store and creating a cycle. A Pinia store would work too but its $id/$patch/... properties would leak into the composed store's spread and collapse its inferred type.
 const useHybridViewerScene = createSharedComposable(() => {
   const hybridDb = reactive<HybridDb>({});
@@ -122,6 +142,7 @@ const useHybridViewerScene = createSharedComposable(() => {
     removeItem,
     setVisibility,
     setZScaling,
+    setBackgroundColor,
     clear,
   };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.41.0",
+  "version": "10.42.0-rc.1",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -64,9 +64,9 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@geode/cloud-api": "latest",
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
+    "@geode/cloud-api": "next",
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-viewer": "next",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",
     "@msgpack/msgpack": "2.8.0",

package/server/api/microservice/app/set_is_app_ready.post.ts

@@ -1,6 +1,5 @@
 // Third party imports
 import { consola } from "consola";
-import { createError } from "h3";
 
 // Local imports
 import { setIsAppReady } from "@geode/opengeodeweb-front/server/utils/server_config.ts";
@@ -11,9 +10,6 @@ import schemas from "@geode/opengeodeweb-front/opengeodeweb_front_typed_schemas.
 export default defineTypedEventHandler(
   schemas.api.microservice.app.set_is_app_ready,
   ({ isReady }) => {
-    if (!isReady) {
-      throw createError({ statusCode: 400, statusMessage: "isReady is required" });
-    }
     setIsAppReady(isReady);
     consola.info(`Updated IS_APP_READY to ${isReady}`);
     return { statusCode: 200, isReady };