Skip to content

Commit

Permalink
fixed issues due to sf reverse dependency changes
Browse files Browse the repository at this point in the history
  • Loading branch information
16EAGLE committed Mar 25, 2020
1 parent 34b30d2 commit 8f1712d
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 32 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Authors@R: person("Jakob", "Schwalb-Willmann", email = "movevis@schwalb-willmann
Description: Tools to visualize movement data (e.g. from GPS tracking) and temporal changes of environmental data (e.g. from remote sensing) by creating video animations.
License: GPL-3
Encoding: UTF-8
RoxygenNote: 7.0.2
RoxygenNote: 7.1.0
Imports:
move,
raster,
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ Revised distance calculations & handling of dateline crossings. Development vers
* Distance calculations are now based on `lwgeom`
* Refined base map plotting (see additional arguments `...` of `frames_spatial` for available options)
* Added `NA` handling for base maps (e.g. rasterized labels)
* Reduced dependencies
* Dropped dependencies

**Bug fixes:**

* Minor errors and warnings caused by reverse dependency changes of package `sf`

<br>

Expand Down
1 change: 0 additions & 1 deletion R/align_move.R
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#' @author Jakob Schwalb-Willmann
#'
#' @importFrom move timestamps timeLag interpolateTime moveStack move split
#' @importFrom raster crs
#' @importFrom lubridate second<- minute<- hour<- day<-
#'
#' @seealso \code{\link{df2move}} \code{\link{frames_spatial}} \code{\link{frames_graph}}
Expand Down
2 changes: 1 addition & 1 deletion R/frames_spatial.R
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ frames_spatial <- function(m, r_list = NULL, r_times = NULL, r_type = "gradient"
if(is.null(equidistant)) if(is.null(ext)) equidistant <- TRUE else equidistant <- FALSE
if(!is.logical(equidistant)) out("Argument 'equidistant' must be of type 'logical'.", type = 3)

if(all(as.integer(st_crs(m)[[1]]) != as.integer(4326), isTRUE(cross_dateline))){
if(all(as.integer(st_crs(m)$epsg) != as.integer(4326), isTRUE(cross_dateline), na.rm = T)){
out("Argument 'cross_dateline' is ignored, since the coordinate reference system of 'm' is not geographical (long/lat).", type = 2)
cross_dateline <- FALSE
}
Expand Down
4 changes: 2 additions & 2 deletions R/moveVis-internal.R
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ repl_vals <- function(data, x, y){
#' @noRd
.time_conform <- function(m){

m.indi <- if(inherits(m, "MoveStack")) split(m) else list(m)
m.indi <- if(inherits(m, "MoveStack")) move::split(m) else list(m)
ts <- .lapply(m.indi, timestamps, moveVis.verbose = F)
tl <- .lapply(m.indi, timeLag, unit = "secs", moveVis.verbose = F)

Expand Down Expand Up @@ -626,7 +626,7 @@ repl_vals <- function(data, x, y){
})

## composite imagery
r <- compose_tile_grid(tg, images)
r <- quiet(compose_tile_grid(tg, images))
crop(projectRaster(r, crs = m.crs), extent(y[1], y[3], y[2], y[4]), snap = "out")
})

Expand Down
4 changes: 2 additions & 2 deletions docs/articles/example-1.html

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

4 changes: 2 additions & 2 deletions docs/articles/example-3.html

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

2 changes: 1 addition & 1 deletion docs/index.html

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

7 changes: 6 additions & 1 deletion docs/news/index.html

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

14 changes: 7 additions & 7 deletions docs/reference/align_move.html

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

Loading

0 comments on commit 8f1712d

Please sign in to comment.