@geode/opengeodeweb-front 10.36.0 → 10.37.0

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

@@ -4,12 +4,14 @@ import type {
   ModelComponentTypeStyle,
   StyleValues,
 } from "@ogw_internal/stores/data_style/types.js";
-import type { JsonRpcSchema } from "@ogw_shared/utils/types.js";
+import type { ParamsOf } from "@ogw_shared/utils/types.js";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import { database } from "@ogw_internal/database/database";
 import merge from "lodash/merge";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useDataStyleState } from "@ogw_internal/stores/data_style/state";
 import { useViewerStore } from "@ogw_front/stores/viewer";
+import type viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 
 // The underlying dexie tables use compound array keys ([id_model, id_component] /
 // [id_model, type]) but the shared `database` proxy types every table as
@@ -17,6 +19,19 @@ import { useViewerStore } from "@ogw_front/stores/viewer";
 type ComponentTable = Table<ModelComponentStyle, [string, string]>;
 type ComponentTypeTable = Table<ModelComponentTypeStyle, [string, string]>;
 
+type ModelComponentSchemas = (typeof viewer_schemas)["opengeodeweb_viewer"]["model"][
+  | "corners"
+  | "lines"
+  | "surfaces"
+  | "blocks"];
+type ModelColorSchema = ModelComponentSchemas["color"];
+type ModelVisibilitySchema = ModelComponentSchemas["visibility"];
+type ModelColorMode = ParamsOf<ModelColorSchema>["color_mode"];
+
+function isModelColorMode(value: string): value is ModelColorMode {
+  return value === "constant" || value === "random";
+}
+
 interface ComponentStyleUpdate {
   id_component: string;
   values: StyleValues;
@@ -45,16 +60,16 @@ interface UseModelCommonStyleReturn {
   setModelTypeColor: (
     id: string,
     component_ids: string[],
-    color: unknown,
-    schema: JsonRpcSchema,
+    color: RGBAColor | undefined,
+    schema: ModelColorSchema,
     activeColoring?: string,
     collectionId?: string,
   ) => Promise<unknown>;
   setModelTypeVisibility: (
     id: string,
     component_ids: string[],
-    visibility: boolean | undefined,
-    schema: JsonRpcSchema,
+    visibility: boolean,
+    schema: ModelVisibilitySchema,
   ) => Promise<unknown>;
 }
 
@@ -164,8 +179,8 @@ export function useModelCommonStyle(): UseModelCommonStyleReturn {
   async function setModelTypeColor(
     id: string,
     component_ids: string[],
-    color: unknown,
-    schema: JsonRpcSchema,
+    color: RGBAColor | undefined,
+    schema: ModelColorSchema,
     activeColoring = "constant",
     collectionId?: string,
   ): Promise<unknown> {
@@ -178,27 +193,28 @@ export function useModelCommonStyle(): UseModelCommonStyleReturn {
       return undefined;
     }
 
-    const params: Record<string, unknown> = {
-      id,
-      block_ids: viewer_ids,
-      color_mode: activeColoring,
-      collection_id: collectionId,
-    };
     if (activeColoring === "constant") {
       await mutateComponentStyles(id, component_ids, {
         coloring: {
           constant: color,
         },
       });
-      params.color = color;
     }
+    if (!isModelColorMode(activeColoring)) {
+      throw new Error(`Unknown model color mode: ${activeColoring}`);
+    }
+    const params = {
+      id,
+      block_ids: viewer_ids,
+      color_mode: activeColoring,
+      collection_id: collectionId,
+      ...(activeColoring === "constant" && { color }),
+    };
 
     return viewerStore.request(
       { schema, params },
       {
-        response_function: async (response: unknown) => {
-          // oxlint-disable-next-line no-unsafe-type-assertion -- response shape is defined by the color-set schema.
-          const colors = response as { geode_id: string; color: unknown }[] | undefined;
+        response_function: async ({ colors }) => {
           if (activeColoring === "constant") {
             await mutateComponentStyles(id, component_ids, {
               coloring: {
@@ -208,7 +224,7 @@ export function useModelCommonStyle(): UseModelCommonStyleReturn {
             return;
           }
 
-          if (colors === undefined || colors.length === 0) {
+          if (colors.length === 0) {
             return;
           }
 
@@ -231,8 +247,8 @@ export function useModelCommonStyle(): UseModelCommonStyleReturn {
   async function setModelTypeVisibility(
     id: string,
     component_ids: string[],
-    visibility: boolean | undefined,
-    schema: JsonRpcSchema,
+    visibility: boolean,
+    schema: ModelVisibilitySchema,
   ): Promise<unknown> {
     if (!component_ids?.length) {
       return undefined;

package/internal/stores/data_style/model/corners/color.ts

@@ -1,9 +1,10 @@
 import { isModelCornersVertexAttributeValid, useModelCornersVertexAttribute } from "./vertex";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 import { useModelCornersCommonStyle } from "./common";
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.corners.color;
 
@@ -11,12 +12,12 @@ interface ModelCornersColorApi {
   setModelCornersColor: (
     modelId: string,
     corners_ids: string[],
-    color: unknown,
+    color: RGBAColor | undefined,
     activeColoring?: string,
     collectionId?: string,
   ) => Promise<unknown>;
   modelCornerColoring: (id: string, corner_id?: string) => StyleValues;
-  modelCornerColor: (id: string, corner_id?: string) => unknown;
+  modelCornerColor: (id: string, corner_id?: string) => RGBAColor | undefined;
   modelCornerActiveColoring: (id: string, corner_id?: string) => unknown;
   setModelCornersActiveColoring: (
     modelId: string,
@@ -37,14 +38,15 @@ export function useModelCornersColor(): ModelCornersColorApi {
     return modelCornersCommonStyle.modelCornerStyle(id, corner_id).coloring as StyleValues;
   }
 
-  function modelCornerColor(id: string, corner_id?: string): unknown {
-    return modelCornerColoring(id, corner_id).constant;
+  function modelCornerColor(id: string, corner_id?: string): RGBAColor | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.constant shape is defined by the data style schema.
+    return modelCornerColoring(id, corner_id).constant as RGBAColor | undefined;
   }
 
   async function setModelCornersColor(
     modelId: string,
     corners_ids: string[],
-    color: unknown,
+    color: RGBAColor | undefined,
     activeColoring = "constant",
     collectionId?: string,
   ): Promise<unknown> {

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

@@ -1,20 +1,21 @@
 import { isModelCornersVertexAttributeValid, useModelCornersVertexAttribute } from "./vertex";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useModelCornersColor } from "./color";
 import { useModelCornersCommonStyle } from "./common";
 import { useModelCornersVisibility } from "./visibility";
 
 interface ColorGroup {
-  color: unknown;
+  color: RGBAColor | undefined;
   corners_ids: string[];
 }
 
 interface AttributeGroup {
-  name: string | undefined;
-  item: number | undefined;
-  minimum: number | undefined;
-  maximum: number | undefined;
-  colorMap: string | undefined;
+  name: string;
+  item: number;
+  minimum: number;
+  maximum: number;
+  colorMap: string;
   corners_ids: string[];
 }
 
@@ -122,14 +123,7 @@ export function useModelCornersStyle(): ModelCornersStyleApi {
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          vertexGroups[key] ??= {
-            name,
-            item,
-            minimum,
-            maximum,
-            colorMap,
-            corners_ids: [],
-          };
+          vertexGroups[key] ??= { ...attribute, corners_ids: [] };
           vertexGroups[key].corners_ids.push(corner_id);
         }
         coloringPromises.push(

package/internal/stores/data_style/model/corners/vertex.ts

@@ -1,6 +1,6 @@
-import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
+import { DEFAULT_NO_DATA_COLOR, type RGBAColor } from "@ogw_front/utils/default_styles/constants";
 // Third party imports
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 
 // Local imports
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
@@ -15,7 +15,7 @@ interface AttributeStoredConfig {
   minimum: number | undefined;
   maximum: number | undefined;
   colorMap: string | undefined;
-  no_data_color: unknown;
+  no_data_color: RGBAColor;
 }
 
 interface AttributeState {
@@ -30,7 +30,16 @@ interface AttributeInput {
   minimum: number | undefined;
   maximum: number | undefined;
   colorMap: string | undefined;
-  no_data_color?: unknown;
+  no_data_color?: RGBAColor;
+}
+
+interface ValidAttributeInput {
+  name: string;
+  item: number;
+  minimum: number;
+  maximum: number;
+  colorMap: string;
+  no_data_color?: RGBAColor;
 }
 
 type IdsFn<Value> = (modelId: string, cornerIds: string[], value: Value) => Promise<void>;
@@ -52,7 +61,7 @@ interface ModelCornersVertexAttributeApi {
   setModelCornersVertexAttribute: (
     modelId: string,
     cornerIds: string[],
-    attribute: AttributeInput,
+    attribute: ValidAttributeInput,
   ) => Promise<unknown>;
   setModelCornersVertexAttributeName: IdsFn<string>;
   setModelCornersVertexAttributeItem: IdsFn<number>;
@@ -63,23 +72,17 @@ interface ModelCornersVertexAttributeApi {
     maximum: number,
   ) => Promise<void>;
   setModelCornersVertexAttributeColorMap: IdsFn<string | undefined>;
-  modelCornersVertexAttributeNoDataColor: (modelId: string, cornerId?: string) => unknown;
-  setModelCornersVertexAttributeNoDataColor: IdsFn<unknown>;
+  modelCornersVertexAttributeNoDataColor: (modelId: string, cornerId?: string) => RGBAColor;
+  setModelCornersVertexAttributeNoDataColor: IdsFn<RGBAColor>;
 }
 
-function isModelCornersVertexAttributeValid({
-  name,
-  item,
-  minimum,
-  maximum,
-  colorMap,
-}: AttributeInput): boolean {
+function isModelCornersVertexAttributeValid(input: AttributeInput): input is ValidAttributeInput {
   return (
-    name !== undefined &&
-    item !== undefined &&
-    minimum !== undefined &&
-    maximum !== undefined &&
-    colorMap !== undefined
+    input.name !== undefined &&
+    input.item !== undefined &&
+    input.minimum !== undefined &&
+    input.maximum !== undefined &&
+    input.colorMap !== undefined
   );
 }
 
@@ -197,7 +200,7 @@ function useModelCornersVertexAttribute(): ModelCornersVertexAttributeApi {
       maximum,
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
-    }: AttributeInput,
+    }: ValidAttributeInput,
   ): Promise<unknown> {
     await mutateModelCornersVertexStyle(modelId, cornerIds, { name, item });
     await setModelCornersVertexAttributeStoredConfig(modelId, cornerIds, name, item, {
@@ -206,7 +209,7 @@ function useModelCornersVertexAttribute(): ModelCornersVertexAttributeApi {
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap ?? "");
+    const points = [...getRGBPointsFromPreset(colorMap)];
     const corner_viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, cornerIds);
     const params = {
       id: modelId,
@@ -278,7 +281,7 @@ function useModelCornersVertexAttribute(): ModelCornersVertexAttributeApi {
     await setModelCornersVertexAttributeStoredConfig(modelId, cornerIds, name, item, { colorMap });
     await applyVertexAttribute(modelId, cornerIds);
   }
-  function modelCornersVertexAttributeNoDataColor(modelId: string, cornerId?: string): unknown {
+  function modelCornersVertexAttributeNoDataColor(modelId: string, cornerId?: string): RGBAColor {
     const name = modelCornersVertexAttributeName(modelId, cornerId);
     const item = modelCornersVertexAttributeItem(modelId, cornerId);
     return modelCornersVertexAttributeStoredConfig(modelId, cornerId, name, item).no_data_color;
@@ -286,7 +289,7 @@ function useModelCornersVertexAttribute(): ModelCornersVertexAttributeApi {
   async function setModelCornersVertexAttributeNoDataColor(
     modelId: string,
     cornerIds: string[],
-    no_data_color: unknown,
+    no_data_color: RGBAColor,
   ): Promise<void> {
     const name = modelCornersVertexAttributeName(modelId, cornerIds[0]);
     const item = modelCornersVertexAttributeItem(modelId, cornerIds[0]);

package/internal/stores/data_style/model/corners/visibility.ts

@@ -1,6 +1,6 @@
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 import { useModelCornersCommonStyle } from "./common";
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.corners.visibility;
 
@@ -8,7 +8,7 @@ interface ModelCornersVisibilityApi {
   setModelCornersVisibility: (
     modelId: string,
     corners_ids: string[],
-    visibility: boolean | undefined,
+    visibility: boolean,
   ) => Promise<unknown>;
   modelCornerVisibility: (id: string, corner_id?: string) => unknown;
 }
@@ -24,7 +24,7 @@ export function useModelCornersVisibility(): ModelCornersVisibilityApi {
   async function setModelCornersVisibility(
     modelId: string,
     corners_ids: string[],
-    visibility: boolean | undefined,
+    visibility: boolean,
   ): Promise<unknown> {
     const result = await modelCommonStyle.setModelTypeVisibility(
       modelId,

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

@@ -1,15 +1,16 @@
 // Third party imports
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 
 import { useModelEdgesCommonStyle } from "./common";
 import { useViewerStore } from "@ogw_front/stores/viewer";
+import { whenDefined } from "@ogw_internal/stores/data_style/when_defined";
 
 // Local constants
 const schema = viewer_schemas.opengeodeweb_viewer.model.edges.visibility;
 
 interface ModelEdgesVisibilityStyleApi {
   modelEdgesVisibility: (id: string) => boolean | undefined;
-  setModelEdgesVisibility: (id: string, visibility: boolean | undefined) => Promise<unknown>;
+  setModelEdgesVisibility: (id: string, visibility: boolean) => Promise<unknown>;
   applyModelEdgesStyle: (id: string) => Promise<unknown[]>;
 }
 
@@ -25,10 +26,7 @@ export function useModelEdgesVisibilityStyle(): ModelEdgesVisibilityStyleApi {
     return undefined;
   }
 
-  async function setModelEdgesVisibility(
-    id: string,
-    visibility: boolean | undefined,
-  ): Promise<unknown> {
+  async function setModelEdgesVisibility(id: string, visibility: boolean): Promise<unknown> {
     const params = { id, visibility };
     const result = await viewerStore.request(
       { schema, params },
@@ -42,8 +40,10 @@ export function useModelEdgesVisibilityStyle(): ModelEdgesVisibilityStyleApi {
   }
 
   async function applyModelEdgesStyle(id: string): Promise<unknown[]> {
-    const visibility = modelEdgesVisibility(id);
-    const result = await setModelEdgesVisibility(id, visibility);
+    const result = await whenDefined(modelEdgesVisibility(id), async (visibility) => {
+      const applied = await setModelEdgesVisibility(id, visibility);
+      return applied;
+    });
     return [result];
   }
 

package/internal/stores/data_style/model/lines/color.ts

@@ -1,10 +1,11 @@
 import { isModelLinesEdgeAttributeValid, useModelLinesEdgeAttribute } from "./edge";
 import { isModelLinesVertexAttributeValid, useModelLinesVertexAttribute } from "./vertex";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import type { StyleValues } from "@ogw_internal/stores/data_style/types.js";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useModelCommonStyle } from "@ogw_internal/stores/data_style/model/common";
 import { useModelLinesCommonStyle } from "./common";
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 
 const schema = viewer_schemas.opengeodeweb_viewer.model.lines.color;
 
@@ -12,12 +13,12 @@ export function useModelLinesColor(): {
   setModelLinesColor: (
     modelId: string,
     lines_ids: string[],
-    color: unknown,
+    color: RGBAColor | undefined,
     activeColoring?: string,
     collectionId?: string,
   ) => Promise<unknown>;
   modelLineColoring: (id: string, line_id?: string) => StyleValues;
-  modelLineColor: (id: string, line_id?: string) => unknown;
+  modelLineColor: (id: string, line_id?: string) => RGBAColor | undefined;
   modelLineActiveColoring: (id: string, line_id?: string) => unknown;
   setModelLinesActiveColoring: (
     modelId: string,
@@ -37,14 +38,15 @@ export function useModelLinesColor(): {
     return modelLinesCommonStyle.modelLineStyle(id, line_id).coloring as StyleValues;
   }
 
-  function modelLineColor(id: string, line_id?: string): unknown {
-    return modelLineColoring(id, line_id).constant;
+  function modelLineColor(id: string, line_id?: string): RGBAColor | undefined {
+    // oxlint-disable-next-line no-unsafe-type-assertion -- coloring.constant shape is defined by the data style schema.
+    return modelLineColoring(id, line_id).constant as RGBAColor | undefined;
   }
 
   async function setModelLinesColor(
     modelId: string,
     lines_ids: string[],
-    color: unknown,
+    color: RGBAColor | undefined,
     activeColoring = "constant",
     collectionId?: string,
   ): Promise<unknown> {

package/internal/stores/data_style/model/lines/edge.ts

@@ -1,7 +1,7 @@
 // oxlint-disable eslint/max-lines
-import { DEFAULT_NO_DATA_COLOR } from "@ogw_front/utils/default_styles/constants";
+import { DEFAULT_NO_DATA_COLOR, type RGBAColor } from "@ogw_front/utils/default_styles/constants";
 // Third party imports
-import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
+import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_typed_schemas.js";
 
 // Local imports
 import { getRGBPointsFromPreset } from "@ogw_front/utils/colormap";
@@ -16,7 +16,7 @@ interface AttributeStoredConfig {
   minimum: number | undefined;
   maximum: number | undefined;
   colorMap: string | undefined;
-  no_data_color: unknown;
+  no_data_color: RGBAColor;
 }
 
 interface AttributeState {
@@ -31,22 +31,25 @@ interface AttributeInput {
   minimum: number | undefined;
   maximum: number | undefined;
   colorMap: string | undefined;
-  no_data_color?: unknown;
+  no_data_color?: RGBAColor;
 }
 
-function isModelLinesEdgeAttributeValid({
-  name,
-  item,
-  minimum,
-  maximum,
-  colorMap,
-}: AttributeInput): boolean {
+interface ValidAttributeInput {
+  name: string;
+  item: number;
+  minimum: number;
+  maximum: number;
+  colorMap: string;
+  no_data_color?: RGBAColor;
+}
+
+function isModelLinesEdgeAttributeValid(input: AttributeInput): input is ValidAttributeInput {
   return (
-    name !== undefined &&
-    item !== undefined &&
-    minimum !== undefined &&
-    maximum !== undefined &&
-    colorMap !== undefined
+    input.name !== undefined &&
+    input.item !== undefined &&
+    input.minimum !== undefined &&
+    input.maximum !== undefined &&
+    input.colorMap !== undefined
   );
 }
 
@@ -67,7 +70,7 @@ interface UseModelLinesEdgeAttributeReturn {
   setModelLinesEdgeAttribute: (
     modelId: string,
     lineIds: string[],
-    input: AttributeInput,
+    input: ValidAttributeInput,
   ) => Promise<unknown>;
   setModelLinesEdgeAttributeName: (
     modelId: string,
@@ -90,11 +93,11 @@ interface UseModelLinesEdgeAttributeReturn {
     lineIds: string[],
     colorMap: string | undefined,
   ) => Promise<unknown>;
-  modelLinesEdgeAttributeNoDataColor: (modelId: string, lineId?: string) => unknown;
+  modelLinesEdgeAttributeNoDataColor: (modelId: string, lineId?: string) => RGBAColor;
   setModelLinesEdgeAttributeNoDataColor: (
     modelId: string,
     lineIds: string[],
-    no_data_color: unknown,
+    no_data_color: RGBAColor,
   ) => Promise<unknown>;
 }
 
@@ -212,7 +215,7 @@ function useModelLinesEdgeAttribute(): UseModelLinesEdgeAttributeReturn {
       maximum,
       colorMap,
       no_data_color = DEFAULT_NO_DATA_COLOR,
-    }: AttributeInput,
+    }: ValidAttributeInput,
   ): Promise<unknown> {
     await mutateModelLinesEdgeStyle(modelId, lineIds, {
       name,
@@ -224,7 +227,7 @@ function useModelLinesEdgeAttribute(): UseModelLinesEdgeAttributeReturn {
       colorMap,
       no_data_color,
     });
-    const points = getRGBPointsFromPreset(colorMap ?? "");
+    const points = [...getRGBPointsFromPreset(colorMap)];
     const line_viewer_ids = await dataStore.getMeshComponentsViewerIds(modelId, lineIds);
     const params = {
       id: modelId,
@@ -305,7 +308,7 @@ function useModelLinesEdgeAttribute(): UseModelLinesEdgeAttributeReturn {
     });
     return applyEdgeAttribute(modelId, lineIds);
   }
-  function modelLinesEdgeAttributeNoDataColor(modelId: string, lineId?: string): unknown {
+  function modelLinesEdgeAttributeNoDataColor(modelId: string, lineId?: string): RGBAColor {
     const name = modelLinesEdgeAttributeName(modelId, lineId);
     const item = modelLinesEdgeAttributeItem(modelId, lineId);
     const storedConfig = modelLinesEdgeAttributeStoredConfig(modelId, lineId, name, item);
@@ -314,7 +317,7 @@ function useModelLinesEdgeAttribute(): UseModelLinesEdgeAttributeReturn {
   async function setModelLinesEdgeAttributeNoDataColor(
     modelId: string,
     lineIds: string[],
-    no_data_color: unknown,
+    no_data_color: RGBAColor,
   ): Promise<unknown> {
     const name = modelLinesEdgeAttributeName(modelId, lineIds[0]);
     const item = modelLinesEdgeAttributeItem(modelId, lineIds[0]);

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

@@ -1,21 +1,22 @@
 import { isModelLinesEdgeAttributeValid, useModelLinesEdgeAttribute } from "./edge";
 import { isModelLinesVertexAttributeValid, useModelLinesVertexAttribute } from "./vertex";
+import type { RGBAColor } from "@ogw_front/utils/default_styles/constants";
 import { useDataStore } from "@ogw_front/stores/data";
 import { useModelLinesColor } from "./color";
 import { useModelLinesCommonStyle } from "./common";
 import { useModelLinesVisibility } from "./visibility";
 
 interface ColorGroup {
-  color: unknown;
+  color: RGBAColor | undefined;
   lines_ids: string[];
 }
 
 interface AttributeGroup {
-  name: string | undefined;
-  item: number | undefined;
-  minimum: number | undefined;
-  maximum: number | undefined;
-  colorMap: string | undefined;
+  name: string;
+  item: number;
+  minimum: number;
+  maximum: number;
+  colorMap: string;
   lines_ids: string[];
 }
 
@@ -117,14 +118,7 @@ export function useModelLinesStyle(): ReturnType<typeof useModelLinesCommonStyle
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          vertexGroups[key] ??= {
-            name,
-            item,
-            minimum,
-            maximum,
-            colorMap,
-            lines_ids: [],
-          };
+          vertexGroups[key] ??= { ...attribute, lines_ids: [] };
           vertexGroups[key].lines_ids.push(line_id);
         }
         coloringPromises.push(
@@ -163,14 +157,7 @@ export function useModelLinesStyle(): ReturnType<typeof useModelLinesCommonStyle
             continue;
           }
           const key = `${name}_${item}_${colorMap}_${minimum}_${maximum}`;
-          edgeGroups[key] ??= {
-            name,
-            item,
-            minimum,
-            maximum,
-            colorMap,
-            lines_ids: [],
-          };
+          edgeGroups[key] ??= { ...attribute, lines_ids: [] };
           edgeGroups[key].lines_ids.push(line_id);
         }
         coloringPromises.push(