diff --git a/DESCRIPTION b/DESCRIPTION index 034b4ca..612548e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Type: Package Package: MazamaLocationUtils -Version: 0.4.0 +Version: 0.4.1 Title: Manage Spatial Metadata for Known Locations Authors@R: c( person("Jonathan", "Callahan", email="jonathan.s.callahan@gmail.com", role=c("aut","cre")), diff --git a/NEWS.md b/NEWS.md index a2b1a63..04070fc 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# MazamaLocationUtils 0.4.1 + +* Documentation fixes for CRAN submission. + # MazamaLocationUtils 0.4.0 * Added `clusterByDistance()` and `table_addClustering()` functions. diff --git a/R/clusterByDistance.R b/R/clusterByDistance.R index 11c6227..e14c299 100644 --- a/R/clusterByDistance.R +++ b/R/clusterByDistance.R @@ -30,7 +30,7 @@ #' #' @seealso \link{table_removeRecord} #' -#' #' @examples +#' @examples #' library(MazamaLocationUtils) #' #' # Fremont, Seattle 47.6504, -122.3509 diff --git a/R/table_addClustering.R b/R/table_addClustering.R index 8ab25ba..bd6dad1 100644 --- a/R/table_addClustering.R +++ b/R/table_addClustering.R @@ -38,7 +38,7 @@ #' #' @seealso \link{clusterByDistance} #' -#' #' @examples +#' @examples #' library(MazamaLocationUtils) #' #' # Fremont, Seattle 47.6504, -122.3509 diff --git a/R/table_leaflet.R b/R/table_leaflet.R index 14096c1..dcf33cf 100644 --- a/R/table_leaflet.R +++ b/R/table_leaflet.R @@ -16,11 +16,11 @@ #' #' @details The \code{maptype} argument is mapped onto leaflet "ProviderTile" #' names. Current mappings include: -#' \enumerate{ -#' \item{"roadmap"}{ -- "OpenStreetMap"} -#' \item{"satellite"}{ -- "Esri.WorldImagery"} -#' \item{"terrain"}{ -- "Esri.WorldTopoMap"} -#' \item{"toner"}{ -- "Stamen.Toner"} +#' \itemize{ +#' \item{"roadmap" => "OpenStreetMap"} +#' \item{"satellite" => "Esri.WorldImagery"} +#' \item{"terrain" => "Esri.WorldTopoMap"} +#' \item{"toner" => "Stamen.Toner"} #' } #' #' If a character string not listed above is provided, it will be used as the diff --git a/docs/404.html b/docs/404.html index f03ecb1..19d6954 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,7 +32,7 @@
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 0e297e5..03d828f 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -17,7 +17,7 @@ diff --git a/docs/articles/Developer_Style_Guide.html b/docs/articles/Developer_Style_Guide.html index 2b7318e..ab3e2f9 100644 --- a/docs/articles/Developer_Style_Guide.html +++ b/docs/articles/Developer_Style_Guide.html @@ -33,7 +33,7 @@ diff --git a/docs/articles/MazamaLocationUtils.html b/docs/articles/MazamaLocationUtils.html index 2b2df5f..6d8f8ab 100644 --- a/docs/articles/MazamaLocationUtils.html +++ b/docs/articles/MazamaLocationUtils.html @@ -33,7 +33,7 @@ @@ -312,9 +312,9 @@## [1] "Burbank" NA "Soap Lake" NA NA
+## [1] NA "Newport" NA NA NA
## [6] NA NA NA NA "Wenatchee"
-## [11] "Mount Vernon" "White Salmon" "LaCrosse"
+## [11] "Mount Vernon" NA NA
# How about 5000 meters?
table_getNearestLocation(
diff --git a/docs/articles/index.html b/docs/articles/index.html
index 4d82142..74c5e3d 100644
--- a/docs/articles/index.html
+++ b/docs/articles/index.html
@@ -17,7 +17,7 @@
Callahan J (2023). MazamaLocationUtils: Manage Spatial Metadata for Known Locations. -R package version 0.4.0, https://github.com/MazamaScience/MazamaLocationUtils. +R package version 0.4.1, https://github.com/MazamaScience/MazamaLocationUtils.
@Manual{, title = {MazamaLocationUtils: Manage Spatial Metadata for Known Locations}, author = {Jonathan Callahan}, year = {2023}, - note = {R package version 0.4.0}, + note = {R package version 0.4.1}, url = {https://github.com/MazamaScience/MazamaLocationUtils}, }diff --git a/docs/index.html b/docs/index.html index fef6134..68f20db 100644 --- a/docs/index.html +++ b/docs/index.html @@ -36,7 +36,7 @@ diff --git a/docs/news/index.html b/docs/news/index.html index 17b5558..1c70ac2 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -17,7 +17,7 @@ @@ -60,6 +60,10 @@
NEWS.md
+
clusterByDistance()
and table_addClustering()
functions.#' @examples -library(MazamaLocationUtils)Fremont, Seattle 47.6504, -122.3509Magnolia, Seattle 47.6403, -122.3997Downtown Seattle 47.6055, -122.3370
-fremont_x <- jitter(rep(-122.3509, 10), .0005) -fremont_y <- jitter(rep(47.6504, 10), .0005)
-magnolia_x <- jitter(rep(-122.3997, 8), .0005) -magnolia_y <- jitter(rep(47.6403, 8), .0005)
-downtown_x <- jitter(rep(-122.3370, 3), .0005) -downtown_y <- jitter(rep(47.6055, 3), .0005)Apply clustering
-tbl <- -dplyr::tibble( -longitude = c(fremont_x, magnolia_x, downtown_x), -latitude = c(fremont_y, magnolia_y, downtown_y) -) %>% -clusterByDistance( -clusterDiameter = 1000 -)
-plot(tbl$longitude, tbl$latitude, pch = tbl$clusterID)
library(MazamaLocationUtils)
+
+# Fremont, Seattle 47.6504, -122.3509
+# Magnolia, Seattle 47.6403, -122.3997
+# Downtown Seattle 47.6055, -122.3370
+
+fremont_x <- jitter(rep(-122.3509, 10), .0005)
+fremont_y <- jitter(rep(47.6504, 10), .0005)
+
+magnolia_x <- jitter(rep(-122.3997, 8), .0005)
+magnolia_y <- jitter(rep(47.6403, 8), .0005)
+
+downtown_x <- jitter(rep(-122.3370, 3), .0005)
+downtown_y <- jitter(rep(47.6055, 3), .0005)
+
+# Apply clustering
+tbl <-
+ dplyr::tibble(
+ longitude = c(fremont_x, magnolia_x, downtown_x),
+ latitude = c(fremont_y, magnolia_y, downtown_y)
+ ) %>%
+ clusterByDistance(
+ clusterDiameter = 1000
+ )
+
+plot(tbl$longitude, tbl$latitude, pch = tbl$clusterID)
+
+
#' @examples -library(MazamaLocationUtils)Fremont, Seattle 47.6504, -122.3509Magnolia, Seattle 47.6403, -122.3997Downtown Seattle 47.6055, -122.3370
-fremont_x <- jitter(rep(-122.3509, 10), .0005) -fremont_y <- jitter(rep(47.6504, 10), .0005)
-magnolia_x <- jitter(rep(-122.3997, 8), .0005) -magnolia_y <- jitter(rep(47.6403, 8), .0005)
-downtown_x <- jitter(rep(-122.3370, 3), .0005) -downtown_y <- jitter(rep(47.6055, 3), .0005)Apply clustering
-tbl <- -dplyr::tibble( -longitude = c(fremont_x, magnolia_x, downtown_x), -latitude = c(fremont_y, magnolia_y, downtown_y) -) %>% -table_addClustering( -clusterDiameter = 1000 -)
-plot(tbl$longitude, tbl$latitude, pch = tbl$clusterID)
library(MazamaLocationUtils)
+
+# Fremont, Seattle 47.6504, -122.3509
+# Magnolia, Seattle 47.6403, -122.3997
+# Downtown Seattle 47.6055, -122.3370
+
+fremont_x <- jitter(rep(-122.3509, 10), .0005)
+fremont_y <- jitter(rep(47.6504, 10), .0005)
+
+magnolia_x <- jitter(rep(-122.3997, 8), .0005)
+magnolia_y <- jitter(rep(47.6403, 8), .0005)
+
+downtown_x <- jitter(rep(-122.3370, 3), .0005)
+downtown_y <- jitter(rep(47.6055, 3), .0005)
+
+# Apply clustering
+tbl <-
+ dplyr::tibble(
+ longitude = c(fremont_x, magnolia_x, downtown_x),
+ latitude = c(fremont_y, magnolia_y, downtown_y)
+ ) %>%
+ table_addClustering(
+ clusterDiameter = 1000
+ )
+
+plot(tbl$longitude, tbl$latitude, pch = tbl$clusterID)
+
+
The maptype
argument is mapped onto leaflet "ProviderTile"
-names. Current mappings include:
"roadmap" -- "OpenStreetMap"
"satellite" -- "Esri.WorldImagery"
"terrain" -- "Esri.WorldTopoMap"
"toner" -- "Stamen.Toner"
If a character string not listed above is provided, it will be used as the +names. Current mappings include:
"roadmap" => "OpenStreetMap"
"satellite" => "Esri.WorldImagery"
"terrain" => "Esri.WorldTopoMap"
"toner" => "Stamen.Toner"
If a character string not listed above is provided, it will be used as the underlying map tile if available. See https://leaflet-extras.github.io/leaflet-providers/ for a list of "provider tiles" to use as the background map.
diff --git a/docs/reference/table_leafletAdd.html b/docs/reference/table_leafletAdd.html index 42fed0c..583f2c6 100644 --- a/docs/reference/table_leafletAdd.html +++ b/docs/reference/table_leafletAdd.html @@ -20,7 +20,7 @@