From 150b5a1f069fee92d251b3eb8cf0df4fb68005a9 Mon Sep 17 00:00:00 2001
From: Daniel Schwabeneder <daschw@disroot.org>
Date: Mon, 9 Sep 2019 13:13:17 +0200
Subject: [PATCH 1/2] fix vline for pgfplots

---
 src/backends/plotly.jl |  2 +-
 src/utils.jl           | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/backends/plotly.jl b/src/backends/plotly.jl
index ead66956..2a4b88e0 100644
--- a/src/backends/plotly.jl
+++ b/src/backends/plotly.jl
@@ -469,7 +469,7 @@ function plotly_series(plt::Plot, series::Series)
     plotattributes_out[:showlegend] = should_add_to_legend(series)
 
     if st == :straightline
-        x, y = straightline_data(series)
+        x, y = straightline_data(series, 100)
         z = series[:z]
     else
         x, y, z  = series[:x], series[:y], series[:z]
diff --git a/src/utils.jl b/src/utils.jl
index 08887237..2e028906 100644
--- a/src/utils.jl
+++ b/src/utils.jl
@@ -1114,20 +1114,20 @@ function convert_sci_unicode(label::AbstractString)
     label
 end
 
-function straightline_data(series)
+function straightline_data(series, expansion_factor = 1)
     sp = series[:subplot]
     xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
     x, y = series[:x], series[:y]
     n = length(x)
     if n == 2
-        return straightline_data(xl, yl, x, y)
+        return straightline_data(xl, yl, x, y, expansion_factor)
     else
         k, r = divrem(n, 3)
         if r == 0
             xdata, ydata = fill(NaN, n), fill(NaN, n)
             for i in 1:k
                 inds = (3 * i - 2):(3 * i - 1)
-                xdata[inds], ydata[inds] = straightline_data(xl, yl, x[inds], y[inds])
+                xdata[inds], ydata[inds] = straightline_data(xl, yl, x[inds], y[inds], expansion_factor)
             end
             return xdata, ydata
         else
@@ -1136,7 +1136,7 @@ function straightline_data(series)
     end
 end
 
-function straightline_data(xl, yl, x, y)
+function straightline_data(xl, yl, x, y, expansion_factor = 1)
     x_vals, y_vals = if y[1] == y[2]
         if x[1] == x[2]
             error("Two identical points cannot be used to describe a straight line.")
@@ -1157,9 +1157,8 @@ function straightline_data(xl, yl, x, y)
     end
     # expand the data outside the axis limits, by a certain factor too improve
     # plotly(js) and interactive behaviour
-    factor = 100
-    x_vals = x_vals .+ (x_vals[2] - x_vals[1]) .* factor .* [-1, 1]
-    y_vals = y_vals .+ (y_vals[2] - y_vals[1]) .* factor .* [-1, 1]
+    x_vals = x_vals .+ (x_vals[2] - x_vals[1]) .* expansion_factor .* [-1, 1]
+    y_vals = y_vals .+ (y_vals[2] - y_vals[1]) .* expansion_factor .* [-1, 1]
     return x_vals, y_vals
 end
 

From d0c6f0d6ee88fddc8be5dd25f5957a35e3dea402 Mon Sep 17 00:00:00 2001
From: Daniel Schwabeneder <daschw@disroot.org>
Date: Mon, 9 Sep 2019 13:17:34 +0200
Subject: [PATCH 2/2] expand data of shapes only for plotly(js)

---
 src/backends/plotly.jl |  2 +-
 src/utils.jl           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/backends/plotly.jl b/src/backends/plotly.jl
index 2a4b88e0..4a604889 100644
--- a/src/backends/plotly.jl
+++ b/src/backends/plotly.jl
@@ -584,7 +584,7 @@ function plotly_series_shapes(plt::Plot, series::Series, clims)
     )
 
     x, y = (plotly_data(series, letter, data)
-        for (letter, data) in zip((:x, :y), shape_data(series))
+        for (letter, data) in zip((:x, :y), shape_data(series, 100))
     )
 
     for (i,rng) in enumerate(segments)
diff --git a/src/utils.jl b/src/utils.jl
index 2e028906..9f159dbb 100644
--- a/src/utils.jl
+++ b/src/utils.jl
@@ -1162,23 +1162,23 @@ function straightline_data(xl, yl, x, y, expansion_factor = 1)
     return x_vals, y_vals
 end
 
-function shape_data(series)
+function shape_data(series, expansion_factor = 1)
     sp = series[:subplot]
     xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
     x, y = series[:x], series[:y]
     factor = 100
     for i in eachindex(x)
         if x[i] == -Inf
-            x[i] = xl[1] - factor * (xl[2] - xl[1])
+            x[i] = xl[1] - expansion_factor * (xl[2] - xl[1])
         elseif x[i] == Inf
-            x[i] = xl[2] + factor * (xl[2] - xl[1])
+            x[i] = xl[2] + expansion_factor * (xl[2] - xl[1])
         end
     end
     for i in eachindex(y)
         if y[i] == -Inf
-            y[i] = yl[1] - factor * (yl[2] - yl[1])
+            y[i] = yl[1] - expansion_factor * (yl[2] - yl[1])
         elseif y[i] == Inf
-            y[i] = yl[2] + factor * (yl[2] - yl[1])
+            y[i] = yl[2] + expansion_factor * (yl[2] - yl[1])
         end
     end
     return x, y