feat: add step overrides to config

konturio · Jan 21, 2025 · 24d0cc7 · 24d0cc7
1 parent 51477bd
commit 24d0cc7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/src/components/MultivariateLegend/MultivariateLegend.tsx b/src/components/MultivariateLegend/MultivariateLegend.tsx
@@ -2,7 +2,7 @@ import { Legend as BiLegend, MCDALegend } from '@konturio/ui-kit';
 import { generateMCDALegendColors } from '~utils/mcda/mcdaLegendsUtils';
 import { BIVARIATE_LEGEND_SIZE } from '~components/BivariateLegend/const';
 import { DEFAULT_MULTIBIVARIATE_STEPS } from '~utils/multivariate/constants';
-import { invertClusters } from '~utils/bivariate';
+import { invertClusters, type Step } from '~utils/bivariate';
 import type { ColorTheme } from '~core/types';
 import type { MultivariateLayerConfig } from '~core/logical_layers/renderers/MultivariateRenderer/types';
 import type { MCDAConfig } from '~core/logical_layers/renderers/stylesConfigs/mcda/types';
@@ -30,15 +30,21 @@ function createMCDALegend(mcdaConfig: MCDAConfig): JSX.Element {
   return <MCDALegend title={mcdaConfig.name} steps={5} colors={legendColors} />;
 }
 
-function createBivariateLegend(score: MCDAConfig, base: MCDAConfig, colors: ColorTheme) {
+function createBivariateLegend(
+  score: MCDAConfig,
+  base: MCDAConfig,
+  scoreSteps: Step[],
+  baseSteps: Step[],
+  colors: ColorTheme,
+) {
   const xAxis: MultiBivariateLegendAxisProp = {
     label: base.name,
-    steps: DEFAULT_MULTIBIVARIATE_STEPS,
+    steps: baseSteps,
     quotient: ['', ''],
   };
   const yAxis: MultiBivariateLegendAxisProp = {
     label: score.name,
-    steps: DEFAULT_MULTIBIVARIATE_STEPS,
+    steps: scoreSteps,
     quotient: ['', ''],
   };
   const cells = invertClusters(
@@ -64,6 +70,8 @@ export function MultivariateLegend({ config }: MultivariateLegendProps) {
     return createBivariateLegend(
       config.score.config,
       config.base.config,
+      config.stepOverrides?.scoreSteps ?? DEFAULT_MULTIBIVARIATE_STEPS,
+      config.stepOverrides?.baseSteps ?? DEFAULT_MULTIBIVARIATE_STEPS,
       config.colors.colors,
     );
   } else {

diff --git a/src/core/logical_layers/renderers/MultivariateRenderer/types.ts b/src/core/logical_layers/renderers/MultivariateRenderer/types.ts
@@ -1,3 +1,4 @@
+import type { Step } from '~utils/bivariate';
 import type { ColorTheme } from '~core/types';
 import type { SymbolLayerSpecification } from 'maplibre-gl';
 import type {
@@ -34,6 +35,10 @@ export interface MultivariateLayerConfig {
   name: string;
   score: MultivariateAxis;
   base?: MultivariateAxis;
+  stepOverrides?: {
+    baseSteps?: Step[];
+    scoreSteps?: Step[];
+  };
   strength?: MultivariateAxis | number;
   tileLabel?: LabelAxis;
   extrusionMin?: MultivariateAxis | number;

diff --git a/src/utils/multivariate/constants.ts b/src/utils/multivariate/constants.ts
@@ -1,12 +1,14 @@
-export const DEFAULT_MULTIBIVARIATE_STEPS = [
+import type { Step } from '~utils/bivariate';
+
+export const DEFAULT_MULTIBIVARIATE_STEPS: Step[] = [
   {
     value: 0,
   },
   {
     value: 0.33,
   },
   {
-    value: 0.66,
+    value: 0.67,
   },
   {
     value: 1,

diff --git a/src/utils/multivariate/multivariateStyle.ts b/src/utils/multivariate/multivariateStyle.ts
@@ -19,6 +19,8 @@ import type { ExpressionSpecification, FillLayerSpecification } from 'maplibre-g
 export interface MultivaritateBivariateGeneratorProps {
   score: MCDALayerStyle['config'];
   base: MCDALayerStyle['config'];
+  baseSteps: Step[];
+  scoreSteps: Step[];
   colors: OverlayColor[];
   id?: string;
   sourceLayer?: string;
@@ -43,6 +45,8 @@ export function generateBivariateColorsAndStyleForMultivariateLayer(
   const bivariateStyle = createBivariateMultivariateStyle({
     score: config.score.config,
     base: config.base.config,
+    baseSteps: config.stepOverrides?.baseSteps ?? DEFAULT_MULTIBIVARIATE_STEPS,
+    scoreSteps: config.stepOverrides?.scoreSteps ?? DEFAULT_MULTIBIVARIATE_STEPS,
     colors,
     sourceLayer,
   });
@@ -90,6 +94,8 @@ function setupColorClasses(
 function createBivariateMultivariateStyle({
   score,
   base,
+  scoreSteps,
+  baseSteps,
   colors,
   sourceLayer,
   id = 'multivariate-bivariate',
@@ -107,9 +113,8 @@ function createBivariateMultivariateStyle({
       'fill-color': setupColorClasses(
         baseValueExpression,
         annexValueExpression,
-        // TODO: multivariate - Where do we get steps from?
-        DEFAULT_MULTIBIVARIATE_STEPS,
-        DEFAULT_MULTIBIVARIATE_STEPS,
+        baseSteps,
+        scoreSteps,
         colorsMap(colors),
       ),
       'fill-opacity': 1,