Use the same Dict type "Dict{Symbol,Any}" all over a 'd' is passed. (#1940)

This forces only one type in many functions and thus reduces the multiple compilations.

Shelter grdimage.

Author: joa-quim

src/GMT.jl

@@ -96,7 +96,7 @@ const DEF_FIG_AXES = Ref{String}(DEF_FIG_AXES_BAK)	# This one may be be changed
 const DEF_FIG_AXES3 = Ref{String}(DEF_FIG_AXES3_BAK)#		""
 const FIG_MARGIN = Ref{Int}(1)                      # Figure margin in points after convertion by 'psconvert'. Accessible 'margin' common option
 const global CTRL = CTRLstruct(zeros(13), zeros(6), [true], [false],
-                    [:arrows, :bubblechart, :basemap, :band, :clip, :coast, :colorbar, :grdcontour, :hband, :hlines, :inset, :logo, :lines, :grdvector, :plot, :plot3, :quiver, :scatter, :scatter3, :stairs, :text, :vlines, :vband], ["", "", ""], ["", "", "", "   "], ["", ""], ["", ""], [false, true], [C_NULL], [Dict()])
+                    [:arrows, :bubblechart, :basemap, :band, :clip, :coast, :colorbar, :grdcontour, :hband, :hlines, :inset, :logo, :lines, :grdvector, :plot, :plot3, :quiver, :scatter, :scatter3, :stairs, :text, :vlines, :vband], ["", "", ""], ["", "", "", "   "], ["", ""], ["", ""], [false, true], [C_NULL], [Dict{Symbol,Any}()])
 const pocket_call = Ref{Vector{Any}}(Any[nothing, nothing, nothing, nothing, nothing, nothing])# Extracted from CTRL to isolate type instability
 const CTRLshapes = CTRLstruct2(true, true, "")		# Used in sub-module Drawing
 const prj4WGS84 = "+proj=longlat +datum=WGS84 +units=m +no_defs"# This is used in many places
@@ -387,7 +387,7 @@ using .Laszip
 	gmtwrite(t, [0.0 0; 1 1])
 	gmtread(t)
 	gmtread(TESTSDIR * "assets/burro_cenora.jpg")
-	coast(R=:g, proj=:guess, W=(level=1, pen=(2, :green)), savefig=tempname()*".ps")
+	#coast(R=:g, proj=:guess, W=(level=1, pen=(2, :green)), savefig=tempname()*".ps")
 	rm(t)
 	D = mat2ds(rand(3, 3), colnames=["Time", "b", "c"])
 	D.attrib = Dict("Timecol" => "1")

src/common_options.jl

