+ The query should be formatted as time series data. + The time series (group by) name should be a 2-letter country code with optional region code. + For example: CN_Beijing or CN-BJ for Beijing in China.
+diff --git a/src/worldmap.test.ts b/src/worldmap.test.ts index 58008d1..0318ab4 100644 --- a/src/worldmap.test.ts +++ b/src/worldmap.test.ts @@ -27,6 +27,19 @@ describe('Worldmap', () => { }); }); + describe('when the data value is too big', () => { + it('should keep 4 significant digits and append k,M,G etc', () => { + expect(worldMap.addUnit(123)).toBe(123); + expect(worldMap.addUnit(1234)).toBe('1.234k'); + expect(worldMap.addUnit(12345)).toBe('12.35k'); + expect(worldMap.addUnit(123456789)).toBe('123.5M'); + expect(worldMap.addUnit(643456343745345642)).toBe('643.5P'); + expect(worldMap.addUnit(7653643456343745345642)).toBe('7.654Z'); + expect(worldMap.addUnit(999999653643456343745345642)).toBe('1000Y'); + expect(worldMap.addUnit(79999999653643456343745345642)).toBe('80000Y'); + }); + }); + describe('when the data has one point', () => { beforeEach(() => { ctrl.data = new DataBuilder() @@ -161,7 +174,7 @@ describe('Worldmap', () => { }); it('should create a circle with circle size 6 for mid value size', () => { - expect(worldMap.circles[1].options.radius).toBe(6); + expect(worldMap.circles[1].options.radius).toBe(Math.sqrt(52)); }); it('should create a circle with max circle size for largest value size', () => { diff --git a/src/worldmap.ts b/src/worldmap.ts index 18aa96f..e820aa8 100644 --- a/src/worldmap.ts +++ b/src/worldmap.ts @@ -347,9 +347,27 @@ export default class WorldMap { } const dataFactor = (dataPointValue - this.ctrl.data.lowestValue) / this.ctrl.data.valueRange; - const circleSizeRange = circleMaxSize - circleMinSize; + const circleSizeRange = (circleMaxSize - circleMinSize) * (circleMaxSize + circleMinSize); - return circleSizeRange * dataFactor + circleMinSize; + return Math.sqrt(circleSizeRange * dataFactor + circleMinSize * circleMinSize); + } + + addUnit(n) { + const Units = 'kMGTPEZY'; + let e = -1; + while (n >= 1000 && e < Units.length - 1) { + n = Math.round(n) / 1000; + e++; + } + if (n >= 100) { + n = Math.round(n * 10) / 10; + } else if (n >= 10) { + n = Math.round(n * 100) / 100; + } + if (e >= 0) { + n += Units.charAt(e); + } + return n; } createClickthrough(circle, dataPoint) { @@ -432,7 +450,7 @@ export default class WorldMap { if (this.ctrl.settings.formatOmitEmptyValue && value === 'n/a') { return `${locationName}`.trim(); } else { - return `${locationName}: ${value} ${unit || ''}`.trim(); + return `${locationName}: ${this.addUnit(value)} ${unit || ''}`.trim(); } }