@deck.gl/extensions 9.0.5 → 9.0.7

package/dist/data-filter/data-filter-extension.d.ts

@@ -56,15 +56,15 @@ export type DataFilterExtensionProps<DataT = any> = {
 };
 type DataFilterExtensionOptions = {
     /**
-     * The size of the category filter (number of columns to filter by). The category filter can show/hide data based on 1-4 properties of each object.
-     * @default 1
+     * The size of the category filter (number of columns to filter by). The category filter can show/hide data based on 1-4 properties of each object. Set to `0` to disable category filtering.
+     * @default 0
      */
-    categorySize?: 1 | 2 | 3 | 4;
+    categorySize?: 0 | 1 | 2 | 3 | 4;
     /**
-     * The size of the filter (number of columns to filter by). The data filter can show/hide data based on 1-4 numeric properties of each object.
+     * The size of the filter (number of columns to filter by). The data filter can show/hide data based on 1-4 numeric properties of each object. Set to `0` to disable numeric filtering.
      * @default 1
      */
-    filterSize?: 1 | 2 | 3 | 4;
+    filterSize?: 0 | 1 | 2 | 3 | 4;
     /**
      * Use 64-bit precision instead of 32-bit.
      * @default false

package/dist/data-filter/data-filter-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-filter-extension.d.ts","sourceRoot":"","sources":["../../src/data-filter/data-filter-extension.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-filter-extension.d.ts","sourceRoot":"","sources":["../../src/data-filter/data-filter-extension.ts"],"names":[],"mappings":"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"}

package/dist/data-filter/data-filter-extension.js

@@ -32,7 +32,7 @@ const defaultProps = {
     filterTransformColor: true
 };
 const defaultOptions = {
-    categorySize: 1,
+    categorySize: 0,
     filterSize: 1,
     fp64: false,
     countItems: false
@@ -52,50 +52,57 @@ export default class DataFilterExtension extends LayerExtension {
     }
     getShaders(extension) {
         const { categorySize, filterSize, fp64 } = extension.opts;
-        return {
-            modules: [fp64 ? shaderModule64 : shaderModule],
-            defines: {
-                DATACATEGORY_TYPE: DATA_TYPE_FROM_SIZE[categorySize],
-                DATACATEGORY_CHANNELS: categorySize,
-                DATAFILTER_TYPE: DATA_TYPE_FROM_SIZE[filterSize],
-                DATAFILTER_DOUBLE: Boolean(fp64)
-            }
-        };
+        const defines = {};
+        if (categorySize) {
+            defines.DATACATEGORY_TYPE = DATA_TYPE_FROM_SIZE[categorySize];
+            defines.DATACATEGORY_CHANNELS = categorySize;
+        }
+        if (filterSize) {
+            defines.DATAFILTER_TYPE = DATA_TYPE_FROM_SIZE[filterSize];
+            defines.DATAFILTER_DOUBLE = Boolean(fp64);
+        }
+        return { modules: [fp64 ? shaderModule64 : shaderModule], defines };
     }
     initializeState(context, extension) {
         const attributeManager = this.getAttributeManager();
         const { categorySize, filterSize, fp64 } = extension.opts;
         if (attributeManager) {
-            attributeManager.add({
-                filterValues: {
-                    size: filterSize,
-                    type: fp64 ? 'float64' : 'float32',
-                    accessor: 'getFilterValue',
-                    shaderAttributes: {
-                        filterValues: {
-                            divisor: 0
-                        },
-                        instanceFilterValues: {
-                            divisor: 1
+            if (filterSize) {
+                attributeManager.add({
+                    filterValues: {
+                        size: filterSize,
+                        type: fp64 ? 'float64' : 'float32',
+                        accessor: 'getFilterValue',
+                        shaderAttributes: {
+                            filterValues: {
+                                divisor: 0
+                            },
+                            instanceFilterValues: {
+                                divisor: 1
+                            }
                         }
                     }
-                },
-                filterCategoryValues: {
-                    size: categorySize,
-                    accessor: 'getFilterCategory',
-                    transform: categorySize === 1
-                        ? d => extension._getCategoryKey.call(this, d, 0)
-                        : d => d.map((x, i) => extension._getCategoryKey.call(this, x, i)),
-                    shaderAttributes: {
-                        filterCategoryValues: {
-                            divisor: 0
-                        },
-                        instanceFilterCategoryValues: {
-                            divisor: 1
+                });
+            }
+            if (categorySize) {
+                attributeManager.add({
+                    filterCategoryValues: {
+                        size: categorySize,
+                        accessor: 'getFilterCategory',
+                        transform: categorySize === 1
+                            ? d => extension._getCategoryKey.call(this, d, 0)
+                            : d => d.map((x, i) => extension._getCategoryKey.call(this, x, i)),
+                        shaderAttributes: {
+                            filterCategoryValues: {
+                                divisor: 0
+                            },
+                            instanceFilterCategoryValues: {
+                                divisor: 1
+                            }
                         }
                     }
-                }
-            });
+                });
+            }
         }
         const { device } = this.context;
         if (attributeManager && extension.opts.countItems) {
@@ -133,7 +140,7 @@ export default class DataFilterExtension extends LayerExtension {
         if (this.state.filterModel) {
             const filterNeedsUpdate = 
             // attributeManager must be defined for filterModel to be set
-            attributeManager.attributes.filterValues.needsUpdate() ||
+            attributeManager.attributes.filterValues?.needsUpdate() ||
                 attributeManager.attributes.filterCategoryValues?.needsUpdate() ||
                 props.filterEnabled !== oldProps.filterEnabled ||
                 props.filterRange !== oldProps.filterRange ||
@@ -178,7 +185,7 @@ export default class DataFilterExtension extends LayerExtension {
             filterModel.updateModuleSettings(params.moduleParameters);
             // @ts-expect-error filterValue and filterIndices should always have buffer value
             filterModel.setAttributes({
-                ...filterValues.getValue(),
+                ...filterValues?.getValue(),
                 ...filterCategoryValues?.getValue(),
                 ...filterIndices?.getValue()
             });

package/dist/data-filter/shader-module.d.ts

@@ -1,5 +1,35 @@
 import type { ShaderModule } from '@luma.gl/shadertools';
 import type { DataFilterExtensionProps } from "./data-filter-extension.js";
+export type Defines = {
+    /**
+     * Primitive type of parameter used for category filtering. If undefined, category filtering disabled.
+     */
+    DATACATEGORY_TYPE?: 'float' | 'vec2' | 'vec3' | 'vec4';
+    /**
+     * Number of category filtering channels. Must match dimension of `DATACATEGORY_TYPE`
+     */
+    DATACATEGORY_CHANNELS?: 1 | 2 | 3 | 4;
+    /**
+     * Primitive type of parameter used for numeric filtering. If undefined, numeric filtering disabled.
+     */
+    DATAFILTER_TYPE?: 'float' | 'vec2' | 'vec3' | 'vec4';
+    /**
+     * Enable 64-bit precision in numeric filter.
+     */
+    DATAFILTER_DOUBLE?: boolean;
+    /**
+     * Numeric filter attribute
+     */
+    DATAFILTER_ATTRIB?: 'filterValues' | 'instanceFilterValues';
+    /**
+     * Numeric filter attribute (low bits). Only used when `DATAFILTER_DOUBLE = true`
+     */
+    DATAFILTER_ATTRIB_64LOW?: 'filterValues64Low' | 'instanceFilterValues64Low';
+    /**
+     * Category filter attribute
+     */
+    DATACATEGORY_ATTRIB?: 'filterCategoryValues' | 'instanceFilterCategoryValues';
+};
 type DataFilterModuleSettings = {
     extensions: any[];
 } & DataFilterExtensionProps;

