More JELS fixes and change the the default GMT_SERVER value (#1972)

Author: joa-quim

ci/config-gmt-unix.sh

@@ -11,7 +11,7 @@ set (DCW_ROOT "$ENV{COASTLINEDIR}/dcw")
 
 set (GMT_USE_THREADS TRUE)
 set (GMT_ENABLE_OPENMP TRUE)
-set (GMT_DATA_SERVER https://www.star.nesdis.noaa.gov/data/socd3/lsa/gmtdata/)
+set (GMT_DATA_SERVER https://www.earthbyte.org/webdav/gmt_mirror/gmtdata/)
 
 # recommended even for release build
 set (CMAKE_C_FLAGS "-Wall -Wdeclaration-after-statement ${CMAKE_C_FLAGS}")

src/GMT.jl

@@ -377,7 +377,6 @@ using .Laszip
 @compile_workload begin
 	G_API[] = GMT_Create_Session("GMT", 2, GMT_SESSION_BITFLAGS)
 	#GMT.parse_B(Dict{Symbol, Any}(:frame => (annot=10, title="Ai Ai"), :grid => (pen=2, x=10, y=20)), "", " -Baf -BWSen");
-	#GMT.parse_opt_S(Dict{String, Any}(), mat2ds(rand(4,2)));
 	GMT.theme("dark")
 	GMT.theme_modern()
 	mat2ds([9 8; 9 8], x=[0 7], pen=["5p,black", "4p,white,20p_20p"], multi=true)

src/common_options.jl

@@ -3071,17 +3071,17 @@ function axis(D::Dict{Symbol,Any}, x::Bool, y::Bool, z::Bool, secondary::Bool, d
 
 	# intervals
 	ints::String, ann_2, ann_3, tic_2, tic_3, gri_2, gri_3, gri_d  = "", "", "", "", "", "", "", ""
-	if (haskey(d, :annot))      ints *= "a" * helper1_axes(d[:annot], is3D, 'a')  end
+	if (haskey(d, :annot))      ints *= "a" * helper1_axes(d, :annot, is3D, 'a')  end
 	contains(ints, ' ') && (spli = split(ints); ints = string(spli[1]); ann_2 = string(spli[2]); ann_3 = string(spli[3]))
 	(haskey(d, :annot_unit)) && (ints *= helper2_axes(d[:annot_unit]))
 
-	if (haskey(d, :ticks))      ints *= "f" * helper1_axes(d[:ticks], is3D, 'f')  end
+	if (haskey(d, :ticks))      ints *= "f" * helper1_axes(d, :ticks, is3D, 'f')  end
 	contains(ints, ' ') && (spli = split(ints); ints = string(spli[1]); tic_2 = string(spli[2]); tic_3 = string(spli[3]))
 	(haskey(d, :ticks_unit)) && (ints *= helper2_axes(d[:ticks_unit]))
 
 	if (haskey(d, :grid))
 		if (isa(d[:grid], NamedTuple))  gri_d = parse_grid(D, d[:grid], opt_B="", stalone=false)		# Whatever comes out
-		else                            gri_d = "g" * helper1_axes(d[:grid], is3D, 'g')
+		else                            gri_d = "g" * helper1_axes(d, :grid, is3D, 'g')
 		end
 		contains(gri_d, ' ') && (spli = split(gri_d); gri_d = string(spli[1]); gri_2 = string(spli[2]); gri_3 = string(spli[3]))
 		ints *= gri_d;	CTRL.pocket_B[1] = gri_d	# If gri_d has a space in it I guess some shit will happen later
@@ -3158,7 +3158,7 @@ function axis(D::Dict{Symbol,Any}, x::Bool, y::Bool, z::Bool, secondary::Bool, d
 	return opt, [have_Baxes, (opt_Bframe != "")]
 end
 
-function axis(opt::String, D::Dict; x::Bool=false, y::Bool=false, z::Bool=false, secondary::Bool=false)::Tuple{String, Vector{Bool}}
+function axis(opt::String, D::Dict{Symbol,Any}; x::Bool=false, y::Bool=false, z::Bool=false, secondary::Bool=false)::Tuple{String, Vector{Bool}}
 	# Method for axes setting already passed as a string
 	(x && opt[1] != 'x') && (opt = "x" * opt)
 	(y && opt[1] != 'y') && (opt = "y" * opt)
@@ -3194,15 +3194,15 @@ function helper0_axes(arg)::String
 end
 
 # ------------------------
-function helper1_axes(arg, is3D::Bool, c::Char)::String
+function helper1_axes(d::Dict{Symbol, Any}, symb::Symbol, is3D::Bool, c::Char)::String
 	# Used by annot, ticks and grid to accept also 'auto' and "" to mean automatic
-	out::String = arg2str(arg)
+	out::String = arg2str(d[symb])
 	(out != "" && out[1] == 'a') && return ""
-	if ((is3D || isa(arg, Tuple)) && ((nc = count_chars(out, '/')) > 0))
-		nc == 1 && return @sprintf("%.12g %s%.12g %s%.12g", arg[1], c, arg[1], c, arg[2])::String
-		nc == 2 && return @sprintf("%.12g %s%.12g %s%.12g", arg[1], c, arg[2], c, arg[3])::String
+	if ((is3D || isa(d[symb], Tuple)) && ((nc = count_chars(out, '/')) > 0))
+		nc == 1 && return @sprintf("%.12g %s%.12g %s%.12g", d[symb][1], c, d[symb][1], c, d[symb][2])::String
+		nc == 2 && return @sprintf("%.12g %s%.12g %s%.12g", d[symb][1], c, d[symb][2], c, d[symb][3])::String
 	end
-	(out != "" && isletter(out[1]) && out[1] != 'p') &&	# "pi" is allowed
+	(out != "" && isletter(out[1]) && out[1] != 'p') &&		# "pi" is allowed
 		(@warn("Probable misuse of the 'grid' sub-otpion. Defaulting to a valid value."); out = "")
 	return out
 end
@@ -4891,7 +4891,7 @@ macro var"?"(name)
 			dir = "modules/"
 			if sym in [:ablines,:append2fig,:bezier,:blendimg,:cart2pol,:cart2sph,:circfit,:colorzones,:cpt4dcw,:crop,
 			         :cubeplot,:coastlinesproj,
-			         :cubeslice,:date2doy,:delrows!,:doy2date,:ecmwf,:era5time,era5vars,:gadm,:geocoder,:geodetic2enu,
+			         :cubeslice,:date2doy,:delrows,:doy2date,:ecmwf,:era5time,era5vars,:gadm,:geocoder,:geodetic2enu,
 			         :getbyattrib,:getprovider,:gmtread,:gmtwrite, :graticules,:gridit,:gunique,hampel,:imagesc,:inwhichpolygon,
 			         :image_alpha!, :image_cpt!,:imshow,:ind2rgb, :info,:isnodata,:isoutlier,:lazinfo,:lazread,:lazwrite,:lasread,
 			         :laswrite,:lelandshade,:linearfitxy,:listecmwfvars,

src/gmtspatial.jl

@@ -106,7 +106,6 @@ function _gmtspatial_helper(cmd0::String, arg1, arg2, d::Dict)::Union{GMTdataset
 		D.colnames = getsize(D)[2] == 2 ? ["centroid_x","centroid_y"] : ["centroid_x","centroid_y","area"];
 		if isa(D, GMTdataset)
 			ind = findall(.!isfinite.(D.data[:,1]))
-			#!isempty(ind) && (D.data = delrows!(D.data, ind))		# Can't do this because it changes the number of output rows
 		end
 	end
 	set_dsBB!(D)

src/makeDCWs.jl

@@ -113,7 +113,7 @@ function makeDCWs(fname="ne_10m_admin_0_countries_iso.shp.zip"; float=false, nam
 					dx = diff(Dk[ind_big].data[:,1]);		dy = diff(Dk[ind_big].data[:,2])
 					ind_x = findall(abs.(dx) .< 0.00001);	ind_y = findall(abs.(dy) .< 0.00001)
 					ind = intersect(ind_x, ind_y)
-					(!isempty(ind)) && (Dk[ind_big].data = delrows!(Dk[ind_big].data, ind))		# Delete repeated points
+					(!isempty(ind)) && (Dk[ind_big].data = delrows(Dk[ind_big].data; rows=ind))		# Delete repeated points
 					deleteat!(Dk, n)		# Delete the one that was included in the big one
 					set_dsBB!(Dk)
 					break