Fix "Fit to data" zooming

grafana-toolbox · Dec 12, 2019 · d63edbd · d63edbd
1 parent 7733744
commit d63edbd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## development
+- Fix "Fit to data" zooming (#25)
 
 
 ## v0.7.0

diff --git a/src/worldmap.ts b/src/worldmap.ts
@@ -337,6 +337,9 @@ export default class WorldMap {
   }
 
   panToMapCenter(options?: any) {
+
+    console.log('panToMapCenter');
+
     // Get a bunch of metadata from settings and data which
     // controls the map centering and zoom level.
     const mapDimensions = this.ctrl.settings.center;

diff --git a/src/worldmap_ctrl.ts b/src/worldmap_ctrl.ts
@@ -411,15 +411,16 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
 
       ctrl.map.resize();
 
-      if (ctrl.mapCenterMoved) {
-        ctrl.map.panToMapCenter();
-      }
-
       if (!ctrl.map.legend && ctrl.panel.showLegend) {
         ctrl.map.createLegend();
       }
 
       ctrl.map.drawCircles();
+
+      if (ctrl.mapCenterMoved) {
+        ctrl.map.panToMapCenter();
+      }
+
     }
   }