package/dist/data-filter/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/data-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAC,wBAAwB,EAAC,mCAAgC;AA+FtE,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB,GAAG,wBAAwB,CAAC;AAkG7B,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,wBAAwB,CAM/D,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,wBAAwB,CAMjE,CAAC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/data-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAC,wBAAwB,EAAC,mCAAgC;AAMtE,MAAM,MAAM,OAAO,GAAG;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAErD;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAG5B;;OAEG;IACH,iBAAiB,CAAC,EAAE,cAAc,GAAG,sBAAsB,CAAC;IAC5D;;OAEG;IACH,uBAAuB,CAAC,EAAE,mBAAmB,GAAG,2BAA2B,CAAC;IAC5E;;OAEG;IACH,mBAAmB,CAAC,EAAE,sBAAsB,GAAG,8BAA8B,CAAC;CAC/E,CAAC;AAwGF,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB,GAAG,wBAAwB,CAAC;AA0G7B,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,wBAAwB,CAM/D,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,wBAAwB,CAMjE,CAAC"}

package/dist/data-filter/shader-module.js

@@ -1,24 +1,20 @@
 import { glsl } from "../utils/syntax-tags.js";
-/*
- * data filter shader module
- */
 const vs = `
-uniform DATAFILTER_TYPE filter_min;
-uniform DATAFILTER_TYPE filter_softMin;
-uniform DATAFILTER_TYPE filter_softMax;
-uniform DATAFILTER_TYPE filter_max;
 uniform bool filter_useSoftMargin;
 uniform bool filter_enabled;
 uniform bool filter_transformSize;
 uniform ivec4 filter_categoryBitMask;
+#ifdef DATAFILTER_TYPE
+uniform DATAFILTER_TYPE filter_min;
+uniform DATAFILTER_TYPE filter_softMin;
+uniform DATAFILTER_TYPE filter_softMax;
+uniform DATAFILTER_TYPE filter_max;
 #ifdef NON_INSTANCED_MODEL
 #define DATAFILTER_ATTRIB filterValues
 #define DATAFILTER_ATTRIB_64LOW filterValues64Low
-#define DATACATEGORY_ATTRIB filterCategoryValues
 #else
 #define DATAFILTER_ATTRIB instanceFilterValues
 #define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
-#define DATACATEGORY_ATTRIB instanceFilterCategoryValues
 #endif
 in DATAFILTER_TYPE DATAFILTER_ATTRIB;
 #ifdef DATAFILTER_DOUBLE
@@ -26,7 +22,15 @@ in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
 uniform DATAFILTER_TYPE filter_min64High;
 uniform DATAFILTER_TYPE filter_max64High;
 #endif
+#endif
+#ifdef DATACATEGORY_TYPE
+#ifdef NON_INSTANCED_MODEL
+#define DATACATEGORY_ATTRIB filterCategoryValues
+#else
+#define DATACATEGORY_ATTRIB instanceFilterCategoryValues
+#endif
 in DATACATEGORY_TYPE DATACATEGORY_ATTRIB;
+#endif
 out float dataFilter_value;
 float dataFilter_reduceValue(float value) {
 return value;
@@ -40,8 +44,8 @@ return min(min(value.x, value.y), value.z);
 float dataFilter_reduceValue(vec4 value) {
 return min(min(value.x, value.y), min(value.z, value.w));
 }
-void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax, DATACATEGORY_TYPE category) {
-if (filter_enabled) {
+#ifdef DATAFILTER_ATTRIB
+void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax) {
 if (filter_useSoftMargin) {
 dataFilter_value = dataFilter_reduceValue(
 smoothstep(filter_min, filter_softMin, valueFromMin) *
@@ -52,6 +56,10 @@ dataFilter_value = dataFilter_reduceValue(
 step(filter_min, valueFromMin) * step(valueFromMax, filter_max)
 );
 }
+}
+#endif
+#ifdef DATACATEGORY_ATTRIB
+void dataFilter_setCategoryValue(DATACATEGORY_TYPE category) {
 #if DATACATEGORY_CHANNELS == 1
 int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
 #elif DATACATEGORY_CHANNELS == 2
@@ -71,10 +79,8 @@ if(dataFilter_bits == 0.0) dataFilter_value = 0.0;
 #else
 if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0.0)))) dataFilter_value = 0.0;
 #endif
-} else {
-dataFilter_value = 1.0;
-}
 }
+#endif
 `;
 const fs = `
 uniform bool filter_transformColor;
@@ -136,15 +142,22 @@ function getUniforms64(opts) {
 }
 const inject = {
     'vs:#main-start': `
