Merge fe61eda into ce6bf9e

HBOCodeLabs · Nov 5, 2021 · bc1f6bd · bc1f6bd
2 parents ce6bf9e + fe61eda
commit bc1f6bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/worldmap.test.ts b/src/worldmap.test.ts
@@ -370,6 +370,7 @@ describe('Worldmap', () => {
         mapCenterLongitude: 0,
         initialZoom: 1,
         colors: ['red', 'blue', 'green'],
+        replaceVariables: (interpolation: string) => {}
       },
       tileServer: 'CartoDB Positron',
     };

diff --git a/src/worldmap.ts b/src/worldmap.ts
@@ -122,13 +122,15 @@ export default class WorldMap {
   }
 
   filterEmptyAndZeroValues(data) {
-    const minValue = this.ctrl.panel.minValue;
-    const maxValue = this.ctrl.panel.maxValue;
+    const minValue = this.ctrl.panel.minValue || parseInt(this.ctrl.panel.replaceVariables('$minDisplayValue'));
+    const maxValue = this.ctrl.panel.maxValue || parseInt(this.ctrl.panel.replaceVariables('$maxDisplayValue'));
     return _.filter(data, o => {
       return !(this.ctrl.panel.hideEmpty && _.isNil(o.value)) 
           && !(this.ctrl.panel.hideZero && o.value === 0)
-          && ([undefined, ''].includes(minValue) || o.value >= minValue)
-          && ([undefined, ''].includes(maxValue) || o.value <= maxValue)
+          // The result of parseInt in case of "No Limit" or any other numberless string will be a NaN. 
+          // In that case all "not numbers" should invalidate the filter and be ignored.
+          && ([undefined, NaN, 0, ''].includes(minValue) || o.value >= minValue)
+          && ([undefined, NaN, ''].includes(maxValue) || o.value <= maxValue)
     });
   }