From ca2fa4f943ecc6d7e6774a31b8c37ed3616b2b8b Mon Sep 17 00:00:00 2001 From: Charles Richardson Date: Sat, 13 Jun 2026 00:42:03 -0400 Subject: [PATCH] Remove COORDINATE_SYSTEM.IDENTITY alias --- modules/core/src/lib/constants.ts | 11 ----------- showcases/ascii/ascii-layer/ascii-layer.js | 2 +- showcases/graph/graph-layer/graph-layer.js | 2 +- showcases/graph/graph-layer/graph-layout-layer.js | 2 +- test/apps/standalone/index.js | 2 +- test/apps/svg-interoperability/app.jsx | 4 ++-- test/apps/video/app.jsx | 2 +- .../shaderlib/project/project-functions.spec.ts | 11 ----------- .../shaderlib/project/viewport-uniforms.spec.ts | 13 ------------- test/modules/mesh-layers/utils.spec.ts | 4 ++-- 10 files changed, 9 insertions(+), 44 deletions(-) diff --git a/modules/core/src/lib/constants.ts b/modules/core/src/lib/constants.ts index b6661dffa89..d8d4d9971e0 100644 --- a/modules/core/src/lib/constants.ts +++ b/modules/core/src/lib/constants.ts @@ -2,7 +2,6 @@ // SPDX-License-Identifier: MIT // Copyright (c) vis.gl contributors -import log from '../utils/log'; import {Pan, InputDirection, Pinch, Tap} from 'mjolnir.js'; import type {PanRecognizerOptions, PinchRecognizerOptions, TapRecognizerOptions} from 'mjolnir.js'; @@ -52,16 +51,6 @@ export const COORDINATE_SYSTEM = { CARTESIAN: 'cartesian' } as const; -// Deprecated -/* eslint-disable accessor-pairs */ -Object.defineProperty(COORDINATE_SYSTEM, 'IDENTITY', { - get: () => { - log.deprecated('COORDINATE_SYSTEM.IDENTITY', 'COORDINATE_SYSTEM.CARTESIAN')(); - return COORDINATE_SYSTEM.CARTESIAN; - } -}); -/* eslint-enable accessor-pairs */ - /** * How coordinates are transformed from the world space into the common space. */ diff --git a/showcases/ascii/ascii-layer/ascii-layer.js b/showcases/ascii/ascii-layer/ascii-layer.js index 210f35d99fe..808df9dad3d 100644 --- a/showcases/ascii/ascii-layer/ascii-layer.js +++ b/showcases/ascii/ascii-layer/ascii-layer.js @@ -110,7 +110,7 @@ export default class AsciiLayer extends CompositeLayer { return new IconLayer({ id: 'text', - coordinateSystem: COORDINATE_SYSTEM.IDENTITY, + coordinateSystem: COORDINATE_SYSTEM.CARTESIAN, data: grid, opacity: 1, iconAtlas, diff --git a/showcases/graph/graph-layer/graph-layer.js b/showcases/graph/graph-layer/graph-layer.js index 5ec6c68e588..cce16999be2 100644 --- a/showcases/graph/graph-layer/graph-layer.js +++ b/showcases/graph/graph-layer/graph-layer.js @@ -6,7 +6,7 @@ import {CompositeLayer, IconLayer, LineLayer, ScatterplotLayer, COORDINATE_SYSTE const defaultProps = { offset: {x: 0, y: 0}, - coordinateSystem: COORDINATE_SYSTEM.IDENTITY, + coordinateSystem: COORDINATE_SYSTEM.CARTESIAN, getLinkPosition: link => ({ sourcePosition: [link.source.x, link.source.y], diff --git a/showcases/graph/graph-layer/graph-layout-layer.js b/showcases/graph/graph-layer/graph-layout-layer.js index e9e7ace7e44..14851b32779 100644 --- a/showcases/graph/graph-layer/graph-layout-layer.js +++ b/showcases/graph/graph-layer/graph-layout-layer.js @@ -13,7 +13,7 @@ const defaultProps = { data: null, opacity: 1.0, layout: LayoutD3, - coordinateSystem: COORDINATE_SYSTEM.IDENTITY, + coordinateSystem: COORDINATE_SYSTEM.CARTESIAN, nodeIconAccessors: {} }; diff --git a/test/apps/standalone/index.js b/test/apps/standalone/index.js index 88918599c74..59b91787997 100644 --- a/test/apps/standalone/index.js +++ b/test/apps/standalone/index.js @@ -54,7 +54,7 @@ const nonGeoExample = new deck.DeckGL({ layers: [ new deck.PointCloudLayer({ id: 'pointCloud', - coordinateSystem: deck.COORDINATE_SYSTEM.IDENTITY, + coordinateSystem: deck.COORDINATE_SYSTEM.CARTESIAN, opacity: 1, data: points, getPosition: d => d.position, diff --git a/test/apps/svg-interoperability/app.jsx b/test/apps/svg-interoperability/app.jsx index 3209841789f..b95425d20d9 100644 --- a/test/apps/svg-interoperability/app.jsx +++ b/test/apps/svg-interoperability/app.jsx @@ -141,7 +141,7 @@ class Root extends PureComponent { ], getRadius: p => 2, getColor: p => [255, 0, 128, 196], - coordinateSystem: COORDINATE_SYSTEM.IDENTITY, + coordinateSystem: COORDINATE_SYSTEM.CARTESIAN, // there's a bug that the radius calculated with project_scale radiusMinPixels: 2 }); @@ -172,7 +172,7 @@ class Root extends PureComponent { p.radius * Math.cos(p.theta * DEGREE_TO_RADIAN) * size, p.radius * Math.sin(p.theta * DEGREE_TO_RADIAN) * size ], - coordinateSystem: COORDINATE_SYSTEM.IDENTITY, + coordinateSystem: COORDINATE_SYSTEM.CARTESIAN, cellSize: 20, contours: this._getContours(bandsOn), gpuAggregation: true diff --git a/test/apps/video/app.jsx b/test/apps/video/app.jsx index bdedc82b436..92f11df5ec3 100644 --- a/test/apps/video/app.jsx +++ b/test/apps/video/app.jsx @@ -37,7 +37,7 @@ export class App extends Component { _renderLayers() { return new BitmapLayer({ - coordinateSystem: COORDINATE_SYSTEM.IDENTITY, + coordinateSystem: COORDINATE_SYSTEM.CARTESIAN, image: this._videoRef.current, bounds: [-300, -400, 400, 300] }); diff --git a/test/modules/core/shaderlib/project/project-functions.spec.ts b/test/modules/core/shaderlib/project/project-functions.spec.ts index 71c7f42dbea..12014318e32 100644 --- a/test/modules/core/shaderlib/project/project-functions.spec.ts +++ b/test/modules/core/shaderlib/project/project-functions.spec.ts @@ -160,17 +160,6 @@ test('project#projectPosition rejects legacy numeric coordinate systems', () => }), 'Legacy numeric coordinate systems are rejected' ).toThrow(/Invalid coordinateSystem/); - - const identityResult = projectPosition([0, 0, 0], { - viewport: TEST_VIEWPORT, - coordinateSystem: COORDINATE_SYSTEM.IDENTITY, - coordinateOrigin: [256, 256, 0] - }); - - expect( - equals(identityResult, [174.15110778808594, -58.11044311523443, 0]), - 'IDENTITY aliases cartesian behavior' - ).toBeTruthy(); }); webglTest('project#projectPosition vs project_position', async () => { diff --git a/test/modules/core/shaderlib/project/viewport-uniforms.spec.ts b/test/modules/core/shaderlib/project/viewport-uniforms.spec.ts index fcf4fa3a6b6..533ca2ec76f 100644 --- a/test/modules/core/shaderlib/project/viewport-uniforms.spec.ts +++ b/test/modules/core/shaderlib/project/viewport-uniforms.spec.ts @@ -171,19 +171,6 @@ test('project#getUniforms rejects legacy numeric coordinate systems', () => { ).toThrow(/Invalid coordinateSystem/); }); -test('project#getUniforms normalizes IDENTITY to CARTESIAN', () => { - const cartesian = project.getUniforms({ - viewport: TEST_VIEWPORTS.infoVis, - coordinateSystem: COORDINATE_SYSTEM.CARTESIAN - }); - const identity = project.getUniforms({ - viewport: TEST_VIEWPORTS.infoVis, - coordinateSystem: COORDINATE_SYSTEM.IDENTITY - }); - - expect(identity, 'IDENTITY matches CARTESIAN').toEqual(cartesian); -}); - test('project64#getUniforms', () => { const viewport = TEST_VIEWPORTS.map; const uniforms = project.getUniforms({viewport}); diff --git a/test/modules/mesh-layers/utils.spec.ts b/test/modules/mesh-layers/utils.spec.ts index adb6a73a301..4a0a90b3a13 100644 --- a/test/modules/mesh-layers/utils.spec.ts +++ b/test/modules/mesh-layers/utils.spec.ts @@ -16,8 +16,8 @@ test('shouldComposeModelMatrix', () => { 'Should not composeModelMatrix for lnglat.' ).toBeFalsy(); expect( - shouldComposeModelMatrix({}, COORDINATE_SYSTEM.IDENTITY), - 'Should composeModelMatrix for identity.' + shouldComposeModelMatrix({}, COORDINATE_SYSTEM.CARTESIAN), + 'Should composeModelMatrix for cartesian.' ).toBeTruthy(); expect( shouldComposeModelMatrix({}, COORDINATE_SYSTEM.METER_OFFSETS),