+dataFilter_value = 1.0;
+if (filter_enabled) {
+#ifdef DATAFILTER_ATTRIB
 #ifdef DATAFILTER_DOUBLE
 dataFilter_setValue(
 DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
-DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW,
-DATACATEGORY_ATTRIB
+DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW
 );
 #else
-dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB, DATACATEGORY_ATTRIB);
+dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB);
 #endif
+#endif
+#ifdef DATACATEGORY_ATTRIB
+dataFilter_setCategoryValue(DATACATEGORY_ATTRIB);
+#endif
+}
 `,
     'vs:#main-end': `
 if (dataFilter_value == 0.0) {

package/dist/dist.dev.js

@@ -247,33 +247,43 @@ var __exports__ = (() => {
 
   // src/data-filter/shader-module.ts
   var vs2 = glsl`
-uniform DATAFILTER_TYPE filter_min;
-uniform DATAFILTER_TYPE filter_softMin;
-uniform DATAFILTER_TYPE filter_softMax;
-uniform DATAFILTER_TYPE filter_max;
 uniform bool filter_useSoftMargin;
 uniform bool filter_enabled;
 uniform bool filter_transformSize;
 uniform ivec4 filter_categoryBitMask;
 
-#ifdef NON_INSTANCED_MODEL
-  #define DATAFILTER_ATTRIB filterValues
-  #define DATAFILTER_ATTRIB_64LOW filterValues64Low
-  #define DATACATEGORY_ATTRIB filterCategoryValues
-#else
-  #define DATAFILTER_ATTRIB instanceFilterValues
-  #define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
-  #define DATACATEGORY_ATTRIB instanceFilterCategoryValues
+#ifdef DATAFILTER_TYPE
+  uniform DATAFILTER_TYPE filter_min;
+  uniform DATAFILTER_TYPE filter_softMin;
+  uniform DATAFILTER_TYPE filter_softMax;
+  uniform DATAFILTER_TYPE filter_max;
+
+  #ifdef NON_INSTANCED_MODEL
+    #define DATAFILTER_ATTRIB filterValues
+    #define DATAFILTER_ATTRIB_64LOW filterValues64Low
+  #else
+    #define DATAFILTER_ATTRIB instanceFilterValues
+    #define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
+  #endif
+
+  in DATAFILTER_TYPE DATAFILTER_ATTRIB;
+  #ifdef DATAFILTER_DOUBLE
+    in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
+
+    uniform DATAFILTER_TYPE filter_min64High;
+    uniform DATAFILTER_TYPE filter_max64High;
+  #endif
 #endif
 
-in DATAFILTER_TYPE DATAFILTER_ATTRIB;
-#ifdef DATAFILTER_DOUBLE
-  in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
 
-  uniform DATAFILTER_TYPE filter_min64High;
-  uniform DATAFILTER_TYPE filter_max64High;
+#ifdef DATACATEGORY_TYPE
+  #ifdef NON_INSTANCED_MODEL
+    #define DATACATEGORY_ATTRIB filterCategoryValues
+  #else
+    #define DATACATEGORY_ATTRIB instanceFilterCategoryValues
+  #endif
+  in DATACATEGORY_TYPE DATACATEGORY_ATTRIB;
 #endif
-in DATACATEGORY_TYPE DATACATEGORY_ATTRIB;
 
 out float dataFilter_value;
 
@@ -289,30 +299,35 @@ float dataFilter_reduceValue(vec3 value) {
 float dataFilter_reduceValue(vec4 value) {
   return min(min(value.x, value.y), min(value.z, value.w));
 }
-void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax, DATACATEGORY_TYPE category) {
-  if (filter_enabled) {
+
+#ifdef DATAFILTER_ATTRIB
+  void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax) {
     if (filter_useSoftMargin) {
       dataFilter_value = dataFilter_reduceValue(
         smoothstep(filter_min, filter_softMin, valueFromMin) *
-        (1.0 - smoothstep(filter_softMax, filter_max, valueFromMax))
+          (1.0 - smoothstep(filter_softMax, filter_max, valueFromMax))
       );
     } else {
       dataFilter_value = dataFilter_reduceValue(
         step(filter_min, valueFromMin) * step(valueFromMax, filter_max)
       );
     }
+  }
+#endif
 
+#ifdef DATACATEGORY_ATTRIB
+  void dataFilter_setCategoryValue(DATACATEGORY_TYPE category) {
     #if DATACATEGORY_CHANNELS == 1 // One 128-bit mask
-      int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
+    int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
     #elif DATACATEGORY_CHANNELS == 2 // Two 64-bit masks
-      ivec2 dataFilter_masks = ivec2(
-        filter_categoryBitMask[int(category.x / 32.0)],
-        filter_categoryBitMask[int(category.y / 32.0) + 2]
-      );
+    ivec2 dataFilter_masks = ivec2(
+      filter_categoryBitMask[int(category.x / 32.0)],
+      filter_categoryBitMask[int(category.y / 32.0) + 2]
+    );
     #elif DATACATEGORY_CHANNELS == 3 // Three 32-bit masks
-      ivec3 dataFilter_masks = filter_categoryBitMask.xyz;
+    ivec3 dataFilter_masks = filter_categoryBitMask.xyz;
     #else // Four 32-bit masks
-      ivec4 dataFilter_masks = filter_categoryBitMask;
+    ivec4 dataFilter_masks = filter_categoryBitMask;
     #endif
 
     // Shift mask and extract relevant bits
@@ -320,14 +335,12 @@ void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFrom
     dataFilter_bits = mod(floor(dataFilter_bits), 2.0);
 
     #if DATACATEGORY_CHANNELS == 1
-      if(dataFilter_bits == 0.0) dataFilter_value = 0.0;
+    if(dataFilter_bits == 0.0) dataFilter_value = 0.0;
     #else
     if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0.0)))) dataFilter_value = 0.0;
     #endif
-  } else {
-    dataFilter_value = 1.0;
   }
-}
+#endif
 `;
   var fs2 = glsl`
 uniform bool filter_transformColor;
@@ -390,15 +403,23 @@ in float dataFilter_value;
   }
   var inject2 = {
     "vs:#main-start": glsl`
-    #ifdef DATAFILTER_DOUBLE
-      dataFilter_setValue(
-        DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
-        DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW,
-        DATACATEGORY_ATTRIB
-      );
-    #else
-      dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB, DATACATEGORY_ATTRIB);
-    #endif
+    dataFilter_value = 1.0;
+    if (filter_enabled) {
+      #ifdef DATAFILTER_ATTRIB
+        #ifdef DATAFILTER_DOUBLE
+          dataFilter_setValue(
+            DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
+            DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW
+          );
+        #else
+          dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB);
+        #endif
+      #endif
+
+      #ifdef DATACATEGORY_ATTRIB
+        dataFilter_setCategoryValue(DATACATEGORY_ATTRIB);
+      #endif
+    }
   `,
     "vs:#main-end": glsl`
     if (dataFilter_value == 0.0) {
@@ -1196,7 +1217,7 @@ void main() {
     filterTransformColor: true
   };
   var defaultOptions = {
-    categorySize: 1,
+    categorySize: 0,
     filterSize: 1,
     fp64: false,
     countItems: false
@@ -1213,48 +1234,55 @@ void main() {
     }
     getShaders(extension) {
       const { categorySize, filterSize, fp64: fp642 } = extension.opts;
-      return {
-        modules: [fp642 ? shaderModule64 : shaderModule],
-        defines: {
-          DATACATEGORY_TYPE: DATA_TYPE_FROM_SIZE[categorySize],
-          DATACATEGORY_CHANNELS: categorySize,
-          DATAFILTER_TYPE: DATA_TYPE_FROM_SIZE[filterSize],
-          DATAFILTER_DOUBLE: Boolean(fp642)
-        }
-      };
+      const defines = {};
+      if (categorySize) {
+        defines.DATACATEGORY_TYPE = DATA_TYPE_FROM_SIZE[categorySize];
+        defines.DATACATEGORY_CHANNELS = categorySize;
+      }
+      if (filterSize) {
+        defines.DATAFILTER_TYPE = DATA_TYPE_FROM_SIZE[filterSize];
+        defines.DATAFILTER_DOUBLE = Boolean(fp642);
+      }
+      return { modules: [fp642 ? shaderModule64 : shaderModule], defines };
     }
     initializeState(context, extension) {
       const attributeManager = this.getAttributeManager();
       const { categorySize, filterSize, fp64: fp642 } = extension.opts;
       if (attributeManager) {
-        attributeManager.add({
-          filterValues: {
-            size: filterSize,
-            type: fp642 ? "float64" : "float32",
-            accessor: "getFilterValue",
-            shaderAttributes: {
-              filterValues: {
-                divisor: 0
-              },
-              instanceFilterValues: {
-                divisor: 1
+        if (filterSize) {
+          attributeManager.add({
+            filterValues: {
+              size: filterSize,
+              type: fp642 ? "float64" : "float32",
+              accessor: "getFilterValue",
+              shaderAttributes: {
+                filterValues: {
+                  divisor: 0
+                },
+                instanceFilterValues: {
+                  divisor: 1
+                }
               }
             }
-          },
-          filterCategoryValues: {
-            size: categorySize,
-            accessor: "getFilterCategory",
-            transform: categorySize === 1 ? (d) => extension._getCategoryKey.call(this, d, 0) : (d) => d.map((x, i) => extension._getCategoryKey.call(this, x, i)),
-            shaderAttributes: {
-              filterCategoryValues: {
-                divisor: 0
-              },
-              instanceFilterCategoryValues: {
-                divisor: 1
+          });
+        }
+        if (categorySize) {
+          attributeManager.add({
+            filterCategoryValues: {
+              size: categorySize,
+              accessor: "getFilterCategory",
+              transform: categorySize === 1 ? (d) => extension._getCategoryKey.call(this, d, 0) : (d) => d.map((x, i) => extension._getCategoryKey.call(this, x, i)),
+              shaderAttributes: {
+                filterCategoryValues: {
+                  divisor: 0
+                },
+                instanceFilterCategoryValues: {
+                  divisor: 1
+                }
               }
             }
-          }
-        });
+          });
+        }
       }
       const { device } = this.context;
       if (attributeManager && extension.opts.countItems) {
@@ -1291,7 +1319,7 @@ void main() {
       const attributeManager = this.getAttributeManager();
       const { categorySize } = extension.opts;
       if (this.state.filterModel) {
-        const filterNeedsUpdate = attributeManager.attributes.filterValues.needsUpdate() || attributeManager.attributes.filterCategoryValues?.needsUpdate() || props.filterEnabled !== oldProps.filterEnabled || props.filterRange !== oldProps.filterRange || props.filterSoftRange !== oldProps.filterSoftRange || props.filterCategories !== oldProps.filterCategories;
+        const filterNeedsUpdate = attributeManager.attributes.filterValues?.needsUpdate() || attributeManager.attributes.filterCategoryValues?.needsUpdate() || props.filterEnabled !== oldProps.filterEnabled || props.filterRange !== oldProps.filterRange || props.filterSoftRange !== oldProps.filterSoftRange || props.filterCategories !== oldProps.filterCategories;
         if (filterNeedsUpdate) {
           this.setState({ filterNeedsUpdate });
         }
@@ -1327,7 +1355,7 @@ void main() {
         this.context.device.clearWebGL({ framebuffer: filterFBO, color: [0, 0, 0, 0] });
         filterModel.updateModuleSettings(params.moduleParameters);
         filterModel.setAttributes({
-          ...filterValues.getValue(),
+          ...filterValues?.getValue(),
           ...filterCategoryValues?.getValue(),
           ...filterIndices?.getValue()
         });
@@ -4162,11 +4190,12 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
             type: GLEnum.FLOAT
           },
           mipmaps: false,
-          sampler: {
+          sampler: opts.interpolate === false ? {
+            minFilter: "nearest",
+            magFilter: "nearest"
+          } : {
             minFilter: "linear",
-            magFilter: "linear",
-            addressModeU: "clamp-to-edge",
-            addressModeV: "clamp-to-edge"
+            magFilter: "linear"
           }
         })
       ]
@@ -4290,7 +4319,8 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
       }
       if (!this.pickingFbo) {
         this.pickingFbo = createRenderTarget(this.targetLayer.context.device, {
-          id: `${this.id}-picking`
+          id: `${this.id}-picking`,
+          interpolate: false
         });
       }
       return this.pickingFbo;