allow extend in colorbar

Author: gabrielaznar

climada/entity/exposures/base.py

@@ -128,35 +128,28 @@ def check(self):
         self._check_optionals(num_exp)
         self._check_defaults(num_exp)
 
-    def plot(self, ignore_null=True, pop_name=True, buffer_deg=None,
+    def plot(self, ignore_zero=True, pop_name=True, buffer_deg=1.0,
              **kwargs):
         """Plot exposures values sum binned over Earth's map.
 
         Parameters:
-            ignore_null (bool, optional): flag to indicate if zero and negative
+            ignore_zero (bool, optional): flag to indicate if zero and negative
                 values are ignored in plot. Default: False
             pop_name (bool, optional): add names of the populated places
             buffer_deg (float, optional): border to add to coordinates.
-                Default: BUFFER_DEG=1 in plot module.
+                Default: 1.0.
             kwargs (optional): arguments for hexbin matplotlib function
 
          Returns:
             matplotlib.figure.Figure, cartopy.mpl.geoaxes.GeoAxesSubplot
         """
-        if ignore_null:
-            pos_vals = self.value > 0
-        else:
-            pos_vals = np.ones((self.value.size,), dtype=bool)
         title = self.tag.join_descriptions()
         cbar_label = 'Value (%s)' % self.value_unit
         if 'reduce_C_function' not in kwargs:
             kwargs['reduce_C_function'] = np.sum
-        if buffer_deg is not None:
-            return plot.geo_bin_from_array(self.value[pos_vals], \
-                self.coord[pos_vals], cbar_label, title, pop_name, buffer_deg,\
-                **kwargs)
-        return plot.geo_bin_from_array(self.value[pos_vals], \
-            self.coord[pos_vals], cbar_label, title, pop_name, **kwargs)
+
+        return plot.geo_bin_from_array(self.value, self.coord, cbar_label,
+                title, pop_name, buffer_deg, ignore_zero, **kwargs)
 
     def read(self, files, descriptions='', var_names=None):
         """Read and check exposures.

climada/util/plot.py

@@ -27,7 +27,7 @@
 MAX_BINS = 200
 
 def geo_bin_from_array(array_sub, geo_coord, var_name, title, pop_name=True,
-                       buffer_deg=BUFFER_DEG, **kwargs):
+                       buffer_deg=BUFFER_DEG, ignore_zero=False, **kwargs):
     """Plot array values binned over input coordinates.
 
     Parameters:
@@ -45,6 +45,7 @@ def geo_bin_from_array(array_sub, geo_coord, var_name, title, pop_name=True,
             array_sub.
         pop_name (bool, optional): add names of the populated places.
         buffer_deg (float, optional): border to add to coordinates
+        ignore_zero (bool, optional): ignore zero and negative values
         kwargs (optional): arguments for hexbin matplotlib function
 
     Returns:
@@ -69,6 +70,14 @@ def geo_bin_from_array(array_sub, geo_coord, var_name, title, pop_name=True,
         if coord.shape[0] != array_im.size:
             raise ValueError("Size mismatch in input array: %s != %s." % \
                              (coord.shape[0], array_im.size))
+        if ignore_zero:
+            pos_vals = array_im > 0
+            array_im = array_im[pos_vals]
+            coord = coord[pos_vals, :]
+            kwargs_cbar = {'extend':'min'}
+        else:
+            kwargs_cbar = {}
+            
         # Binned image with coastlines
         extent = get_borders(coord)
         extent = ([extent[0] - buffer_deg, extent[1] + buffer_deg, extent[2] -\
@@ -86,7 +95,8 @@ def geo_bin_from_array(array_sub, geo_coord, var_name, title, pop_name=True,
         # Create colorbar in this axis
         cbax = make_axes_locatable(axis).append_axes('right', size="6.5%", \
             pad=0.1, axes_class=plt.Axes)
-        cbar = plt.colorbar(hex_bin, cax=cbax, orientation='vertical')
+        cbar = plt.colorbar(hex_bin, cax=cbax, orientation='vertical', 
+                            **kwargs_cbar)
         cbar.set_label(name)
         axis.set_title(tit)