From 112a7e4840ae8c5d2ee50a67e22091f49b0716d9 Mon Sep 17 00:00:00 2001
From: mjmdavis <DavisMichael@JohnDeere.com>
Date: Mon, 5 Mar 2018 15:17:06 +0100
Subject: [PATCH 1/3] Recalculate map zoom after resizing.

---
 packages/geojson-extension/src/index.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/geojson-extension/src/index.tsx b/packages/geojson-extension/src/index.tsx
index 37c57b5bc..1bba51f9e 100644
--- a/packages/geojson-extension/src/index.tsx
+++ b/packages/geojson-extension/src/index.tsx
@@ -123,6 +123,7 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
     });
   }
   
+
   /**
    * A message handler invoked on an `'after-attach'` message.
    */
@@ -139,13 +140,19 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
         this._map.scrollWheelZoom.enable();
       });
     }
+    // Update map size after panel/window is resized
+    this._map.fitBounds(this._geoJSONLayer.getBounds());
     this.update();
   }
+
+
   
   /**
    * A message handler invoked on an `'after-show'` message.
    */
   protected onAfterShow(msg: Message): void {
+    // Update map size after panel/window is resized
+    this._map.fitBounds(this._geoJSONLayer.getBounds());
     this.update();
   }
     
@@ -153,6 +160,8 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
    * A message handler invoked on a `'resize'` message.
    */
   protected onResize(msg: Widget.ResizeMessage): void {
+    // Update map size after panel/window is resized
+    this._map.fitBounds(this._geoJSONLayer.getBounds());
     this.update();
   }
   
@@ -162,6 +171,8 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
   protected onUpdateRequest(msg: Message): void {
     // Update map size after update
     if (this.isVisible) this._map.invalidateSize();
+    // Update map size after panel/window is resized
+    this._map.fitBounds(this._geoJSONLayer.getBounds());
   }
 
   private _map: leaflet.Map;

From 20ecd81d5eb1100572b7f14d6769280f4d59c44c Mon Sep 17 00:00:00 2001
From: mjmdavis <DavisMichael@JohnDeere.com>
Date: Mon, 5 Mar 2018 15:19:41 +0100
Subject: [PATCH 2/3] Moved map resizing into update().

---
 packages/geojson-extension/src/index.tsx | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/geojson-extension/src/index.tsx b/packages/geojson-extension/src/index.tsx
index 1bba51f9e..688c85d06 100644
--- a/packages/geojson-extension/src/index.tsx
+++ b/packages/geojson-extension/src/index.tsx
@@ -116,8 +116,6 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
       ).addTo(this._map);
       // Create GeoJSON layer from data and add to map
       this._geoJSONLayer = leaflet.geoJSON(data).addTo(this._map);
-      // Update map size after panel/window is resized
-      this._map.fitBounds(this._geoJSONLayer.getBounds());
       this.update();
       resolve();
     });
@@ -140,8 +138,6 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
         this._map.scrollWheelZoom.enable();
       });
     }
-    // Update map size after panel/window is resized
-    this._map.fitBounds(this._geoJSONLayer.getBounds());
     this.update();
   }
 
@@ -151,8 +147,6 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
    * A message handler invoked on an `'after-show'` message.
    */
   protected onAfterShow(msg: Message): void {
-    // Update map size after panel/window is resized
-    this._map.fitBounds(this._geoJSONLayer.getBounds());
     this.update();
   }
     
@@ -160,8 +154,6 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
    * A message handler invoked on a `'resize'` message.
    */
   protected onResize(msg: Widget.ResizeMessage): void {
-    // Update map size after panel/window is resized
-    this._map.fitBounds(this._geoJSONLayer.getBounds());
     this.update();
   }
   

From 07e45af844695799b277b18a3fef0f86a0d2b945 Mon Sep 17 00:00:00 2001
From: mjmdavis <DavisMichael@JohnDeere.com>
Date: Mon, 5 Mar 2018 15:21:40 +0100
Subject: [PATCH 3/3] Cleaned up whitespace.

---
 packages/geojson-extension/src/index.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/geojson-extension/src/index.tsx b/packages/geojson-extension/src/index.tsx
index 688c85d06..918c318ad 100644
--- a/packages/geojson-extension/src/index.tsx
+++ b/packages/geojson-extension/src/index.tsx
@@ -121,7 +121,6 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
     });
   }
   
-
   /**
    * A message handler invoked on an `'after-attach'` message.
    */
@@ -140,8 +139,6 @@ class RenderedGeoJSON extends Widget implements IRenderMime.IRenderer {
     }
     this.update();
   }
-
-
   
   /**
    * A message handler invoked on an `'after-show'` message.