Add “zoomControl” and “attributionControl” to visual option settings

grafana-toolbox · Apr 20, 2019 · 0e476d0 · 0e476d0
1 parent f73bb50
commit 0e476d0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/partials/editor.html b/src/partials/editor.html
@@ -48,6 +48,8 @@ <h5 class="section-heading">Map Visual Options</h5>
         ng-change="ctrl.render()" ng-model-onblur />
     </div>
     <gf-form-switch class="gf-form" label="Show Legend" label-class="width-10" checked="ctrl.panel.showLegend" on-change="ctrl.toggleLegend()"></gf-form-switch>
+    <gf-form-switch class="gf-form" label="Show Zoom Control" label-class="width-10" checked="ctrl.panel.showZoomControl" on-change="ctrl.toggleZoomControl()"></gf-form-switch>
+    <gf-form-switch class="gf-form" label="Show Attribution" label-class="width-10" checked="ctrl.panel.showAttribution" on-change="ctrl.toggleAttribution()"></gf-form-switch>
     <gf-form-switch class="gf-form" label="Mouse Wheel Zoom" label-class="width-10" checked="ctrl.panel.mouseWheelZoom" on-change="ctrl.toggleMouseWheelZoom()"></gf-form-switch>
   </div>
   <div class="section gf-form-group">

diff --git a/src/worldmap.ts b/src/worldmap.ts
@@ -43,6 +43,8 @@ export default class WorldMap {
       preferCanvas: true,
       center: mapCenter,
       zoom: parseInt(this.ctrl.panel.initialZoom, 10) || 1,
+      zoomControl: this.ctrl.panel.showZoomControl,
+      attributionControl: this.ctrl.panel.showAttribution,
     });
     this.setMouseWheelZoom();
 

diff --git a/src/worldmap_ctrl.ts b/src/worldmap_ctrl.ts
@@ -27,6 +27,8 @@ const panelDefaults = {
   unitSingle: "",
   unitPlural: "",
   showLegend: true,
+  showZoomControl: true,
+  showAttribution: true,
   mouseWheelZoom: false,
   esMetric: "Count",
   decimals: 0,
@@ -166,9 +168,7 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
   }
 
   onPanelTeardown() {
-    if (this.map) {
-      this.map.remove();
-    }
+    this.teardownMap();
   }
 
   onInitEditMode() {
@@ -250,13 +250,30 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
     this.map.setZoom(this.panel.initialZoom || 1);
   }
 
+  teardownMap() {
+    if (this.map) {
+      this.map.remove();
+      this.map = null;
+    }
+  }
+
   toggleLegend() {
     if (!this.panel.showLegend) {
       this.map.removeLegend();
     }
     this.render();
   }
 
+  toggleZoomControl() {
+    this.teardownMap();
+    this.render();
+  }
+
+  toggleAttribution() {
+    this.teardownMap();
+    this.render();
+  }
+
   toggleMouseWheelZoom() {
     this.map.setMouseWheelZoom();
     this.render();