fix

Fix polar heatmap on GR

.github/workflows/SnoopCompile.yml

@@ -21,8 +21,6 @@ jobs:
       fail-fast: false
       matrix:
         version:   # NOTE: the versions below should match those in your botconfig
-          - '1.3'
-          - '1.4'
           - '1.5'
         os:        # NOTE: should match the os setting of your botconfig
           - ubuntu-latest

.github/workflows/ci.yml

@@ -21,7 +21,6 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.3'
           - '1'
           - 'nightly'
         os:

Artifacts.toml

@@ -1,7 +0,0 @@
-[plotly]
-git-tree-sha1 = "f03dd0451a05a5fdbbcb3e548998a9d7a1ab6368"
-lazy = true
-
-    [[plotly.download]]
-    url = "https://cdn.plot.ly/plotly-1.54.2.min.js"
-    sha256 = "487f1da6b7a1f127de59af8a65bb3fe2c63d709f011afea82896bdce28ecc0f8"

Project.toml

@@ -1,7 +1,7 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "1.6.10"
+version = "1.6.12"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -17,7 +17,6 @@ Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
 NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PlotThemes = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a"
 PlotUtils = "995b91a9-d308-5afd-9ec6-746e21dbc043"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
@@ -27,6 +26,7 @@ RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 RecipesPipeline = "01d81517-befc-4cb6-b9ec-a95719d0359c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
+Scratch = "6c6a2e73-6563-6170-7368-637461726353"
 Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
@@ -52,9 +52,8 @@ RecipesPipeline = "0.1.13"
 Reexport = "0.2"
 Requires = "1"
 Showoff = "0.3.1"
-StableRNGs = "0.1.1"
 StatsBase = "0.32, 0.33"
-julia = "1.3"
+julia = "1.5"
 
 [extras]
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"

deps/SnoopCompile/precompile/apple/1.3/precompile_Plots.jl

@@ -226,7 +226,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

deps/SnoopCompile/precompile/apple/1.4/precompile_Plots.jl

@@ -315,7 +315,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

deps/SnoopCompile/precompile/apple/1.5/precompile_Plots.jl

@@ -291,7 +291,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

deps/SnoopCompile/precompile/linux/1.3/precompile_Plots.jl

@@ -227,7 +227,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

deps/SnoopCompile/precompile/linux/1.4/precompile_Plots.jl

@@ -285,7 +285,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

deps/SnoopCompile/precompile/linux/1.5/precompile_Plots.jl

@@ -285,7 +285,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

deps/SnoopCompile/precompile/windows/1.3/precompile_Plots.jl

@@ -226,7 +226,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

deps/SnoopCompile/precompile/windows/1.4/precompile_Plots.jl

@@ -317,7 +317,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

deps/SnoopCompile/precompile/windows/1.5/precompile_Plots.jl

@@ -286,7 +286,6 @@ function _precompile_()
     Base.precompile(Tuple{typeof(Plots.slice_arg),Array{Symbol,2},Int64})
     Base.precompile(Tuple{typeof(Plots.slice_arg),Base.ReshapedArray{Int64,2,UnitRange{Int64},Tuple{}},Int64})
     Base.precompile(Tuple{typeof(Plots.straightline_data),Tuple{Float64,Float64},Tuple{Float64,Float64},Array{Float64,1},Array{Float64,1},Int64})
-    Base.precompile(Tuple{typeof(Plots.transpose_z),Plots.Series,Array{Float64,2},Bool})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{Complex{Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{GeometryBasics.Point{2,Float64},1}})
     Base.precompile(Tuple{typeof(RecipesBase.apply_recipe),Dict{Symbol,Any},Array{OHLC,1}})

src/args.jl

