Merge pull request #1981 from GenericMappingTools/fix-core-boxes

Fix Core.Boxes and labellines simplifications.

Author: joa-quim

src/gadm.jl

@@ -89,24 +89,17 @@ function gadm(country, subregions...; children::Bool=false, names::Bool=false, c
 		error("Asked data for a level ($(plevel+1)) that is lower than lowest data level ($(_nlayers))")
 	end
 
-	function _get_attrib(feature)
-		n = Gdal.nfield(feature)
-		attrib = DictSvS()
-		[attrib[Gdal.getname(Gdal.getfielddefn(feature, i))] = string(Gdal.getfield(feature, i)) for i = 0:n-1]
-		attrib
-	end
-
 	function _get_polygs(gdfeature)
 		D = gd2gmt(getgeom(gdfeature[1], 0),"")
 		isa(D, GMTdataset) && (D = [D])		# Hopefully not too wasteful but it simplifies a lot the whole algo
-		att = _get_attrib(gdfeature[1])
+		att = helper_get_attrib(gdfeature[1])
 		for k = 1:numel(D)  D[k].attrib = att;  D[k].colnames = ["Lon", "Lat"]  end
-		D[1].attrib = _get_attrib(gdfeature[1])
+		D[1].attrib = helper_get_attrib(gdfeature[1])
 		((prj = getproj(Gdal.getlayer(data, 0))) != C_NULL) && (D[1].proj4 = toPROJ4(prj))
 		for n = 2:numel(gdfeature)
 			_D = gd2gmt(getgeom(gdfeature[n], 0),"")
 			isa(_D, GMTdataset) && (_D = [_D])
-			att = _get_attrib(gdfeature[n])
+			att = helper_get_attrib(gdfeature[n])
 			for k = 1:numel(_D)  _D[k].attrib = att;  _D[k].colnames = ["Lon", "Lat"]  end
 			append!(D, _D)
 		end
@@ -141,6 +134,13 @@ function gadm(country, subregions...; children::Bool=false, names::Bool=false, c
 	end
 end
 
+function helper_get_attrib(feature)
+	n = Gdal.nfield(feature)
+	attrib = DictSvS()
+	[attrib[Gdal.getname(Gdal.getfielddefn(feature, i))] = string(Gdal.getfield(feature, i)) for i = 0:n-1]
+	attrib
+end
+
 # ------------------------------------------------------------------------------------------------------
 # Tells whether or not `str` is a valid ISO 3166 Alpha 3 country code. Valid code examples are "IND", "USA", "BRA".
 isvalidcode(str) = match(r"\b[A-Z]{3}\b", str) !== nothing

src/legend_funs.jl

@@ -444,9 +444,9 @@ function _best_label_pos(D::Vector{<:GMTdataset}, labels::Vector{String}, nc::In
 	end
 
 	# Text half-dimensions in cm
-	pt2cm = 2.54 / 72
-	char_w = 0.55 * fontsize * pt2cm
-	char_h = fontsize * pt2cm
+	fs = fontsize * 2.54 / 72
+	char_w = 0.55 * fs
+	char_h = fs
 	hws = [length(l) * char_w / 2 for l in labels]    # half-width per label
 	hh  = char_h * 0.9                                 # half-height (shared)
 
@@ -820,7 +820,7 @@ Called from `_common_plot_xyz()` when the `labellines` keyword is used.
 - `val` can be a `Vector{<:AbstractString}` with one label per curve, or a NamedTuple with fields
   `labels` (required), `fontsize` (default 8), and `prefer` (`:begin`, `:middle`, or `:end`; default `:middle`).
 """
-function add_labellines!(curves, d::Dict{Symbol,Any}, _cmd::Vector{String})
+function add_labellines!(curves, d::Dict{Symbol,Any}, _cmd::Vector{String})::Nothing
 	val = find_in_dict(d, [:labellines])[1]
 	if isa(val, Vector{<:AbstractString})
 		labels = [string(l) for l in val]
@@ -835,7 +835,7 @@ function add_labellines!(curves, d::Dict{Symbol,Any}, _cmd::Vector{String})
 		else
 			_add_labellines(curves, _cmd, labels, 8, :middle)
 		end
-		return curves
+		return nothing
 	end
 	# NamedTuple path — dispatch to the right inner function based on which options are set
 	dd = nt2dict(val)
@@ -845,7 +845,7 @@ function add_labellines!(curves, d::Dict{Symbol,Any}, _cmd::Vector{String})
 	if get(dd, :outside, false) == true
 		text_cmd = _inject_outside_labels!(d, curves, labels, fnt, _cmd)
 		push!(_cmd, text_cmd)
-		return curves
+		return nothing
 	end
 	xv = get(dd, :xvals, nothing)
 	yv = get(dd, :yvals, nothing)
@@ -855,10 +855,10 @@ function add_labellines!(curves, d::Dict{Symbol,Any}, _cmd::Vector{String})
 		_yv::Vector{Float64} = yv === nothing ? Float64[] : isa(yv, Real) ? fill(Float64(yv), nc) : Float64.(yv)
 		pos = _label_pos_at_vals(curves, nc, _xv, _yv)
 		_add_labellines_apply(curves, _cmd, labels, fnt, pos)
-		return curves
+		return nothing
 	end
 	_add_labellines(curves, _cmd, labels, fnt, prefer)
-	return curves
+	return nothing
 end
 
 function _add_labellines(arg1::Vector{<:GMTdataset}, _cmd::Vector{String}, labels::Vector{String}, fontsize::Int, prefer::Symbol)
@@ -908,11 +908,7 @@ function _outside_label_data(D::Vector{<:GMTdataset}, labels::Vector{String}, fo
 	(ymax - ymin) < 1e-10 && (ymin -= 0.5; ymax += 0.5)	# degenerate range fallback
 
 	# x positions: at the right edge of the plot region so labels start just beyond the axis
-	if CTRL.limits[7] != 0
-		xmax = CTRL.limits[8]
-	else
-		_, xmax, _, _ = getregion(D)
-	end
+	xmax = (CTRL.limits[7] != 0) ? CTRL.limits[8] : getregion(D)[2]
 	xs = Vector{Float64}(undef, nc)
 	ys = Vector{Float64}(undef, nc)
 	colors = Vector{String}(undef, nc)
@@ -925,8 +921,7 @@ function _outside_label_data(D::Vector{<:GMTdataset}, labels::Vector{String}, fo
 	# Repel overlapping labels vertically
 	pw, ph = _get_plotsize()
 	sy = ph / (ymax - ymin)
-	pt2cm = 2.54 / 72
-	label_h = fontsize * pt2cm * 1.4		# label height in cm with some padding
+	label_h = fontsize * 2.54 / 72 * 1.4	# label height in cm with some padding
 	min_sep = label_h / sy					# minimum separation in data units
 
 	order = sortperm(ys)
@@ -1012,9 +1007,9 @@ function text_repel(points, labels::Vector{<:AbstractString}; fontsize::Int=10,
 	ay = (py .- ymin) .* sy
 
 	# Text box half-dimensions in cm (with padding)
-	pt2cm = 2.54 / 72
-	char_w = 0.55 * fontsize * pt2cm
-	char_h = fontsize * pt2cm
+	fs = fontsize * 2.54 / 72
+	char_w = 0.55 * fs
+	char_h = fs
 	pad = Float64(padding)
 	hws = [length(l) * char_w / 2 + pad for l in labels]
 	hhs = fill(char_h / 2 + pad, n)

src/psxy.jl

@@ -241,7 +241,7 @@ function _common_plot_xyz(w::wrapDatasets, caller::String, O::Bool, K::Bool, is3
 
 	if haskey(d, :labellines)
 		_cmd = gmt_proggy .* _cmd				# In any case we need this
-		arg1 = add_labellines!(arg1, d, _cmd)
+		add_labellines!(arg1, d, _cmd)
 	else
 		(!IamModern[]) && put_in_legend_bag(d, _cmd, arg1, O, opt_l)
 		_cmd = gmt_proggy .* _cmd

src/rasterpolygonfuns.jl

@@ -51,10 +51,6 @@ function rasterzones!(GI::GItype, shapes::GDtype, fun::Function; isRaster=true,
 	function within(bbox_p::Vector{Float64}, bbox_R::Vector{Float64})	# Check if the polygon BB is contained inside the image's region.
 		bbox_p[1] >= bbox_R[1] && bbox_p[2] <= bbox_R[2] && bbox_p[3] >= bbox_R[3] && bbox_p[4] <= bbox_R[4]
 	end
-	function maskit(GI_, mask, band)
-		t = (band > 0) ? skipnan(GI_[mask, band]) : skipnan(GI_[mask])
-		return (eltype(GI_) <: Integer) ? round(eltype(GI_), fun(t)) : fun(t)
-	end
 	function get_the_mask(D, nx, ny, touches, layout)::Union{Nothing, Matrix{Bool}}
 		# Compute the mask matrix
 		local mask
@@ -71,11 +67,11 @@ function rasterzones!(GI::GItype, shapes::GDtype, fun::Function; isRaster=true,
 	end
 	function mask_GI!(GI, _GI, pix_x, pix_y, mask, n_layers) # Apply the mask to a Grid/Image
 		if (n_layers == 1)
-			_GI[mask] .= maskit(_GI, mask, 0)
+			_GI[mask] .= helper_maskit(_GI, mask, 0, fun)
 			GI[pix_y[1]:pix_y[2], pix_x[1]:pix_x[2]] = _GI
 		else
 			for n = 1:n_layers
-				_GI[mask, n] .= maskit(_GI, mask, n)
+				_GI[mask, n] .= helper_maskit(_GI, mask, n, fun)
 				GI[pix_y[1]:pix_y[2], pix_x[1]:pix_x[2], n] = _GI[:,:,n]
 			end
 		end
@@ -101,7 +97,7 @@ function rasterzones!(GI::GItype, shapes::GDtype, fun::Function; isRaster=true,
 			((mask = get_the_mask(Dt, size(_GI, col_dim), size(_GI, row_dim), touches, layout)) === nothing) && continue
 
 			if (isRaster)  mask_GI!(GI, _GI, pix_x, pix_y, mask, n_layers)
-			else           for n = 1:n_layers   mat[k,n] = maskit(_GI, mask, n-1)   end
+			else           for n = 1:n_layers   mat[k,n] = helper_maskit(_GI, mask, n-1, fun)   end
 			end
 		end
 	else									# Compute the result (stats or raster) on a per polygon basis
@@ -116,14 +112,20 @@ function rasterzones!(GI::GItype, shapes::GDtype, fun::Function; isRaster=true,
 			((mask = get_the_mask(shapes[k], size(_GI, col_dim), size(_GI, row_dim), touches, layout)) === nothing) && continue
 
 			if (isRaster)  mask_GI!(GI, _GI, pix_x, pix_y, mask, n_layers)
-			else           for n = 1:n_layers   mat[k,n] = maskit(_GI, mask, n-1)   end
+			else           for n = 1:n_layers   mat[k,n] = helper_maskit(_GI, mask, n-1, fun)   end
 			end
 		end
 		names = String[]					# We need something to return
 	end
 	return isRaster ? nothing : (mat, names)
 end
 
+function helper_maskit(GI_, mask, band, fun::Function)
+	# Move it out of a nested fun because it was Core.Boxed when called from another nested
+	t = (band > 0) ? skipnan(GI_[mask, band]) : skipnan(GI_[mask])
+	return (eltype(GI_) <: Integer) ? round(eltype(GI_), fun(t)) : fun(t)
+end
+
 # ---------------------------------------------------------------------------------------------------
 """
     GI = rasterzones(GI::GItype, shapes::GDtype, fun::Function; touches=false)

src/utils_types.jl

@@ -1059,8 +1059,8 @@ function df2ds(arg)::GMTdataset
 	if (isempty(col_time_names))						# Simple case, no time columns
 		D = mat2ds(mat, colnames=colnames)
 	else			# We have time columns. Need to convert them to unix time AND insert them in the matrix 'mat'
-		colnames = [i for i in names(arg) if Base.nonmissingtype(eltype(arg[!,i])) <: Union{Real, TimeType}]	# all of the names
-		inds_time = [findfirst(col_time_names[k] .== colnames) for k = 1:numel(col_time_names)]
+		colnames2 = [i for i in names(arg) if Base.nonmissingtype(eltype(arg[!,i])) <: Union{Real, TimeType}]	# all of the names
+		inds_time = [findfirst(col_time_names[k] .== colnames2) for k = 1:numel(col_time_names)]
 		new_mat = Matrix{Float64}(undef, size(mat, 1), size(mat, 2) + numel(inds_time))
 		new_inds = zeros(Int, size(mat, 2) + numel(inds_time))
 		for k = 1:numel(inds_time)						# Insert the time columns first.

test/test_labellines.jl

@@ -105,19 +105,19 @@ d12 = Dict{Symbol,Any}(:labellines => ["sin", "cos"]);
 cmd12 = ["psxy -R0/10/-1.5/1.5 -JX15c/10c -Baf -BWSen"];
 Dl2 = GMT.add_labellines!(Dl, d12, cmd12);
 @test occursin("-Sq", cmd12[1])
-@test occursin("-Sql", Dl2[1].header)
-@test occursin("sin", Dl2[1].header)
-@test occursin("cos", Dl2[2].header)
+@test occursin("-Sql", Dl[1].header)
+@test occursin("sin", Dl[1].header)
+@test occursin("cos", Dl[2].header)
 # Line colors should appear in the -Sq font spec
-@test occursin("red", Dl2[1].header)
+@test occursin("red", Dl[1].header)
 
 # 13) add_labellines! with xvals via NamedTuple
 Dl3 = [mat2ds(hcat(x, sin.(x)), header="-W1,red"), mat2ds(hcat(x, cos.(x)), header="-W1,blue")]
 d13 = Dict{Symbol,Any}(:labellines => (labels=["sin", "cos"], xvals=5.0))
 cmd13 = ["psxy -R0/10/-1.5/1.5 -JX15c/10c -Baf -BWSen"]
-Dl3b = GMT.add_labellines!(Dl3, d13, cmd13)
+GMT.add_labellines!(Dl3, d13, cmd13)
 @test occursin("-Sq", cmd13[1])
-@test occursin("sin", Dl3b[1].header)
+@test occursin("sin", Dl3[1].header)
 
 # 14) add_labellines! replaces previous -Sq (not appends)
 Dl4 = [mat2ds(hcat(x, sin.(x)), header="-W1,red -Sql1/2/3/4:+l\"old\"+f8p+v")]