fix(deck): improve map layer settings and color scale behavior - #789

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

packages/deck/src/json/createDeckJsonConfiguration.ts (1)

35-41: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Duplicated color accessor list.

COLOR_ACCESSOR_PROP_NAMES duplicates the exact prop-name list already defined inside getAllColorScales in packages/deck/src/json/colorScaleFunction.ts. Keeping two independent literals risks them drifting out of sync (e.g. a new color accessor added to one list but not the other).

♻️ Suggested consolidation

Export the list (or a getter) from colorScaleFunction.ts and import it here instead of redeclaring it.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/deck/src/json/createDeckJsonConfiguration.ts` around lines 35 - 41,
The color accessor prop-name list is duplicated between
createDeckJsonConfiguration and getAllColorScales, so consolidate it by
exporting the shared list (or a getter) from colorScaleFunction.ts and importing
it here. Update COLOR_ACCESSOR_PROP_NAMES in createDeckJsonConfiguration to use
that shared source, and keep getAllColorScales as the single place defining the
accessor names.

packages/deck/src/MapSettings.tsx (1)

879-985: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Consolidate duplicate Boolean(activeLayer?.extruded) checks.

The elevation-column block (line 903) and the new elevation-scale block (line 954) both gate on the same Boolean(activeLayer?.extruded) condition. Wrapping both in a single conditional block would avoid repeating the guard and keep the extrusion-only fields grouped together.

♻️ Suggested consolidation

-                {Boolean(activeLayer?.extruded) && dataTable && (
-                  <ColumnsProvider columns={dataTable.columns}>
-                    <Field label="Elevation column">
-                      ...
-                    </Field>
-                  </ColumnsProvider>
-                )}
-
-                {Boolean(activeLayer?.extruded) && (
-                  <Field label={`Elevation scale: ...`}>
-                    ...
-                  </Field>
-                )}
+                {Boolean(activeLayer?.extruded) && (
+                  <>
+                    {dataTable && (
+                      <ColumnsProvider columns={dataTable.columns}>
+                        <Field label="Elevation column">
+                          ...
+                        </Field>
+                      </ColumnsProvider>
+                    )}
+                    <Field label={`Elevation scale: ...`}>
+                      ...
+                    </Field>
+                  </>
+                )}

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/deck/src/MapSettings.tsx` around lines 879 - 985, The extrusion
settings UI repeats the same Boolean(activeLayer?.extruded) guard for both the
elevation-column selector and the elevation-scale slider in MapSettings.tsx.
Consolidate these into one shared conditional around the extrusion-only fields
so they stay grouped together, and keep the existing ColumnsProvider, Field,
ColumnSelector.Numeric, and Slider behavior unchanged while moving the
duplicated check to the outer container.

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

packages/deck/src/json/createDeckJsonConfiguration.ts (1)

270-279: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

GeoJsonLayer elevation normalization/trigger is still skipped — regresses a previously-fixed bug.

The getElevation normalization and the new get* @@= accessor trigger-merge logic (lines 300-348) live entirely inside the GeoArrow branch, after the geojson branch already returns at line 279. A previous review on this file flagged exactly this gap: "GeoJsonLayer can also be extruded, so changing the elevation column or scale can leave stale geometry when this trigger is only set in the GeoArrow branch." That was fixed in a prior commit, but this refactor moved the (now more general) accessor-trigger logic back into the GeoArrow-only branch, so extruded GeoJsonLayers changing their elevation column/scale will again render stale/incorrect extruded geometry — directly undermining this PR's stated goal of making "elevation column changes...apply immediately."

Extract the elevation-normalization + accessor-trigger logic into a shared helper usable from both branches.

🩹 Proposed fix — share the logic between both representations

+      function normalizeElevationAndAccessorTriggers(options: {
+        props: Record<string, unknown>;
+        table: arrow.Table;
+      }) {
+        const {props, table} = options;
+        const nextProps: Record<string, unknown> = {...props};
+
+        const rawElev = nextProps.getElevation;
+        if (typeof rawElev === 'string' && rawElev.startsWith('@@=')) {
+          const elevField = rawElev.slice(3).trim();
+          const elevVector = table.getChild(elevField);
+          if (elevVector) {
+            let min = Infinity;
+            for (let i = 0; i < elevVector.length; i++) {
+              const v = Number(elevVector.get(i));
+              if (Number.isFinite(v) && v < min) min = v;
+            }
+            if (Number.isFinite(min) && min !== 0) {
+              nextProps.getElevation = `@@=${elevField} - ${min}`;
+            }
+          }
+        }
+
+        const accessorTriggers: Record<string, string> = {};
+        for (const [propName, propValue] of Object.entries(nextProps)) {
+          if (
+            typeof propValue === 'string' &&
+            propValue.startsWith('@@=') &&
+            propName.startsWith('get')
+          ) {
+            accessorTriggers[propName] = propValue;
+          }
+        }
+        if (Object.keys(accessorTriggers).length > 0) {
+          const existingTriggers =
+            nextProps.updateTriggers &&
+            typeof nextProps.updateTriggers === 'object' &&
+            !Array.isArray(nextProps.updateTriggers)
+              ? (nextProps.updateTriggers as Record<string, unknown>)
+              : {};
+          nextProps.updateTriggers = {...existingTriggers, ...accessorTriggers};
+        }
+        return nextProps;
+      }
+
       if (compatibility.representation === 'geojson') {
         const baseProps = applyColorScale({
           props: strippedProps,
           table: prepared.table,
         });
+        const geojsonProps = normalizeElevationAndAccessorTriggers({
+          props: baseProps,
+          table: prepared.table,
+        });
         return {
-          ...baseProps,
+          ...geojsonProps,
           data: prepared.getGeoJsonBinaryData(geometryColumn),
         };
       }

Then reuse normalizeElevationAndAccessorTriggers for nextProps before calling rewriteGeoArrowAccessors in the GeoArrow branch.

Also applies to: 294-349

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/deck/src/json/createDeckJsonConfiguration.ts` around lines 270 -
279, The elevation normalization and accessor-trigger merge currently only run
in the GeoArrow path, so GeoJsonLayer updates can still skip elevation/scale
changes and render stale extruded geometry. Move the shared `getElevation`
normalization plus the `get*` `@@=` trigger logic out of the GeoArrow-only
branch into a reusable helper in `createDeckJsonConfiguration`, and apply it to
the GeoJSON return path before `prepared.getGeoJsonBinaryData(geometryColumn)`
as well as the GeoArrow path before `rewriteGeoArrowAccessors`.

packages/deck/src/json/createDeckJsonConfiguration.ts (1)

294-349: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Add tests for elevation normalization and accessor triggers.
createDeckJsonConfiguration now rewrites getElevation to subtract the column minimum and derives updateTriggers from rewritten @@= accessors, but packages/deck/__tests__/createDeckJsonConfiguration.test.ts doesn’t cover either path yet.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/deck/src/json/createDeckJsonConfiguration.ts` around lines 294 -
349, Add test coverage in createDeckJsonConfiguration for the new elevation
normalization and updateTriggers behavior. Update
packages/deck/__tests__/createDeckJsonConfiguration.test.ts to verify that
createDeckJsonConfiguration rewrites getElevation from a @@= field accessor into
an expression that subtracts the column minimum, and that rewritten accessor
props are copied into rewritten.updateTriggers for any get* property using @@=
syntax. Use the createDeckJsonConfiguration and rewriteGeoArrowAccessors paths
to validate both behaviors end to end.

Source: Coding guidelines

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".