From 9dbeb9e6ee2e90cb9aad592ee0853430c9234e8b Mon Sep 17 00:00:00 2001 From: Charles Richardson Date: Wed, 8 Jan 2025 14:20:03 -0500 Subject: [PATCH 1/5] fix: update Viewport type for https://github.com/visgl/deck.gl/pull/9313 --- modules/tiles/src/types.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/tiles/src/types.ts b/modules/tiles/src/types.ts index 9d7a1b1df6..385552aa27 100644 --- a/modules/tiles/src/types.ts +++ b/modules/tiles/src/types.ts @@ -1,5 +1,3 @@ -import {Vector3} from '@math.gl/core'; - export type BoundingRectangle = { width: number; height: number; @@ -9,7 +7,7 @@ export type BoundingRectangle = { * We can't import it from Deck.gl to avoid circular reference */ export type Viewport = { id: string; - cameraPosition: number[] | Vector3; + cameraPosition: [number,number,number] ; height: number; width: number; zoom: number; @@ -17,9 +15,9 @@ export type Viewport = { unitsPerMeter: number[]; metersPerUnit: number[]; }; - center: number[] | Vector3; - unprojectPosition: (position: number[] | Vector3) => [number, number, number]; - project: (coorinates: number[] | Vector3) => number[]; + center: [number,number,number] ; + unprojectPosition: (position: [number,number,number]) => [number, number, number]; + project: (coordinates: [number,number,number] ) => [number,number,number]; }; /** From 7aa2f640cbaf6cc592a5587b2628bc14e4c42417 Mon Sep 17 00:00:00 2001 From: Charles Richardson Date: Thu, 23 Jan 2025 15:50:24 -0500 Subject: [PATCH 2/5] fix: generalize viewport position type --- modules/tiles/src/types.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/tiles/src/types.ts b/modules/tiles/src/types.ts index 385552aa27..14e1b1d911 100644 --- a/modules/tiles/src/types.ts +++ b/modules/tiles/src/types.ts @@ -15,9 +15,9 @@ export type Viewport = { unitsPerMeter: number[]; metersPerUnit: number[]; }; - center: [number,number,number] ; - unprojectPosition: (position: [number,number,number]) => [number, number, number]; - project: (coordinates: [number,number,number] ) => [number,number,number]; + center: Vector3Like; + unprojectPosition: (position: Vector3Like) => Vector3Like; + project: (coordinates: Vector3Like) => Vector3Like; }; /** From 1f4fad0cc2fb72efa25253084a66464c78e98a56 Mon Sep 17 00:00:00 2001 From: Charles Richardson Date: Thu, 23 Jan 2025 15:51:02 -0500 Subject: [PATCH 3/5] fix: generalize viewport position type --- modules/tiles/src/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tiles/src/types.ts b/modules/tiles/src/types.ts index 14e1b1d911..0936ee084e 100644 --- a/modules/tiles/src/types.ts +++ b/modules/tiles/src/types.ts @@ -7,7 +7,7 @@ export type BoundingRectangle = { * We can't import it from Deck.gl to avoid circular reference */ export type Viewport = { id: string; - cameraPosition: [number,number,number] ; + cameraPosition: Vector3Like; height: number; width: number; zoom: number; From 99b5013e8fa512feccf99a1158a26d7a055fba6b Mon Sep 17 00:00:00 2001 From: Charles Richardson Date: Thu, 23 Jan 2025 15:52:23 -0500 Subject: [PATCH 4/5] fix: generalize viewport position type --- modules/tiles/src/types.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/tiles/src/types.ts b/modules/tiles/src/types.ts index 0936ee084e..67f012bb97 100644 --- a/modules/tiles/src/types.ts +++ b/modules/tiles/src/types.ts @@ -1,3 +1,5 @@ +import {Vector3Like} from '@math.gl/core'; + export type BoundingRectangle = { width: number; height: number; From 976b9f6b5a104694c44651226092289ee416e159 Mon Sep 17 00:00:00 2001 From: Charles Richardson Date: Thu, 23 Jan 2025 22:20:39 -0500 Subject: [PATCH 5/5] docs: update types to reflect https://github.com/visgl/deck.gl/pull/9313 --- modules/tiles/src/types.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/tiles/src/types.ts b/modules/tiles/src/types.ts index 67f012bb97..eb0ac2dcdb 100644 --- a/modules/tiles/src/types.ts +++ b/modules/tiles/src/types.ts @@ -1,4 +1,4 @@ -import {Vector3Like} from '@math.gl/core'; +import {NumberArray2, NumberArray3} from '@math.gl/core'; export type BoundingRectangle = { width: number; @@ -9,7 +9,7 @@ export type BoundingRectangle = { * We can't import it from Deck.gl to avoid circular reference */ export type Viewport = { id: string; - cameraPosition: Vector3Like; + cameraPosition: NumberArray2 | NumberArray3; height: number; width: number; zoom: number; @@ -18,8 +18,8 @@ export type Viewport = { metersPerUnit: number[]; }; center: Vector3Like; - unprojectPosition: (position: Vector3Like) => Vector3Like; - project: (coordinates: Vector3Like) => Vector3Like; + unprojectPosition: (position: NumberArray2 | NumberArray3) => NumberArray2 | NumberArray3; + project: (coordinates: NumberArray2 | NumberArray3) => NumberArray2 | NumberArray3; }; /**