The query should be formatted as Time Series data. The time series (group by) name should be a 3-letter country code. For example: USA for United States or FRA for France.
+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.
+The query should be formatted as Time Series data. The time series (group by) name should be a 2-letter US state code.
diff --git a/src/plugin.json b/src/plugin.json
index 1afa70a..afdf8a4 100644
--- a/src/plugin.json
+++ b/src/plugin.json
@@ -15,15 +15,15 @@
"large": "images/worldmap_logo.svg"
},
"links": [
- {"name": "Project site", "url": "https://github.com/grafana/worldmap-panel"},
- {"name": "MIT License", "url": "https://github.com/grafana/worldmap-panel/blob/master/LICENSE"}
+ {"name": "Project site", "url": "https://github.com/mileweb/worldmap-panel"},
+ {"name": "MIT License", "url": "https://github.com/mileweb/worldmap-panel/blob/master/LICENSE"}
],
"screenshots": [
{"name": "World", "path": "images/worldmap-world.png"},
{"name": "USA", "path": "images/worldmap-usa.png"},
{"name": "Light Theme", "path": "images/worldmap-light-theme.png"}
],
- "version": "1.0.1",
+ "version": "1.1.1",
"updated": "Fri May 15 14:40:24 MDT 2020"
},
diff --git a/src/worldmap.test.ts b/src/worldmap.test.ts
index c34d688..0fa1b42 100644
--- a/src/worldmap.test.ts
+++ b/src/worldmap.test.ts
@@ -117,7 +117,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 341f9a6..8ea7556 100644
--- a/src/worldmap.ts
+++ b/src/worldmap.ts
@@ -183,14 +183,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) {
+ 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;
}
createPopup(circle, locationName, value) {
const unit = value && value === 1 ? this.ctrl.panel.unitSingular : this.ctrl.panel.unitPlural;
- const label = (locationName + ': ' + value + ' ' + (unit || '')).trim();
+ const label = (locationName + ': ' + this.addUnit(value) + ' ' + (unit || '')).trim();
circle.bindPopup(label, {
offset: (