Merge 68f9a73 into 9a47ac9

Author: eduelias

src/worldmap.test.ts

@@ -424,4 +424,52 @@ describe('Worldmap', () => {
       expect(worldMap.circles[2]._popup._content).toBe(`United States: ${HIGH}`);
     });
   });
+
+  describe('when variables have M or K', () => {
+    beforeEach(() => {
+      setupWorldmapFixture();
+    })
+
+    const getValidData = (): Array < [string, {
+      providedInput: string,
+      expectedOutput: string
+    }] > => {
+        return [
+            ['no shortcuts', {
+                providedInput: '1000',
+                expectedOutput: '1000'
+            }],
+            ['only text', {
+                providedInput: 'Something',
+                expectedOutput: 'Something'
+            }],
+            ['one K shortcut', {
+                providedInput: '1k',
+                expectedOutput: '1000'
+            }],
+            ['one m shortcut', {
+                providedInput: '1m',
+                expectedOutput: '1000000'
+            }],
+            ['uppercase shortcuts', {
+                providedInput: '1K',
+                expectedOutput: '1000'
+            }],
+            ['mixed shortcuts', {
+                providedInput: '1Km',
+                expectedOutput: '1000000000'
+            }],
+        ]
+    }
+
+    test.each(getValidData())(
+      'Should parse variables when it have %s', (record: { providedInput: string, expectedOutput: string }) : void => {
+        // Act
+        const actual = worldMap.replaceThousandsAndMillions(record.providedInput);
+
+        // Assert
+        expect(actual).toEqual(record.providedInput);
+      }
+    )
+  });
 });

src/worldmap.ts

@@ -121,9 +121,17 @@ export default class WorldMap {
     this.valueRange = this.highestValue - this.lowestValue;
   }
 
+  replaceThousandsAndMillions(value: string) : string {
+    if (!value || !value.match(/\d+[k|m]+/gi)){
+      return value
+    }
+    value = value.replace(/k/gi, '000').replace(/m/ig,'000000')
+    return value;
+  }
+
   filterEmptyAndZeroValues(data) {
-    const minValue = this.ctrl.panel.minValue || parseInt(this.ctrl.panel.replaceVariables('$minDisplayValue'));
-    const maxValue = this.ctrl.panel.maxValue || parseInt(this.ctrl.panel.replaceVariables('$maxDisplayValue'));
+    const minValue = this.ctrl.panel.minValue || parseInt(this.replaceThousandsAndMillions(this.ctrl.panel.replaceVariables('$minDisplayValue')));
+    const maxValue = this.ctrl.panel.maxValue || parseInt(this.replaceThousandsAndMillions(this.ctrl.panel.replaceVariables('$maxDisplayValue')));
     return _.filter(data, o => {
       return !(this.ctrl.panel.hideEmpty && _.isNil(o.value)) 
           && !(this.ctrl.panel.hideZero && o.value === 0)