Update

NAMESPACE

@@ -42,11 +42,7 @@ export(x_numeric_breaks)
 export(y_numeric_breaks)
 import(ggplot2)
 import(leaflet)
+import(sf)
 importFrom(magrittr,"%>%")
 importFrom(rlang,"!!")
 importFrom(rlang,.data)
-importFrom(sf,st_crs)
-importFrom(sf,st_drop_geometry)
-importFrom(sf,st_geometry_type)
-importFrom(sf,st_is_longlat)
-importFrom(sf,st_transform)

R/ggplotly.R

@@ -41,7 +41,7 @@ plotly_camera <- function(plotly, logo = FALSE){
 #'   plotly_col_legend(rev = TRUE)
 #' 
 #' plotly::ggplotly(plot) %>% 
-#'   plotly_col_legend(order = c(2, 1, 3:8))
+#'   plotly_col_legend(order = c(2, 1, 3:7))
 plotly_col_legend <- function(plotly, rev = FALSE, order = NULL) {
   if(rev == TRUE & !is.null(order)) stop("Please either reverse or provide a specified order, but not both")
 

R/imports.R

@@ -2,13 +2,9 @@
 #' 
 #' @import ggplot2
 #' @import leaflet
+#' @import sf
 #' @importFrom rlang !!
 #' @importFrom rlang .data
-#' @importFrom sf st_crs
-#' @importFrom sf st_drop_geometry
-#' @importFrom sf st_geometry_type
-#' @importFrom sf st_is_longlat
-#' @importFrom sf st_transform
 
 NULL
 

R/other.R

@@ -20,13 +20,17 @@
 #' plotly::ggplotly(plot, tooltip = "text")
 mutate_text <- function(data, text_vars_vctr = NULL, comma = FALSE) {
 
-  data <- data %>% dplyr::ungroup()
+  data <- data %>% 
+    dplyr::ungroup()
 
   class <- class(data)[1]
 
   if(is.null(text_vars_vctr)) {
-    if(class == "sf") text_vars_vctr <- colnames(data)[colnames(data) != "geometry"]
-    else if(class != "sf") text_vars_vctr <- colnames(data)
+    if(class == "sf") {
+      text_vars_vctr <- colnames(data)[colnames(data) != "geometry"]
+    } else if(class != "sf") {
+      text_vars_vctr <- colnames(data)
+    }
   }
 
   text <- vector("character", 0)
@@ -37,7 +41,7 @@ mutate_text <- function(data, text_vars_vctr = NULL, comma = FALSE) {
       temp <- data %>% 
         dplyr::select(text_vars_vctr[i]) 
 
-      if(class == "sf") temp <- temp %>% 
+      if(class == "sf") temp <- temp %>%
           sf::st_drop_geometry()
 
       temp <- paste0(
@@ -54,7 +58,7 @@ mutate_text <- function(data, text_vars_vctr = NULL, comma = FALSE) {
       temp <- data %>% 
         dplyr::select(text_vars_vctr[i]) 
 
-      if(class == "sf") temp <- temp %>% 
+      if(class == "sf") temp <- temp %>%
           sf::st_drop_geometry()
 
       temp <- paste0(
@@ -68,6 +72,11 @@ mutate_text <- function(data, text_vars_vctr = NULL, comma = FALSE) {
 
   data <- data %>%
     dplyr::mutate(text = stringr::str_replace_all(text, " NA<br>", " Not available<br>"))
+
+  if(class == "sf") {
+    data <- data %>%
+      dplyr::relocate(text, .before = "geometry")
+  }
 
   return(data)
 }

docs/pkgdown.yml

@@ -8,5 +8,5 @@ articles:
   scales: scales.html
   shiny: shiny.html
   simplevis: simplevis.html
-last_built: 2021-05-07T04:14Z
+last_built: 2021-05-07T06:03Z