@@ -45,9 +45,9 @@ function mapsize2region(; proj="", scale="", clon=NaN, clat=NaN, width=0, height
 	@assert clon != NaN && clat != NaN "Center longitude and latitude must be specified"
 	@assert width > 0 && height > 0 "Width and height must be positive"
 	@assert contains(scale, ':') "Scale must be in the form of '1:xxxx'"
-	(!isa(proj, StrSymb)) && (proj = parse_J(Dict(:J => proj, :scale => scale), "")[1][4:end];	scale="")	# scale is now in J
-	(bnds != "") && (bnds = parse_R(Dict(:R => bnds), "")[4:end])	# If bnds is not empty, parse it
-	(!isa(scale, StrSymb)) && (scale = parse_Scale(Dict(:S => scale), ""))	# If scale is not a StrSymb, parse it
+	(!isa(proj, StrSymb)) && (proj = parse_J(Dict{Symbol,Any}(:J => proj, :scale => scale), "")[1][4:end];	scale="")	# scale is now in J
+	(bnds != "") && (bnds = parse_R(Dict{Symbol,Any}(:R => bnds), "")[4:end])	# If bnds is not empty, parse it
+	(!isa(scale, StrSymb)) && (scale = parse_Scale(Dict{Symbol,Any}(:S => scale), ""))	# If scale is not a StrSymb, parse it
 	(bnds == "" && proj == "m" || startswith(proj, "merc") || startswith(proj, "Merc")) && (bnds="-180/180/-85/85")	# Default bounds for Mercator
 	opt_R, opt_J = mapsize2region(string(proj), scale, Float64(clon), Float64(clat), Float64(width), Float64(height), bnds)
 	(plot != 0) && coast(R=opt_R, J=opt_J, shore=true, show=true, Vd=1)

src/extras/mapsize2region.jl

@@ -136,7 +136,7 @@ function seismicity(; starttime::Union{DateTime, String}="", endtime::Union{Date
 	plot!(D[:,1:4]; ml="faint", S=opt_S, C=C, show=see, Vd=Vd, d...)
 	d = CTRL.pocket_d[1]
 	d[:show] = show
-	ms = (_size !== nothing) ? parse_opt_S(Dict(:size => _size), [3., 4, 5, 6, 7, 8, 9])[1] : [3., 4, 5, 6, 7, 8, 9] .* 0.02
+	ms = (_size !== nothing) ? parse_opt_S(Dict{Symbol,Any}(:size => _size), [3., 4, 5, 6, 7, 8, 9])[1] : [3., 4, 5, 6, 7, 8, 9] .* 0.02
 	st = (starttime != "") ? string(starttime) : string(Date(now() - Dates.Day(30)))
 	et = (endtime != "") ? string(endtime) : string(Date(now()))
 	legend && seislegend(; first=false, title="From "*st*" to "*et, cmap=C, mags=ms, pos="JBC+o0/1c+w12c/2.3c", d...)

src/extras/seismicity.jl

@@ -264,7 +264,7 @@ function ecmwf(source::Symbol=:reanalysis; filename="", cb::Bool=false, dataset=
 			last = (region == "") ? "\n" : ",\n"	# Having an extra comma at the end of the line is a json syntax error
 			params *= "\"download_format\": \"unarchived\"" * last
 			if (region != "")		# The region is provided by parse_R() as a string like " -R58/6/55/9" (N/W/S/E)
-				optR = split(parse_R(Dict(:R => region), "")[1], '/')
+				optR = split(parse_R(Dict{Symbol,Any}(:R => region), "")[1], '/')
 				params *= "\"area\": [" * optR[1][4:end] * ", " * optR[4] * ", " * optR[2] * ", " * optR[3] * "]\n"
 			end
 			params = "{\"product_type\": [\"reanalysis\"],\n" * params * "}"

src/extras/weather.jl

@@ -334,17 +334,19 @@ function gdalvectortranslate(indata, opts=String[]; dest="/vsimem/tmp", kwargs..
 	helper_run_GDAL_fun(gdalvectortranslate, indata, dest, opts, "", KW(kwargs))
 end
 
-function helper_run_GDAL_fun(f::Function, indata, dest::String, opts, method::String, d::Dict{Symbol, Any})::Union{GItype, GDtype, Gdal.AbstractDataset, Nothing}
+function helper_run_GDAL_fun(f::Function, indata, dest::String, opts, method::String, d::Dict{Symbol, Any})
 	ressurectGDAL()					# Another black-hole plug attempt.
 	opts = gdal_opts2vec(opts)		# Guarantied to return a Vector{String}
-	#d = KW(kwargs)
+	opts_vs = gdal_opts2vec(opts)	# Guarantied to return a Vector{String}
 	opts_vs, got_GMT_opts = GMT_opts_to_GDAL(f, opts, d)
-	_helper_run_GDAL_fun(f, indata, dest, opts_vs, method, got_GMT_opts, d)
+	d_fun = Dict{Symbol, Function}(:fun => f)	# To avoid fck compilation for each different fuction
+	_helper_run_GDAL_fun(d_fun, indata, dest, opts_vs, method, got_GMT_opts, d)
 end
 
 # ---------------------------------------------------------------------------------------------------
-function _helper_run_GDAL_fun(f::Function, indata, dest::String, opts::Union{String, Vector{String}}, method, got_GMT_opts::Bool, d::Dict{Symbol, Any})::Union{GItype, GDtype, Gdal.AbstractDataset, Nothing}
-	# This second level helper function reduces the number of multiple compiles. Here, only 'indata' may have different types.
+function _helper_run_GDAL_fun(d_fun::Dict{Symbol, Function}, @nospecialize(indata), dest::String, opts::Vector{String}, method::String, got_GMT_opts::Bool, d::Dict{Symbol, Any})
+	# This second level helper function reduces the number of multiple compiles.
+	f = d_fun[:fun]		# Get back the function name
 
 	Vd::Int = ((val = find_in_dict(d, [:Vd])[1]) !== nothing) ? val : 0		# More gymns to avoid Anys
 	(Vd > 0) && println(opts)
@@ -459,7 +461,6 @@ function GMT_opts_to_GDAL(f::Function, opts::Vector{String}, d::Dict{Symbol, Any
 			end
 		end
 		f == gdalgrid ? append!(opts, ["-txe", s[1], s[2], "-tye", s[3], s[4]]) : append!(opts, op)
-		#f == gdalgrid ? append!(opts, ["-txe", s[1], s[2], "-tye", s[3], s[4]]) : append!(opts, ["-projwin", split(opt_R[4:end], '/')[[1,4,2,3]]...])	# Ugly
 	end
 
 	x_srs = (f == gdaltranslate) ? "-a_srs" : "-t_srs"		# But don't know if there are others that take -a_srs instead of -t_srs
@@ -527,7 +528,7 @@ function default_gdopts!(f::Function, ds, opts::Vector{String}, dest::String)
 end
 
 # ---------------------------------------------------------------------------------------------------
-function get_gdaldataset(data, opts, isVec::Bool=false)::Tuple{Gdal.AbstractDataset, Bool}
+function get_gdaldataset(data, opts::Vector{String}, isVec::Bool=false)::Tuple{Gdal.AbstractDataset, Bool}
 	# Get a GDAL dataset from either a file name, a GMT grid or image, or a dataset itself
 	# In case of a file name we must be careful and deal with possible "+b" band requests from GMT.
 	# isVec tells us if the filename 'data' is to be opened as a Vector or a Raster.
@@ -540,11 +541,7 @@ function get_gdaldataset(data, opts, isVec::Bool=false)::Tuple{Gdal.AbstractData
 			o = split(ext[ind[1]+2:end], ",")			# But we must add 1 because GDAL band count is 1-based and GMT 0-based
 			p = parse.(Int, o) .+ 1
 			o = [string(c) for c in p]
-			if (isa(opts, Vector{String}))
-				for k = 1:lastindex(o)  append!(opts, ["-b", o[k]])  end
-			else
-				opts *= " -b" * join(o, " -b ")
-			end
+			for k = 1:lastindex(o)  append!(opts, ["-b", o[k]])  end
 		end
 		flags = isVec ? GDAL_OF_VECTOR | GDAL_OF_VERBOSE_ERROR : GDAL_OF_READONLY | GDAL_OF_VERBOSE_ERROR
 		_ext = lowercase(ext[2:end])		# Drop the leading dot too
@@ -578,7 +575,7 @@ Convert a 24bit RGB image to 8bit paletted.
 """
 function dither(indata, opts=String[]; n_colors::Integer=256, save::String="", gdataset::Bool=false)
 	# ...
-	src_ds, needclose = get_gdaldataset(indata, "", false)
+	src_ds, needclose = get_gdaldataset(indata, String[], false)
 	(nraster(src_ds) < 3) && error("Input image must have at least 3 bands")
 	(isa(indata, GMTimage) && !startswith(indata.layout, "TRB")) &&
 		error("Image memory layout must be `TRB` and not $(indata.layout). Load image with gdaltranslate()")

src/gdal/gdal_tools.jl

@@ -957,7 +957,8 @@ Write a MxNxP `cube` object to disk as a multilayered file.
 """
 function gdalwrite(fname::AbstractString, data, optsP=String[]; opts=String[], kw...)
 	(fname == "") && error("Output file name is missing.")
-	(isempty(optsP) && !isempty(opts)) && (optsP = opts)		# Accept either Positional or KW argument
+	(isempty(optsP) && !isempty(opts)) && (optsP = opts)			# Accept either Positional or KW argument
+	isa(optsP, AbstractString) && (optsP = gdal_opts2vec(optsP))	# Guarantied to return a Vector{String}
 	ds = Gdal.get_gdaldataset(data, optsP)[1]
 	if (Gdal.GDALGetRasterCount(ds.ptr) >= 1)
 		gdaltranslate(ds, optsP; dest=fname, kw...)

src/gdal_utils.jl

@@ -365,17 +365,20 @@ end
 mutable struct wrapGrids
 	fname::String
 	grd::GMTgrid
+	img::GMTimage
 	function wrapGrids(arg1, arg2)
-		if     (arg1 !== "")         new(arg1, GMTgrid())
-		elseif (isa(arg2, GMTgrid))  new("", arg2)
-		elseif (isa(arg2, Matrix{<:Real}))        new("", mat2grid(arg2))
-		elseif (arg1 === "" && arg2 === nothing)  new("", GMTgrid())	# Less usual case in grdlandmask where only kwargs are given
+		tg, ti  = GMTgrid(), GMTimage()
+		if     (arg1 !== "")         new(arg1, tg, ti)
+		elseif (isa(arg2, GMTgrid))  new("", arg2, ti)
+		elseif (isa(arg2, GMTimage)) new("", tg, arg2)
+		elseif (isa(arg2, Matrix{<:Real}))        new("", mat2grid(arg2), ti)
+		elseif (arg1 === "" && arg2 === nothing)  new("", tg, ti)	# Less usual case in grdlandmask where only kwargs are given
 		else   error("Unknown types ($(typeof(arg1)), $(typeof(arg2))) in wrapGrids")
 		end
 	end
 end
 function unwrapGrids(w::wrapGrids)
-	return w.fname, !isempty(w.grd) ? w.grd : nothing
+	return w.fname, !isempty(w.grd) ? w.grd : !isempty(w.img) ? w.img : nothing
 end
 
 #=

src/gmt_types.jl

@@ -49,12 +49,14 @@ grdimage!(arg1, arg2=nothing, arg3=nothing; kw...) = grdimage_helper("", arg1, a
 function grdimage_helper(cmd0::String, arg1=nothing, arg2=nothing, arg3=nothing; first=true, kwargs...)
 	d, K, O = init_module(first, kwargs...)		# Also checks if the user wants ONLY the HELP mode
 	(cmd0 != "" && arg1 === nothing && haskey(d, :inset)) && (arg1 = gmtread(cmd0); cmd0 = "")
-	grdimage_helper(cmd0, arg1, arg2, arg3, K, O, d)
+	(isa(arg1, Matrix{<:Real}) && isa(arg2, Matrix{<:Real}) && isa(arg3, Matrix{<:Real})) &&
+		(arg2 = mat2grid(arg2); arg3 = mat2grid(arg3))	# Because than wrapGrids will convert arg1 to GMTgrid and other two must type agree 
+	grdimage_helper(wrapGrids(cmd0, arg1), arg2, arg3, K, O, d)
 end
 
 # ---------------------------------------------------------------------------------------------------
-#function grdimage(cmd0::String="", arg1=nothing, arg2=nothing, arg3=nothing; first=true, kwargs...)
-function grdimage_helper(cmd0::String, arg1, arg2, arg3, K::Bool, O::Bool, d::Dict{Symbol, Any})
+function grdimage_helper(w::wrapGrids, arg2, arg3, K::Bool, O::Bool, d::Dict{Symbol, Any})
+	cmd0, arg1 = unwrapGrids(w)
 
 	common_insert_R!(d, O, cmd0, arg1)			# Set -R in 'd' out of grid/images (with coords) if limits was not used
 
@@ -84,10 +86,11 @@ function grdimage_helper(cmd0::String, arg1, arg2, arg3, K::Bool, O::Bool, d::Di
 		(haskey(d, :stretch) || haskey(d, :histo_bounds)) && delete!(d, [:histo_bounds, :stretch])
 	end
 
-	_grdimage(cmd0, arg1, arg2, arg3, O, K, d)
+	_grdimage(wrapGrids(cmd0, arg1), arg2, arg3, O, K, d)
 end
 
-function _grdimage(cmd0::String, arg1, arg2, arg3, O::Bool, K::Bool, d::Dict)
+function _grdimage(w::wrapGrids, arg2, arg3, O::Bool, K::Bool, d::Dict{Symbol, Any})
+	cmd0, arg1 = unwrapGrids(w)
 
 	arg4 = nothing		# For the r,g,b + intensity case
 

src/grdimage.jl

@@ -180,7 +180,7 @@ function imshow(arg1::GItype; kw...)
 			# This is a (poor) pach for a GMT bug that screws when plotting CPTs on the sides.
 			margin = "0"
 			if ((val = find_in_dict(d, [:colorbar], false)[1]) !== nothing)
-				tv = add_opt_module(Dict(:colorbar => val))
+				tv = add_opt_module(Dict{Symbol,Any}(:colorbar => val))
 				t2 = scan_opt(tv[1], "-D")
 				t2 = replace(t2, "JMR" => "JMC")
 				!contains(t2, "+o") && (t2 *= "+o$(_w/2 + 0.3)/0")