Merge pull request #1 from KWMSys/feature/implement_rainrecorder

Implement rain recorder support
KWMSys · Apr 26, 2021 · 973e5f0 · 973e5f0
2 parents e2064dc + 8b36b55
commit 973e5f0
Show file tree

Hide file tree

Showing 10 changed files with 25,213 additions and 298 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/__mocks__/grafana/app/core/utils/kbn.ts b/src/__mocks__/grafana/app/core/utils/kbn.ts
@@ -1,6 +1,6 @@
 const kbn: any = {};
 
-kbn.regexEscape = value => {
+kbn.regexEscape = (value) => {
   return value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&');
 };
 

diff --git a/src/data_formatter.ts b/src/data_formatter.ts
@@ -10,10 +10,10 @@ export default class DataFormatter {
       let highestValue = 0;
       let lowestValue = Number.MAX_VALUE;
 
-      this.ctrl.series.forEach(serie => {
+      this.ctrl.series.forEach((serie) => {
         const lastPoint = _.last(serie.datapoints);
         const lastValue = _.isArray(lastPoint) ? lastPoint[0] : null;
-        const location = _.find(this.ctrl.locations, loc => {
+        const location = _.find(this.ctrl.locations, (loc) => {
           return loc.key.toUpperCase() === serie.alias.toUpperCase();
         });
         const timestamp = _.isArray(lastPoint) ? lastPoint[1] : null;
@@ -53,8 +53,8 @@ export default class DataFormatter {
 
       // Add data which are not in series
       Object.keys(this.ctrl.store)
-        .filter(x => this.ctrl.store.hasOwnProperty(x) && data.find(y => y.key === x) == null)
-        .map(x => {
+        .filter((x) => this.ctrl.store.hasOwnProperty(x) && data.find((y) => y.key === x) == null)
+        .map((x) => {
           console.log('Fill data');
           data.push(this.ctrl.store[x].data);
         });
@@ -99,15 +99,15 @@ export default class DataFormatter {
       let highestValue = 0;
       let lowestValue = Number.MAX_VALUE;
 
-      dataList.forEach(result => {
+      dataList.forEach((result) => {
         if (result.type === 'table') {
           const columnNames = {};
 
           result.columns.forEach((column, columnIndex) => {
             columnNames[column.text] = columnIndex;
           });
 
-          result.rows.forEach(row => {
+          result.rows.forEach((row) => {
             const encodedGeohash = row[columnNames[this.ctrl.panel.esGeoPoint]];
             const decodedGeohash = decodeGeoHash(encodedGeohash);
             const locationName = this.ctrl.panel.esLocationName
@@ -131,7 +131,7 @@ export default class DataFormatter {
           data.lowestValue = lowestValue;
           data.valueRange = highestValue - lowestValue;
         } else {
-          result.datapoints.forEach(datapoint => {
+          result.datapoints.forEach((datapoint) => {
             const encodedGeohash = datapoint[this.ctrl.panel.esGeoPoint];
             const decodedGeohash = decodeGeoHash(encodedGeohash);
             const locationName = this.ctrl.panel.esLocationName
@@ -167,7 +167,7 @@ export default class DataFormatter {
         columnNames[columnIndex] = column.text;
       });
 
-      tableData.rows.forEach(row => {
+      tableData.rows.forEach((row) => {
         const datapoint = {};
 
         row.forEach((value, columnIndex) => {
@@ -187,7 +187,7 @@ export default class DataFormatter {
       let highestValue = 0;
       let lowestValue = Number.MAX_VALUE;
 
-      tableData[0].forEach(datapoint => {
+      tableData[0].forEach((datapoint) => {
         let key;
         let longitude;
         let latitude;
@@ -238,7 +238,7 @@ export default class DataFormatter {
       let highestValue = 0;
       let lowestValue = Number.MAX_VALUE;
 
-      this.ctrl.series.forEach(point => {
+      this.ctrl.series.forEach((point) => {
         const dataValue = {
           key: point.key,
           locationName: point.name,

diff --git a/src/geohash.ts b/src/geohash.ts
@@ -13,9 +13,9 @@ export default function decodeGeoHash(geohash) {
   lon[1] = 180.0;
   let base32Decoded;
 
-  geohash.split('').forEach(item => {
+  geohash.split('').forEach((item) => {
     base32Decoded = BASE32.indexOf(item);
-    BITS.forEach(mask => {
+    BITS.forEach((mask) => {
       if (isEven) {
         refineInterval(lon, base32Decoded, mask);
       } else {

diff --git a/src/partials/editor.html b/src/partials/editor.html
diff --git a/src/plugin.json b/src/plugin.json
@@ -1,34 +1,34 @@
 {
-  "type": "panel",
-  "name": "Worldmap Panel",
-  "id": "grafana-worldmap-panel",
+    "type": "panel",
+    "name": "Worldmap Panel Ultimate",
+    "id": "grafana-worldmap-panel-ultimate",
 
-  "info": {
-    "description": "World Map panel for Grafana. Displays time series data or geohash data from Elasticsearch overlaid on a world map.",
-    "author": {
-      "name": "Grafana Labs",
-      "url": "https://grafana.com"
+    "info": {
+        "description": "World Map panel for Grafana. Displays time series data or geohash data from Elasticsearch overlaid on a world map.",
+        "author": {
+            "name": "Grafana Labs",
+            "url": "https://grafana.com"
+        },
+        "keywords": ["worldmap", "panel"],
+        "logos": {
+            "small": "images/worldmap_logo.svg",
+            "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" }
+        ],
+        "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",
+        "updated": "Fri May 15 14:40:24 MDT 2020"
     },
-    "keywords": ["worldmap", "panel"],
-    "logos": {
-      "small": "images/worldmap_logo.svg",
-      "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"}
-    ],
-    "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",
-    "updated": "Fri May 15 14:40:24 MDT 2020"
-  },
 
-  "dependencies": {
-    "grafanaVersion": "3.x.x",
-    "plugins": [ ]
-  }
-}
+    "dependencies": {
+        "grafanaVersion": "3.x.x",
+        "plugins": []
+    }
+}
diff --git a/src/plugin.json.tmpl b/src/plugin.json.tmpl
@@ -1,34 +1,34 @@
 {
-  "type": "panel",
-  "name": "Worldmap Panel",
-  "id": "grafana-worldmap-panel",
+    "type": "panel",
+    "name": "Worldmap Panel Ultimate",
+    "id": "grafana-worldmap-panel-ultimate",
 
-  "info": {
-    "description": "World Map panel for Grafana. Displays time series data or geohash data from Elasticsearch overlaid on a world map.",
-    "author": {
-      "name": "Grafana Labs",
-      "url": "https://grafana.com"
+    "info": {
+        "description": "World Map panel for Grafana. Displays time series data or geohash data from Elasticsearch overlaid on a world map.",
+        "author": {
+            "name": "Grafana Labs",
+            "url": "https://grafana.com"
+        },
+        "keywords": ["worldmap", "panel"],
+        "logos": {
+            "small": "images/worldmap_logo.svg",
+            "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" }
+        ],
+        "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",
+        "updated": "Fri May 15 14:40:24 MDT 2020"
     },
-    "keywords": ["worldmap", "panel"],
-    "logos": {
-      "small": "images/worldmap_logo.svg",
-      "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"}
-    ],
-    "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": "%VERSION%",
-    "updated": "%TODAY%"
-  },
 
-  "dependencies": {
-    "grafanaVersion": "3.x.x",
-    "plugins": [ ]
-  }
-}
+    "dependencies": {
+        "grafanaVersion": "3.x.x",
+        "plugins": []
+    }
+}
diff --git a/src/worldmap.test.ts b/src/worldmap.test.ts
@@ -18,10 +18,7 @@ describe('Worldmap', () => {
 
   describe('when the data has one point', () => {
     beforeEach(() => {
-      ctrl.data = new DataBuilder()
-        .withCountryAndValue('SE', 1)
-        .withDataRange(1, 1, 0)
-        .build();
+      ctrl.data = new DataBuilder().withCountryAndValue('SE', 1).withDataRange(1, 1, 0).build();
       ctrl.panel.circleMaxSize = '10';
       worldMap.drawCircles();
     });