Merge pull request #1739 from knutfrode/dev

Dev

Author: knutfrode

opendrift/models/basemodel/__init__.py

@@ -2420,7 +2420,7 @@ def index_of_first_and_last(self):
 
     def set_up_map(self,
                    corners=None,
-                   buffer=.1,
+                   buffer='auto',
                    delta_lat=None,
                    lscale=None,
                    fast=False,
@@ -2461,6 +2461,9 @@ def set_up_map(self,
                 lonmax = np.nanmax(lons)
                 latmin = np.nanmin(lats)
                 latmax = np.nanmax(lats)
+            if buffer == 'auto':
+                buffer_fraction = 0.3  # 30% whitespace, to be updated
+                buffer = np.maximum((lonmax-lonmin)/2, latmax-latmin)*buffer_fraction
             lonmin = lonmin - buffer * 2
             lonmax = lonmax + buffer * 2
             latmin = latmin - buffer
@@ -2617,7 +2620,7 @@ def set_up_map(self,
 
 
     def animation(self,
-                  buffer=.2,
+                  buffer='auto',
                   corners=None,
                   filename=None,
                   compare=None,
@@ -3347,7 +3350,7 @@ def _get_comparison_xy_for_plots(self, compare):
 
     def plot(self,
              background=None,
-             buffer=.2,
+             buffer='auto',
              corners=None,
              linecolor=None,
              filename=None,

tests/plotting/test_norkyst.py

@@ -20,7 +20,7 @@ def test_fast_norkyst():
                     time=rn.start_time)
     o.run(steps=2)
 
-    return o.plot(fast=True)[1]
+    return o.plot(fast=True, buffer=.2)[1]
 
 
 @pytest.mark.slow
@@ -38,4 +38,4 @@ def test_norkyst():
                     time=rn.start_time)
     o.run(steps=2)
 
-    return o.plot(fast=False)[1]
+    return o.plot(fast=False, buffer=.2)[1]