fix merge conflict

Author: daniellee

README.md

@@ -92,6 +92,15 @@ Similar to the Elasticsearch query above, 3 fields are expected (2 of them are m
 
 ![Example influxdb query](https://cloud.githubusercontent.com/assets/434655/16535977/8cd520be-3fec-11e6-8dc9-2ecf7b16ad5f.png)
 
+## JSON result as the Data Source
+
+
+Supported Databases: 
+
+- Warp 10 via [grafana-warp10-datasource](https://github.com/cityzendata/grafana-warp10) plugin  
+
+It supports any datasource capable of generating a JSON response with a  a custom list of locations (the same format that for the JSON enpoint).
+
 ### Map Visual Option Settings
 
 **Center**

dist/README.md

@@ -92,6 +92,15 @@ Similar to the Elasticsearch query above, 3 fields are expected (2 of them are m
 
 ![Example influxdb query](https://cloud.githubusercontent.com/assets/434655/16535977/8cd520be-3fec-11e6-8dc9-2ecf7b16ad5f.png)
 
+## JSON result as the Data Source
+
+
+Supported Databases: 
+
+- Warp 10 via [grafana-warp10-datasource](https://github.com/cityzendata/grafana-warp10) plugin  
+
+It supports any datasource capable of generating a JSON response with a  a custom list of locations (the same format that for the JSON enpoint).
+
 ### Map Visual Option Settings
 
 **Center**

dist/data_formatter.js

@@ -45,7 +45,7 @@ <h5 class="section-heading">Map Data Options</h5>
 		<div class="gf-form">
 			<label class="gf-form-label width-12">Location Data</label>
 			<div class="gf-form-select-wrapper max-width-10">
-				<select class="input-small gf-form-input" ng-model="ctrl.panel.locationData" ng-options="t for t in ['countries', 'countries_3letter', 'states', 'probes', 'geohash', 'json endpoint', 'jsonp endpoint', 'table']" ng-change="ctrl.changeLocationData()"></select>
+				<select class="input-small gf-form-input" ng-model="ctrl.panel.locationData" ng-options="t for t in ['countries', 'countries_3letter', 'states', 'probes', 'geohash', 'json endpoint', 'jsonp endpoint', 'json result', 'table']" ng-change="ctrl.changeLocationData()"></select>
 			</div>
 		</div>
 		<div class="gf-form" ng-show="ctrl.panel.locationData !== 'geohash'">

dist/data_formatter.js.map

@@ -172,4 +172,30 @@ export default class DataFormatter {
       data.valueRange = highestValue - lowestValue;
     }
   }
+
+  setJsonValues(data) {
+    if (this.ctrl.series && this.ctrl.series.length > 0) {
+      let highestValue = 0;
+      let lowestValue = Number.MAX_VALUE;
+
+      this.ctrl.series.forEach((point) => {
+        const dataValue = {
+          key: point.key,
+          locationName: point.name,
+          locationLatitude: point.latitude,
+          locationLongitude: point.longitude,
+          value: (point.value !== undefined) ? point.value : 1,
+          valueRounded: 0
+        };
+        if (dataValue.value > highestValue) highestValue = dataValue.value;
+        if (dataValue.value < lowestValue) lowestValue = dataValue.value;
+        dataValue.valueRounded = Math.round(dataValue.value);
+        data.push(dataValue);
+      });
+      data.highestValue = highestValue;
+      data.lowestValue = lowestValue;
+      data.valueRange = highestValue - lowestValue;
+    }
+  }
 }
+

dist/partials/editor.html

@@ -45,7 +45,7 @@ <h5 class="section-heading">Map Data Options</h5>
 		<div class="gf-form">
 			<label class="gf-form-label width-12">Location Data</label>
 			<div class="gf-form-select-wrapper max-width-10">
-				<select class="input-small gf-form-input" ng-model="ctrl.panel.locationData" ng-options="t for t in ['countries', 'countries_3letter', 'states', 'probes', 'geohash', 'json endpoint', 'jsonp endpoint', 'table']" ng-change="ctrl.changeLocationData()"></select>
+				<select class="input-small gf-form-input" ng-model="ctrl.panel.locationData" ng-options="t for t in ['countries', 'countries_3letter', 'states', 'probes', 'geohash', 'json endpoint', 'jsonp endpoint', 'json result', 'table']" ng-change="ctrl.changeLocationData()"></select>
 			</div>
 		</div>
 		<div class="gf-form" ng-show="ctrl.panel.locationData !== 'geohash'">

dist/worldmap_ctrl.js

@@ -100,7 +100,7 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
       });
     } else if (this.panel.locationData === 'table') {
       // .. Do nothing
-    } else if (this.panel.locationData !== 'geohash') {
+    } else if (this.panel.locationData !== 'geohash' && this.panel.locationData !== 'json result') {
       window.$.getJSON('public/plugins/grafana-worldmap-panel/data/' + this.panel.locationData + '.json')
         .then(this.reloadLocations.bind(this));
     }
@@ -133,6 +133,9 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
     } else if (this.panel.locationData === 'table') {
       const tableData = dataList.map(DataFormatter.tableHandler.bind(this));
       this.dataFormatter.setTableValues(tableData, data);
+    } else if (this.panel.locationData === 'json result') {
+      this.series = dataList;
+      this.dataFormatter.setJsonValues(data);
     } else {
       this.series = dataList.map(this.seriesHandler.bind(this));
       this.dataFormatter.setValues(data);