From 8e3377457f883102e1c548487fa2fd71bbf51b85 Mon Sep 17 00:00:00 2001 From: Florencia D'Andrea Date: Wed, 13 Mar 2024 07:06:49 -0700 Subject: [PATCH] Update DESCRIPTION authors and fix bug in pixelXY_to_latlong() --- DESCRIPTION | 21 +++++++++++-- R/grid_to_polygon.R | 8 ----- R/qk_to_latlong_functions.R | 2 +- docs/404.html | 2 +- docs/CODE_OF_CONDUCT.html | 2 +- docs/CONTRIBUTING.html | 2 +- docs/LICENSE-text.html | 2 +- ...acebook_mobility_csvs_to_raster_files.html | 4 +-- docs/articles/index.html | 2 +- .../quadkey_identified_data_to_raster.html | 2 +- docs/articles/quadkey_to_sf_conversion.html | 4 +-- docs/articles/quadkey_visualization_app.html | 4 +-- docs/authors.html | 30 +++++++++++++++++-- docs/index.html | 6 +++- docs/news/index.html | 2 +- docs/pkgdown.yml | 2 +- docs/reference/add_regular_polygon_grid.html | 2 +- docs/reference/apply_weekly_lag.html | 2 +- docs/reference/clip.html | 2 +- .../reference/complete_grid_for_polygons.html | 2 +- docs/reference/create_qk_grid.html | 2 +- docs/reference/create_stars_raster.html | 2 +- docs/reference/data_provided.html | 2 +- docs/reference/format_fb_data.html | 2 +- docs/reference/get_qk_coord.html | 2 +- docs/reference/get_regular_polygon_grid.html | 2 +- docs/reference/get_tile_coord.html | 2 +- docs/reference/grid_to_polygon.html | 2 +- docs/reference/ground_res.html | 2 +- docs/reference/index.html | 2 +- docs/reference/latlong_to_pixelXY.html | 2 +- docs/reference/latlong_to_quadkey.html | 2 +- docs/reference/mapscale.html | 2 +- docs/reference/mapsize.html | 2 +- docs/reference/missing_combinations.html | 2 +- docs/reference/pixelXY_to_latlong.html | 2 +- docs/reference/pixelXY_to_tileXY.html | 2 +- docs/reference/polygon_to_raster.html | 2 +- docs/reference/qkmap_app.html | 2 +- docs/reference/quadkey_df_to_polygon.html | 2 +- docs/reference/quadkey_to_latlong.html | 2 +- docs/reference/quadkey_to_polygon.html | 2 +- docs/reference/quadkey_to_tileXY.html | 2 +- docs/reference/quadkeyr-package.html | 2 +- docs/reference/read_fb_mobility_files.html | 2 +- docs/reference/regular_qk_grid.html | 2 +- .../result_read_fb_mobility_data.html | 2 +- docs/reference/tileXY_to_pixelXY.html | 2 +- docs/reference/tileXY_to_quadkey.html | 2 +- docs/search.json | 2 +- 50 files changed, 100 insertions(+), 63 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5874c09..b8e5173 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,11 +2,28 @@ Package: quadkeyr Title: Tools for converting QuadKey-identified datasets (Microsoft's Bing Maps Tile System) into raster images Version: 0.0.0.9000 Authors@R: - person(given = "Florencia", + c(person(given = "Florencia", family = "D'Andrea", email = "florencia.dandrea@gmail.com", role = c("aut", "cre"), - comment = c(ORCID = "0000-0002-0041-097X")) + comment = c(ORCID = "0000-0002-0041-097X")), + person(given = "Pilar", + family = "Fernandez", + email = "pilar.fernandez@wsu.edu", + role = c("aut"), + comment = c(ORCID = "0000-0001-8645-2267")), + person(given = "Maria Paula", + family = "Caldas", + role = c("rev"), + comment = c("Maria Paula Caldas reviewed the package (v. 0.0.99) for rOpenSci, see https://github.com/ropensci/software-review/issues/619")), + person(given = "Vincent", + family = "Van Hess", + role = c("rev"), + comment = c("Vincent Van Hess reviewed the package (v. 0.0.99) for rOpenSci, see https://github.com/ropensci/software-review/issues/619")), + person("CDC's Center for Forecasting and Outbreak Analytics", + comment = c("This project was made possible by cooperative agreement CDC-RFA-FT-23-0069 (grant # NU38FT000009-01-00) from the CDC's Center for Forecasting and Outbreak Analytics. Its contents are solely the responsibility of the authors and do not necessarily represent the official views of the Centers for Disease Control and Prevention."), role = c("fnd")), + person("MIDAS-NIH COVID-19 urgent grant program", role = c("fnd")), + person("Washington State University", role = c("cph"))) Description: 'Quadkeyr' functions generate raster images based on QuadKey-identified data, facilitating efficient integration of Tile Maps data into R workflows. In particular, 'Quadkeyr' provides support to process and analyze Facebook mobility datasets within the R environment. License: MIT + file LICENSE URL: https://fernandez-lab-wsu.github.io/quadkeyr/, https://github.com/Fernandez-Lab-WSU/quadkeyr diff --git a/R/grid_to_polygon.R b/R/grid_to_polygon.R index ee4412a..4c0db94 100644 --- a/R/grid_to_polygon.R +++ b/R/grid_to_polygon.R @@ -36,14 +36,6 @@ grid_to_polygon <- function(data) { stop("The dataset should be of class 'sf'") } - # Convert the QuadKeys to tile coordinates - # if that columns aren't present in the data - # if (!("tileX" %in% colnames(data) | "tileY" %in% colnames(data))) { - # message(paste( - # "The 'tileX' and 'tileY' columns have been generated", - # "using the 'quadkey_to_tileXY' function." - # )) - # In the case that one of this columns is not present, # calculate both again. data$tileX <- NA diff --git a/R/qk_to_latlong_functions.R b/R/qk_to_latlong_functions.R index 4c0b6fc..4d459a8 100644 --- a/R/qk_to_latlong_functions.R +++ b/R/qk_to_latlong_functions.R @@ -169,7 +169,7 @@ pixelXY_to_latlong <- function(pixelX, pixelY, zoom) { } # Check if pixelX and pixelY are within the valid range - max_pixel_value <- mapsize(zoom) - 1 + max_pixel_value <- mapsize(zoom) if (pixelX < 0 | pixelX > max_pixel_value | pixelY < 0 | pixelY > max_pixel_value) { stop(paste( diff --git a/docs/404.html b/docs/404.html index 07a88b4..510cb98 100644 --- a/docs/404.html +++ b/docs/404.html @@ -86,7 +86,7 @@