From 3551df38259aca78e9f5baeab64f10d48b872ffe Mon Sep 17 00:00:00 2001 From: Carl Suster Date: Tue, 16 Jan 2024 15:23:40 +1100 Subject: [PATCH] Fix lint errors --- R/geom_inset_frame.R | 6 ++++-- R/geom_sf_inset.R | 27 ++++++++++++++++++--------- R/stat_sf_coordinates_inset.R | 3 ++- R/stat_sf_inset.R | 6 ++++-- R/transform_to_inset.R | 6 ++++-- data-raw/mozzies_nsw2301.R | 12 ++++++------ data/mozzies_nsw2301.rda | Bin 2956 -> 2912 bytes vignettes/ggmapinset.Rmd | 12 ++++++++---- 8 files changed, 46 insertions(+), 26 deletions(-) diff --git a/R/geom_inset_frame.R b/R/geom_inset_frame.R index ba3330b..5c675cd 100644 --- a/R/geom_inset_frame.R +++ b/R/geom_inset_frame.R @@ -186,13 +186,15 @@ get_outer_bitangents <- function(centre1, radius1, centre2, radius2) { phi1 <- atan2(centre2[[2]] - centre1[[2]], centre2[[1]] - centre1[[1]]) + acos(short / hypot) b1 <- sf::st_sfc( sf::st_point(c(centre1[[1]] + radius1 * cos(phi1), centre1[[2]] + radius1 * sin(phi1))), - sf::st_point(c(centre2[[1]] + radius2 * cos(phi1), centre2[[2]] + radius2 * sin(phi1)))) + sf::st_point(c(centre2[[1]] + radius2 * cos(phi1), centre2[[2]] + radius2 * sin(phi1))) + ) b1 <- sf::st_cast(sf::st_union(b1), "LINESTRING") phi2 <- atan2(centre2[[2]] - centre1[[2]], centre2[[1]] - centre1[[1]]) - acos(short / hypot) b2 <- sf::st_sfc( sf::st_point(c(centre1[[1]] + radius1 * cos(phi2), centre1[[2]] + radius1 * sin(phi2))), - sf::st_point(c(centre2[[1]] + radius2 * cos(phi2), centre2[[2]] + radius2 * sin(phi2)))) + sf::st_point(c(centre2[[1]] + radius2 * cos(phi2), centre2[[2]] + radius2 * sin(phi2))) + ) b2 <- sf::st_cast(sf::st_union(b2), "LINESTRING") c(b1, b2) diff --git a/R/geom_sf_inset.R b/R/geom_sf_inset.R index 76b4841..299ba90 100644 --- a/R/geom_sf_inset.R +++ b/R/geom_sf_inset.R @@ -107,17 +107,23 @@ transform_only_viewport <- function(data, inset) { sf::st_sf(data), inset_centre(inset), .f = function(data, centre) { result <- clip_to_viewport(data$geometry, viewport) - geometry <- transform(result[["geometry"]], centre, - scale = inset_scale(inset), - translation = inset_translation(inset)) + geometry <- transform( + result[["geometry"]], + centre, + scale = inset_scale(inset), + translation = inset_translation(inset) + ) data <- data[result[["retained"]], ] data$geometry <- geometry data - }) + } + ) if (nrow(result) == 0 && nrow(data) != 0) { - cli::cli_warn(c("None of the spatial data is inside the inset viewport", - "i" = "Check your inset configuration to ensure the centre, radius, and units are correct")) + cli::cli_warn(c( + "None of the spatial data is inside the inset viewport", + "i" = "Check your inset configuration to ensure the centre, radius, and units are correct" + )) } result @@ -134,11 +140,14 @@ remove_viewport <- function(data, inset) { data <- data[result[["retained"]], ] data$geometry <- result[["geometry"]] data - }) + } + ) if (nrow(result) == 0 && nrow(data) != 0) { - cli::cli_warn(c("None of the spatial data is outside the inset viewport", - "i" = "Check your inset configuration to ensure the centre, radius, and units are correct")) + cli::cli_warn(c( + "None of the spatial data is outside the inset viewport", + "i" = "Check your inset configuration to ensure the centre, radius, and units are correct" + )) } result diff --git a/R/stat_sf_coordinates_inset.R b/R/stat_sf_coordinates_inset.R index 4b244fa..60beac9 100644 --- a/R/stat_sf_coordinates_inset.R +++ b/R/stat_sf_coordinates_inset.R @@ -72,7 +72,8 @@ stat_sf_coordinates_inset <- function(mapping = ggplot2::aes(), data = NULL, fun.geometry = fun.geometry, na.rm = na.rm, ... - )) + ) + ) } #' @export diff --git a/R/stat_sf_inset.R b/R/stat_sf_inset.R index 9d6ee1c..69ae282 100644 --- a/R/stat_sf_inset.R +++ b/R/stat_sf_inset.R @@ -19,7 +19,8 @@ stat_sf_inset <- function(mapping = ggplot2::aes(), data = NULL, inset = inset, na.rm = na.rm, ... - )) + ) + ) } #' @export @@ -77,6 +78,7 @@ inset_bbox <- function(inset) { .f = function(centre) { viewport <- circular_viewport(centre, radius) transform(viewport, centre, scale = scale, translation = translation) - }) + } + ) sf::st_bbox(result) } diff --git a/R/transform_to_inset.R b/R/transform_to_inset.R index dae3dd0..be08a64 100644 --- a/R/transform_to_inset.R +++ b/R/transform_to_inset.R @@ -28,9 +28,11 @@ transform_to_inset <- function(x, inset) { translation <- inset_translation(inset) result <- with_crs_working( - crs_working, geometry, inset_centre(inset), .f = function(result, centre) { + crs_working, geometry, inset_centre(inset), + .f = function(result, centre) { transform(result, centre, scale = scale, translation = translation) - }) + } + ) if (has_s3_method("st_geometry<-", class(x))) { sf::st_set_geometry(x, result) diff --git a/data-raw/mozzies_nsw2301.R b/data-raw/mozzies_nsw2301.R index 6d8042e..c8ec49b 100644 --- a/data-raw/mozzies_nsw2301.R +++ b/data-raw/mozzies_nsw2301.R @@ -117,8 +117,8 @@ sites <- tribble( "Mullumbimby", "coastal", "-28 33 0", "153 30 0", "Murrumbidgee", "inland", "-34 48 0", "145 53 0", "Murwillumbah", "coastal", "-28 19 39", "153 23 45", - "Narrabi","inland", "-30 19 0", "149 46 0", - "Narrendera","inland", "-34 45 0", "146 33 0", + "Narrabi", "inland", "-30 19 0", "149 46 0", + "Narrendera", "inland", "-34 45 0", "146 33 0", "Newcastle", "coastal", "-32 55 0", "151 45 0", "Northern Beaches", "sydney", "-33 45 0", "151 17 0", "Numbucca", "coastal", "-30 43 0", "152 55 0", @@ -127,13 +127,13 @@ sites <- tribble( "Port Macquarie", "coastal", "-31 26 0", "152 54 0", "Shoalhaven", "coastal", "-34 51 0", "150 44 0", "Sydney Olympic Park", "sydney", "-33 50 51", "151 03 54", - "Temora","inland", "-34 26 0", "147 32 0", + "Temora", "inland", "-34 26 0", "147 32 0", "Tweed Heads", "coastal", "-28 11 0", "153 33 0", "Wagga Wagga", "inland", "-35 7 8", "147 22 8", "Walgett", "inland", "-30 01 0", "148 07 0", "Wauchope", "coastal", "-31 27 0", "152 44 0", "West Wyalong", "inland", "-33 55 0", "147 13 0", - "Wilcannia","inland", "-31 33 25", "143 22 45", + "Wilcannia", "inland", "-31 33 25", "143 22 45", "Wollongong", "coastal", "-34 25 38", "150 53 38", "Wyong", "coastal", "-33 16 55", "151 25 5", "Yass", "inland", "-34 49 0", "148 54 0", @@ -149,8 +149,8 @@ coords_to_decimal <- function(coords) { str_split_fixed(" ", 3) |> as.integer() |> matrix(ncol = 3) - sign_coords <- sign(parts[,1]) - sign_coords * (abs(parts[,1]) + parts[,2]/60 + parts[,3]/3600) + sign_coords <- sign(parts[, 1]) + sign_coords * (abs(parts[, 1]) + parts[, 2] / 60 + parts[, 3] / 3600) } expand_levels <- function(raw) { diff --git a/data/mozzies_nsw2301.rda b/data/mozzies_nsw2301.rda index 6e0a4fe94045b7ee72eee335143da15f85c5c88a..dbd51d5e7c9eca576f877d0eba0e36e3f48f8773 100644 GIT binary patch literal 2912 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 literal 2956 zcmcJQ{X5eOAIHaG!PV=zQSWF(5^3cyq^)I1b< zW|3pd;|OyjOecnjx}y+|BZNxi?z(?E|G@qF>GQs>_jP?fzkJ?rTX%m;QyVuUsvA2J z28EbRZ2pgtmCd`GA2;WJi0`xO(@m2nHr_4=M>KEV*t{_I^TXp;{ng4@3hR&mA4z?&!=L*)!p*=bW(Hb{}ulTS*HVp#PJm9rWh#Gfl$+ zv0lpdxy78jpY zD!FACcRGzUbh4X+xYl>WvE1k+w0=D>LFwN$wA|Dh<{DvBVE^JSM`6f+`q21oKW5RIPvsw zT)$2rQKJUBJ8+9eUQJ7f0gQLkbgPpOvC3$Sdm0^Ff#*2zJs-2$%~5>D zI0w~-Me=1AkZ{oKfic5VYp7QIc8QH&l*&&3Tiu!gYmUgRqdGGD>a&|SRP})ys3*wl4K=-ytw8 z?x0colYVJ^xI;OWGAuY^Rc%ysc+?e7jbccXis}ZMhnQSbjH#^?-;E?U-;s3A(WML z2WFw5Btd1)1Y!8#l=6{{od<~+o@?$Mj`tn6==t?3)Dx`MU*sgbuR{qIq*pTI+)&4> zgt9BPJx|li(3anIO`W0?v+xaYEF>6(s3+7gZiS#6-3d(|lO@Tgdc^mfOt zC#Af?vzT*I?tn*op_JQG1NIBy@c_CKAp9-Jtp&ZG=3Pi%Ma~3*^lEtvKF4d#qkSUz z?@OpP5LW3a8N*?&S2`$4wwby-`NmGTqOc%)))jT&Y`F07YOn|^eR15AH7QJ4F4`b$ zqTe9lDa>6_2Gk;Vo{|#+$JPQm_GwATZFF@ z7UW~;tymED40sso@eN%N`}iHQo-+g9VeSe+c6_N9ObXR+b9?IAbDu_?$AW@PUjSC< zDe0`z!evwv>)gp{jQx5wAgrrXIxpWv8G4Z_br)ruW^w?@m(|#`tOUD(mz?I3~ zN<6j}UIxG_ymsin1>$ax1i#;D0Tuy@DR}S@u1zWpXg8k}(mKT6wZ|0gX1Idt&wPcO za4`sVKq~nJ%Z$3cPThI+LL<;=%qC#|c7td$JS^JXLYtLvZ^)VXSN$AFn0Q zYy~!s%+7DOq~nNTaI>G>2#cw(VhubC&oep4PSyO@dFK1bFcMX7Pkr%`GgU^hIn z3T|_46HmN={F5Ndy`%hPvW%z=_m&82UOKaSJr%3Enf?H}vpcI+RQg1e6D~VnF7L$3 z>5K@DkUu0GzhpN2^pn^%@iu1GJ#{R{(letGg8!o6709*xcRk$IOLy^~r{y@Gg1W72Z zE2;n<5+v^AGrK4Gy+D4i{Z-p(p{LF(U;1y~O`Xfr-eQp{&+@Qj5g-`_xD)eox)@&% z1aEtCyl%1+NO^~lJ$}NwzH^`r>ThOKxkqn0`_wUvy2FLr=yJx52gpT#EEryYWxe%3 z@6$DZJk=~n1M-KEu=*Mg<%#9PUt3L^`9t_$7#)j&!sHNS?%gsMgm`Rno0y2%PIEU`W{Y)@b|U$U7&LM_ zH;km;QnFKWwTsunnD-m7o>8k&PVVdvAnGaGkNRu(X-@Nuldz~_Jk9Iq z)66KsHzn^%_|ruYvCdimN019O@^PW*aL!fCT>ni>g2p-m80=G#W>;7bNXg zOD}g6L|=Rj(7M|G23dcep*)U1&^+zn1hBpqattQYnqs2)Z*j`j3(b&Yxe<_Q8KR_% z+WlQUB6~KAc6rv;3T6;lh+!XAzcfJApfv;*DXnZKWK=(5W2h2}(&jx1$>$E+WfFZH zZFLt=1F#SiKlwNm;1n7ph$e)DKs9#>E|Ws6am{ zHjlDmepW=L$sSUz`T1Fa31r7&YyfAvIMu26eS*pYGyHD3mv@u+3gt8U0~yBeWiB^Y zS@pU`Sbd?oy@slX#AG7`M_LxW_f=t0QoOd5yK-?J4K$utYX zraD_1DV+{nFU>~DjOt&Y=UtY=2o|pYjVsgLK8%Z(qTg=MB3I&tZm1V{x;xPswx-+1 zDp5O6@^wpJPVYAENoy(ldc!EA*qRuHSY_X_IUDLw2((Uv`5r~Hgz3)j++OC7h*