fixes for cartopy migration.

Status: "python tcevent.py -c examples/yasi.ini" outputs a figure that appears sensible
GeoscienceAustralia · Jul 25, 2019 · 584fd34 · 584fd34
1 parent dbf352d
commit 584fd34
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/PlotInterface/maps.py b/PlotInterface/maps.py
@@ -258,7 +258,7 @@ def createMap(self, axes, xgrid, ygrid, map_kwargs):
 
         axes.set_extent([x0, x1, y0, y1])
 
-        return mapobj, xgrid, ygrid
+        return axes, xgrid, ygrid
 
     def subplot(self, axes, subfigure):
         """
@@ -367,8 +367,7 @@ def subplot(self, axes, subfigure):
         cmap = selectColormap(lvls)
         CS = mapobj.contourf(mx, my, data, levels=lvls,
                              extend='both', cmap=cmap)
-        CB = mapobj.colorbar(CS, location='right', pad='5%', ticks=lvls[::2],
-                             fig=self, ax=axes, extend='both')
+        CB = self.colorbar(CS, ticks=lvls[::2], ax=axes, extend='both')
         CB.set_label(cbarlab)
         axes.set_title(title)
         self.addGraticule(axes, mapobj)
@@ -403,8 +402,7 @@ def subplot(self, axes, subfigure):
         cmap = selectColormap(lvls)
         CS = mapobj.contourf(mx, my, masked_data, levels=lvls,
                              extend='both', cmap=cmap)
-        CB = mapobj.colorbar(CS, location='right', pad='5%', ticks=lvls[::2],
-                             fig=self, ax=axes, extend='both')
+        CB = self.colorbar(CS, ticks=lvls[::2], ax=axes, extend='both')
         CB.set_label(cbarlab)
         axes.set_title(title)
         self.labelAxes(axes)
@@ -440,8 +438,8 @@ def subplot(self, axes, subfigure):
         vmax = datarange[1]
         CS = mapobj.pcolormesh(mx, my, data, vmin=vmin,
                                vmax=vmax, cmap=cmap)
-        CB = mapobj.colorbar(CS, location='bottom', pad='10%',
-                             fig=self, ax=axes)
+        #CB = self.colorbar(CS, location='bottom', pad=0.1,
+        #                     fig=self, ax=axes)
         CB.set_label(cbarlab)
         axes.set_title(title)
         self.addGraticule(axes, mapobj)