Prop rename: filterData to _filterData

visgl · Dec 10, 2019 · 5752e1d · 5752e1d
1 parent 6d7f5fd
commit 5752e1d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/modules/aggregation-layers/src/cpu-grid-layer/cpu-grid-layer.js b/modules/aggregation-layers/src/cpu-grid-layer/cpu-grid-layer.js
@@ -66,7 +66,7 @@ const defaultProps = {
   material: defaultMaterial,
 
   // data filter
-  filterData: {type: 'function', value: null, optional: true}
+  _filterData: {type: 'function', value: null, optional: true}
 };
 
 export default class CPUGridLayer extends CompositeLayer {

diff --git a/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.js b/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.js
@@ -64,7 +64,7 @@ const defaultProps = {
   material: defaultMaterial,
 
   // data filter
-  filterData: {type: 'function', value: null, optional: true}
+  _filterData: {type: 'function', value: null, optional: true}
 };
 
 export default class HexagonLayer extends CompositeLayer {

diff --git a/modules/aggregation-layers/src/utils/cpu-aggregator.js b/modules/aggregation-layers/src/utils/cpu-aggregator.js
@@ -43,8 +43,8 @@ const defaultDimensions = [
           prop: 'colorAggregation'
         },
         filterData: {
-          prop: 'filterData',
-          updateTrigger: 'filterData'
+          prop: '_filterData',
+          updateTrigger: '_filterData'
         }
       }
     },
@@ -90,8 +90,8 @@ const defaultDimensions = [
           prop: 'elevationAggregation'
         },
         filterData: {
-          prop: 'filterData',
-          updateTrigger: 'filterData'
+          prop: '_filterData',
+          updateTrigger: '_filterData'
         }
       }
     },
@@ -378,7 +378,7 @@ export default class CPUAggregator {
 
     const sortedBins = new BinSorter(this.state.layerData.data || [], {
       getValue,
-      filterData: props.filterData
+      filterData: props._filterData
     });
     this.setDimensionState(key, {sortedBins});
     this.getDimensionValueDomain(props, dimensionUpdater);

diff --git a/test/modules/aggregation-layers/cpu-grid-layer/cpu-grid-layer.spec.js b/test/modules/aggregation-layers/cpu-grid-layer/cpu-grid-layer.spec.js
@@ -152,7 +152,7 @@ test('CPUGridLayer#updates', t => {
         }
       }
     };
-    return assertStateUpdate(shouldUpdate, 'filterData');
+    return assertStateUpdate(shouldUpdate, '_filterData');
   }
   function getChecksForPositionChange(triggerChange) {
     const shouldUpdate = {
@@ -331,7 +331,7 @@ test('CPUGridLayer#updates', t => {
       },
       {
         updateProps: {
-          filterData: pt => pt.SPACES >= 4 && pt.SPACES <= 10
+          _filterData: pt => pt.SPACES >= 4 && pt.SPACES <= 10
         },
         onAfterUpdate: ({layer, oldState}) => {
           getChecksForFilterChange(false)({layer, oldState});
@@ -344,9 +344,9 @@ test('CPUGridLayer#updates', t => {
       },
       {
         updateProps: {
-          filterData: pt => pt.SPACES >= 4 && pt.SPACES <= 10,
+          _filterData: pt => pt.SPACES >= 4 && pt.SPACES <= 10,
           updateTriggers: {
-            filterData: 1
+            _filterData: 1
           }
         },
         onAfterUpdate: ({layer, oldState}) => {
@@ -375,9 +375,9 @@ test('CPUGridLayer#updates', t => {
       },
       {
         updateProps: {
-          filterData: null,
+          _filterData: null,
           updateTriggers: {
-            filterData: 0
+            _filterData: 0
           }
         },
         onAfterUpdate: ({layer, oldState}) => {

diff --git a/test/modules/aggregation-layers/hexagon-layer.spec.js b/test/modules/aggregation-layers/hexagon-layer.spec.js
@@ -307,7 +307,7 @@ test('HexagonLayer#updateLayer', t => {
       },
       {
         updateProps: {
-          filterData: pt => pt.SPACES >= 4 && pt.SPACES <= 10
+          _filterData: pt => pt.SPACES >= 4 && pt.SPACES <= 10
         },
         onAfterUpdate: ({layer, oldState}) => {
           getChecksForFilterChange(false)({layer, oldState});
@@ -320,9 +320,9 @@ test('HexagonLayer#updateLayer', t => {
       },
       {
         updateProps: {
-          filterData: pt => pt.SPACES >= 4 && pt.SPACES <= 10,
+          _filterData: pt => pt.SPACES >= 4 && pt.SPACES <= 10,
           updateTriggers: {
-            filterData: 1
+            _filterData: 1
           }
         },
         onAfterUpdate: ({layer, oldState}) => {
@@ -351,9 +351,9 @@ test('HexagonLayer#updateLayer', t => {
       },
       {
         updateProps: {
-          filterData: null,
+          _filterData: null,
           updateTriggers: {
-            filterData: 0
+            _filterData: 0
           }
         },
         onAfterUpdate: ({layer, oldState}) => {