diff --git a/DESCRIPTION b/DESCRIPTION index 5b7c562..6198308 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ceramic Title: Download Online Imagery Tiles -Version: 0.8.0.9001 +Version: 0.9.0 Authors@R: c( person("Michael", "Sumner", email = "mdsumner@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-2471-7511")), @@ -14,7 +14,7 @@ Description: Download imagery tiles to a standard cache and load the data into r Depends: R (>= 3.5.0), terra License: GPL-3 Encoding: UTF-8 -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.0 Roxygen: list(markdown = TRUE) Imports: curl, @@ -38,7 +38,7 @@ Suggests: covr, spelling, testthat (>= 3.0.0) -URL: https://github.com/hypertidy/ceramic, https://hypertidy.github.io/ceramic/ +URL: https://hypertidy.github.io/ceramic/ BugReports: https://github.com/hypertidy/ceramic/issues Language: en-US LazyData: true diff --git a/NAMESPACE b/NAMESPACE index e2f7424..abbbec1 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -38,6 +38,7 @@ importFrom(stats,approx) importFrom(stats,setNames) importFrom(stringr,str_extract) importFrom(terra,ext) +importFrom(terra,is.lonlat) importFrom(terra,rast) importFrom(terra,set.crs) importFrom(terra,set.ext) diff --git a/NEWS.md b/NEWS.md index 0f66a57..4a1ebbb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,8 @@ -# ceramic dev +# 0.9.0 * Added a suite of Tasmap sources for 'cc_location()'. +* Removed bad-practice use on terra internals, thanks to Robert Hijmans. # ceramic 0.8.0 diff --git a/R/spatial.R b/R/spatial.R index e01e31b..2942b72 100644 --- a/R/spatial.R +++ b/R/spatial.R @@ -11,7 +11,7 @@ is_spatial <- function(x) { inherits(x, .spatial_classes()) } - +#' @importFrom terra is.lonlat #' @importFrom wk wk_crs .crs_crs <- function(x) { crs <- crsmeta::crs_wkt(x) @@ -42,7 +42,7 @@ is_spatial <- function(x) { if (is.na(crs)) { # if (x@ptr$isLonLat()) { - if (is.lonlat(x, perhaps=FALSE, warn=FALSE)) { + if (terra::is.lonlat(x, perhaps=FALSE, warn=FALSE)) { crs <- "+proj=longlat +datum=WGS84" } } diff --git a/R/tasmap.R b/R/tasmap.R index 15ffb5f..1c71f78 100644 --- a/R/tasmap.R +++ b/R/tasmap.R @@ -22,13 +22,5 @@ names <- unlist(lapply(strsplit(bases, "/"), "[", 2)) tasmap_sources <- sprintf(template, bases, gsub("/", "_", bases)) names(tasmap_sources) <- tolower(names) -## bit more work needed +## bit more work needed, there's a few more layer servers tasmap_sources <- c(tasmap_sources, street = "https://services.thelist.tas.gov.au/arcgis/rest/services/Raster/TTSA/MapServer/WMTS/1.0.0/WMTSCapabilities.xml") -# tasmap_sources <- c( -# ortho = "WMS:https://services.thelist.tas.gov.au/arcgis/services/Basemaps/Orthophoto/MapServer/WmsServer?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Data%20Boundaries&SRS=EPSG:4326&BBOX=111.848916,-54.849439,159.145536,-7.800454", -# street = "WMS:https://services.thelist.tas.gov.au/arcgis/services/Raster/TTSA/MapServer/WmsServer?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Data_Boundaries47811&SRS=EPSG:4326&BBOX=111.848916,-54.849439,159.145536,-7.800454" , -# mapbook = "WMS:https://services.thelist.tas.gov.au/arcgis/services/Basemaps/ESgisMapBookPUBLIC/MapServer/WmsServer?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Data_Boundaries47811&SRS=EPSG:4326&BBOX=111.848916,-54.849439,159.145536,-7.800454", -# hillshade = "WMS:https://services.thelist.tas.gov.au/arcgis/services/Basemaps/HillshadeGrey/MapServer/WmsServer?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Data_Boundaries47811&SRS=EPSG:4326&BBOX=111.848916,-54.849439,159.145536,-7.800454" , -# tasmap250 = "WMS:https://services.thelist.tas.gov.au/arcgis/services/Basemaps/Tasmap250K/MapServer/WmsServer?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Data_Boundaries47811&SRS=EPSG:4326&BBOX=111.848916,-54.849439,159.145536,-7.800454" , -# topo = "WMS:https://services.thelist.tas.gov.au/arcgis/services/Basemaps/Topographic/MapServer/WmsServer?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Data%20Boundaries&SRS=EPSG:4326&BBOX=111.848916,-54.849439,159.145536,-7.800454", -# tasmap500 = "WMTS:https://services.thelist.tas.gov.au/arcgis/rest/services/Basemaps/Tasmap500K/MapServer/WMTS/1.0.0/WMTSCapabilities.xml,layer=Basemaps_Tasmap500K,tilematrixset=default028mm") diff --git a/cran-comments.md b/cran-comments.md index 57b1c91..f1663d2 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,16 +1,11 @@ -# ceramic 0.8.0 +# ceramic 0.9.0 -* Second submit, reduced README size. - -* Fixed LazyData note on CRAN (ceramic now has a data set installed). - -* (There's a curl message on CRAN, but for old windows release. ) Thank you. ## Test environments -* Ubuntu R 4.2.3 +* Ubuntu R 4.3.2 * win-builder (devel) * mac-builder diff --git a/man/ceramic-package.Rd b/man/ceramic-package.Rd index 909d6a8..02fd940 100644 --- a/man/ceramic-package.Rd +++ b/man/ceramic-package.Rd @@ -52,3 +52,21 @@ Other functions that are either rarely used or considered subject to change: \code{\link{cc_macquarie}}\tab Specific location hardcoded form of \code{\link{cc_location}} \cr } } +\seealso{ +Useful links: +\itemize{ + \item \url{https://hypertidy.github.io/ceramic/} + \item Report bugs at \url{https://github.com/hypertidy/ceramic/issues} +} + +} +\author{ +\strong{Maintainer}: Michael Sumner \email{mdsumner@gmail.com} (\href{https://orcid.org/0000-0002-2471-7511}{ORCID}) + +Other contributors: +\itemize{ + \item Miles McBain (\href{https://orcid.org/0000-0003-2865-2548}{ORCID}) [contributor] + \item Ben Raymond (regex wizardry) [contributor] +} + +}