Closes #128. Fixes merge conflict

Author: daniellee

dist/data_formatter.js

@@ -57,6 +57,10 @@ <h5 class="section-heading">Map Data Options</h5>
 			<label class="gf-form-label width-12">Table Label Field</label>
 			<input type="text" class="input-small gf-form-input width-10" ng-model="ctrl.panel.tableLabel" ng-change="ctrl.refresh()" ng-model-onblur />
 		</div>
+		<div class="gf-form" ng-show="ctrl.panel.locationData === 'table'">
+			<label class="gf-form-label width-12">Geohash Field</label>
+			<input type="text" class="input-small gf-form-input width-10" ng-model="ctrl.panel.tableGeohash" ng-change="ctrl.refresh()" ng-model-onblur />
+		</div>
 		<div class="gf-form" ng-show="ctrl.panel.locationData === 'geohash'">
 			<label class="gf-form-label width-12">ES Metric Field</label>
 			<input type="text" class="input-small gf-form-input width-10" ng-model="ctrl.panel.esMetric" ng-change="ctrl.refresh()" ng-model-onblur />

dist/data_formatter.js.map

@@ -147,8 +147,8 @@ export default class DataFormatter {
         let longitude = datapoint.longitude;
         let key = `${latitude}_${longitude}`;
 
-        if (datapoint.geohash) {
-          const encodedGeohash = datapoint.geohash;
+        if (datapoint[this.ctrl.panel.tableGeohash]) {
+          const encodedGeohash = datapoint[this.ctrl.panel.tableGeohash];
           const decodedGeohash = decodeGeoHash(encodedGeohash);
 
           latitude = decodedGeohash.latitude;
@@ -157,6 +157,7 @@ export default class DataFormatter {
           key = encodedGeohash;
         }
 
+
         const dataValue = {
           key: key,
           locationName: datapoint[this.ctrl.panel.tableLabel] || 'n/a',

dist/partials/editor.html

@@ -57,6 +57,10 @@ <h5 class="section-heading">Map Data Options</h5>
 			<label class="gf-form-label width-12">Table Label Field</label>
 			<input type="text" class="input-small gf-form-input width-10" ng-model="ctrl.panel.tableLabel" ng-change="ctrl.refresh()" ng-model-onblur />
 		</div>
+		<div class="gf-form" ng-show="ctrl.panel.locationData === 'table'">
+			<label class="gf-form-label width-12">Geohash Field</label>
+			<input type="text" class="input-small gf-form-input width-10" ng-model="ctrl.panel.tableGeohash" ng-change="ctrl.refresh()" ng-model-onblur />
+		</div>
 		<div class="gf-form" ng-show="ctrl.panel.locationData === 'geohash'">
 			<label class="gf-form-label width-12">ES Metric Field</label>
 			<input type="text" class="input-small gf-form-input width-10" ng-model="ctrl.panel.esMetric" ng-change="ctrl.refresh()" ng-model-onblur />

dist/worldmap_ctrl.js

@@ -28,7 +28,8 @@ const panelDefaults = {
   decimals: 0,
   hideEmpty: false,
   hideZero: false,
-  stickyLabels: false
+  stickyLabels: false,
+  tableGeohash: 'geohash'
 };
 
 const mapCenters = {