From f0cef352ad0ee4084c01237e740e7962ab890230 Mon Sep 17 00:00:00 2001 From: Jakub Miszczyszyn Date: Sun, 18 Feb 2024 22:16:55 +0100 Subject: [PATCH] self repair in dem_download_big_area_rgugik --- DESCRIPTION | 4 +--- NAMESPACE | 2 -- R/dem_download_big_area_rgugik.R | 28 +++++++++------------------ R/ortho_download_big_area_rgugik.R | 23 +++++++++++----------- man/dem_download_big_area_rgugik.Rd | 20 ------------------- man/ortho_download_big_area_rgugik.Rd | 8 +------- 6 files changed, 22 insertions(+), 63 deletions(-) delete mode 100644 man/dem_download_big_area_rgugik.Rd diff --git a/DESCRIPTION b/DESCRIPTION index a0d2248..ff679a7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,9 +1,7 @@ Package: foRestools Title: Tools for foresters Version: 1.0.1 - -Authors@R: - person("First", "Last", , "jakub.miszczyszyn@urk.edu.pl", role = c("cre","aut"), +Authors@R: person("First", "Last", , "jakub.miszczyszyn@urk.edu.pl", role = c("cre","aut"), comment = c(ORCID = "0009-0002-8592-946X")) Description: Calculate vegetation indices and generate statistics and charts for user defined districts License: MIT + file LICENSE diff --git a/NAMESPACE b/NAMESPACE index bb03c69..26b8c85 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -16,6 +16,4 @@ export(define_nir) export(define_red) export(define_rededge) export(define_yellow) -export(dem_download_big_area_rgugik) export(ortho_download_big_area_rgugik) -importFrom(lifecycle,deprecated) diff --git a/R/dem_download_big_area_rgugik.R b/R/dem_download_big_area_rgugik.R index f90a752..3050584 100644 --- a/R/dem_download_big_area_rgugik.R +++ b/R/dem_download_big_area_rgugik.R @@ -1,23 +1,13 @@ - -#' Title -#' -#' @param x - path to your shapefile -#' @param y - integer of length 1 or 2, number of grid cells in x and y direction (columns, rows) -#' -#' @return -#' @export -#' -#' @examples -dem_download_big_area_rgugik=function(x,y){ - aoi=sf::st_read(x) - grid=sf::st_make_grid(aoi, n=y) - aoi=sf::st_intersection(aoi,grid) +dem_download_big_area_rgugik <- function(x, y) { + aoi <- sf::st_read(x) + grid <- sf::st_make_grid(aoi, n = y) + aoi <- sf::st_intersection(aoi, grid) plot(aoi) - result=data_frame() - for (i in 1:length(aoi$geometry)) { - req_df=rgugik::DEM_request(aoi[i,]) - result=dplyr::bind_rows(req_df, result) + result <- tibble::tibble() + for (i in seq_len(nrow(aoi))) { + req_df <- rgugik::DEM_request(aoi[i, ]) + result <- dplyr::bind_rows(result, req_df) } - return(result) print("This tools is based on https://github.com/kadyb/rgugik") + return(result) } diff --git a/R/ortho_download_big_area_rgugik.R b/R/ortho_download_big_area_rgugik.R index 1dd0bb5..bc84bd0 100644 --- a/R/ortho_download_big_area_rgugik.R +++ b/R/ortho_download_big_area_rgugik.R @@ -1,23 +1,22 @@ - #' Title #' -#' @param x - path to your shapefile -#' @param y - integer of length 1 or 2, number of grid cells in x and y direction (columns, rows) +#' @param x +#' @param y #' #' @return #' @export #' #' @examples -ortho_download_big_area_rgugik=function(x,y){ - aoi=sf::st_read(x) - grid=sf::st_make_grid(aoi, n=y) - aoi=sf::st_intersection(aoi,grid) +ortho_download_big_area_rgugik <- function(x, y) { + aoi <- sf::st_read(x) + grid <- sf::st_make_grid(aoi, n = y) + aoi <- sf::st_intersection(aoi, grid) plot(aoi) - result=data_frame() - for (i in 1:length(aoi$geometry)) { - req_df=rgugik::ortho_request(aoi[i,]) - result=dplyr::bind_rows(req_df, result) + result <- tibble::tibble() + for (i in seq_len(nrow(aoi))) { + req_df <- rgugik::ortho_request(aoi[i, ]) + result <- dplyr::bind_rows(result, req_df) } - return(result) print("This tools is based on https://github.com/kadyb/rgugik") + return(result) } diff --git a/man/dem_download_big_area_rgugik.Rd b/man/dem_download_big_area_rgugik.Rd deleted file mode 100644 index c770087..0000000 --- a/man/dem_download_big_area_rgugik.Rd +++ /dev/null @@ -1,20 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/dem_download_big_area_rgugik.R -\name{dem_download_big_area_rgugik} -\alias{dem_download_big_area_rgugik} -\title{Title} -\usage{ -dem_download_big_area_rgugik(x, y) -} -\arguments{ -\item{x}{\itemize{ -\item path to your shapefile -}} - -\item{y}{\itemize{ -\item integer of length 1 or 2, number of grid cells in x and y direction (columns, rows) -}} -} -\description{ -Title -} diff --git a/man/ortho_download_big_area_rgugik.Rd b/man/ortho_download_big_area_rgugik.Rd index 9da47a9..973ff23 100644 --- a/man/ortho_download_big_area_rgugik.Rd +++ b/man/ortho_download_big_area_rgugik.Rd @@ -7,13 +7,7 @@ ortho_download_big_area_rgugik(x, y) } \arguments{ -\item{x}{\itemize{ -\item path to your shapefile -}} - -\item{y}{\itemize{ -\item integer of length 1 or 2, number of grid cells in x and y direction (columns, rows) -}} +\item{y}{} } \description{ Title