Default cartopy transform bugfix

proplot-dev · Nov 1, 2019 · 077e1ab · 077e1ab
1 parent ad235aa
commit 077e1ab
Showing 1 changed file with 35 additions and 37 deletions.
diff --git a/proplot/axes.py b/proplot/axes.py
@@ -3175,54 +3175,52 @@ def projection(self, map_projection):
         text = _text_wrapper(
             GeoAxes.text
             )
-        plot = _plot_wrapper(_standardize_1d(_add_errorbars(_cycle_changer(
-            _default_transform(GeoAxes.plot)
-            ))))
-        scatter = _scatter_wrapper(_standardize_1d(_add_errorbars(_cycle_changer(
-            _default_transform(GeoAxes.scatter)
-            ))))
+        # Wrapped by standardize method
+        plot = _default_transform(_plot_wrapper(_standardize_1d(_add_errorbars(_cycle_changer(
+            GeoAxes.plot
+            )))))
+        scatter = _default_transform(_scatter_wrapper(_standardize_1d(_add_errorbars(_cycle_changer(
+            GeoAxes.scatter
+            )))))
         fill_between  = _fill_between_wrapper(_standardize_1d(_cycle_changer(
             GeoAxes.fill_between
             )))
         fill_betweenx = _fill_betweenx_wrapper(_standardize_1d(_cycle_changer(
             GeoAxes.fill_betweenx
             )))
+        contour = _default_transform(_standardize_2d(_cmap_changer(
+            GeoAxes.contour
+            )))
+        contourf = _default_transform(_standardize_2d(_cmap_changer(
+            GeoAxes.contourf
+            )))
+        pcolor = _default_transform(_standardize_2d(_cmap_changer(
+            GeoAxes.pcolor
+            )))
+        pcolormesh = _default_transform(_standardize_2d(_cmap_changer(
+            GeoAxes.pcolormesh
+            )))
+        quiver = _default_transform(_standardize_2d(_cmap_changer(
+            GeoAxes.quiver
+            )))
+        streamplot = _default_transform(_standardize_2d(_cmap_changer(
+            GeoAxes.streamplot
+            )))
+        barbs = _default_transform(_standardize_2d(_cmap_changer(
+            GeoAxes.barbs
+            )))
 
-        # Wrapped by cmap wrapper and standardized
-        # Also support redirecting to Basemap methods
-        contour = _standardize_2d(_cmap_changer(
-            _default_transform(GeoAxes.contour)
-            ))
-        contourf = _standardize_2d(_cmap_changer(
-            _default_transform(GeoAxes.contourf)
-            ))
-        pcolor = _standardize_2d(_cmap_changer(
-            _default_transform(GeoAxes.pcolor)
-            ))
-        pcolormesh = _standardize_2d(_cmap_changer(
-            _default_transform(GeoAxes.pcolormesh)
-            ))
-        quiver = _standardize_2d(_cmap_changer(
-            _default_transform(GeoAxes.quiver)
+        # Wrapped only by cmap wrapper
+        tripcolor = _default_transform(_cmap_changer(
+            GeoAxes.tripcolor
             ))
-        streamplot = _standardize_2d(_cmap_changer(
-            _default_transform(GeoAxes.streamplot)
+        tricontour = _default_transform(_cmap_changer(
+            GeoAxes.tricontour
             ))
-        barbs = _standardize_2d(_cmap_changer(
-            _default_transform(GeoAxes.barbs)
+        tricontourf = _default_transform(_cmap_changer(
+            GeoAxes.tricontourf
             ))
 
-        # Wrapped only by cmap wrapper
-        tripcolor = _cmap_changer(
-            _default_transform(GeoAxes.tripcolor)
-            )
-        tricontour = _cmap_changer(
-            _default_transform(GeoAxes.tricontour)
-            )
-        tricontourf = _cmap_changer(
-            _default_transform(GeoAxes.tricontourf)
-            )
-
         # Special GeoAxes commands
         get_extent = _default_crs(GeoAxes.get_extent)
         set_extent = _default_crs(GeoAxes.set_extent)