@deck.gl/extensions 9.0.18 → 9.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/data-filter/data-filter-extension.d.ts.map +1 -1
- package/dist/data-filter/data-filter-extension.js +7 -6
- package/dist/dist.dev.js +6 -5
- package/dist/index.cjs +6 -5
- package/dist/index.cjs.map +2 -2
- package/dist.min.js +13 -13
- package/package.json +2 -2
- package/src/data-filter/data-filter-extension.ts +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-filter-extension.d.ts","sourceRoot":"","sources":["../../src/data-filter/data-filter-extension.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACnF,OAAO,EAA0B,cAAc,EAAM,MAAM,eAAe,CAAC;AAiB3E,KAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAEtC,MAAM,MAAM,wBAAwB,CAAC,KAAK,GAAG,GAAG,IAAI;IAClD;;;OAGG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACpD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,EAAE,CAAC,CAAC;IACvE;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACpD;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;IAC/D;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;OAGG;IACH,gBAAgB,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE,EAAE,CAAC;IACxD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE;QAC5B,kCAAkC;QAClC,EAAE,EAAE,MAAM,CAAC;QACX,uDAAuD;QACvD,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;CACZ,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC;;;OAGG;IACH,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAgBF,0IAA0I;AAC1I,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,cAAc,CAC7D,QAAQ,CAAC,0BAA0B,CAAC,CACrC;IACC,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAyB;gBAEjC,IAAI,GAAE,0BAA+B;IAIjD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAevE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAmE7F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EACrC,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,EACjF,SAAS,EAAE,IAAI;IAuCjB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"data-filter-extension.d.ts","sourceRoot":"","sources":["../../src/data-filter/data-filter-extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -141,7 +141,7 @@ export default class DataFilterExtension extends LayerExtension {
|
|
|
141
141
|
const categoryBitMaskNeedsUpdate = attributeManager.attributes.filterCategoryValues.needsUpdate() ||
|
|
142
142
|
!deepEqual(props.filterCategories, oldProps.filterCategories, 2);
|
|
143
143
|
if (categoryBitMaskNeedsUpdate) {
|
|
144
|
-
this.setState({
|
|
144
|
+
this.setState({ categoryBitMask: null });
|
|
145
145
|
}
|
|
146
146
|
// Need to recreate category map if categorySize has changed
|
|
147
147
|
const resetCategories = changeFlags.dataChanged;
|
|
@@ -159,11 +159,12 @@ export default class DataFilterExtension extends LayerExtension {
|
|
|
159
159
|
const filterFBO = this.state.filterFBO;
|
|
160
160
|
const filterModel = this.state.filterModel;
|
|
161
161
|
const filterNeedsUpdate = this.state.filterNeedsUpdate;
|
|
162
|
-
const categoryBitMaskNeedsUpdate = this.state.categoryBitMaskNeedsUpdate;
|
|
163
162
|
const { onFilteredItemsChange } = this.props;
|
|
164
|
-
if (
|
|
163
|
+
if (!this.state.categoryBitMask) {
|
|
165
164
|
extension._updateCategoryBitMask.call(this, params, extension);
|
|
166
165
|
}
|
|
166
|
+
/* eslint-disable-next-line camelcase */
|
|
167
|
+
params.uniforms.filter_categoryBitMask = this.state.categoryBitMask;
|
|
167
168
|
if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {
|
|
168
169
|
const { attributes: { filterValues, filterCategoryValues, filterIndices } } = this.getAttributeManager();
|
|
169
170
|
filterModel.setVertexCount(this.getNumInstances());
|
|
@@ -207,6 +208,8 @@ export default class DataFilterExtension extends LayerExtension {
|
|
|
207
208
|
*/
|
|
208
209
|
_updateCategoryBitMask(params, extension) {
|
|
209
210
|
const { categorySize } = extension.opts;
|
|
211
|
+
if (!categorySize)
|
|
212
|
+
return;
|
|
210
213
|
const { filterCategories } = this.props;
|
|
211
214
|
const categoryBitMask = new Uint32Array([0, 0, 0, 0]);
|
|
212
215
|
const categoryFilters = (categorySize === 1 ? [filterCategories] : filterCategories);
|
|
@@ -224,9 +227,7 @@ export default class DataFilterExtension extends LayerExtension {
|
|
|
224
227
|
}
|
|
225
228
|
}
|
|
226
229
|
}
|
|
227
|
-
|
|
228
|
-
params.uniforms.filter_categoryBitMask = categoryBitMask;
|
|
229
|
-
this.state.categoryBitMaskNeedsUpdate = false;
|
|
230
|
+
this.state.categoryBitMask = categoryBitMask;
|
|
230
231
|
}
|
|
231
232
|
/**
|
|
232
233
|
* Returns an index of bit in the bitmask for a given category. If the category has
|
package/dist/dist.dev.js
CHANGED
|
@@ -1294,7 +1294,7 @@ void main() {
|
|
|
1294
1294
|
if (attributeManager?.attributes.filterCategoryValues) {
|
|
1295
1295
|
const categoryBitMaskNeedsUpdate = attributeManager.attributes.filterCategoryValues.needsUpdate() || !(0, import_core4._deepEqual)(props.filterCategories, oldProps.filterCategories, 2);
|
|
1296
1296
|
if (categoryBitMaskNeedsUpdate) {
|
|
1297
|
-
this.setState({
|
|
1297
|
+
this.setState({ categoryBitMask: null });
|
|
1298
1298
|
}
|
|
1299
1299
|
const resetCategories = changeFlags.dataChanged;
|
|
1300
1300
|
if (resetCategories) {
|
|
@@ -1309,11 +1309,11 @@ void main() {
|
|
|
1309
1309
|
const filterFBO = this.state.filterFBO;
|
|
1310
1310
|
const filterModel = this.state.filterModel;
|
|
1311
1311
|
const filterNeedsUpdate = this.state.filterNeedsUpdate;
|
|
1312
|
-
const categoryBitMaskNeedsUpdate = this.state.categoryBitMaskNeedsUpdate;
|
|
1313
1312
|
const { onFilteredItemsChange } = this.props;
|
|
1314
|
-
if (
|
|
1313
|
+
if (!this.state.categoryBitMask) {
|
|
1315
1314
|
extension._updateCategoryBitMask.call(this, params, extension);
|
|
1316
1315
|
}
|
|
1316
|
+
params.uniforms.filter_categoryBitMask = this.state.categoryBitMask;
|
|
1317
1317
|
if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {
|
|
1318
1318
|
const {
|
|
1319
1319
|
attributes: { filterValues, filterCategoryValues, filterIndices }
|
|
@@ -1354,6 +1354,8 @@ void main() {
|
|
|
1354
1354
|
}
|
|
1355
1355
|
_updateCategoryBitMask(params, extension) {
|
|
1356
1356
|
const { categorySize } = extension.opts;
|
|
1357
|
+
if (!categorySize)
|
|
1358
|
+
return;
|
|
1357
1359
|
const { filterCategories } = this.props;
|
|
1358
1360
|
const categoryBitMask = new Uint32Array([0, 0, 0, 0]);
|
|
1359
1361
|
const categoryFilters = categorySize === 1 ? [filterCategories] : filterCategories;
|
|
@@ -1370,8 +1372,7 @@ void main() {
|
|
|
1370
1372
|
}
|
|
1371
1373
|
}
|
|
1372
1374
|
}
|
|
1373
|
-
|
|
1374
|
-
this.state.categoryBitMaskNeedsUpdate = false;
|
|
1375
|
+
this.state.categoryBitMask = categoryBitMask;
|
|
1375
1376
|
}
|
|
1376
1377
|
_getCategoryKey(category, channel) {
|
|
1377
1378
|
const categoryMap = this.state.categoryMap[channel];
|
package/dist/index.cjs
CHANGED
|
@@ -565,7 +565,7 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
|
|
|
565
565
|
if (attributeManager == null ? void 0 : attributeManager.attributes.filterCategoryValues) {
|
|
566
566
|
const categoryBitMaskNeedsUpdate = attributeManager.attributes.filterCategoryValues.needsUpdate() || !(0, import_core3._deepEqual)(props.filterCategories, oldProps.filterCategories, 2);
|
|
567
567
|
if (categoryBitMaskNeedsUpdate) {
|
|
568
|
-
this.setState({
|
|
568
|
+
this.setState({ categoryBitMask: null });
|
|
569
569
|
}
|
|
570
570
|
const resetCategories = changeFlags.dataChanged;
|
|
571
571
|
if (resetCategories) {
|
|
@@ -580,11 +580,11 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
|
|
|
580
580
|
const filterFBO = this.state.filterFBO;
|
|
581
581
|
const filterModel = this.state.filterModel;
|
|
582
582
|
const filterNeedsUpdate = this.state.filterNeedsUpdate;
|
|
583
|
-
const categoryBitMaskNeedsUpdate = this.state.categoryBitMaskNeedsUpdate;
|
|
584
583
|
const { onFilteredItemsChange } = this.props;
|
|
585
|
-
if (
|
|
584
|
+
if (!this.state.categoryBitMask) {
|
|
586
585
|
extension._updateCategoryBitMask.call(this, params, extension);
|
|
587
586
|
}
|
|
587
|
+
params.uniforms.filter_categoryBitMask = this.state.categoryBitMask;
|
|
588
588
|
if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {
|
|
589
589
|
const { attributes: { filterValues, filterCategoryValues, filterIndices } } = this.getAttributeManager();
|
|
590
590
|
filterModel.setVertexCount(this.getNumInstances());
|
|
@@ -620,6 +620,8 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
|
|
|
620
620
|
}
|
|
621
621
|
_updateCategoryBitMask(params, extension) {
|
|
622
622
|
const { categorySize } = extension.opts;
|
|
623
|
+
if (!categorySize)
|
|
624
|
+
return;
|
|
623
625
|
const { filterCategories } = this.props;
|
|
624
626
|
const categoryBitMask = new Uint32Array([0, 0, 0, 0]);
|
|
625
627
|
const categoryFilters = categorySize === 1 ? [filterCategories] : filterCategories;
|
|
@@ -636,8 +638,7 @@ var _DataFilterExtension = class extends import_core3.LayerExtension {
|
|
|
636
638
|
}
|
|
637
639
|
}
|
|
638
640
|
}
|
|
639
|
-
|
|
640
|
-
this.state.categoryBitMaskNeedsUpdate = false;
|
|
641
|
+
this.state.categoryBitMask = categoryBitMask;
|
|
641
642
|
}
|
|
642
643
|
_getCategoryKey(category, channel) {
|
|
643
644
|
const categoryMap = this.state.categoryMap[channel];
|