Merging and regenerating dist

Author: LostInBrittany

CHANGELOG.md

@@ -77,3 +77,7 @@
 
 - Fixes some coordinates in the country location data.
 - Last Geohash as center for the map - it centers the map on the last geohash position received. Useful for real time tracking (with auto refresh on in Grafana).
+
+## v0.0.19
+
+Fix for Elasticsearch geohash maps after breaking change in Grafana 4.5.

dist/CHANGELOG.md

@@ -77,3 +77,7 @@
 
 - Fixes some coordinates in the country location data.
 - Last Geohash as center for the map - it centers the map on the last geohash position received. Useful for real time tracking (with auto refresh on in Grafana).
+
+## v0.0.19
+
+Fix for Elasticsearch geohash maps after breaking change in Grafana 4.5.

dist/data_formatter.js

@@ -23,8 +23,8 @@
       {"name": "USA", "path": "images/worldmap-usa.png"},
       {"name": "Light Theme", "path": "images/worldmap-light-theme.png"}
     ],
-    "version": "0.0.18",
-    "updated": "2017-10-10"
+    "version": "0.0.19",
+    "updated": "2017-10-11"
   },
 
   "dependencies": {

dist/data_formatter.js.map

@@ -46,37 +46,69 @@ export default class DataFormatter {
     }
   }
 
+  createDataValue(encodedGeohash, decodedGeohash, locationName, value, highestValue, lowestValue) {
+    const dataValue = {
+      key: encodedGeohash,
+      locationName: locationName,
+      locationLatitude: decodedGeohash.latitude,
+      locationLongitude: decodedGeohash.longitude,
+      value: value,
+      valueFormatted: value,
+      valueRounded: 0
+    };
+
+    dataValue.valueRounded = this.kbn.roundValue(dataValue.value, this.ctrl.panel.decimals || 0);
+    return dataValue;
+  }
+
   setGeohashValues(dataList, data) {
     if (!this.ctrl.panel.esGeoPoint || !this.ctrl.panel.esMetric) return;
 
     if (dataList && dataList.length > 0) {
       let highestValue = 0;
       let lowestValue = Number.MAX_VALUE;
 
-      dataList[0].datapoints.forEach((datapoint) => {
-        const encodedGeohash = datapoint[this.ctrl.panel.esGeoPoint];
-        const decodedGeohash = decodeGeoHash(encodedGeohash);
-
-        const dataValue = {
-          key: encodedGeohash,
-          locationName: this.ctrl.panel.esLocationName ? datapoint[this.ctrl.panel.esLocationName] : encodedGeohash,
-          locationLatitude: decodedGeohash.latitude,
-          locationLongitude: decodedGeohash.longitude,
-          value: datapoint[this.ctrl.panel.esMetric],
-          valueFormatted: datapoint[this.ctrl.panel.esMetric],
-          valueRounded: 0
-        };
-
-        if (dataValue.value > highestValue) highestValue = dataValue.value;
-        if (dataValue.value < lowestValue) lowestValue = dataValue.value;
-
-        dataValue.valueRounded = this.kbn.roundValue(dataValue.value, this.ctrl.panel.decimals || 0);
-        data.push(dataValue);
+      dataList.forEach((result) => {
+        if (result.type === 'table') {
+          const columnNames = {};
+
+          result.columns.forEach((column, columnIndex) => {
+            columnNames[column.text] = columnIndex;
+          });
+
+          result.rows.forEach((row) => {
+            const encodedGeohash = row[columnNames[this.ctrl.panel.esGeoPoint]];
+            const decodedGeohash = decodeGeoHash(encodedGeohash);
+            const locationName = this.ctrl.panel.esLocationName ? row[columnNames[this.ctrl.panel.esLocationName]] : encodedGeohash;
+            const value = row[columnNames[this.ctrl.panel.esMetric]];
+
+            const dataValue = this.createDataValue(encodedGeohash, decodedGeohash, locationName, value, highestValue, lowestValue);
+            if (dataValue.value > highestValue) highestValue = dataValue.value;
+            if (dataValue.value < lowestValue) lowestValue = dataValue.value;
+            data.push(dataValue);
+          });
+
+          data.highestValue = highestValue;
+          data.lowestValue = lowestValue;
+          data.valueRange = highestValue - lowestValue;
+        } else {
+          result.forEach((datapoint) => {
+            const encodedGeohash = datapoint[this.ctrl.panel.esGeoPoint];
+            const decodedGeohash = decodeGeoHash(encodedGeohash);
+            const locationName = this.ctrl.panel.esLocationName ? datapoint[this.ctrl.panel.esLocationName] : encodedGeohash;
+            const value =  datapoint[this.ctrl.panel.esMetric];
+
+            const dataValue = this.createDataValue(encodedGeohash, decodedGeohash, locationName, value, highestValue, lowestValue);
+            if (dataValue.value > highestValue) highestValue = dataValue.value;
+            if (dataValue.value < lowestValue) lowestValue = dataValue.value;
+            data.push(dataValue);
+          });
+
+          data.highestValue = highestValue;
+          data.lowestValue = lowestValue;
+          data.valueRange = highestValue - lowestValue;
+        }
       });
-
-      data.highestValue = highestValue;
-      data.lowestValue = lowestValue;
-      data.valueRange = highestValue - lowestValue;
     }
   }
 

dist/plugin.json

@@ -23,8 +23,8 @@
       {"name": "USA", "path": "images/worldmap-usa.png"},
       {"name": "Light Theme", "path": "images/worldmap-light-theme.png"}
     ],
-    "version": "0.0.18",
-    "updated": "2017-10-10"
+    "version": "0.0.19",
+    "updated": "2017-10-11"
   },
 
   "dependencies": {