Merge pull request #1745 from knutfrode/dev

[run-ex] new parameter background_zorder for plot and animation metdo…

Author: knutfrode

opendrift/models/basemodel/__init__.py

@@ -2526,7 +2526,7 @@ def set_up_map(self,
                 land_color = 'gray'
             else:
                 land_color = cfeature.COLORS['land']
-        land_zorder = kwargs.pop('land_zorder', 10)
+        land_zorder = kwargs.pop('land_zorder', 1.5)
 
         if 'text' in kwargs:
             if not isinstance(kwargs['text'], list):
@@ -2677,6 +2677,8 @@ def animation(self,
                 compare)
             kwargs.update(compare_args)
 
+        background_zorder = kwargs.pop('background_zorder', 0)
+
         start_time = datetime.now()
         if cmap is None:
             cmap = 'jet'
@@ -2859,7 +2861,7 @@ def plot_timestep(i):
                                map_y,
                                scalar,
                                alpha=bgalpha,
-                               zorder=1,
+                               zorder=background_zorder,
                                antialiased=True,
                                linewidth=0.0,
                                rasterized=True,
@@ -2873,7 +2875,7 @@ def plot_timestep(i):
                                     u_component[::skip, ::skip],
                                     v_component[::skip, ::skip],
                                     scale=scale,
-                                    zorder=1,
+                                    zorder=background_zorder,
                                     transform=self.crs_lonlat)
 
         if lcs is not None:
@@ -2886,6 +2888,7 @@ def plot_timestep(i):
                                  vmin=vmin,
                                  vmax=vmax,
                                  cmap=cmap,
+                                 zorder=background_zorder,
                                  transform=self.crs_lonlat)
 
         if show_elements is True:
@@ -3375,7 +3378,7 @@ def plot(self,
              show_initial=True,
              density_pixelsize_m=1000,
              lalpha=None,
-             bgalpha=1,
+             bgalpha=.8,
              clabel=None,
              cpad=.05,
              caspect=30,
@@ -3676,6 +3679,7 @@ def plot(self,
                            color=self.plot_comparison_colors[i + 1],
                            transform=self.crs_lonlat)
 
+        background_zorder = kwargs.pop('background_zorder', 0)
         if background is not None:
             if hasattr(self, 'time'):
                 time = self.time - self.time_step_output
@@ -3710,7 +3714,7 @@ def plot(self,
                                             map_y,
                                             scalar,
                                             alpha=bgalpha,
-                                            zorder=1,
+                                            zorder=background_zorder,
                                             vmin=vmin,
                                             vmax=vmax,
                                             cmap=cmap,
@@ -3741,7 +3745,7 @@ def plot(self,
                       v_component[::skip, ::skip],
                       scale=scale,
                       transform=self.crs_lonlat,
-                      zorder=1)
+                      zorder=background_zorder)
 
         if lcs is not None:
             map_x_lcs, map_y_lcs = (lcs['lon'], lcs['lat'])
@@ -3751,7 +3755,7 @@ def plot(self,
                           alpha=1,
                           vmin=vmin,
                           vmax=vmax,
-                          zorder=0,
+                          zorder=background_zorder,
                           cmap=cmap,
                           transform=self.crs_lonlat)
 

opendrift/readers/reader_global_landmask.py

@@ -124,7 +124,7 @@ def intersecting_geometries(self, extent):
         return super().intersecting_geometries(extent)
 
 def plot_land(ax, lonmin, latmin, lonmax, latmax, fast,
-              ocean_color='white', land_color=cfeature.COLORS['land'], land_zorder=0,
+              ocean_color='white', land_color=cfeature.COLORS['land'], land_zorder=1.5,
               lscale='auto', crs_plot=None, crs_lonlat=None):
     """
     Plot the landmask or the shapes from GSHHG.
@@ -168,7 +168,7 @@ def show_landmask_roaring(roaring):
         cmap = colors.ListedColormap([ocean_color, land_color])
 
         ax.imshow(img, origin = 'lower',
-                  extent=extent, zorder=1, cmap=cmap,
+                  extent=extent, zorder=-10, cmap=cmap,
                   transform=transform)
 
     if fast: