WidthUnits/radiusUnits: add new 'common' unit type (danmarshall#241)

* WidthUnits/radiusUnits: add new 'common' unit type * use UNIT const * ScatterplotLayerProps: fix UNIT import
maptable · Apr 6, 2022 · 8c97b54 · 8c97b54
1 parent 0b545fb
commit 8c97b54
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/deck.gl/index.d.ts b/deck.gl/index.d.ts
@@ -54,6 +54,7 @@ declare module 'deck.gl' {
     Position,
     Position2D,
     Position3D,
+    UNIT
   } from '@deck.gl/core';
   export {
     ArcLayer,

diff --git a/deck.gl__core/index.d.ts b/deck.gl__core/index.d.ts
@@ -982,6 +982,7 @@ declare module '@deck.gl/core/lib/layer' {
   import Viewport from '@deck.gl/core/viewports/viewport';
   import { Position } from '@deck.gl/core/utils/positions';
   import { Matrix4 } from '@math.gl/core';
+  import { UNIT } from '@deck.gl/core/lib/constants';
 
   export interface LayerContext {
     layerManager: LayerManager;
@@ -1016,7 +1017,7 @@ declare module '@deck.gl/core/lib/layer' {
     (o: PickInfo<D>, e: HammerInput): any;
   }
   export type DataSet<D> = Iterable<D>;
-  export type WidthUnits = 'meters' | 'pixels';
+  export type WidthUnits = keyof typeof UNIT;
 
   export interface ObjectInfo<D, T> {
     // the index of the current iteration

diff --git a/deck.gl__layers/index.d.ts b/deck.gl__layers/index.d.ts
@@ -296,6 +296,7 @@ declare module '@deck.gl/layers/scatterplot-layer/scatterplot-layer' {
   import { LayerProps, WidthUnits } from '@deck.gl/core/lib/layer';
   import { Position } from '@deck.gl/core/utils/positions';
   import { RGBAColor } from '@deck.gl/core/utils/color';
+  import { UNIT } from '@deck.gl/core/lib/constants';
   export interface ScatterplotLayerProps<D> extends LayerProps<D> {
     radiusScale?: number;
     lineWidthUnits?: WidthUnits;
@@ -306,7 +307,7 @@ declare module '@deck.gl/layers/scatterplot-layer/scatterplot-layer' {
     radiusMaxPixels?: number;
     lineWidthMinPixels?: number;
     lineWidthMaxPixels?: number;
-    radiusUnits?: 'meters' | 'pixels';
+    radiusUnits?: keyof typeof UNIT;
 
     //Data Accessors
     getPosition?: (d: D) => Position;