@@ -280,8 +280,6 @@ const _series_defaults = KW(
     :show_empty_bins   => false,     # should empty bins in 2D histogram be colored as zero (otherwise they are transparent)
     :contours          => false,     # add contours to 3d surface and wireframe plots
     :contour_labels    => false,
-    :match_dimensions  => false,     # do rows match x (true) or y (false) for heatmap/image/spy? see issue 196
-                                     # this ONLY effects whether or not the z-matrix is transposed for a heatmap display!
     :subplot           => :auto,     # which subplot(s) does this series belong to?
     :series_annotations => nothing,       # a list of annotations which apply to the coordinates of this series
     :primary            => true,     # when true, this "counts" as a series for color selection, etc.  the main use is to allow
@@ -629,7 +627,6 @@ add_aliases(:quiver, :velocity, :quiver2d, :gradient, :vectorfield)
 add_aliases(:normalize, :norm, :normed, :normalized)
 add_aliases(:show_empty_bins, :showemptybins, :showempty, :show_empty)
 add_aliases(:aspect_ratio, :aspectratio, :axis_ratio, :axisratio, :ratio)
-add_aliases(:match_dimensions, :transpose, :transpose_z)
 add_aliases(:subplot, :sp, :subplt, :splt)
 add_aliases(:projection, :proj)
 add_aliases(:titlelocation, :title_location, :title_loc, :titleloc, :title_position, :title_pos, :titlepos, :titleposition, :title_align, :title_alignment)

src/backends.jl

@@ -316,7 +316,6 @@ const _gr_attr = merge_with_base_supported([
     :layout,
     :title, :window_title,
     :guide, :lims, :ticks, :scale, :flip,
-    :match_dimensions,
     :titlefontfamily, :titlefontsize, :titlefonthalign, :titlefontvalign,
     :titlefontrotation, :titlefontcolor,
     :legendfontfamily, :legendfontsize, :legendfonthalign, :legendfontvalign,
@@ -472,7 +471,6 @@ const _pgfplots_attr = merge_with_base_supported([
     :polar,
     # :normalize, :weights, :contours,
     :aspect_ratio,
-    # :match_dimensions,
     :tick_direction,
     :framestyle,
     :camera,
@@ -541,7 +539,6 @@ const _pyplot_attr = merge_with_base_supported([
     :polar,
     :normalize, :weights,
     :contours, :aspect_ratio,
-    :match_dimensions,
     :clims,
     :inset_subplots,
     :dpi,
@@ -627,7 +624,6 @@ const _hdf5_attr = merge_with_base_supported([
     :polar,
     :normalize, :weights,
     :contours, :aspect_ratio,
-    :match_dimensions,
     :clims,
     :inset_subplots,
     :dpi,
@@ -700,7 +696,6 @@ const _inspectdr_attr = merge_with_base_supported([
     :polar,
 #    :normalize, :weights,
 #    :contours, :aspect_ratio,
-    :match_dimensions,
 #    :clims,
 #    :inset_subplots,
     :dpi,
@@ -761,7 +756,6 @@ const _pgfplotsx_attr = merge_with_base_supported([
     :ticks,
     :scale,
     :flip,
-    :match_dimensions,
     :titlefontfamily,
     :titlefontsize,
     :titlefonthalign,

src/backends/gr.jl

@@ -1488,14 +1488,12 @@ function gr_add_series(sp, series)
 
     GR.savestate()
 
-    x, y, z = series[:x], series[:y], series[:z]
+    x, y, z = (handle_surface(series[letter]) for letter in (:x, :y, :z))
     xscale, yscale = sp[:xaxis][:scale], sp[:yaxis][:scale]
     frng = series[:fillrange]
 
     # recompute data
-    if typeof(z) <: Surface
-        z = transpose_z(series, z.surf, false)
-    elseif ispolar(sp)
+    if ispolar(sp) && z === nothing
         rmin, rmax = axis_limits(sp, :y)
         if frng !== nothing
             _, frng = convert_to_polar(x, frng, (rmin, rmax))
@@ -1735,7 +1733,7 @@ function gr_draw_heatmap(series, x, y, z, clims)
     else
         phimin, phimax = 0.0, 360.0 # nonuniform polar array is not yet supported in GR.jl
         nx, ny = length(series[:x]), length(series[:y])
-        xmin, xmax, ymin, ymax = gr_xy_axislims(sp)
+        xmin, xmax, ymin, ymax = gr_xy_axislims(series[:subplot])
         GR.setwindow(-ymax, ymax, -ymax, ymax)
         if ymin > 0
             @warn "'ymin[1] > 0' (rmin) is not yet supported."
@@ -1752,7 +1750,6 @@ function gr_draw_heatmap(series, x, y, z, clims)
 end
 
 function gr_draw_image(series, x, y, z, clims)
-    z = transpose_z(series, series[:z].surf, true)'
     w, h = size(z)
     xmin, xmax = ignorenan_extrema(x)
     ymin, ymax = ignorenan_extrema(y)

src/backends/pgfplotsx.jl

@@ -646,7 +646,7 @@ pgfx_series_arguments(series, opt, range) = (arg[range] for arg in pgfx_series_a
 function pgfx_series_arguments(series, opt)
     st = series[:seriestype]
     return if st in (:contour, :contour3d)
-        opt[:x], opt[:y], Array(opt[:z])'
+        opt[:x], opt[:y], handle_surface(opt[:z])
     elseif st in (:heatmap, :surface, :wireframe)
         surface_to_vecs(opt[:x], opt[:y], opt[:z])
     elseif RecipesPipeline.is3d(st)

src/backends/plotly.jl

@@ -459,7 +459,7 @@ function plotly_data(series::Series, letter::Symbol, data)
     end
 
     if series[:seriestype] in (:heatmap, :contour, :surface, :wireframe, :mesh3d)
-        plotly_surface_data(series, data)
+        handle_surface(data)
     else
         plotly_data(data)
     end
@@ -469,10 +469,6 @@ plotly_data(v::AbstractArray) = v
 plotly_data(surf::Surface) = surf.surf
 plotly_data(v::AbstractArray{R}) where {R<:Rational} = float(v)
 
-plotly_surface_data(series::Series, a::AbstractVector) = a
-plotly_surface_data(series::Series, a::AbstractMatrix) = transpose_z(series, a, false)
-plotly_surface_data(series::Series, a::Surface) = plotly_surface_data(series, a.surf)
-
 function plotly_native_data(axis::Axis, data::AbstractArray)
     if !isempty(axis[:discrete_values])
         construct_categorical_data(data, axis)
@@ -588,7 +584,7 @@ function plotly_series(plt::Plot, series::Series)
             plotattributes_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
             plotattributes_out[:opacity] = series[:fillalpha]
             if series[:fill_z] !== nothing
-                plotattributes_out[:surfacecolor] = plotly_surface_data(series, series[:fill_z])
+                plotattributes_out[:surfacecolor] = handle_surface(series[:fill_z])
             end
             plotattributes_out[:showscale] = hascolorbar(sp)
         end
@@ -613,7 +609,7 @@ function plotly_series(plt::Plot, series::Series)
 	plotattributes_out[:color] = rgba_string(plot_color(series[:fillcolor], series[:fillalpha]))
         plotattributes_out[:opacity] = series[:fillalpha]
         if series[:fill_z] !== nothing
-            plotattributes_out[:surfacecolor] = plotly_surface_data(series, series[:fill_z])
+            plotattributes_out[:surfacecolor] = handle_surface(series[:fill_z])
         end
         plotattributes_out[:showscale] = hascolorbar(sp)
     else

src/backends/pyplot.jl

@@ -61,6 +61,9 @@ end
 # # anything else just gets a bluesred gradient
 # py_colormap(c, α=nothing) = py_colormap(default_gradient(), α)
 
+py_handle_surface(v) = v
+py_handle_surface(z::Surface) = z.surf
+
 py_color(s) = py_color(parse(Colorant, string(s)))
 py_color(c::Colorant) = (red(c), green(c), blue(c), alpha(c))
 py_color(cs::AVec) = map(py_color, cs)
@@ -344,7 +347,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
     fix_xy_lengths!(plt, series)
 
     # ax = getAxis(plt, series)
-    x, y, z = series[:x], series[:y], series[:z]
+    x, y, z = (py_handle_surface(series[letter]) for letter in (:x, :y, :z))
     if st == :straightline
         x, y = straightline_data(series)
     elseif st == :shape
@@ -512,16 +515,11 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
     end
 
     if st in (:contour, :contour3d)
-        z = transpose_z(series, z.surf)
-	if typeof(x)<:Plots.Surface
-            x = Plots.transpose_z(series, x.surf)
-        end
-        if typeof(y)<:Plots.Surface
-            y = Plots.transpose_z(series, y.surf)
-        end
-
         if st == :contour3d
             extrakw[:extend3d] = true
+            if !ismatrix(x) || !ismatrix(y)
+                x, y = repeat(x', length(y), 1), repeat(y, 1, length(x))
+            end
         end
 
         if typeof(series[:linecolor]) <: AbstractArray
@@ -556,17 +554,17 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
     end
 
     if st in (:surface, :wireframe)
-        if typeof(z) <: AbstractMatrix || typeof(z) <: Surface
-            x, y, z = map(Array, (x,y,z))
+        if z isa AbstractMatrix
             if !ismatrix(x) || !ismatrix(y)
-                x = repeat(x', length(y), 1)
-                y = repeat(y, 1, length(series[:x]))
+                x, y = repeat(x', length(y), 1), repeat(y, 1, length(x))
             end
-            z = transpose_z(series, z)
             if st == :surface
                 if series[:fill_z] !== nothing
                     # the surface colors are different than z-value
-                    extrakw[:facecolors] = py_shading(series[:fillcolor], transpose_z(series, series[:fill_z].surf))
+                    extrakw[:facecolors] = py_shading(
+                        series[:fillcolor],
+                        py_handle_surface(series[:fill_z]),
+                    )
                     extrakw[:shade] = false
                 else
                     extrakw[:cmap] = py_fillcolormap(series)
@@ -618,15 +616,15 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
         ymin, ymax = ignorenan_extrema(series[:y])
         dx = (xmax - xmin) / (length(series[:x]) - 1) / 2
         dy = (ymax - ymin) / (length(series[:y]) - 1) / 2
-        img = Array(transpose_z(series, z.surf))
-        z = if eltype(img) <: Colors.AbstractGray
-            float(img)
-        elseif eltype(img) <: Colorant
-            map(c -> Float64[red(c),green(c),blue(c),alpha(c)], img)
+        z = if eltype(z) <: Colors.AbstractGray
+            float(z)
+        elseif eltype(z) <: Colorant
+            map(c -> Float64[red(c),green(c),blue(c),alpha(c)], z)
         else
             z  # hopefully it's in a data format that will "just work" with imshow
         end
-        handle = ax."imshow"(z;
+        handle = ax."imshow"(
+            z;
             zorder = series[:series_plotindex],
             cmap = py_colormap(cgrad(plot_color([:black, :white]))),
             vmin = 0.0,
@@ -642,7 +640,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
     end
 
     if st == :heatmap
-        x, y, z = heatmap_edges(x, sp[:xaxis][:scale]), heatmap_edges(y, sp[:yaxis][:scale]), transpose_z(series, z.surf)
+        x, y = heatmap_edges(x, sp[:xaxis][:scale], y, sp[:yaxis][:scale], size(z))
 
         expand_extrema!(sp[:xaxis], x)
         expand_extrema!(sp[:yaxis], y)
@@ -729,7 +727,7 @@ function py_set_lims(ax, sp::Subplot, axis::Axis)
 end
 
 function py_surround_latextext(latexstring, env)
-    if latexstring[1] == '$' && latexstring[end] == '$'
+    if !isempty(latexstring) && latexstring[1] == '$' && latexstring[end] == '$'
         unenclosed = latexstring[2:end-1]
     else
         unenclosed = latexstring

src/examples.jl

@@ -1040,15 +1040,23 @@ const _examples = PlotExample[
             )
         end]
     ),
+    PlotExample( # 49
+        "Polar heatmaps",
+        "",
+        [quote
+            z = (1:4) .+ (1:8)'
+            heatmap(z, projection = :polar)
+        end]
+    ),
 ]
 
 # Some constants for PlotDocs and PlotReferenceImages
 _animation_examples = [2, 31]
 _backend_skips = Dict(
     :gr => [25, 30, 47],
-    :pyplot => [2, 25, 30, 31, 47],
-    :plotlyjs => [2, 21, 24, 25, 30, 31],
-    :plotly => [2, 21, 24, 25, 30, 31],
+    :pyplot => [2, 25, 30, 31, 47, 49],
+    :plotlyjs => [2, 21, 24, 25, 30, 31, 49],
+    :plotly => [2, 21, 24, 25, 30, 31, 49],
     :pgfplots => [2, 5, 6, 10, 16, 20, 22, 23, 25, 28, 30, 31, 34, 37, 38, 39, 47],
     :pgfplotsx => [
         2, # animation
@@ -1058,7 +1066,8 @@ _backend_skips = Dict(
         30, # @df
         31, # animation
         32, # spy
-    	47, # mesh3
+        47, # mesh3
+        49, # polar heatmap
     ],
 )
 

src/init.jl

@@ -1,7 +1,8 @@
 using REPL
-using Pkg.Artifacts
+using Scratch
+
+const plotly_local_file_path = Ref{Union{Nothing, String}}(nothing)
 
-const plotly_local_file_path = Ref("")
 
 function _plots_defaults()
     if isdefined(Main, :PLOTS_DEFAULTS)
@@ -77,17 +78,12 @@ function __init__()
         end
     end
 
-    if get(ENV, "PLOTS_HOST_DEPENDENCY_LOCAL", "false") == true
-        artifact_toml = joinpath(@__DIR__, "Artifacts.toml")
-
-        plotly_sha = artifact_hash("plotly", artifact_toml)
-        if plotly_sha === nothing || !artifact_exists(plotly_sha)
-            plotly_sha = create_artifact() do artifact_dir
-                download("https://cdn.plot.ly/plotly-1.54.2.min.js", joinpath(artifact_dir, "plotly-1.54.2.min.js"))
-            end
+    if get(ENV, "PLOTS_HOST_DEPENDENCY_LOCAL", "false") == "true"
+        global plotly_local_file_path[] = joinpath(@get_scratch!("plotly"), "plotly-1.54.2.min.js")
+        if !isfile(plotly_local_file_path[])
+            download("https://cdn.plot.ly/plotly-1.54.2.min.js", plotly_local_file_path[])
         end
 
-        plotly_local_file_path[] = joinpath(artifact_path(plotly_sha), "plotly-1.54.2.min.js")
         use_local_plotlyjs[] = true
     end
 

src/layouts.jl

@@ -230,7 +230,7 @@ end
     grid(args...; kw...)
 
 Create a grid layout for subplots. `args` specify the dimensions, e.g.
-`grid(3,2, widths = (0.6,04))` creates a grid with three rows and two
+`grid(3,2, widths = (0.6,0.4))` creates a grid with three rows and two
 columns of different width.
 """
 grid(args...; kw...) = GridLayout(args...; kw...)

src/recipes.jl

@@ -874,9 +874,7 @@ end
 
     x := Plots._bin_centers(edge_x)
     y := Plots._bin_centers(edge_y)
-    z := Surface(float_weights)
-
-    match_dimensions := true
+    z := Surface(permutedims(float_weights))
     seriestype := :heatmap
     ()
 end

src/utils.jl

@@ -334,17 +334,8 @@ function indices_and_unique_values(z::AbstractArray)
     newz, vals
 end
 
-# this is a helper function to determine whether we need to transpose a surface matrix.
-# it depends on whether the backend matches rows to x (transpose_on_match == true) or vice versa
-# for example: PyPlot sends rows to y, so transpose_on_match should be true
-function transpose_z(plotattributes, z, transpose_on_match::Bool = true)
-    if plotattributes[:match_dimensions] == transpose_on_match
-        # z'
-        permutedims(z, [2,1])
-    else
-        z
-    end
-end
+handle_surface(z) = z
+handle_surface(z::Surface) = permutedims(z.surf)
 
 function ok(x::Number, y::Number, z::Number = 0)
     isfinite(x) && isfinite(y) && isfinite(z)

test/runtests.jl

@@ -11,6 +11,19 @@ import GeometryTypes, GeometryBasics
 using Dates
 using RecipesBase
 
+@testset "Plotly standalone" begin
+    @test Plots.plotly_local_file_path[] === nothing
+    temp = Plots.use_local_dependencies[]
+    withenv("PLOTS_HOST_DEPENDENCY_LOCAL" => true) do
+        Plots.__init__()
+        @test Plots.plotly_local_file_path[] isa String
+        @test isfile(Plots.plotly_local_file_path[])
+        @test Plots.use_local_dependencies[] = true
+    end
+    Plots.plotly_local_file_path[] = nothing
+    Plots.use_local_dependencies[] = temp
+end # testset
+
 include("test_defaults.jl")
 include("test_axes.jl")
 include("test_axis_letter.jl")