Skip to content

Commit

Permalink
rc 0.9.0 to resolve #53
Browse files Browse the repository at this point in the history
  • Loading branch information
mdsumner committed Jan 22, 2024
1 parent c4b290e commit bf01720
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 22 deletions.
6 changes: 3 additions & 3 deletions 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")),
Expand All @@ -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,
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion 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

Expand Down
4 changes: 2 additions & 2 deletions R/spatial.R
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
}
}
Expand Down
10 changes: 1 addition & 9 deletions R/tasmap.R
Expand Up @@ -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")
9 changes: 2 additions & 7 deletions 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

Expand Down
18 changes: 18 additions & 0 deletions man/ceramic-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit bf01720

Please sign in to comment.