Merge branch 'master' into felix/carto-private-fetchmap

visgl · Sep 4, 2024 · c54c198 · c54c198
2 parents 05b9d84 + f944077
commit c54c198
Show file tree

Hide file tree

Showing 20 changed files with 772 additions and 608 deletions.
diff --git a/modules/aggregation-layers/src/common/types.ts b/modules/aggregation-layers/src/common/types.ts
@@ -9,3 +9,5 @@ export type AggregateAccessor<DataT = any> = (
     data: any;
   }
 ) => number;
+
+export type ScaleType = 'linear' | 'quantize' | 'quantile' | 'ordinal';
diff --git a/modules/aggregation-layers/src/common/utils/color-utils.ts b/modules/aggregation-layers/src/common/utils/color-utils.ts
@@ -20,6 +20,7 @@
 import type {Color} from '@deck.gl/core';
 import type {Device, Texture} from '@luma.gl/core';
 import type {NumericArray, TypedArray, TypedArrayConstructor} from '@math.gl/types';
+import type {ScaleType} from '../types';
 
 export const defaultColorRange: Color[] = [
   [255, 255, 178],
@@ -63,15 +64,33 @@ export function colorRangeToFlatArray(
   return flatArray;
 }
 
-export function colorRangeToTexture(device: Device, colorRange: Color[] | NumericArray): Texture {
+export const COLOR_RANGE_FILTER: Record<ScaleType, 'linear' | 'nearest'> = {
+  linear: 'linear',
+  quantile: 'nearest',
+  quantize: 'nearest',
+  ordinal: 'nearest'
+} as const;
+
+export function updateColorRangeTexture(texture: Texture, type: ScaleType) {
+  texture.setSampler({
+    minFilter: COLOR_RANGE_FILTER[type],
+    magFilter: COLOR_RANGE_FILTER[type]
+  });
+}
+
+export function createColorRangeTexture(
+  device: Device,
+  colorRange: Color[] | NumericArray,
+  type: ScaleType = 'linear'
+): Texture {
   const colors = colorRangeToFlatArray(colorRange, false, Uint8Array);
 
   return device.createTexture({
     format: 'rgba8unorm',
     mipmaps: false,
     sampler: {
-      minFilter: 'linear',
-      magFilter: 'linear',
+      minFilter: COLOR_RANGE_FILTER[type],
+      magFilter: COLOR_RANGE_FILTER[type],
       addressModeU: 'clamp-to-edge',
       addressModeV: 'clamp-to-edge'
     },

diff --git a/modules/aggregation-layers/src/common/utils/scale-utils.js b/modules/aggregation-layers/src/common/utils/scale-utils.js