Merge e3718d3 into 9a47ac9

Author: eduelias

src/worldmap.test.ts

@@ -424,4 +424,33 @@ describe('Worldmap', () => {
       expect(worldMap.circles[2]._popup._content).toBe(`United States: ${HIGH}`);
     });
   });
+
+  describe('when variables have M or K', () => {
+    beforeEach(() => {
+      setupWorldmapFixture();
+    })
+    it('shouldnt break if only numbers are added', () => {
+      const input = '1000';
+      const output = worldMap.replaceThousandsAndMillions(input);
+      expect(output).toEqual(input);
+    });
+    it('should replace K with 1000', () => {
+      const input = '1k';
+      const output = worldMap.replaceThousandsAndMillions(input);
+      expect(output).not.toEqual(input);
+      expect(output).toEqual('1000');
+    })
+    it('should replace M with 1000000', () => {
+      const input = '1m';
+      const output = worldMap.replaceThousandsAndMillions(input);
+      expect(output).not.toEqual(input);
+      expect(output).toEqual('1000000');
+    })
+    it('should replace Ks,Ms correctly', () => {
+      const input = '1km';
+      const output = worldMap.replaceThousandsAndMillions(input);
+      expect(output).not.toEqual(input);
+      expect(output).toEqual('1000000000');
+    })
+  });
 });

src/worldmap.ts

@@ -121,9 +121,18 @@ export default class WorldMap {
     this.valueRange = this.highestValue - this.lowestValue;
   }
 
+  replaceThousandsAndMillions(value) {
+    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')));
+    console.log(minValue, maxValue);
     return _.filter(data, o => {
       return !(this.ctrl.panel.hideEmpty && _.isNil(o.value)) 
           && !(this.ctrl.panel.hideZero && o.value === 0)